diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 7fe4834..f0476a7 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 = BlueMisc.blueCrouchHit(); + Frame f = BlueMisc.blueCrouchGuard(); 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 033a632..f70297d 100644 --- a/src/gameplay/Characters/Blue/BlueMisc.java +++ b/src/gameplay/Characters/Blue/BlueMisc.java @@ -346,4 +346,77 @@ public class BlueMisc { f.setSpriteWrap(138*14,138*2,138,138); return f; } + + protected static Frame blueStandGuard(){ + //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(220,-250,230,150); + Passive_HitBox pHB2 = new Passive_HitBox(250,-550,230,150); + Passive_HitBox pHB3 = new Passive_HitBox(270,-350,150,300); + Passive_HitBox pHB4 = new Passive_HitBox(280,-180,90,90); + + phb.add(pHB1); + phb.add(pHB2); + phb.add(pHB3); + phb.add(pHB4); + + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*1,138*7,138,138); + return f; + } + + protected static Frame blueCrouchGuard(){ + //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(240,-400,250,300); + Passive_HitBox pHB1 = new Passive_HitBox(310,-270,100,90); + Passive_HitBox pHB2 = new Passive_HitBox(200,-500,300,200); + Passive_HitBox pHB3 = new Passive_HitBox(220,-350,240,200); + + 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*4,138,138); + return f; + } } diff --git a/src/gameplay/Characters/Blue/CharacterBlue.java b/src/gameplay/Characters/Blue/CharacterBlue.java index bc84d92..869003c 100644 --- a/src/gameplay/Characters/Blue/CharacterBlue.java +++ b/src/gameplay/Characters/Blue/CharacterBlue.java @@ -35,6 +35,8 @@ public class CharacterBlue { Frame shf = BlueMisc.blueStandHit(); Frame chf = BlueMisc.blueCrouchHit(); + Frame sbf = BlueMisc.blueStandGuard(); + Frame cbf = BlueMisc.blueCrouchGuard(); /* * Temporary values to change later */ @@ -57,7 +59,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,shf,chf); + Character c = new Character(0,0,standF[0],1000,atks,fJ,nJ,bJ,fDash,bDash,th,standF,crouchF,fWalkF,bWalkF,f,f,fallingFs,sbf,cbf,shf,chf); return c; }