diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index b986822..7fe4834 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -761,7 +761,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = BlueNormals.blueStandJab().getFrame().get(7); + Frame f = BlueMisc.blueCrouchHit(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); diff --git a/src/gameplay/Characters/Blue/BlueMisc.java b/src/gameplay/Characters/Blue/BlueMisc.java index 02915da..033a632 100644 --- a/src/gameplay/Characters/Blue/BlueMisc.java +++ b/src/gameplay/Characters/Blue/BlueMisc.java @@ -278,4 +278,72 @@ public class BlueMisc { while(c < f.length) {f[c] = bDash4(); c++;} return f; } + + protected static Frame blueStandHit(){ + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(170,-150,250,550); + Passive_HitBox pHB1 = new Passive_HitBox(150,-150,285,250); + Passive_HitBox pHB2 = new Passive_HitBox(180,-400,290,270); + + phb.add(pHB1); + phb.add(pHB2); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*11,138*3,138,138); + return f; + } + + protected static Frame blueCrouchHit(){ + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(170,-250,250,450); + Passive_HitBox pHB1 = new Passive_HitBox(150,-250,285,150); + Passive_HitBox pHB2 = new Passive_HitBox(180,-500,290,200); + Passive_HitBox pHB3 = new Passive_HitBox(180,-400,190,170); + + phb.add(pHB1); + phb.add(pHB2); + phb.add(pHB3); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*14,138*2,138,138); + return f; + } } diff --git a/src/gameplay/Characters/Blue/CharacterBlue.java b/src/gameplay/Characters/Blue/CharacterBlue.java index 894a96d..bc84d92 100644 --- a/src/gameplay/Characters/Blue/CharacterBlue.java +++ b/src/gameplay/Characters/Blue/CharacterBlue.java @@ -33,6 +33,8 @@ public class CharacterBlue { Attack[] atks = {blueLDP(),blueFordwardRoundHouse(),blueCrouchFierce(),blueCrouchJab(),blueStandHeavyKick(),blueStandJab(),blueFordwardRoundHouse()}; + Frame shf = BlueMisc.blueStandHit(); + Frame chf = BlueMisc.blueCrouchHit(); /* * Temporary values to change later */ @@ -55,7 +57,7 @@ public class CharacterBlue { - Character c = new Character(0,0,standF[0],1000,atks,fJ,nJ,bJ,fDash,bDash,th,standF,crouchF,fWalkF,bWalkF,f,f,fallingFs,f,f,f,f); + Character c = new Character(0,0,standF[0],1000,atks,fJ,nJ,bJ,fDash,bDash,th,standF,crouchF,fWalkF,bWalkF,f,f,fallingFs,f,f,shf,chf); return c; }