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

Added hit-in-air and falling frames for Blue

Browse Source
This commit is contained in:
Azra Victor 2021-06-24 01:09:19 +02:00 committed by no
parent 20788b59c7
commit 7986cd594e
3 changed files with 69 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gameplay/Characters/Blue/BlueBaseFrames.java
View File

@ -1022,7 +1022,7 @@ public class BlueBaseFrames {
String path = "textures/Sprite_sans_grille_9comp.png";
String pathToBG = "textures/arena1.png";
Frame f = BlueNormals.JumpDFrame2();
Frame f = BlueMisc.airHit();
ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null);
blue.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3]);

64
src/gameplay/Characters/Blue/BlueMisc.java
View File

@ -419,4 +419,68 @@ public class BlueMisc {
f.setSpriteWrap(138*14,138*4,138,138);
return f;
}
protected static Frame airHit(){
//movement data
double moveX = 12.0;
double moveY = 8.0;
//cancelData
boolean normalC = false;
boolean specialC = false;
boolean jumpC = false;
boolean moveC = false;
boolean dashC = false;
//hitbox lists
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
//generate hitboxes here and then use ArrayList add method to add them to the correct list
Push_HitBox pB1 = new Push_HitBox(200,-400,300,250);
Passive_HitBox phb1 = new Passive_HitBox(250,-490,280,170);
Passive_HitBox phb2 = new Passive_HitBox(200,-380,280,170);
phb.add(phb1);
phb.add(phb2);
Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC);
//set sprite data on sheet
f.setSpriteWrap(0,138*6,138,138);
return f;
}
protected static Frame falling(){
//movement data
double moveX = 12.0;
double moveY = -8.0;
//cancelData
boolean normalC = false;
boolean specialC = false;
boolean jumpC = false;
boolean moveC = false;
boolean dashC = false;
//hitbox lists
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
//generate hitboxes here and then use ArrayList add method to add them to the correct list
Push_HitBox pB1 = new Push_HitBox(100,-500,400,150);
Passive_HitBox phb1 = new Passive_HitBox(80,-490,440,170);
phb.add(phb1);
Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC);
//set sprite data on sheet
f.setSpriteWrap(138,138*4,138,138);
return f;
}
}

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

@ -40,6 +40,9 @@ public class CharacterBlue {
Frame chf = BlueMisc.blueCrouchHit();
Frame sbf = BlueMisc.blueStandGuard();
Frame cbf = BlueMisc.blueCrouchGuard();
Frame falling = BlueMisc.falling();
Frame hia = BlueMisc.airHit();
/*
* Temporary values to change later
*/
@ -55,8 +58,6 @@ public class CharacterBlue {
Throw th = new Throw(false,throwCMD,tp);
Dash fDash = new Dash(fdashCMD,fDashF);
Dash bDash =new Dash(bdashCMD,bDashF);
Frame[] fallingFs = new Frame[0];
Frame[] knDwn = BlueBaseFrames.knockedDown();
@ -64,7 +65,7 @@ public class CharacterBlue {
Character c = new Character(0,0,standF[0],1000,atks,fJ,nJ,bJ,fDash,bDash,th,standF,crouchF,fWalkF,bWalkF,f,f,knDwn,sbf,cbf,shf,chf);
Character c = new Character(0,0,standF[0],1000,atks,fJ,nJ,bJ,fDash,bDash,th,standF,crouchF,fWalkF,bWalkF,hia,falling,knDwn,sbf,cbf,shf,chf);
return c;
}