reverts

devTools/apkbuilder/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.vrelnir.DegreesOfLewdity_debug" id="dol" version="0.4.6.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name short="DoL">Degrees of Lewdity</name>
+<widget
+	id="dol"
+	version="0.4.5.3"
+	xmlns="http://www.w3.org/ns/widgets"
+	xmlns:cdv="http://cordova.apache.org/ns/1.0"
+	android-packageName="com.vrelnir.DegreesOfLewdity"
+>
+	<name short="DoL">Degrees of Lewdity</name>
     <description>Degrees of Lewdity</description>
     <author email="9096-Vrelnir@users.noreply.gitgud.io" href="https://gitgud.io/Vrelnir/degrees-of-lewdity">
         Vrelnir
     </author>
-    <content src="index.html" />
-    <platform name="android">
-        <hook src="scripts/prevent_unnecessary_deletes.js" type="before_prepare" />
-        <hook src="scripts/prepare_files.js" type="before_compile" />
-        <hook src="scripts/move_built_apks.js" type="after_compile" />
-        <preference name="AndroidWindowSplashScreenAnimatedIcon" value="res/splashscreen.png" />
-        <preference name="AndroidWindowSplashScreenBackground" value="#111111" />
-        <preference name="AndroidWindowSplashScreenIconBackgroundColor" value="#111111" />
-        <preference name="SplashScreenDelay" value="0" />
-        <icon comment="36x36 px" density="ldpi" src="res/icon-ldpi.png" />
-        <icon comment="48x48 px" density="mdpi" src="res/icon-mdpi.png" />
-        <icon comment="72x72 px" density="hdpi" src="res/icon-hdpi.png" />
-        <icon comment="96x96 px" density="xhdpi" src="res/icon-xhdpi.png" />
-        <icon comment="144x144 px" density="xxhdpi" src="res/icon-xxhdpi.png" />
-        <icon comment="192x192 px" density="xxxhdpi" src="res/icon-xxxhdpi.png" />
-    </platform>
+	<content src="index.html" />
+	<platform name="android">
+		<!-- build scripts -->
+		<hook type="before_prepare" src="scripts/prevent_unnecessary_deletes.js" />
+		<hook type="before_compile" src="scripts/prepare_files.js" />
+		<hook type="after_compile"  src="scripts/move_built_apks.js" />
+		<!-- splash screen -->
+		<preference name="AndroidWindowSplashScreenAnimatedIcon" value="res/splashscreen.png" />
+		<preference name="AndroidWindowSplashScreenBackground" value="#111111" />
+		<preference name="AndroidWindowSplashScreenIconBackgroundColor" value="#111111" />
+		<preference name="SplashScreenDelay" value="0" />
+		<!-- app icons -->
+		<icon src="res/icon-ldpi.png"    density="ldpi"    comment="36x36 px"   />
+		<icon src="res/icon-mdpi.png"    density="mdpi"    comment="48x48 px"   />
+		<icon src="res/icon-hdpi.png"    density="hdpi"    comment="72x72 px"   />
+		<icon src="res/icon-xhdpi.png"   density="xhdpi"   comment="96x96 px"   />
+		<icon src="res/icon-xxhdpi.png"  density="xxhdpi"  comment="144x144 px" />
+		<icon src="res/icon-xxxhdpi.png" density="xxxhdpi" comment="192x192 px" />
+	</platform>
 </widget>

game/01-config/start.twee

@@ -106,7 +106,7 @@ If you want to avoid trouble, dress modestly and stick to safe, well-lit areas.
 	<<link [[Winter Start|Orphanage Intro]]>><<set Time.startDate to new DateTime(2022, 12, 4, 7)>><</link>> (Begins the game at the start of winter. For testing.)
 	<br>
 
-	<<link [[Christmas Start|Orphanage Intro]]>><<npc Kylar>><<person1>><<endevent>><<set $NPCName[$NPCNameList.indexOf("Kylar")].state to "active">><<set Time.startDate to new DateTime(2022, 12, 23, 7)>><<set $money += 50000>><</link>> (Begins the game two days before Christmas. For testing.)
+	<<link [[Christmas Start|Orphanage Intro]]>><<npc Kylar>><<person1>><<endevent>><<set C.npc.Kylar.state to "active">><<set Time.startDate to new DateTime(2022, 12, 23, 7)>><<set $money += 50000>><</link>> (Begins the game two days before Christmas. For testing.)
 	<br>
 
 	<<link [[Valentine's Day Start|Orphanage Intro]]>><<set Time.startDate to new DateTime(2022, 2, 12, 7)>><</link>> (Begins the game 2 days before Valentine's Day. For testing.)

game/03-JavaScript/02-Helpers/table.js

-// Macro.add("table", {
-// 	skipArgs: ["table"],
-// 	tags: ["tableColumn", "tableRow"],
-// 	isAsync: true,
-// 	handler() {
-// 		for (let i = 0; i < this.payload.length; i++) {
-// 			switch (this.payload[i].name) {
-// 				// case Combat.macroNames.main:
-// 				// 	Wikifier.wikifyEval(this.payload[i].contents);
-// 				// 	break;
-// 				case "tableColumn":
-// 					// Save until end of combat
-// 					// Wikifier.wikifyEval(this.payload[i].contents);
-// 					break;
-// 				case Combat.macroNames.endCondition:
-// 					Combat.addEndCondition(this.payload[i].args, this.payload[i].contents);
-// 					break;
-// 			}
-// 		}
-
-// 		//const output = Combat.create();
-// 		//this.output.append(output);
-// 	},
-// });