From cd53c4b08dac7ff5008ac08af8ace0865491bd27 Mon Sep 17 00:00:00 2001
From: James <150948866+jameslaight@users.noreply.github.com>
Date: Sun, 21 Apr 2024 12:45:17 +0100
Subject: [PATCH 1/3] add limited rerolls back

---
 core/src/com/monjaro/gamejam/main/Game.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/monjaro/gamejam/main/Game.java b/core/src/com/monjaro/gamejam/main/Game.java
index e910a30..29cfefa 100644
--- a/core/src/com/monjaro/gamejam/main/Game.java
+++ b/core/src/com/monjaro/gamejam/main/Game.java
@@ -61,7 +61,7 @@ public class Game extends ApplicationAdapter {
 
 		if (input.isKeyJustPressed(Input.Keys.R) && round.getRerolls() > 0) { //reroll dice that aren't locked
 			reroll();
-			round.reduceRerolls(0);
+			round.reduceRerolls(1);
 		}
 
 		if (input.isKeyPressed(Input.Keys.SHIFT_LEFT)) {

From 594fd5074a9793ed3f9e898781c46a90b48b9eac Mon Sep 17 00:00:00 2001
From: James <150948866+jameslaight@users.noreply.github.com>
Date: Sun, 21 Apr 2024 12:46:16 +0100
Subject: [PATCH 2/3] attacks now reroll, cannot destroy segment twice

---
 core/src/com/monjaro/gamejam/main/Game.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/com/monjaro/gamejam/main/Game.java b/core/src/com/monjaro/gamejam/main/Game.java
index 29cfefa..54356a3 100644
--- a/core/src/com/monjaro/gamejam/main/Game.java
+++ b/core/src/com/monjaro/gamejam/main/Game.java
@@ -71,11 +71,13 @@ public class Game extends ApplicationAdapter {
 				if (input.isKeyJustPressed(keyCode)) {
 					Segment segment = round.getSegments().get(i);
 
-					if (segment.isDestroyedBy(getSelectedDice())) { //if can be destroyed with selected
+					if (!segment.isDestroyed() && segment.isDestroyedBy(getSelectedDice())) { //if can be destroyed with selected
 						segment.destroy();
+
 						round.getDecays().forEach(d -> d.getDecayed(getSelectedDice()).forEach(Die::decay)); //apply all decay rules
-						dice.forEach(d -> d.setSelected(false));
-//						reroll();
+
+						dice.forEach(d -> d.setSelected(false)); //unselect all dice
+						reroll(); //reroll
 					}
 				}
 			}

From 7f9ca47b84e3dff7122c060078c8c8c57477ce77 Mon Sep 17 00:00:00 2001
From: James <150948866+jameslaight@users.noreply.github.com>
Date: Sun, 21 Apr 2024 12:53:13 +0100
Subject: [PATCH 3/3] add skeleton for getting sprites

---
 core/src/com/monjaro/gamejam/segment/DualSegment.java  | 10 ++++++++++
 core/src/com/monjaro/gamejam/segment/KinSegment.java   | 10 ++++++++++
 .../com/monjaro/gamejam/segment/OlympicSegment.java    | 10 ++++++++++
 core/src/com/monjaro/gamejam/segment/Segment.java      |  4 ++++
 4 files changed, 34 insertions(+)

diff --git a/core/src/com/monjaro/gamejam/segment/DualSegment.java b/core/src/com/monjaro/gamejam/segment/DualSegment.java
index ee60a13..7613e66 100644
--- a/core/src/com/monjaro/gamejam/segment/DualSegment.java
+++ b/core/src/com/monjaro/gamejam/segment/DualSegment.java
@@ -55,4 +55,14 @@ public class DualSegment extends Segment {
 				&& (!firstTrio || countCounts.getOrDefault(3, 0) >= 1);
 	}
 
+	@Override
+	public int getSpriteColumn() {
+		return 0;
+	}
+
+	@Override
+	public int getSpriteRow() {
+		return 0;
+	}
+
 }
diff --git a/core/src/com/monjaro/gamejam/segment/KinSegment.java b/core/src/com/monjaro/gamejam/segment/KinSegment.java
index f862249..8869620 100644
--- a/core/src/com/monjaro/gamejam/segment/KinSegment.java
+++ b/core/src/com/monjaro/gamejam/segment/KinSegment.java
@@ -36,4 +36,14 @@ public class KinSegment extends Segment { //multiple dice of the same value
 		return false;
 	}
 
+	@Override
+	public int getSpriteColumn() {
+		return 0;
+	}
+
+	@Override
+	public int getSpriteRow() {
+		return 0;
+	}
+
 }
diff --git a/core/src/com/monjaro/gamejam/segment/OlympicSegment.java b/core/src/com/monjaro/gamejam/segment/OlympicSegment.java
index 3236ad7..05869d1 100644
--- a/core/src/com/monjaro/gamejam/segment/OlympicSegment.java
+++ b/core/src/com/monjaro/gamejam/segment/OlympicSegment.java
@@ -47,4 +47,14 @@ public class OlympicSegment extends Segment {
 		return best >= length;
 	}
 
+	@Override
+	public int getSpriteColumn() {
+		return 0;
+	}
+
+	@Override
+	public int getSpriteRow() {
+		return 0;
+	}
+
 }
diff --git a/core/src/com/monjaro/gamejam/segment/Segment.java b/core/src/com/monjaro/gamejam/segment/Segment.java
index f821986..07d476f 100644
--- a/core/src/com/monjaro/gamejam/segment/Segment.java
+++ b/core/src/com/monjaro/gamejam/segment/Segment.java
@@ -39,4 +39,8 @@ public abstract class Segment {
 		return destroyed;
 	}
 
+	public abstract int getSpriteColumn();
+
+	public abstract int getSpriteRow();
+
 }