From 02d305a36b71cdbccd49440ef68934188afb297d Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 6 Apr 2021 16:18:22 -0400
Subject: [PATCH] continue to strip down player arc

---
 src/cheats/mod_EditArcologyCheat.tw |  7 -----
 src/cheats/playerArcCheats.js       | 27 -------------------
 src/gui/options/options.js          | 41 ++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100644 src/cheats/playerArcCheats.js

diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index e18c731096b..0c9c2221bd9 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -10,15 +10,8 @@
 
 <<includeDOM App.Intro.economy()>>
 
-<br>Arcology sex slaves: <<print num($NPCSlaves)>>
-<<textbox "$NPCSlaves" $NPCSlaves>>
 <br>Arcology prosperity: $arcologies[0].prosperity
 <<textbox "$arcologies[0].prosperity" $arcologies[0].prosperity>>
-<br>Arcology prosperity cap: $AProsperityCap
-<<textbox "$AProsperityCap" $AProsperityCap>>
-
-<br><br>Shelter Abuse Counter: $shelterAbuse
-<<textbox "$shelterAbuse" $shelterAbuse>>
 
 <br><br>__Arcologies:__
 <br>&nbsp;&nbsp;&nbsp;&nbsp;__''$arcologies[0].name''__ is your arcology.
diff --git a/src/cheats/playerArcCheats.js b/src/cheats/playerArcCheats.js
deleted file mode 100644
index 2ddaebe4002..00000000000
--- a/src/cheats/playerArcCheats.js
+++ /dev/null
@@ -1,27 +0,0 @@
-App.UI.Cheat.schools = function() {
-	const el = new DocumentFragment();
-	const options = new App.UI.OptionsGroup();
-	options.addCustom(App.UI.DOM.makeElement("h2", "Schools"));
-	for (const [key, obj] of App.Data.misc.schools) {
-		if (typeof obj.requirements === "function" && !obj.requirements()) {
-			continue;
-		}
-		options.addCustom(App.UI.DOM.makeElement("h3", obj.title));
-		options.addOption("Students Bought", "studentsBought", V[key]).showTextBox();
-		options.addOption("Upgrades", "schoolUpgrade", V[key])
-			.addValueList([
-				["None", 0],
-				["Partial", 1],
-				["Full", 2],
-			]);
-		options.addOption("Moved to arcology", "schoolPresent", V[key])
-			.addValue("No", 0).off()
-			.addValue("Yes", 1).on();
-		options.addOption("Prosperity", "schoolProsperity", V[key]).showTextBox();
-		options.addOption("Failed", "schoolAnnexed", V[key])
-			.addValue("No", 0).off()
-			.addValue("Yes", 1).on();
-	}
-	el.append(options.render());
-	return el;
-};
diff --git a/src/gui/options/options.js b/src/gui/options/options.js
index 0bd5b0284c9..19f9bcbdf95 100644
--- a/src/gui/options/options.js
+++ b/src/gui/options/options.js
@@ -14,7 +14,8 @@ App.UI.optionsPassage = function() {
 	tabBar.addTab("Mods", "mods", mods());
 	tabBar.addTab("Debug & cheating", "debug-cheating", debugCheating());
 	if (V.cheatMode) {
-		tabBar.addTab("Cheat edit schools", "cheat-school", App.UI.Cheat.schools());
+		tabBar.addTab("Cheats", "cheat", cheat());
+		tabBar.addTab("Cheat edit schools", "cheat-school", cheatSchools());
 	}
 	tabBar.addTab("Experimental", "experimental", experimental());
 	el.append(tabBar.render());
@@ -446,6 +447,44 @@ App.UI.optionsPassage = function() {
 		}
 	}
 
+	function cheat() {
+		const el = new DocumentFragment();
+		const options = new App.UI.OptionsGroup();
+		options.addOption("Arcology sex slaves", "NPCSlaves").showTextBox();
+		options.addOption("Arcology prosperity cap", "AProsperityCap").showTextBox();
+		options.addOption("Shelter Abuse Counter", "shelterAbuse").showTextBox();
+		el.append(options.render());
+		return el;
+	}
+
+	function cheatSchools() {
+		const el = new DocumentFragment();
+		const options = new App.UI.OptionsGroup();
+		options.addCustom(App.UI.DOM.makeElement("h2", "Schools"));
+		for (const [key, obj] of App.Data.misc.schools) {
+			if (typeof obj.requirements === "function" && !obj.requirements()) {
+				continue;
+			}
+			options.addCustom(App.UI.DOM.makeElement("h3", obj.title));
+			options.addOption("Students Bought", "studentsBought", V[key]).showTextBox();
+			options.addOption("Upgrades", "schoolUpgrade", V[key])
+				.addValueList([
+					["None", 0],
+					["Partial", 1],
+					["Full", 2],
+				]);
+			options.addOption("Moved to arcology", "schoolPresent", V[key])
+				.addValue("No", 0).off()
+				.addValue("Yes", 1).on();
+			options.addOption("Prosperity", "schoolProsperity", V[key]).showTextBox();
+			options.addOption("Failed", "schoolAnnexed", V[key])
+				.addValue("No", 0).off()
+				.addValue("Yes", 1).on();
+		}
+		el.append(options.render());
+		return el;
+	}
+
 	function debugCheating() {
 		const el = new DocumentFragment();
 		let options;
-- 
GitLab