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

added stand D hitboxes

Browse Source
This commit is contained in:
no 2021-06-23 12:32:49 +02:00
parent 8a89007304
commit 5145e3cef0
2 changed files with 94 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,7 +761,7 @@ public class BlueBaseFrames {
String path = "textures/Sprite_sans_grille_9comp.png"; String path = "textures/Sprite_sans_grille_9comp.png";
String pathToBG = "textures/arena1.png"; String pathToBG = "textures/arena1.png";
Frame f = BlueMisc.blueCrouchGuard(); Frame f = BlueNormals.ForwardDFrame0();
ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null);

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

@ -17,7 +17,7 @@ import static gameplay.input.ButtonIG.*;
public class BlueNormals { public class BlueNormals {
private static Frame crouchAFrame1(){ protected static Frame crouchAFrame1(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -50,7 +50,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame crouchAFrame2(){ protected static Frame crouchAFrame2(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -87,7 +87,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame crouchAFrame3(){ protected static Frame crouchAFrame3(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -120,7 +120,7 @@ public class BlueNormals {
return f; return f;
} }
private static attackPart blueCrouchAstartup() { protected static attackPart blueCrouchAstartup() {
Frame[] f = new Frame[4]; Frame[] f = new Frame[4];
f[0] = crouchAFrame1(); f[0] = crouchAFrame1();
f[1] = crouchAFrame1(); f[1] = crouchAFrame1();
@ -129,7 +129,7 @@ public class BlueNormals {
return(new attackPart(f)); return(new attackPart(f));
} }
private static attackPart blueCrouchArecovery() { protected static attackPart blueCrouchArecovery() {
Frame[] f = new Frame[5]; Frame[] f = new Frame[5];
f[0] = crouchAFrame3(); f[0] = crouchAFrame3();
f[1] = crouchAFrame3(); f[1] = crouchAFrame3();
@ -139,7 +139,7 @@ public class BlueNormals {
return(new attackPart(f)); return(new attackPart(f));
} }
private static attackPart blueCrouchAactive() { protected static attackPart blueCrouchAactive() {
Frame[] f = new Frame[3]; Frame[] f = new Frame[3];
f[0] = crouchAFrame2(); f[0] = crouchAFrame2();
f[1] = crouchAFrame2(); f[1] = crouchAFrame2();
@ -155,7 +155,7 @@ public class BlueNormals {
return new Attack(isSpecial,rS,cmd,parts); return new Attack(isSpecial,rS,cmd,parts);
} }
private static Frame crouchCFrame1() { protected static Frame crouchCFrame1() {
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -221,7 +221,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame crouchCFrame3() { protected static Frame crouchCFrame3() {
Passive_HitBox bStandPHB1 = new Passive_HitBox(300,-200,150,500); Passive_HitBox bStandPHB1 = new Passive_HitBox(300,-200,150,500);
Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200,-600,280,100); Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(200,-600,280,100);
Push_HitBox bStandPB1 = new Push_HitBox(270,-170,180,540); Push_HitBox bStandPB1 = new Push_HitBox(270,-170,180,540);
@ -238,7 +238,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame crouchCFrame4() { protected static Frame crouchCFrame4() {
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -271,7 +271,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame crouchCFrame5() { protected static Frame crouchCFrame5() {
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -304,7 +304,7 @@ public class BlueNormals {
return f; return f;
} }
private static attackPart blueCrouchCstartup() { protected static attackPart blueCrouchCstartup() {
Frame[] f = new Frame[5]; Frame[] f = new Frame[5];
f[0] = crouchCFrame1(); f[0] = crouchCFrame1();
f[1] = crouchCFrame1(); f[1] = crouchCFrame1();
@ -314,7 +314,7 @@ public class BlueNormals {
return(new attackPart(f)); return(new attackPart(f));
} }
private static attackPart blueCrouchCrecovery() { protected static attackPart blueCrouchCrecovery() {
Frame[] f = new Frame[19]; Frame[] f = new Frame[19];
int i; int i;
for(i = 0; i < 10; i++) { for(i = 0; i < 10; i++) {
@ -326,7 +326,7 @@ public class BlueNormals {
return(new attackPart(f)); return(new attackPart(f));
} }
private static attackPart blueCrouchCactive() { protected static attackPart blueCrouchCactive() {
Frame[] f = new Frame[5]; Frame[] f = new Frame[5];
for(int i = 0; i < f.length; i++) { for(int i = 0; i < f.length; i++) {
f[i] = crouchCFrame3(); f[i] = crouchCFrame3();
@ -342,7 +342,7 @@ public class BlueNormals {
return new Attack(isSpecial,rS,cmd,parts); return new Attack(isSpecial,rS,cmd,parts);
} }
private static Frame standAFrame1(){ protected static Frame standAFrame1(){
/* /*
Hitboxes lists creation Hitboxes lists creation
@ -381,7 +381,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame standAFrame2(){ protected static Frame standAFrame2(){
/* /*
Hitboxes lists creation Hitboxes lists creation
@ -422,7 +422,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame standAFrame3(){ protected static Frame standAFrame3(){
Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f); Passive_HitBox bStandPHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f);
Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,75*1.25f,150*1.25f); Passive_HitBox bStandPHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,75*1.25f,150*1.25f);
@ -443,7 +443,7 @@ public class BlueNormals {
return blueStandframe1; return blueStandframe1;
} }
private static attackPart blueStandAstartup() { protected static attackPart blueStandAstartup() {
Frame[] f = new Frame[3]; Frame[] f = new Frame[3];
f[0] = standAFrame1(); f[0] = standAFrame1();
f[1] = standAFrame1(); f[1] = standAFrame1();
@ -451,7 +451,7 @@ public class BlueNormals {
return(new attackPart(f)); return(new attackPart(f));
} }
private static attackPart blueStandArecovery() { protected static attackPart blueStandArecovery() {
Frame[] f = new Frame[5]; Frame[] f = new Frame[5];
f[0] = standAFrame3(); f[0] = standAFrame3();
f[1] = standAFrame3(); f[1] = standAFrame3();
@ -461,7 +461,7 @@ public class BlueNormals {
return(new attackPart(f)); return(new attackPart(f));
} }
private static attackPart blueStandAactive() { protected static attackPart blueStandAactive() {
Frame[] f = new Frame[3]; Frame[] f = new Frame[3];
f[0] = standAFrame2(); f[0] = standAFrame2();
f[1] = standAFrame2(); f[1] = standAFrame2();
@ -477,7 +477,7 @@ public class BlueNormals {
return new Attack(isSpecial,rS,cmd,parts); return new Attack(isSpecial,rS,cmd,parts);
} }
private static Frame standDFrame1(){ protected static Frame standDFrame1(){
/* /*
Hitboxes lists creation Hitboxes lists creation
@ -490,16 +490,23 @@ public class BlueNormals {
/* /*
Individual hitboxes creation Individual hitboxes creation
*/ */
Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); Passive_HitBox pHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); Passive_HitBox pHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f);
Push_HitBox pushB = new Push_HitBox(70,70,150,500); Passive_HitBox pHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f);
Passive_HitBox pHB4 = new Passive_HitBox(280*1.25f,-150*1.25f,50*1.25f,50*1.25f);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,220*1.25f,70*1.25f);
Push_HitBox pushB = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f);
/* /*
adding hitboxes to lists adding hitboxes to lists
*/ */
phb.add(phb1); phb.add(pHB1);
phb.add(pHB4);
phb.add(pHB3);
phb.add(pHB2);
pthb.add(pthb1); pthb.add(pthb1);
/* /*
frame creation frame creation
*/ */
@ -510,7 +517,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame standDFrame2(){ protected static Frame standDFrame2(){
/* /*
Hitboxes lists creation Hitboxes lists creation
@ -520,19 +527,26 @@ public class BlueNormals {
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>(); ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>(); ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/* Passive_HitBox pHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f);
Individual hitboxes creation Passive_HitBox pHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f);
*/ Passive_HitBox pHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f);
Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); Passive_HitBox pHB4 = new Passive_HitBox(250*1.25f,-130*1.25f,50*1.25f,70*1.25f);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); Passive_HitBox pHB5 = new Passive_HitBox(350*1.25f,-230*1.25f,50*1.25f,70*1.25f);
Push_HitBox pushB = new Push_HitBox(70,70,150,500); Passive_HitBox pHB6 = new Passive_HitBox(400*1.25f,-180*1.25f,50*1.25f,70*1.25f);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,220*1.25f,70*1.25f);
Push_HitBox pushB = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f);
/* /*
adding hitboxes to lists adding hitboxes to lists
*/ */
phb.add(phb1); phb.add(pHB1);
phb.add(pHB4);
phb.add(pHB3);
phb.add(pHB2);
phb.add(pHB5);
phb.add(pHB6);
pthb.add(pthb1); pthb.add(pthb1);
/* /*
frame creation frame creation
*/ */
@ -543,7 +557,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame standDFrame3(){ protected static Frame standDFrame3(){
/* /*
Hitboxes lists creation Hitboxes lists creation
@ -556,15 +570,28 @@ public class BlueNormals {
/* /*
Individual hitboxes creation Individual hitboxes creation
*/ */
Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); Passive_HitBox phb1 = new Passive_HitBox(300,-150,150,550);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); Passive_HitBox phb2 = new Passive_HitBox(150,-180,250,350);
Push_HitBox pushB = new Push_HitBox(70,70,150,500); Passive_HitBox phb3 = new Passive_HitBox(450,-250,150,70);
Passive_HitBox phb5 = new Passive_HitBox(450,-320,40,70);
Passive_HitBox phb4 = new Passive_HitBox(550,-180,100,100);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(250,-600,250,100);
Push_HitBox pushB = new Push_HitBox(300,-200,150,500);
Active_HitBox ahb1 = new Active_HitBox(500,-110,220,220);
Active_HitBox ahb2 = new Active_HitBox(400,-300,120,120);
/* /*
adding hitboxes to lists adding hitboxes to lists
*/ */
phb.add(phb1); phb.add(phb1);
phb.add(phb3);
phb.add(phb2);
phb.add(phb5);
phb.add(phb4);
pthb.add(pthb1); pthb.add(pthb1);
ahb.add(ahb1);
ahb.add(ahb2);
/* /*
frame creation frame creation
@ -576,7 +603,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame standDFrame4(){ protected static Frame standDFrame4(){
/* /*
Hitboxes lists creation Hitboxes lists creation
@ -586,19 +613,26 @@ public class BlueNormals {
ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>(); ArrayList<Active_HitBox> ahb = new ArrayList<Active_HitBox>();
ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>(); ArrayList<Active_throw_Hitbox> athb = new ArrayList<Active_throw_Hitbox>();
/* Passive_HitBox pHB1 = new Passive_HitBox(200*1.25f,-200*1.25f,150*1.25f,150*1.25f);
Individual hitboxes creation Passive_HitBox pHB2 = new Passive_HitBox(220*1.25f,-300*1.25f,100*1.25f,150*1.25f);
*/ Passive_HitBox pHB3 = new Passive_HitBox(200*1.25f,-400*1.25f,150*1.25f,150*1.25f);
Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); Passive_HitBox pHB4 = new Passive_HitBox(250*1.25f,-130*1.25f,50*1.25f,70*1.25f);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); Passive_HitBox pHB5 = new Passive_HitBox(350*1.25f,-230*1.25f,50*1.25f,70*1.25f);
Push_HitBox pushB = new Push_HitBox(70,70,150,500); Passive_HitBox pHB6 = new Passive_HitBox(400*1.25f,-180*1.25f,50*1.25f,70*1.25f);
Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(150*1.25f,-500*1.25f,220*1.25f,70*1.25f);
Push_HitBox pushB = new Push_HitBox(200*1.25f,-150*1.25f,160*1.25f,400*1.25f);
/* /*
adding hitboxes to lists adding hitboxes to lists
*/ */
phb.add(phb1); phb.add(pHB1);
phb.add(pHB4);
phb.add(pHB3);
phb.add(pHB2);
phb.add(pHB5);
phb.add(pHB6);
pthb.add(pthb1); pthb.add(pthb1);
/* /*
frame creation frame creation
*/ */
@ -609,7 +643,7 @@ public class BlueNormals {
return f; return f;
} }
private static attackPart blueStandDstartup() { protected static attackPart blueStandDstartup() {
Frame[] f = new Frame[8]; Frame[] f = new Frame[8];
for(int i = 0; i < 5; i++) { for(int i = 0; i < 5; i++) {
f[i] = standDFrame1(); f[i] = standDFrame1();
@ -620,7 +654,7 @@ public class BlueNormals {
return(new attackPart(f)); return(new attackPart(f));
} }
private static attackPart blueStandDactive() { protected static attackPart blueStandDactive() {
Frame[] f = new Frame[5]; Frame[] f = new Frame[5];
for(int i = 0; i < f.length; i++) { for(int i = 0; i < f.length; i++) {
f[i] = standDFrame3(); f[i] = standDFrame3();
@ -628,7 +662,7 @@ public class BlueNormals {
return(new attackPart(100,0,20,18,16,14,f,false,false,false)); return(new attackPart(100,0,20,18,16,14,f,false,false,false));
} }
private static attackPart blueStandDrecovery() { protected static attackPart blueStandDrecovery() {
Frame[] f = new Frame[18]; Frame[] f = new Frame[18];
for(int i = 0; i < f.length; i++) { for(int i = 0; i < f.length; i++) {
f[i] = standDFrame4(); f[i] = standDFrame4();
@ -643,7 +677,7 @@ public class BlueNormals {
attackPart[] parts = {blueStandDstartup(),blueStandDactive(),blueStandDrecovery()}; attackPart[] parts = {blueStandDstartup(),blueStandDactive(),blueStandDrecovery()};
return new Attack(isSpecial,rS,cmd,parts); return new Attack(isSpecial,rS,cmd,parts);
} }
private static Frame ForwardDFrame0() { protected static Frame ForwardDFrame0() {
//movement data //movement data
double moveX = 3.0; double moveX = 3.0;
double moveY = 0.0; double moveY = 0.0;
@ -670,7 +704,7 @@ public class BlueNormals {
f.setSpriteWrap((138*5),(138*4),138,138); f.setSpriteWrap((138*5),(138*4),138,138);
return f; return f;
} }
private static Frame ForwardDFrame1(){ protected static Frame ForwardDFrame1(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -698,7 +732,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame ForwardDFrame2(){ protected static Frame ForwardDFrame2(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -726,7 +760,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame ForwardDFrame3(){ protected static Frame ForwardDFrame3(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -754,7 +788,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame ForwardDFrame4(){ protected static Frame ForwardDFrame4(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -782,7 +816,7 @@ public class BlueNormals {
return f; return f;
} }
private static Frame ForwardDFrame5(){ protected static Frame ForwardDFrame5(){
//movement data //movement data
double moveX = 0.0; double moveX = 0.0;
double moveY = 0.0; double moveY = 0.0;
@ -810,7 +844,7 @@ public class BlueNormals {
return f; return f;
} }
private static attackPart blueForwardDstartup() { protected static attackPart blueForwardDstartup() {
Frame[] f = new Frame[18]; Frame[] f = new Frame[18];
for (int i = 0; i < 3 ; i++) { for (int i = 0; i < 3 ; i++) {
f[i] = ForwardDFrame0(); f[i] = ForwardDFrame0();
@ -824,7 +858,7 @@ public class BlueNormals {
return (new attackPart(f)); return (new attackPart(f));
} }
private static attackPart blueForwardDrecovery() { protected static attackPart blueForwardDrecovery() {
Frame[] f = new Frame[8]; Frame[] f = new Frame[8];
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
f[i] = ForwardDFrame4(); f[i] = ForwardDFrame4();
@ -835,7 +869,7 @@ public class BlueNormals {
return (new attackPart(f)); return (new attackPart(f));
} }
private static attackPart blueForwardDactive() { protected static attackPart blueForwardDactive() {
Frame[] f = new Frame[4]; Frame[] f = new Frame[4];
for (int i = 0; i < f.length; i++) { for (int i = 0; i < f.length; i++) {
f[i] = ForwardDFrame3(); f[i] = ForwardDFrame3();
@ -843,7 +877,7 @@ public class BlueNormals {
return(new attackPart(30,0,5,5,0,0,f,false,true,false)); return(new attackPart(30,0,5,5,0,0,f,false,true,false));
} }
private static attackPart blueForwardDactive2() { protected static attackPart blueForwardDactive2() {
Frame[] f = new Frame[3]; Frame[] f = new Frame[3];
for (int i = 0; i < f.length; i++) { for (int i = 0; i < f.length; i++) {
f[i] = ForwardDFrame4(); f[i] = ForwardDFrame4();