Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added blue stand jab and heavy kick moves

Browse Source
This commit is contained in:
Azra Victor 2021-06-16 10:40:46 +02:00 committed by no
parent 0fc5db4f58
commit d0a842c481
3 changed files with 276 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

279
src/gameplay/Characters/Blue/BlueNormals.java
View File

@ -13,8 +13,7 @@ import gameplay.input.ButtonIG;
import java.util.ArrayList;
import static gameplay.input.ButtonIG.A;
import static gameplay.input.ButtonIG.DOWN;
import static gameplay.input.ButtonIG.*;
public class BlueNormals {
@ -27,7 +26,7 @@ public class BlueNormals {
phb.add(bStandPHB1);
pthb.add(bStandPTHB1);
Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
bStandPB1,true,true,true,true,true);
bStandPB1,false,false,false,false,false);
blueStandframe1.setSpriteWrap(102,120,102,120);
return blueStandframe1;
}
@ -41,7 +40,7 @@ public class BlueNormals {
phb.add(bStandPHB1);
pthb.add(bStandPTHB1);
Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
bStandPB1,true,true,true,true,true);
bStandPB1,false,false,false,false,false);
blueStandframe1.setSpriteWrap(816,120,102,120);
return blueStandframe1;
}
@ -55,7 +54,7 @@ public class BlueNormals {
phb.add(bStandPHB1);
pthb.add(bStandPTHB1);
Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
bStandPB1,true,true,true,true,true);
bStandPB1,false,true,false,false,false);
blueStandframe1.setSpriteWrap(102,120,102,120);
return blueStandframe1;
}
@ -81,7 +80,7 @@ public class BlueNormals {
private static attackPart blueCrouchAactive() {
Frame[] f = new Frame[3];
f[0] = crouchAFrame3();
f[0] = crouchAFrame2();
f[1] = crouchAFrame2();
f[2] = crouchAFrame2();
return(new attackPart(15,0,4,4,8,3,f,false,false,false));
@ -91,7 +90,273 @@ public class BlueNormals {
ButtonIG[][] cmd = {{DOWN,A}};
boolean isSpecial = false;
Status rS = Status.NORMAL;
attackPart[] parts = {blueCrouchAstartup(),blueCrouchAactive(),blueCrouchAstartup()};
attackPart[] parts = {blueCrouchAstartup(),blueCrouchAactive(),blueCrouchArecovery()};
return new Attack(isSpecial,rS,cmd,parts);
}
private static Frame standAFrame1(){
/*
Hitboxes lists creation
*/
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/*
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,false,false,false,false);
f.setSpriteWrap(102,0,102,120);
return f;
}
private static Frame standAFrame2(){
/*
Hitboxes lists creation
*/
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/*
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(510,120,102,120);
return f;
}
private static Frame standAFrame3(){
/*
Hitboxes lists creation
*/
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/*
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(102,0,102,120);
return f;
}
private static attackPart blueStandAstartup() {
Frame[] f = new Frame[3];
f[0] = standAFrame1();
f[1] = standAFrame1();
f[2] = standAFrame1();
f[3] = standAFrame3();
return(new attackPart(f));
}
private static attackPart blueStandArecovery() {
Frame[] f = new Frame[5];
f[0] = standAFrame3();
f[1] = standAFrame3();
f[2] = standAFrame3();
f[3] = standAFrame3();
f[4] = standAFrame3();
return(new attackPart(f));
}
private static attackPart blueStandAactive() {
Frame[] f = new Frame[3];
f[0] = standAFrame2();
f[1] = standAFrame2();
f[2] = standAFrame2();
return(new attackPart(20,0,4,4,8,3,f,false,false,false));
}
public static Attack blueStandJab() {
ButtonIG[][] cmd = {{A}};
boolean isSpecial = false;
Status rS = Status.NORMAL;
attackPart[] parts = {blueStandAstartup(),blueStandAactive(),blueStandArecovery()};
return new Attack(isSpecial,rS,cmd,parts);
}
private static Frame standDFrame1(){
/*
Hitboxes lists creation
*/
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/*
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(408,0,102,120);
return f;
}
private static Frame standDFrame2(){
/*
Hitboxes lists creation
*/
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/*
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,false,false,false,false);
f.setSpriteWrap(1632,120,102,120);
return f;
}
private static Frame standDFrame3(){
/*
Hitboxes lists creation
*/
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/*
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,false,false,false,false);
f.setSpriteWrap(102,0,102,120);
return f;
}
private static attackPart blueStandDstartup() {
Frame[] f = new Frame[8];
for(int i = 0; i < f.length; i++) {
f[i] = standDFrame1();
}
return(new attackPart(f));
}
private static attackPart blueStandDactive() {
Frame[] f = new Frame[5];
for(int i = 0; i < f.length; i++) {
f[i] = standDFrame2();
}
return(new attackPart(100,0,20,18,16,14,f,false,false,false));
}
private static attackPart blueStandDrecovery() {
Frame[] f = new Frame[18];
for(int i = 0; i < f.length; i++) {
f[i] = standDFrame3();
}
return(new attackPart(f));
}
public static Attack blueStandHeavyKick() {
ButtonIG[][] cmd = {{D}};
boolean isSpecial = false;
Status rS = Status.NORMAL;
attackPart[] parts = {blueStandDstartup(),blueStandDactive(),blueStandDrecovery()};
return new Attack(isSpecial,rS,cmd,parts);
}
}

5
src/gameplay/Characters/Blue/CharacterBlue.java
View File

@ -3,11 +3,12 @@ package gameplay.Characters.Blue;
import gameplay.actions.*;
import gameplay.entities.Character;
import gameplay.frames.Frame;
import gameplay.Characters.Blue.BlueBaseFrames;
import gameplay.Characters.Blue.BlueBaseFrames.*;
import gameplay.input.ButtonIG;
import java.util.ArrayList;
import static gameplay.Characters.Blue.BlueNormals.*;
import static gameplay.input.ButtonIG.*;
public class CharacterBlue {
@ -29,7 +30,7 @@ public class CharacterBlue {
Jump nJ = new Jump(njcmd,nJumpF);
Jump bJ = new Jump(bjcmd,bJumpF);
Attack[] atks = {BlueNormals.blueCrouchJab()};
Attack[] atks = {blueCrouchJab(),blueStandJab(),blueStandHeavyKick()};
/*
* Temporary values to change later

2
src/gameplay/match/match.java
View File

@ -320,7 +320,7 @@ public class match {
c.setStatus(Status.JUMPING);
} else if (input.commandRecognized(c.getBackJump().getCommand())) {
c.clearNextFrames();
c.addNextFramesList(c.getForwardJump().getFrame());
c.addNextFramesList(c.getBackJump().getFrame());
actionSet = true;
c.setStatus(Status.JUMPING);
} else if (input.commandRecognized(c.getNeutralJump().getCommand())) {