From 7a9956fb630084ce2310d237d26793383b70f3d8 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Tue, 19 Nov 2024 11:28:47 +0100 Subject: [PATCH] 1b: add constructor with 3 params --- .../displayableElement/BoulderModel.java | 11 ++++++---- .../displayableElement/BrickWallModel.java | 9 ++++---- .../displayableElement/DiamondModel.java | 6 ++--- .../models/displayableElement/DirtModel.java | 4 +--- .../DisplayableElementModel.java | 22 ++++++++++--------- .../ExpandingWallModel.java | 6 ++--- .../displayableElement/MagicWallModel.java | 7 +++--- .../displayableElement/RockfordModel.java | 8 ++++--- .../displayableElement/SteelWallModel.java | 7 +++--- 9 files changed, 44 insertions(+), 36 deletions(-) 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 edea27c6..cff2e659 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java @@ -11,9 +11,12 @@ package fr.enssat.BoulderDash.models.displayableElement; */ public class BoulderModel extends DisplayableElementModel { BoulderModel(boolean convertible) { - super(false, true, "boulder", - 2, false, true, - false, "die", convertible); - this.loadSprite("boulder"); + super("boulder", false,true); + setPriority(2); + setAnimate(true); + setCollideSound("die"); + setConvertibleValue(convertible); + + 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 b060dbe3..f9b33979 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BrickWallModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BrickWallModel.java @@ -11,9 +11,10 @@ package fr.enssat.BoulderDash.models.displayableElement; */ public class BrickWallModel extends DisplayableElementModel { BrickWallModel() { - super(true, false, "brickwall", - 3, false, false, - false, "touch"); - this.loadSprite("brickwall"); + super("brickwall", true, false); + setPriority(3); + setCollideSound("touch"); + + loadSprite("brickwall"); } } diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java index 334b3390..e67c3b1a 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java @@ -23,9 +23,9 @@ public class DiamondModel extends DisplayableElementModel { private ArrayList framesDiamond; DiamondModel() { - super(true, true, "diamond", - 0, false, true, - false, "coin"); + super("diamond", true, true); + setAnimate(true); + setCollideSound("coin"); this.initSprites(); } 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 883f91ba..7135a8c6 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DirtModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DirtModel.java @@ -11,9 +11,7 @@ package fr.enssat.BoulderDash.models.displayableElement; */ public class DirtModel extends DisplayableElementModel { DirtModel() { - super(true, false, - "dirt", 0, false, - false, false, null); + super("dirt", true, false); this.loadSprite("dirt"); } diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java index 32ccb64d..cab5ed65 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java @@ -52,20 +52,22 @@ public abstract class DisplayableElementModel { this.collideSound = collideSound; } - public DisplayableElementModel(boolean destructible, boolean moving, String spriteName, int priority, boolean impactExplosive, boolean animate, boolean falling, String collideSound) { - this( - destructible, moving, spriteName, + private DisplayableElementModel(boolean destructible, boolean moving, String spriteName, + int priority, boolean impactExplosive, boolean animate, + boolean falling, String collideSound) { + this(destructible, moving, spriteName, priority, impactExplosive, animate, - falling, collideSound, false - ); + falling, collideSound, false); } - public DisplayableElementModel(final String spriteName){ - this( - false, false, spriteName, + public DisplayableElementModel(final String spriteName, boolean destructible, boolean moving){ + this(destructible, moving, spriteName, 0, false, false, - false, null - ); + false, null); + } + + public DisplayableElementModel(final String spriteName){ + this(spriteName, false, false); } public static BoulderModel newBoulderModel(boolean convertible) { 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 9c8f76c4..9a868ba8 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/ExpandingWallModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/ExpandingWallModel.java @@ -11,9 +11,9 @@ package fr.enssat.BoulderDash.models.displayableElement; */ public class ExpandingWallModel extends DisplayableElementModel { ExpandingWallModel() { - super(false, false, "expandingwall", - 10, false, false, - false, null); + super("expandingwall"); + setPriority(10); + this.loadSprite("expandingwall"); } } \ No newline at end of file diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/MagicWallModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/MagicWallModel.java index 4088bcc1..821ff95d 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/MagicWallModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/MagicWallModel.java @@ -24,9 +24,10 @@ public class MagicWallModel extends DisplayableElementModel { private long speed; MagicWallModel() { - super(false, false, "magicwall", - 3, false, false, - false, "touch"); + super("magicwall"); + setPriority(3); + setCollideSound("touch"); + this.currentFrame = 0; this.speed = 100; this.initSprites(); diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java index 57fc575e..0533945a 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java @@ -47,9 +47,11 @@ public class RockfordModel extends DisplayableElementModel { private boolean hasExploded; RockfordModel() { - super(true, true, "rockford", - 1, true, true, - false, null); + super("rockford", true, true); + setPriority(1); + setImpactExplosive(true); + setAnimate(true); + // Speed of the animation of the sprite this.setSpeed(100); // Init the sprites in arrays 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 45ba3076..91cf1a1e 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/SteelWallModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/SteelWallModel.java @@ -11,9 +11,10 @@ package fr.enssat.BoulderDash.models.displayableElement; */ public class SteelWallModel extends DisplayableElementModel { SteelWallModel() { - super(false, false, "steelwall", - 3, false, false, - false, "touch"); + super("steelwall"); + setPriority(3); + setCollideSound("touch"); + this.loadSprite("steelwall"); } }