diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 63de31f..17c3448 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -29,14 +29,14 @@ public class BlueBaseFrames { //hitbox lists ArrayList ahb = new ArrayList(); - ArrayList athb = 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(70,70,150,500); + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); - Frame f = new Frame(moveX,moveY,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); //set sprite data on sheet f.setSpriteWrap(0,0,138,138); @@ -44,12 +44,18 @@ public class BlueBaseFrames { } */ private static Frame generateStandFrame1(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,75,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(250,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200,-500,200,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); 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,true,true,true,true,true); @@ -58,12 +64,18 @@ public class BlueBaseFrames { } private static Frame generateStandFrame2(){ - Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,75,300); - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,75,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(250,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200,-500,200,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); 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,true,true,true,true,true); @@ -83,17 +95,36 @@ public class BlueBaseFrames { } private static Frame generateCrouchFrame1(){ - 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 = true; + boolean specialC = true; + boolean jumpC = true; + boolean moveC = true; + boolean dashC = true; + + //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 blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,true,true,true,true,true); - blueStandframe1.setSpriteWrap(138,138*3,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB = new Push_HitBox(140,-250,280,300); + Passive_HitBox phb1 = new Passive_HitBox(200,-250,200,300); + Passive_HitBox phb2 = new Passive_HitBox(260,-200,80,50); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150,-500,300,70); + 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(0,138*2,138,138); + return f; } protected static Frame[] blueCrouchFrames() { @@ -102,31 +133,79 @@ public class BlueBaseFrames { } private static Frame generateNeutralJumpFrame1(){ - 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 = 18.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(18.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*7,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*7,0,138,138); + return f; } private static Frame generateNeutralJumpFrame2(){ - 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 = -18.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(-18.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*7,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*7,0,138,138); + return f; } protected static Frame[] blueNeutralJump() { @@ -141,59 +220,155 @@ public class BlueBaseFrames { } private static Frame GenerateForwardJumpFrame1(){ - 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 = 10.0; + double moveY = 18.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(18.0,10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*6,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*6,0,138,138); + return f; } private static Frame GenerateForwardJumpFrame2(){ - 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 = 10.0; + double moveY = 9.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(9.0,10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*7,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*7,0,138,138); + return f; } private static Frame GenerateForwardJumpFrame3(){ - 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 = 10.0; + double moveY = -9.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(-9.0,10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*7,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*7,0,138,138); + return f; } private static Frame GenerateForwardJumpFrame4(){ - 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 = 10.0; + double moveY = -18.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(-18.0,10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*6,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*6,0,138,138); + return f; } protected static Frame[] blueForwardJump() { @@ -214,59 +389,155 @@ public class BlueBaseFrames { } private static Frame BackJumpFrame1(){ - 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 = -10.0; + double moveY = 18.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(18.0,-10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*6,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*6,0,138,138); + return f; } private static Frame BackJumpFrame2(){ - 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 = -10.0; + double moveY = 9.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(9.0,-10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*7,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*7,0,138,138); + return f; } private static Frame BackJumpFrame3(){ - 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 = -10.0; + double moveY = 9.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(-9.0,-10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*7,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,90,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(280,-20,70,100); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*7,0,138,138); + return f; } private static Frame BackJumpFrame4(){ - 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 = -10.0; + double moveY = 18.0; + + //cancelData + boolean normalC = true; + 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(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(-18.0,-10.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(138*6,0,138,138); - return blueStandframe1; + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-20,160,400); + Passive_HitBox phb1 = new Passive_HitBox(180,-100,170,200); + Passive_HitBox phb2 = new Passive_HitBox(210,-350,150,80); + Passive_HitBox phb3 = new Passive_HitBox(230,-200,140,160); + Passive_HitBox phb4 = new Passive_HitBox(230,-50,70,50); + Passive_HitBox phb5 = new Passive_HitBox(210,-430,70,70); + phb.add(phb1); + phb.add(phb2); + phb.add(phb3); + phb.add(phb4); + phb.add(phb5); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138*6,0,138,138); + return f; } protected static Frame[] blueBackJump() { @@ -288,26 +559,38 @@ public class BlueBaseFrames { private static Frame walkForwardFrame1(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,true,true,true,true,true); - blueStandframe1.setSpriteWrap(138*3,0,138,138); + blueStandframe1.setSpriteWrap(138*2,0,138,138); return blueStandframe1; } private static Frame walkForwardFrame2(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,true,true,true,true,true); @@ -316,12 +599,18 @@ public class BlueBaseFrames { } private static Frame walkForwardFrame3(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,true,true,true,true,true); @@ -330,12 +619,18 @@ public class BlueBaseFrames { } private static Frame walkForwardFrame4(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,true,true,true,true,true); @@ -363,26 +658,58 @@ public class BlueBaseFrames { private static Frame walkBackFrame4(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,true,true,true,true,true); - blueStandframe1.setSpriteWrap(138*5,0,138,138); + blueStandframe1.setSpriteWrap(138*2,0,138,138); return blueStandframe1; } private static Frame walkBackFrame3(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); + pthb.add(bStandPTHB1); + Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList(),pthb,new ArrayList(), + bStandPB1,true,true,true,true,true); + blueStandframe1.setSpriteWrap(138*3,0,138,138); + return blueStandframe1; + } + + private static Frame walkBackFrame2(){ + Passive_HitBox bStandPHB1 = new Passive_HitBox(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,true,true,true,true,true); @@ -390,31 +717,23 @@ public class BlueBaseFrames { return blueStandframe1; } - private static Frame walkBackFrame2(){ - 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); - ArrayList phb = new ArrayList(); - ArrayList pthb = new ArrayList(); - phb.add(bStandPHB1); - pthb.add(bStandPTHB1); - Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList(),pthb,new ArrayList(), - bStandPB1,true,true,true,true,true); - blueStandframe1.setSpriteWrap(138*3,0,138,138); - return blueStandframe1; - } - private static Frame walkBackFrame1(){ - 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(200,-200,150,150); + Passive_HitBox bStandPHB2 = new Passive_HitBox(220,-300,100,150); + Passive_HitBox bStandPHB3 = new Passive_HitBox(200,-400,150,150); + Passive_HitBox bStandPHB4 = new Passive_HitBox(280,-150,50,50); + Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(150,-500,220,70); + Push_HitBox bStandPB1 = new Push_HitBox(200,-150,160,400); ArrayList phb = new ArrayList(); ArrayList pthb = new ArrayList(); phb.add(bStandPHB1); + phb.add(bStandPHB2); + phb.add(bStandPHB3); + phb.add(bStandPHB4); pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,true,true,true,true,true); - blueStandframe1.setSpriteWrap(138*3,0,138,138); + blueStandframe1.setSpriteWrap(138*5,0,138,138); return blueStandframe1; } @@ -442,7 +761,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = generateStandFrame1(); + Frame f = walkForwardFrame4(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 4f, path, null);