From 296ec9c821885f0f9c2c532f65e460e60d6f6d41 Mon Sep 17 00:00:00 2001 From: no Date: Thu, 27 May 2021 00:54:28 +0200 Subject: [PATCH] Ordered files and folders a bit --- GamePlay/Entities/Entity.java | 12 ++++++++++++ GamePlay/Frames/Frame.java | 14 ++++++++++++++ GamePlay/{ => Hitboxes}/Active_HitBox.java | 1 + GamePlay/{ => Hitboxes}/Active_throw_Hitbox.java | 1 + GamePlay/{ => Hitboxes}/HitBox.java | 1 + GamePlay/{ => Hitboxes}/Passive_HitBox.java | 1 + GamePlay/{ => Hitboxes}/Passive_throw_HitBox.java | 1 + GamePlay/{ => Hitboxes}/Push_HitBox.java | 1 + GamePlay/Match/match.java | 3 +++ 9 files changed, 35 insertions(+) create mode 100644 GamePlay/Entities/Entity.java create mode 100644 GamePlay/Frames/Frame.java rename GamePlay/{ => Hitboxes}/Active_HitBox.java (72%) rename GamePlay/{ => Hitboxes}/Active_throw_Hitbox.java (75%) rename GamePlay/{ => Hitboxes}/HitBox.java (87%) rename GamePlay/{ => Hitboxes}/Passive_HitBox.java (73%) rename GamePlay/{ => Hitboxes}/Passive_throw_HitBox.java (75%) rename GamePlay/{ => Hitboxes}/Push_HitBox.java (71%) diff --git a/GamePlay/Entities/Entity.java b/GamePlay/Entities/Entity.java new file mode 100644 index 0000000..5e254f3 --- /dev/null +++ b/GamePlay/Entities/Entity.java @@ -0,0 +1,12 @@ +package Entities; + +/** + * Entity class, which is the main class regrouping characters and projectiles + * @author Victor + * + */ +public class Entity { + private int posx; + private int posy; + private .Frame currentFrame = new Entityframe(); +} diff --git a/GamePlay/Frames/Frame.java b/GamePlay/Frames/Frame.java new file mode 100644 index 0000000..4808daf --- /dev/null +++ b/GamePlay/Frames/Frame.java @@ -0,0 +1,14 @@ +package Frames; +/** + * Main class for frames + * @author Victor Azra + * + */ +public class Frame { + + //TODO: to implement + + public Frame() { + //TODO : to implement + } +} diff --git a/GamePlay/Active_HitBox.java b/GamePlay/Hitboxes/Active_HitBox.java similarity index 72% rename from GamePlay/Active_HitBox.java rename to GamePlay/Hitboxes/Active_HitBox.java index 0ae21f7..af4b970 100644 --- a/GamePlay/Active_HitBox.java +++ b/GamePlay/Hitboxes/Active_HitBox.java @@ -1,3 +1,4 @@ +package Hitboxes; public class Active_HitBox extends HitBox { diff --git a/GamePlay/Active_throw_Hitbox.java b/GamePlay/Hitboxes/Active_throw_Hitbox.java similarity index 75% rename from GamePlay/Active_throw_Hitbox.java rename to GamePlay/Hitboxes/Active_throw_Hitbox.java index 55c4dc2..2bcd36b 100644 --- a/GamePlay/Active_throw_Hitbox.java +++ b/GamePlay/Hitboxes/Active_throw_Hitbox.java @@ -1,3 +1,4 @@ +package Hitboxes; public class Active_throw_Hitbox extends HitBox { diff --git a/GamePlay/HitBox.java b/GamePlay/Hitboxes/HitBox.java similarity index 87% rename from GamePlay/HitBox.java rename to GamePlay/Hitboxes/HitBox.java index 9477c25..bc7fd89 100644 --- a/GamePlay/HitBox.java +++ b/GamePlay/Hitboxes/HitBox.java @@ -1,3 +1,4 @@ +package Hitboxes; public class HitBox { diff --git a/GamePlay/Passive_HitBox.java b/GamePlay/Hitboxes/Passive_HitBox.java similarity index 73% rename from GamePlay/Passive_HitBox.java rename to GamePlay/Hitboxes/Passive_HitBox.java index c9dcf07..2a2582b 100644 --- a/GamePlay/Passive_HitBox.java +++ b/GamePlay/Hitboxes/Passive_HitBox.java @@ -1,3 +1,4 @@ +package Hitboxes; public class Passive_HitBox extends HitBox { diff --git a/GamePlay/Passive_throw_HitBox.java b/GamePlay/Hitboxes/Passive_throw_HitBox.java similarity index 75% rename from GamePlay/Passive_throw_HitBox.java rename to GamePlay/Hitboxes/Passive_throw_HitBox.java index 4da4ad0..8ffe132 100644 --- a/GamePlay/Passive_throw_HitBox.java +++ b/GamePlay/Hitboxes/Passive_throw_HitBox.java @@ -1,3 +1,4 @@ +package Hitboxes; public class Passive_throw_HitBox extends HitBox { diff --git a/GamePlay/Push_HitBox.java b/GamePlay/Hitboxes/Push_HitBox.java similarity index 71% rename from GamePlay/Push_HitBox.java rename to GamePlay/Hitboxes/Push_HitBox.java index ac7de7f..1fab532 100644 --- a/GamePlay/Push_HitBox.java +++ b/GamePlay/Hitboxes/Push_HitBox.java @@ -1,3 +1,4 @@ +package Hitboxes; public class Push_HitBox extends HitBox { diff --git a/GamePlay/Match/match.java b/GamePlay/Match/match.java index fd702a6..c0b1716 100644 --- a/GamePlay/Match/match.java +++ b/GamePlay/Match/match.java @@ -19,6 +19,9 @@ public class match { private int hpP1, hpP2; private int roundsWonP1, roundsWonP2; + /** + * base constructor of the match class + */ public match() { this.timer = 99; this.inputsP1 = new input.InputBuffer(inputBufferSize);