diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index 5bcbdb2..8b463be 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -27,7 +27,7 @@ public class BlueNormals { pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(102,120,102,120); + blueStandframe1.setSpriteWrap(0,(138*2),138,138); return blueStandframe1; } @@ -41,7 +41,7 @@ public class BlueNormals { pthb.add(bStandPTHB1); Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), bStandPB1,false,false,false,false,false); - blueStandframe1.setSpriteWrap(816,120,102,120); + blueStandframe1.setSpriteWrap(138,(138*2),138,138); return blueStandframe1; } @@ -55,7 +55,7 @@ public class BlueNormals { 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(102,120,102,120); + blueStandframe1.setSpriteWrap((138*2),(138*2),138,138); return blueStandframe1; } @@ -93,7 +93,115 @@ public class BlueNormals { attackPart[] parts = {blueCrouchAstartup(),blueCrouchAactive(),blueCrouchArecovery()}; return new Attack(isSpecial,rS,cmd,parts); } + + private static Frame crouchCFrame1() { + 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 f = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), + bStandPB1,false,false,false,false,false); + f.setSpriteWrap((138*6),(138*2),138,138); + return f; + } + + private static Frame crouchCFrame2() { + 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 f = new Frame(0.0,0.0,phb,new ArrayList(),pthb,new ArrayList(), + bStandPB1,false,false,false,false,false); + f.setSpriteWrap((138*7),(138*2),138,138); + return f; + } + + 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); + 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*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); + 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); + 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); + 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); + return f; + } + + private static attackPart blueCrouchCstartup() { + Frame[] f = new Frame[5]; + f[0] = crouchCFrame1(); + f[1] = crouchCFrame1(); + f[2] = crouchCFrame2(); + f[3] = crouchCFrame2(); + f[4] = crouchCFrame2(); + return(new attackPart(f)); + } + private static attackPart blueCrouchCrecovery() { + Frame[] f = new Frame[19]; + int i; + for(i = 0; i < 10; i++) { + f[i] = crouchCFrame4(); + } + for(int j = i; j < f.length; j++) { + f[j] = crouchCFrame5(); + } + return(new attackPart(f)); + } + + private static attackPart blueCrouchCactive() { + Frame[] f = new Frame[5]; + for(int i = 0; i < f.length; i++) { + f[i] = crouchCFrame3(); + } + return(new attackPart(23,0,13,29,12,5,f,false,false,false)); + } + + public static Attack blueCrouchFierce() { + ButtonIG[][] cmd = {{DOWN,C}}; + boolean isSpecial = false; + Status rS = Status.NORMAL; + attackPart[] parts = {blueCrouchCstartup(),blueCrouchCactive(),blueCrouchCrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + private static Frame standAFrame1(){ /* @@ -123,7 +231,7 @@ public class BlueNormals { 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(102,0,102,120); + f.setSpriteWrap((138*3),0,138,138); return f; } @@ -156,7 +264,7 @@ public class BlueNormals { 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(510,120,102,120); + f.setSpriteWrap((138*13),0,138,138); return f; } @@ -189,7 +297,7 @@ public class BlueNormals { 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(102,0,102,120); + f.setSpriteWrap((138*14),0,138,138); return f; } @@ -256,7 +364,7 @@ public class BlueNormals { Frame f = new Frame(0.0,3.0,phb,ahb,pthb,athb,pushB, //cancels (in order : normal, special, jump, move, dash) false,false,false,false,false); - f.setSpriteWrap(408,0,102,120); + f.setSpriteWrap((138*4),0,138,138); return f; } @@ -289,7 +397,7 @@ public class BlueNormals { 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(1632,120,102,120); + f.setSpriteWrap((138*10),138,138,138); return f; } @@ -322,22 +430,58 @@ public class BlueNormals { 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(102,0,102,120); + f.setSpriteWrap((138*9),138,138,138); + return f; + } + + private static Frame standDFrame4(){ + + /* + Hitboxes lists creation + */ + 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,3.0,phb,ahb,pthb,athb,pushB, + //cancels (in order : normal, special, jump, move, dash) + false,false,false,false,false); + f.setSpriteWrap((138*10),138,138,138); return f; } private static attackPart blueStandDstartup() { Frame[] f = new Frame[8]; - for(int i = 0; i < f.length; i++) { + for(int i = 0; i < 5; i++) { f[i] = standDFrame1(); } + for(int i = 5; i< f.length; i++) { + f[i] = standDFrame2(); + } return(new attackPart(f)); } private static attackPart blueStandDactive() { Frame[] f = new Frame[5]; for(int i = 0; i < f.length; i++) { - f[i] = standDFrame2(); + f[i] = standDFrame3(); } return(new attackPart(100,0,20,18,16,14,f,false,false,false)); } @@ -345,7 +489,7 @@ public class BlueNormals { private static attackPart blueStandDrecovery() { Frame[] f = new Frame[18]; for(int i = 0; i < f.length; i++) { - f[i] = standDFrame3(); + f[i] = standDFrame4(); } return(new attackPart(f)); } diff --git a/src/gameplay/Characters/Blue/CharacterBlue.java b/src/gameplay/Characters/Blue/CharacterBlue.java index e8ba7c8..c9db4c7 100644 --- a/src/gameplay/Characters/Blue/CharacterBlue.java +++ b/src/gameplay/Characters/Blue/CharacterBlue.java @@ -31,7 +31,7 @@ public class CharacterBlue { Jump nJ = new Jump(njcmd,nJumpF); Jump bJ = new Jump(bjcmd,bJumpF); - Attack[] atks = {blueLDP(),blueCrouchJab(),blueStandHeavyKick(),blueStandJab()}; + Attack[] atks = {blueLDP(),blueCrouchFierce(),blueCrouchJab(),blueStandHeavyKick(),blueStandJab()}; /* * Temporary values to change later