diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 83762db..03bd2f0 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.blueCrouchFierce().getFrame().get(22); + Frame f = BlueNormals.blueCrouchFierce().getFrame().get(7); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index f136378..43af406 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -222,44 +222,85 @@ public class BlueNormals { } private static Frame crouchCFrame3() { - Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100); - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Passive_HitBox bStandPHB1 = new Passive_HitBox(300,-200,150,500); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200,-600,280,100); + Push_HitBox bStandPB1 = new Push_HitBox(270,-170,180,540); + Active_HitBox ahb1 = new Active_HitBox(400,0,90,300); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); + ArrayList ahb = new ArrayList(); phb.add(bStandPHB1); pthb.add(bStandPTHB1); - Frame f = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), + ahb.add(ahb1); + Frame f = new Frame(0.0,0.0,phb,ahb,pthb,new ArrayList(), bStandPB1,false,false,false,false,false); f.setSpriteWrap((138*8),(138*2),138,138); return f; } private static Frame crouchCFrame4() { - Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100); - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame f = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - f.setSpriteWrap((138*9),(138*2),138,138); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB = new Push_HitBox(140*1.25f,-250*1.25f,280*1.25f,300*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-250*1.25f,200*1.25f,300*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(260*1.25f,-200*1.25f,80*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,300*1.25f,70*1.25f); + pthb.add(pthb1); + phb.add(phb1); + phb.add(phb2); + + Frame f = new Frame(moveX,moveY,phb,ahb,pthb,athb,pB,normalC,specialC,jumpC,moveC,dashC); + + f.setSpriteWrap(138*9,138*2,138,138); return f; } private static Frame crouchCFrame5() { - Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500); - Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100); - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame f = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - f.setSpriteWrap((138*10),(138*2),138,138); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB = new Push_HitBox(140*1.25f,-250*1.25f,280*1.25f,300*1.25f); + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-250*1.25f,200*1.25f,300*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(260*1.25f,-200*1.25f,80*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,300*1.25f,70*1.25f); + pthb.add(pthb1); + phb.add(phb1); + phb.add(phb2); + + Frame f = new Frame(moveX,moveY,phb,ahb,pthb,athb,pB,normalC,specialC,jumpC,moveC,dashC); + + f.setSpriteWrap(138*10,138*2,138,138); return f; }