diff --git a/GamePlay/Frames/Frame.java b/GamePlay/Frames/Frame.java index b0c1e89..177603d 100644 --- a/GamePlay/Frames/Frame.java +++ b/GamePlay/Frames/Frame.java @@ -18,12 +18,38 @@ public class Frame { private Push_HitBox pushHitBox; public Frame() { - move_y = 0.0; - move_x = 0.0; - passHitBox = new ArrayList(); - actHitBox = new ArrayList(); - passThrowHitBox = new ArrayList(); - actThrowHitBox = new ArrayList(); - pushHitBox = new Push_HitBox(); + this.move_y = 0.0; + this.move_x = 0.0; + this.passHitBox = new ArrayList(); + this.actHitBox = new ArrayList(); + this.passThrowHitBox = new ArrayList(); + this.actThrowHitBox = new ArrayList(); + this.pushHitBox = new Push_HitBox(); } + + public Frame(Double move_y, Double move_x, ArrayList passHitBox, ArrayList actHitBox, + ArrayList passThrowHitBox, ArrayList actThrowHitBox, + Push_HitBox pushHitBox) { + this.move_y = move_y; + this.move_x = move_x; + this.passHitBox = passHitBox; + this.actHitBox = actHitBox; + this.passThrowHitBox = passThrowHitBox; + this.actThrowHitBox = actThrowHitBox; + this.pushHitBox = pushHitBox; + } + + /* + * Mainly use for projectiles + */ + public Frame(Double move_y, Double move_x, ArrayList passHitBox, ArrayList actHitBox) { + this.move_y = move_y; + this.move_x = move_x; + this.passHitBox = passHitBox; + this.actHitBox = actHitBox; + this.passThrowHitBox = new ArrayList(); + this.actThrowHitBox = new ArrayList(); + this.pushHitBox = new Push_HitBox(); + } + }