diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java index 2db0b294..edea27c6 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java @@ -10,30 +10,10 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-19 */ public class BoulderModel extends DisplayableElementModel { - private static String spriteName; - private static boolean isDestructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static String collideSound; - - /** - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "boulder"; - isDestructible = false; - canMove = true; - impactExplosive = false; - animate = true; - priority = 2; - collideSound = "die"; - } - BoulderModel(boolean convertible) { - super(isDestructible, canMove, spriteName, priority, impactExplosive, animate, false, collideSound, convertible); - this.loadSprite(spriteName); + super(false, true, "boulder", + 2, false, true, + false, "die", convertible); + this.loadSprite("boulder"); } } \ No newline at end of file diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BrickWallModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BrickWallModel.java index 96ebfe57..b060dbe3 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BrickWallModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BrickWallModel.java @@ -10,32 +10,10 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-19 */ public class BrickWallModel extends DisplayableElementModel { - private static String spriteName; - private static boolean isDestructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static boolean falling; - private static String collideSound; - - /** - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "brickwall"; - isDestructible = true; - canMove = false; - impactExplosive = false; - animate = false; - priority = 3; - falling = false; - collideSound = "touch"; - } - BrickWallModel() { - super(isDestructible, canMove, spriteName, priority, impactExplosive, animate, falling, collideSound); - this.loadSprite(spriteName); + super(true, false, "brickwall", + 3, false, false, + false, "touch"); + this.loadSprite("brickwall"); } } diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java index 553dc958..00686b4c 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java @@ -10,33 +10,11 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-22 */ public class CursorModel extends DisplayableElementModel { - private static String spriteName; - private static boolean isDestructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static boolean falling; - private static String collideSound; - - /** - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "cursor"; - isDestructible = false; - canMove = false; - impactExplosive = false; - animate = false; - priority = 0; - falling = false; - collideSound = null; - } - CursorModel() { - super(isDestructible, canMove, spriteName, priority, impactExplosive, animate, falling, collideSound); + super(false, false, "cursor", + 0, false, false, + false, null); - this.loadSprite(spriteName); + this.loadSprite("cursor"); } } \ No newline at end of file diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DirtModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DirtModel.java index d4e45e8e..883f91ba 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DirtModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DirtModel.java @@ -10,36 +10,11 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-19 */ public class DirtModel extends DisplayableElementModel { - private static String spriteName; - private static boolean isDestructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static boolean falling; - private static String collideSound; - - /** - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "dirt"; - isDestructible = true; - canMove = false; - impactExplosive = false; - animate = false; - priority = 0; - falling = false; - collideSound = null; - } - - /** - * Class constructor - */ DirtModel() { - super(isDestructible, canMove, spriteName, priority, impactExplosive, animate, falling, collideSound); + super(true, false, + "dirt", 0, false, + false, false, null); - this.loadSprite(spriteName); + this.loadSprite("dirt"); } } \ No newline at end of file diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java index 0f5059c3..8a0834e0 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java @@ -10,33 +10,11 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-19 */ public class DoorModel extends DisplayableElementModel { - private static String spriteName; - private static boolean isDestructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static boolean falling; - private static String collideSound; - - /** - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "door"; - isDestructible = false; - canMove = false; - impactExplosive = false; - animate = false; - priority = 0; - falling = false; - collideSound = null; - } - DoorModel() { - super(isDestructible, canMove, spriteName, priority, impactExplosive, animate, falling, collideSound); + super(false, false, "door", + 0, false, false, + false, null); - this.loadSprite(spriteName); + this.loadSprite("door"); } } diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java index a126f71f..9377dd64 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java @@ -10,33 +10,11 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-19 */ public class EmptyModel extends DisplayableElementModel { - private static String spriteName; - private static boolean isDestructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static boolean falling; - private static String collideSound; - - /** - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "black"; - isDestructible = false; - canMove = false; - impactExplosive = false; - animate = false; - priority = 0; - falling = false; - collideSound = null; - } - EmptyModel() { - super(isDestructible, canMove, spriteName, priority, impactExplosive, animate, falling, collideSound); + super(false, false, "black", + 0, false, false, + false, null); - this.loadSprite(spriteName); + this.loadSprite("black"); } } diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/ExpandingWallModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/ExpandingWallModel.java index edd7d18e..9c8f76c4 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/ExpandingWallModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/ExpandingWallModel.java @@ -10,32 +10,10 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-19 */ public class ExpandingWallModel extends DisplayableElementModel { - private static String spriteName; - private static boolean destructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static boolean falling; - private static String collideSound; - - /* - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "expandingwall"; - destructible = false; - canMove = false; - impactExplosive = false; - animate = false; - priority = 10; - falling = false; - collideSound = null; - } - ExpandingWallModel() { - super(destructible, canMove, spriteName, priority, impactExplosive, animate, falling, collideSound); - this.loadSprite(spriteName); + super(false, false, "expandingwall", + 10, false, false, + false, null); + this.loadSprite("expandingwall"); } } \ No newline at end of file diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/SteelWallModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/SteelWallModel.java index faa0e06c..45ba3076 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/SteelWallModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/SteelWallModel.java @@ -10,32 +10,10 @@ package fr.enssat.BoulderDash.models.displayableElement; * @since 2015-06-19 */ public class SteelWallModel extends DisplayableElementModel { - private static String spriteName; - private static boolean isDestructible; - private static boolean canMove; - private static boolean impactExplosive; - private static boolean animate; - private static int priority; - private static boolean falling; - private static String collideSound; - - /** - * Static dataset - * Specifies the physical parameters of the object - */ - static { - spriteName = "steelwall"; - isDestructible = false; - canMove = false; - impactExplosive = false; - animate = false; - priority = 3; - falling = false; - collideSound = "touch"; - } - SteelWallModel() { - super(isDestructible, canMove, spriteName, priority, impactExplosive, animate, falling, collideSound); - this.loadSprite(spriteName); + super(false, false, "steelwall", + 3, false, false, + false, "touch"); + this.loadSprite("steelwall"); } }