diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 0dbd49b..5a92eb8 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -1022,7 +1022,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = BlueNormals.StandCFrame4(); + Frame f = BlueNormals.ForwardDFrame5(); 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 2166ca7..0399edc 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -1311,7 +1311,7 @@ public class BlueNormals { - private static Frame ForwardDFrame0() { + protected static Frame ForwardDFrame0() { //movement data double moveX = 3.0; double moveY = 0.0; @@ -1330,7 +1330,12 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(200,-100,250,550); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(200,-600,250,120); + Passive_HitBox phb1 = new Passive_HitBox(230, -100, 200, 550); + + pthb.add(pthb1); + phb.add(phb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1357,7 +1362,12 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(200,-100,250,550); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(200,-600,250,120); + Passive_HitBox phb1 = new Passive_HitBox(230, -100, 200, 550); + + pthb.add(pthb1); + phb.add(phb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1385,7 +1395,15 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(200,-100,250,550); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(200,-600,250,120); + Passive_HitBox phb1 = new Passive_HitBox(230, -100, 200, 550); + Passive_HitBox phb2 = new Passive_HitBox(400, -200, 200, 170); + + + pthb.add(pthb1); + phb.add(phb1); + phb.add(phb2); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1413,7 +1431,14 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(200,-100,180,550); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(200,-600,250,120); + Passive_HitBox phb1 = new Passive_HitBox(200,-100,180,550); + Active_HitBox ahb1 = new Active_HitBox(300,-60,250,300); + + pthb.add(pthb1); + phb.add(phb1); + ahb.add(ahb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1441,7 +1466,49 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(200,-100,180,550); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(200,-600,250,120); + Passive_HitBox phb1 = new Passive_HitBox(200,-100,180,550); + Active_HitBox ahb1 = new Active_HitBox(300,-160,250,300); + + pthb.add(pthb1); + phb.add(phb1); + ahb.add(ahb1); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*12),138,138,138); + return f; + } + + protected static Frame ForwardDFrame6(){ + //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 bStandPB1 = new Push_HitBox(200,-100,180,550); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(200,-600,250,120); + Passive_HitBox phb1 = new Passive_HitBox(200,-100,180,550); + Passive_HitBox ahb1 = new Passive_HitBox(300,-160,250,300); + + pthb.add(pthb1); + phb.add(phb1); + phb.add(ahb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1469,7 +1536,12 @@ public class BlueNormals { ArrayList pthb = new ArrayList(); //generate hitboxes here and then use ArrayList add method to add them to the correct list - Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + Push_HitBox bStandPB1 = new Push_HitBox(200,-100,250,550); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(200,-600,250,120); + Passive_HitBox phb1 = new Passive_HitBox(230, -100, 200, 550); + + pthb.add(pthb1); + phb.add(phb1); Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); @@ -1495,7 +1567,7 @@ public class BlueNormals { protected static attackPart blueForwardDrecovery() { Frame[] f = new Frame[8]; for (int i = 0; i < 3; i++) { - f[i] = ForwardDFrame4(); + f[i] = ForwardDFrame6(); } for (int i = 3; i < f.length; i++) { f[i] = ForwardDFrame5();