diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 03bd2f0..b986822 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(7); + Frame f = BlueNormals.blueStandJab().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 43af406..def4b96 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -355,20 +355,26 @@ public class BlueNormals { /* Individual hitboxes creation */ - Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); - Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); - Push_HitBox pushB = new Push_HitBox(70,70,150,500); + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,220*1.25f,70*1.25f); + Push_HitBox pushb = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f); /* adding hitboxes to lists */ phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); pthb.add(pthb1); /* frame creation */ - Frame f = new Frame(0.0,0.0,phb,ahb,pthb,athb,pushB, + Frame f = new Frame(0.0,0.0,phb,ahb,pthb,athb,pushb, //cancels (in order : normal, special, jump, move, dash) false,false,false,false,false); f.setSpriteWrap((138*3),0,138,138); @@ -388,20 +394,28 @@ public class BlueNormals { /* Individual hitboxes creation */ - Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); - Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); - Push_HitBox pushB = new Push_HitBox(70,70,150,500); - + Passive_HitBox phb1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox phb2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f); + Passive_HitBox phb3 = new Passive_HitBox(200*1.25f,-450,250f,220); + Passive_HitBox phb4 = new Passive_HitBox(400,-290,150,50*1.25f); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,220*1.25f,70*1.25f); + Push_HitBox pushb = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f); + Active_HitBox ahb1 = new Active_HitBox(400,-280,220,75); /* adding hitboxes to lists */ phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); pthb.add(pthb1); + ahb.add(ahb1); + /* frame creation */ - Frame f = new Frame(0.0,0.0,phb,ahb,pthb,athb,pushB, + Frame f = new Frame(0.0,0.0,phb,ahb,pthb,athb,pushb, //cancels (in order : normal, special, jump, move, dash) false,true,false,false,false); f.setSpriteWrap((138*13),0,138,138); @@ -410,35 +424,23 @@ public class BlueNormals { private static Frame standAFrame3(){ - /* - Hitboxes lists creation - */ + Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,75*1.25f,150*1.25f); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f); + Passive_HitBox bStandPHB4 = new Passive_HitBox(250*1.25f,-150*1.25f,50*1.25f,50*1.25f); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200*1.25f,-500*1.25f,200*1.25f,70*1.25f); + Push_HitBox bStandPB1 = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); - ArrayList ahb = new ArrayList(); - ArrayList athb = new ArrayList(); - - /* - Individual hitboxes creation - */ - Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); - Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); - Push_HitBox pushB = new Push_HitBox(70,70,150,500); - - /* - adding hitboxes to lists - */ - phb.add(phb1); - pthb.add(pthb1); - - /* - frame creation - */ - Frame f = new Frame(0.0,0.0,phb,ahb,pthb,athb,pushB, - //cancels (in order : normal, special, jump, move, dash) - false,true,false,false,false); - f.setSpriteWrap((138*14),0,138,138); - return f; + phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); + pthb.add(bStandPTHB1); + Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), + bStandPB1,false,true,false,false,false); + blueStandframe1.setSpriteWrap(138,0,138,138); + return blueStandframe1; } private static attackPart blueStandAstartup() {