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

Added getter and Setter for frame's attributes

Browse Source
This commit is contained in:
Rémi Rativel 2021-06-08 20:11:13 +02:00
parent 987f0c3703
commit 759ea2222d
1 changed files with 77 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/gameplay/frames/Frame.java
View File

@ -25,13 +25,13 @@ public class Frame {
private boolean isDashCancellable; private boolean isDashCancellable;
public Frame() { public Frame() {
this.move_y = 0.0; this.setMove_y(0.0);
this.move_x = 0.0; this.setMove_x(0.0);
this.passHitBox = new ArrayList<Passive_HitBox>(); this.setPassHitBox(new ArrayList<Passive_HitBox>());
this.actHitBox = new ArrayList<Active_HitBox>(); this.setActHitBox(new ArrayList<Active_HitBox>());
this.passThrowHitBox = new ArrayList<Passive_throw_HitBox>(); this.setPassThrowHitBox(new ArrayList<Passive_throw_HitBox>());
this.actThrowHitBox = new ArrayList<Active_throw_Hitbox>(); this.setActThrowHitBox(new ArrayList<Active_throw_Hitbox>());
this.pushHitBox = new Push_HitBox(); this.setPushHitBox(new Push_HitBox());
this.normalCancellable = true; this.normalCancellable = true;
this.specialCancellable = true; this.specialCancellable = true;
this.jumpCancellable = true; this.jumpCancellable = true;
@ -43,13 +43,13 @@ public class Frame {
ArrayList<Passive_throw_HitBox> passThrowHitBox, ArrayList<Active_throw_Hitbox> actThrowHitBox, ArrayList<Passive_throw_HitBox> passThrowHitBox, ArrayList<Active_throw_Hitbox> actThrowHitBox,
Push_HitBox pushHitBox, boolean normalCancellable, boolean specialCancellable, boolean jumpCancellable, Push_HitBox pushHitBox, boolean normalCancellable, boolean specialCancellable, boolean jumpCancellable,
boolean moveCancellable, boolean isDashCancellable) { boolean moveCancellable, boolean isDashCancellable) {
this.move_y = move_y; this.setMove_y(move_y);
this.move_x = move_x; this.setMove_x(move_x);
this.passHitBox = passHitBox; this.setPassHitBox(passHitBox);
this.actHitBox = actHitBox; this.setActHitBox(actHitBox);
this.passThrowHitBox = passThrowHitBox; this.setPassThrowHitBox(passThrowHitBox);
this.actThrowHitBox = actThrowHitBox; this.setActThrowHitBox(actThrowHitBox);
this.pushHitBox = pushHitBox; this.setPushHitBox(pushHitBox);
this.normalCancellable = normalCancellable; this.normalCancellable = normalCancellable;
this.specialCancellable = specialCancellable; this.specialCancellable = specialCancellable;
this.jumpCancellable = jumpCancellable; this.jumpCancellable = jumpCancellable;
@ -61,13 +61,13 @@ public class Frame {
* Mainly use for projectiles * Mainly use for projectiles
*/ */
public Frame(Double move_y, Double move_x, ArrayList<Passive_HitBox> passHitBox, ArrayList<Active_HitBox> actHitBox) { public Frame(Double move_y, Double move_x, ArrayList<Passive_HitBox> passHitBox, ArrayList<Active_HitBox> actHitBox) {
this.move_y = move_y; this.setMove_y(move_y);
this.move_x = move_x; this.setMove_x(move_x);
this.passHitBox = passHitBox; this.setPassHitBox(passHitBox);
this.actHitBox = actHitBox; this.setActHitBox(actHitBox);
this.passThrowHitBox = new ArrayList<Passive_throw_HitBox>(); this.setPassThrowHitBox(new ArrayList<Passive_throw_HitBox>());
this.actThrowHitBox = new ArrayList<Active_throw_Hitbox>(); this.setActThrowHitBox(new ArrayList<Active_throw_Hitbox>());
this.pushHitBox = new Push_HitBox(); this.setPushHitBox(new Push_HitBox());
} }
public boolean isNormalCancellable() { public boolean isNormalCancellable() {
@ -89,4 +89,60 @@ public class Frame {
public boolean isDashCancellable() { public boolean isDashCancellable() {
return isDashCancellable; return isDashCancellable;
} }
public Double getMove_y() {
return move_y;
}
public void setMove_y(Double move_y) {
this.move_y = move_y;
}
public Double getMove_x() {
return move_x;
}
public void setMove_x(Double move_x) {
this.move_x = move_x;
}
public ArrayList<Passive_HitBox> getPassHitBox() {
return passHitBox;
}
public void setPassHitBox(ArrayList<Passive_HitBox> passHitBox) {
this.passHitBox = passHitBox;
}
public ArrayList<Active_HitBox> getActHitBox() {
return actHitBox;
}
public void setActHitBox(ArrayList<Active_HitBox> actHitBox) {
this.actHitBox = actHitBox;
}
public ArrayList<Passive_throw_HitBox> getPassThrowHitBox() {
return passThrowHitBox;
}
public void setPassThrowHitBox(ArrayList<Passive_throw_HitBox> passThrowHitBox) {
this.passThrowHitBox = passThrowHitBox;
}
public ArrayList<Active_throw_Hitbox> getActThrowHitBox() {
return actThrowHitBox;
}
public void setActThrowHitBox(ArrayList<Active_throw_Hitbox> actThrowHitBox) {
this.actThrowHitBox = actThrowHitBox;
}
public Push_HitBox getPushHitBox() {
return pushHitBox;
}
public void setPushHitBox(Push_HitBox pushHitBox) {
this.pushHitBox = pushHitBox;
}
} }