Merge remote-tracking branch 'origin/master'
This commit is contained in:
Antoine
commit
24e6ff0a45
@ -7,10 +7,42 @@ import engine.object.ObjectGl;
|
||||
import gameplay.frames.Frame;
|
||||
import gameplay.hitboxes.*;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class BlueBaseFrames {
|
||||
|
||||
/*
|
||||
TO COPY PASTE FOR EASY frame function generation :
|
||||
|
||||
private static Frame ExampleFrame(){
|
||||
//movement data
|
||||
double moveX = 0.0;
|
||||
double moveY = 0.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 bStandPB1 = new Push_HitBox(70,70,150,500);
|
||||
|
||||
Frame f = new Frame(moveX,moveY,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC);
|
||||
|
||||
//set sprite data on sheet
|
||||
f.setSpriteWrap(0,0,138,138);
|
||||
return f;
|
||||
}
|
||||
*/
|
||||
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);
|
||||
@ -21,7 +53,7 @@ public class BlueBaseFrames {
|
||||
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);
|
||||
blueStandframe1.setSpriteWrap(0,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(0,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -35,12 +67,18 @@ public class BlueBaseFrames {
|
||||
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);
|
||||
blueStandframe1.setSpriteWrap(0,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
protected static Frame[] blueStandFrames() {
|
||||
Frame[] sf = {generateStandFrame1(),generateStandFrame2()};
|
||||
Frame[] sf = new Frame[6];
|
||||
sf[0] = generateStandFrame1();
|
||||
sf[1] = generateStandFrame1();
|
||||
sf[2] = generateStandFrame1();
|
||||
sf[3] = generateStandFrame2();
|
||||
sf[4] = generateStandFrame2();
|
||||
sf[5] = generateStandFrame2();
|
||||
return sf;
|
||||
}
|
||||
|
||||
@ -54,7 +92,7 @@ public class BlueBaseFrames {
|
||||
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);
|
||||
blueStandframe1.setSpriteWrap(102,120,102,120);
|
||||
blueStandframe1.setSpriteWrap(138,138*3,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -73,7 +111,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(18.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(816,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*7,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -87,7 +125,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(-18.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(816,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*7,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -112,11 +150,39 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(18.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(816,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*6,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
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);
|
||||
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(9.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(138*7,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
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);
|
||||
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(-9.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(138*7,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
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);
|
||||
@ -126,18 +192,24 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(-18.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(816,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*6,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
protected static Frame[] blueForwardJump() {
|
||||
Frame[] jF = new Frame[40];
|
||||
for(int i = 0; i < jF.length/2; i++) {
|
||||
for(int i = 0; i < jF.length/4; i++) {
|
||||
jF[i] = GenerateForwardJumpFrame1();
|
||||
}
|
||||
for(int i = jF.length/2; i < jF.length; i++) {
|
||||
for(int i = jF.length/4; i < jF.length/2; i++) {
|
||||
jF[i] = GenerateForwardJumpFrame2();
|
||||
}
|
||||
for(int i = jF.length/2; i < jF.length/(3/4); i++) {
|
||||
jF[i] = GenerateForwardJumpFrame3();
|
||||
}
|
||||
for(int i = jF.length/(3/4); i < jF.length; i++) {
|
||||
jF[i] = GenerateForwardJumpFrame4();
|
||||
}
|
||||
return jF;
|
||||
}
|
||||
|
||||
@ -151,21 +223,10 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(18.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(816,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*6,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
protected static Frame[] blueBackJump() {
|
||||
Frame[] jF = new Frame[40];
|
||||
for(int i = 0; i < jF.length/2; i++) {
|
||||
jF[i] = BackJumpFrame1();
|
||||
}
|
||||
for(int i = jF.length/2; i < jF.length; i++) {
|
||||
jF[i] = BackJumpFrame2();
|
||||
}
|
||||
return jF;
|
||||
}
|
||||
|
||||
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);
|
||||
@ -174,12 +235,58 @@ public class BlueBaseFrames {
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(-18.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
Frame blueStandframe1 = new Frame(9.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(816,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*7,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
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);
|
||||
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(-9.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(138*7,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
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);
|
||||
ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(-18.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,false,false,false,false,false);
|
||||
blueStandframe1.setSpriteWrap(138*6,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
protected static Frame[] blueBackJump() {
|
||||
Frame[] jF = new Frame[40];
|
||||
for(int i = 0; i < jF.length/4; i++) {
|
||||
jF[i] = BackJumpFrame1();
|
||||
}
|
||||
for(int i = jF.length/4; i < jF.length/2; i++) {
|
||||
jF[i] = BackJumpFrame2();
|
||||
}
|
||||
for(int i = jF.length/2; i < jF.length/(3/4); i++) {
|
||||
jF[i] = BackJumpFrame3();
|
||||
}
|
||||
for(int i = jF.length/(3/4); i < jF.length; i++) {
|
||||
jF[i] = BackJumpFrame4();
|
||||
}
|
||||
return jF;
|
||||
}
|
||||
|
||||
|
||||
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);
|
||||
@ -190,7 +297,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(204,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*3,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -204,7 +311,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(306,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*3,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -218,7 +325,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(408,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*4,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -232,7 +339,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(510,0,102,120);
|
||||
blueStandframe1.setSpriteWrap(138*5,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -265,7 +372,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(220,0,112,120);
|
||||
blueStandframe1.setSpriteWrap(138*5,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -279,7 +386,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(330,0,112,120);
|
||||
blueStandframe1.setSpriteWrap(138*4,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -293,7 +400,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(420,0,112,120);
|
||||
blueStandframe1.setSpriteWrap(138*3,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -307,7 +414,7 @@ public class BlueBaseFrames {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
bStandPB1,true,true,true,true,true);
|
||||
blueStandframe1.setSpriteWrap(500,0,112,120);
|
||||
blueStandframe1.setSpriteWrap(138*3,0,138,138);
|
||||
return blueStandframe1;
|
||||
}
|
||||
|
||||
@ -325,37 +432,69 @@ public class BlueBaseFrames {
|
||||
Engine engine = new Engine(640, 480, new Vector3f(4.0f, 3.0f));
|
||||
engine.init();
|
||||
|
||||
String path = "textures/Sprite.png";
|
||||
String pathToBG = "textures/background_beach.png";
|
||||
Vector3f BLUE = new Vector3f(0f,0f,1f); //passive_hit
|
||||
Vector3f RED = new Vector3f(1f,0f,0f); //active_hit
|
||||
Vector3f GREEN = new Vector3f(0f,1f,0f); //passive_throw
|
||||
Vector3f YELLOW = new Vector3f(1f,1f,0f); //Active throw
|
||||
Vector3f PURPLE = new Vector3f(1f,0f,1f); //pushbox
|
||||
|
||||
|
||||
String path = "textures/Sprite_sans_grille_9comp.png";
|
||||
String pathToBG = "textures/arena1.png";
|
||||
|
||||
Frame f = generateStandFrame1();
|
||||
ObjectGl blue = new ObjectGl(0f, 60f, 80f, 5f, path, null);
|
||||
|
||||
|
||||
ObjectGl blue = new ObjectGl(0f, 138f, 138f, 4f, path, null);
|
||||
blue.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3]);
|
||||
blue.translate(new Vector3f(-750,200,0));
|
||||
|
||||
int posX = -750;
|
||||
int posY = 200;
|
||||
engine.add_objectGl(blue);
|
||||
int counter = 0;
|
||||
long ts1, ts2;
|
||||
float posZ = 11;
|
||||
while(counter < 1000) {
|
||||
ts1 = System.currentTimeMillis();
|
||||
posZ = 11;
|
||||
engine.update();
|
||||
engine.render();
|
||||
counter++;
|
||||
for(Passive_HitBox h: f.getPassHitBox()){
|
||||
Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),5f,new Vector3f(1,0,0));
|
||||
engine.add_objectGl(hh);
|
||||
hh.translate(new Vector3f(-750+h.getPosY(),200+h.getPosY()));
|
||||
}
|
||||
blue.translate(new Vector3f(0,0,0));
|
||||
ts2 = System.currentTimeMillis();
|
||||
while(ts2-ts1 < 1000/20) {
|
||||
ts2 = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
blue.translate(new Vector3f(posX,posY,0));
|
||||
|
||||
engine.add_objectGl(blue);
|
||||
float posZ = 11f;
|
||||
|
||||
for(Passive_HitBox h: f.getPassHitBox()){
|
||||
Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,BLUE);
|
||||
engine.add_objectGl(hh);
|
||||
hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
|
||||
posZ++;
|
||||
}
|
||||
for(Active_HitBox h: f.getActHitBox()){
|
||||
Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,RED);
|
||||
engine.add_objectGl(hh);
|
||||
hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
|
||||
posZ++;
|
||||
}
|
||||
for(Passive_throw_HitBox h: f.getPassThrowHitBox()){
|
||||
Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,GREEN);
|
||||
engine.add_objectGl(hh);
|
||||
hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
|
||||
posZ++;
|
||||
}
|
||||
for(Active_throw_Hitbox h: f.getActThrowHitBox()){
|
||||
Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,YELLOW);
|
||||
engine.add_objectGl(hh);
|
||||
hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
|
||||
posZ++;
|
||||
}
|
||||
|
||||
Push_HitBox phb = f.getPushHitBox();
|
||||
Hitbox hh = new Hitbox(posZ,phb.getSize_x(),phb.getSize_y(),1f,PURPLE);
|
||||
engine.add_objectGl(hh);
|
||||
hh.translate(new Vector3f(posX+phb.getPosX(),posY+phb.getPosY()));
|
||||
|
||||
engine.update();
|
||||
engine.render();
|
||||
|
||||
double ts1 = System.currentTimeMillis();
|
||||
double ts2 = System.currentTimeMillis();
|
||||
while(ts2 - ts1 < 60000) {
|
||||
ts2 = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@ public class BlueNormals {
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame f = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame f = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame f = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame f = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
|
||||
ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
|
||||
phb.add(bStandPHB1);
|
||||
pthb.add(bStandPTHB1);
|
||||
Frame f = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
|
||||
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<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((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));
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -110,7 +110,7 @@ public class InputBuffer {
|
||||
try {
|
||||
ret = this.inputList[pos].containsButtonTab(command[command.length - 1]);
|
||||
} catch (ArrayIndexOutOfBoundsException e ) {
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
for(int i = command.length - 2; i >= 0 && ret; i--) {
|
||||
backCounter = 1;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user