From df04f4018e3b32cc8416757982b7f4fbddc0f80f Mon Sep 17 00:00:00 2001
From: Brendan Robert <brobert@adobe.com>
Date: Sun, 9 May 2021 16:16:02 -0500
Subject: [PATCH] Fixed bug in changing scores

---
 .../main/java/jace/lawless/LawlessHacks.java  |  1 +
 .../main/resources/jace/data/sound/scores.txt | 46 ++++++++++++++++---
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java
index 775fcf2e..ed419b37 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java
@@ -250,6 +250,7 @@ public class LawlessHacks extends Cheats {
         currentScore = score.toLowerCase(Locale.ROOT);
         if (currentScore.equalsIgnoreCase(SCORE_NONE)) {
             stopMusic();
+            currentSong = -1;
         } else if ((currentSongPlayer != null || wasStoppedPreviously) && currentSong > 0) {
             int currentSongTemp = currentSong;
             currentSong = Integer.MAX_VALUE;
diff --git a/Platform/Apple/tools/jace/src/main/resources/jace/data/sound/scores.txt b/Platform/Apple/tools/jace/src/main/resources/jace/data/sound/scores.txt
index 1fd79ead..73e9b477 100644
--- a/Platform/Apple/tools/jace/src/main/resources/jace/data/sound/scores.txt
+++ b/Platform/Apple/tools/jace/src/main/resources/jace/data/sound/scores.txt
@@ -2,15 +2,47 @@
 ---- Note: Anything that is shared for all scores is under the "common" section
 ---- Lines that start with dashes, hash marks, single quotes are treated as comments
 Common
-
----- Orchestral version uses sampled synthesis
-Orchestral
-1   BGM-1.mp3
-2   someotherfile.mp3
 --- Sound effects start at number 129
 129 bang.mp3
 130 boom.mp3
 
----- Chiptune verison uses the blips and bleeps that are the voice of a generation
+Orchestral
+1	Title.mp3
+2	Miller.mp3
+3	Tragedy.mp3
+4	Victory.mp3
+5	Grub.mp3
+6	mines.mp3
+7	Texas.mp3
+8	Strange.mp3
+9	Oro.mp3
+10	Village.mp3
+11	Sanctuary.mp3
+12	Meriposa.mp3
+13	Freemont.mp3
+14	Littlecreek.mp3
+15	Grove.mp3
+16	Poverty.mp3
+17	Killed.mp3
+18	Wilderness.mp3
+
+---- Chiptune version uses the blips and bleeps that are the voice of a generation
 Chiptune
-1   BGM-2.mp3
+1	Title8.mp3
+2	Miller8.mp3
+3	Tragedy8.mp3
+4	Victory8.mp3
+5	Grub8.mp3
+6	Mines8.mp3
+7	Texas8.mp3
+8	Strange8.mp3
+9	Oro8.mp3
+10	Village8.mp3
+11	Sanctuary8.mp3
+12	Mariposa8.mp3
+13	Freemont8.mp3
+14	Littlecreek8.mp3
+15	Grove8.mp3
+16	Poverty8.mp3
+17	Killed8.mp3
+18	Wilderness8.mp3