From 6e17a0c28c12ad16063ceab17d39e17c5450517a Mon Sep 17 00:00:00 2001 From: James <150948866+jameslaight@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:07:42 +0100 Subject: [PATCH 1/4] add method skeletons --- core/src/com/monjaro/gamejam/Die.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/src/com/monjaro/gamejam/Die.java b/core/src/com/monjaro/gamejam/Die.java index 5d9b890..76ae04d 100644 --- a/core/src/com/monjaro/gamejam/Die.java +++ b/core/src/com/monjaro/gamejam/Die.java @@ -28,4 +28,12 @@ public class Die extends Actor { } + public void roll() { + + } + + public void decay() { + + } + } From 2624277302172af960fe3aa42a8b607b502240e0 Mon Sep 17 00:00:00 2001 From: James <150948866+jameslaight@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:24:09 +0100 Subject: [PATCH 2/4] add roll and decay --- core/src/com/monjaro/gamejam/Die.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/core/src/com/monjaro/gamejam/Die.java b/core/src/com/monjaro/gamejam/Die.java index 68d46b8..d3242cb 100644 --- a/core/src/com/monjaro/gamejam/Die.java +++ b/core/src/com/monjaro/gamejam/Die.java @@ -3,6 +3,10 @@ package com.monjaro.gamejam; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import javax.print.attribute.standard.PrinterIsAcceptingJobs; +import java.util.List; +import java.util.Random; + public class Die extends Actor { private Rectangle shape; @@ -12,6 +16,9 @@ public class Die extends Actor { 5 */ private Face[] faces = new Face[6]; + private int faceIndex = 3; + + private final Random random = new Random(); //TODO use central random public Die() { int[] pips = {4, 6, 5, 1, 2, 3}; @@ -43,11 +50,15 @@ public class Die extends Actor { } public void roll() { - + faceIndex = random.nextInt(6); } - public void decay() { - + public void decay() { //remove a pip from all faces of this die + for (Face face : faces) { + List pips = face.getPips(); + Face.Pip decayed = pips.get(random.nextInt()); + face.removePip(decayed); + } } } From 54c4937b8a32f36e14ba9a4cea26ad111c56db9e Mon Sep 17 00:00:00 2001 From: James <150948866+jameslaight@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:30:22 +0100 Subject: [PATCH 3/4] add final to variables --- core/src/com/monjaro/gamejam/Die.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/com/monjaro/gamejam/Die.java b/core/src/com/monjaro/gamejam/Die.java index d3242cb..045c6ed 100644 --- a/core/src/com/monjaro/gamejam/Die.java +++ b/core/src/com/monjaro/gamejam/Die.java @@ -1,21 +1,20 @@ package com.monjaro.gamejam; -import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.math.Rectangle; -import javax.print.attribute.standard.PrinterIsAcceptingJobs; import java.util.List; import java.util.Random; public class Die extends Actor { - private Rectangle shape; + private final Rectangle shape; /* 0 1 2 3 4 5 */ - private Face[] faces = new Face[6]; + private final Face[] faces = new Face[6]; private int faceIndex = 3; private final Random random = new Random(); //TODO use central random From 6abb79e3a99b352bc264f0591ab42818ca826e86 Mon Sep 17 00:00:00 2001 From: James <150948866+jameslaight@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:30:50 +0100 Subject: [PATCH 4/4] whitespace --- core/src/com/monjaro/gamejam/Actor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/com/monjaro/gamejam/Actor.java b/core/src/com/monjaro/gamejam/Actor.java index f27cb5e..de35aa4 100644 --- a/core/src/com/monjaro/gamejam/Actor.java +++ b/core/src/com/monjaro/gamejam/Actor.java @@ -4,6 +4,7 @@ package com.monjaro.gamejam; import com.badlogic.gdx.graphics.g2d.SpriteBatch; public abstract class Actor { + public abstract void tick(); public abstract void render(SpriteBatch batch);