From c5fb9a630cd8cf3979a748a6a71cbd4697dcb44f Mon Sep 17 00:00:00 2001
From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com>
Date: Fri, 17 Nov 2023 04:03:52 +0100
Subject: [PATCH] Merge labels into menus

(cherry picked from commit a29b7ec28b6b1ab3894985822218368ea8acef04)
---
 game/scripts/interface/cheats.rpy | 39 +++++++++----------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/game/scripts/interface/cheats.rpy b/game/scripts/interface/cheats.rpy
index 71612bf8..6b0931bb 100644
--- a/game/scripts/interface/cheats.rpy
+++ b/game/scripts/interface/cheats.rpy
@@ -11,9 +11,7 @@ label cheats:
 
     menu:
         "-Inventory-":
-            label .general:
-
-            menu:
+            menu .general:
                 "-Add 500 Gold-" (icon="interface/icons/small/gold.webp"):
                     $ game.gold += 500
                     jump cheats.general
@@ -86,12 +84,9 @@ label cheats:
             jump cheats.general
 
         "-Characters-":
-            label .characters:
-
-            menu:
+            menu .characters:
                 "-Tonks-" (icon="interface/icons/small/tonks.webp") if states.ton.unlocked:
-                    label .tonks:
-                    menu:
+                    menu .tonks:
                         "-Reset mood- ([states.ton.mood])" if states.ton.mood != 0:
                             $ states.ton.mood = 0
                             nar "Tonks is no longer mad at you."
@@ -106,8 +101,7 @@ label cheats:
                     jump cheats.tonks
 
                 "-Hermione-" (icon="interface/icons/small/hermione.webp") if states.her.unlocked:
-                    label .hermione:
-                    menu:
+                    menu .hermione:
                         "-Reset mood- ([states.her.mood])" if states.her.mood != 0:
                             $ states.her.mood = 0
                             nar "Hermione is no longer mad at you."
@@ -128,8 +122,7 @@ label cheats:
                     jump cheats.hermione
 
                 "-Cho-" (icon="interface/icons/small/cho.webp") if states.cho.unlocked:
-                    label .cho:
-                    menu:
+                    menu .cho:
                         "-Reset mood- ([states.cho.mood])" if states.cho.mood != 0:
                             $ states.cho.mood = 0
                             nar "Cho is no longer mad at you."
@@ -150,8 +143,7 @@ label cheats:
                     jump cheats.cho
 
                 "-Luna-" (icon="interface/icons/small/luna.webp") if states.lun.unlocked:
-                    label .luna:
-                    menu:
+                    menu .luna:
                         "-Reset mood- ([states.cho.mood])" if states.lun.mood != 0:
                             $ states.lun.mood = 0
                             nar "Luna is no longer mad at you."
@@ -172,8 +164,7 @@ label cheats:
                     jump cheats.luna
 
                 "-Astoria-" (icon="interface/icons/small/astoria.webp") if states.ast.unlocked:
-                    label .astoria:
-                    menu:
+                    menu .astoria:
                         "-Reset mood-" if states.ast.mood != 0:
                             $ states.ast.mood = 0
                             nar "Astoria is no longer mad at you."
@@ -194,8 +185,7 @@ label cheats:
                     jump cheats.astoria
 
                 "-Susan-" (icon="interface/icons/small/huff.webp") if states.sus.unlocked:
-                    label .susan:
-                    menu:
+                    menu .susan:
                         "-Reset mood- ([states.cho.mood])" if states.sus.mood != 0:
                             $ states.sus.mood = 0
                             nar "Susan is no longer mad at you."
@@ -219,9 +209,7 @@ label cheats:
                     jump cheats
 
         "-House Points-":
-            label .points:
-
-            menu:
+            menu .points:
                 "-Add 200 Slytherin Points-" (icon="interface/icons/small/slyt.webp"):
                     $ slytherin = clamp(slytherin+200, 1, 999999)
                     call update_ui_points
@@ -266,9 +254,7 @@ label cheats:
             jump cheats.points
 
         "-Progression-":
-            label .progression:
-
-            menu:
+            menu .progression:
                 "-Unlock all Mirror Stories-":
                     python:
                         for i in mirror.items:
@@ -303,8 +289,7 @@ label cheats:
 
             menu:
                 "-Genie Outfits-":
-                    label .genie:
-                    menu:
+                    menu .genie:
                         "-Use Default Outfit-":
                             show genie robes
                             hide genie
@@ -359,8 +344,6 @@ label cheats:
                     nar "All wardrobes have been unlocked."
 
                 "-Permanent body alteration-":
-                    label .alteration:
-
                     # Note: itertools.cycle breaks Ren'py so we have to rely on a good 'ol if statement
                     # *Sigh* I wish we had match statement in python 2 :(
                     #