From 6c786570807555a733060c50fd35b7c91aaa8e3d Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sat, 23 Jul 2022 13:49:18 +1000
Subject: [PATCH 01/10] 0.3.10.2 fixes

- fixed the statistics screen `>_<`
- changed array.at(-1) call for array[array.length - 1] for
  compatibility with older browsers
---
 game/base-system/overlays/statistics.twee | 2 +-
 modules/02-array-extensions.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/base-system/overlays/statistics.twee b/game/base-system/overlays/statistics.twee
index 0b3e758c22..43738f835b 100644
--- a/game/base-system/overlays/statistics.twee
+++ b/game/base-system/overlays/statistics.twee
@@ -250,7 +250,7 @@ Minutes spent masturbating: $masturbationtimestat
 	<</if>>
 	Machines disabled: $machine_stat
 	<br>
-	<<if $lurkerdisable if "f">>
+	<<if $lurkerdisable is "f">>
 		Lurkers captured: $stat_lurkers_captured
 		<br><br>
 	<</if>>
diff --git a/modules/02-array-extensions.js b/modules/02-array-extensions.js
index 3636f9d717..b57e89cf36 100644
--- a/modules/02-array-extensions.js
+++ b/modules/02-array-extensions.js
@@ -64,6 +64,6 @@ Object.defineProperty(Array.prototype, 'formatList', {
 		conjunction += " ";
 		if (this.length <= 2) return this.join(" " + conjunction);
 		const oxConj = (useOxfordComma ? separator : " ") + conjunction;
-		return this.slice(0, -1).join(separator) + oxConj + this.at(-1);
+		return this.slice(0, -1).join(separator) + oxConj + this[this.length - 1];
 	}
 });
-- 
GitLab


From 84817aa010e57c0de1e829efd0b3ba3fd090e4d7 Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sat, 23 Jul 2022 15:05:02 +1000
Subject: [PATCH 02/10] added missing monster/0_gray.png

---
 img/clothes/upper/monster/0_gray.png | Bin 0 -> 686 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 img/clothes/upper/monster/0_gray.png

diff --git a/img/clothes/upper/monster/0_gray.png b/img/clothes/upper/monster/0_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f742ddda516f99467840f593096bacfbd68b7b4
GIT binary patch
literal 686
zcmeAS@N?(olHy`uVBq!ia0y~yU;;83893O0)X@p&(t!e{o-U3d6?5L+aO84U<Y7G!
zQ5DGQuUc{Ses8PZu2<8WQrK9g3stD80Cfx-ps;Ag!N{z&hR^@}JiGUMcI;^h<#@)2
z32V2m{i*NDed5i`y$s7QUr^Nl`Mj_F)!e7&zU-e;x~~5`vqi(7&69Z#B<^du#>YQt
zLVcMLgUaVP;cxe9WhV6eVWvj-I8;%?l)-GqpJ<mo41z1PntTH-Z-5-?>FVdQ&MBb@
E0BLYdlK=n!

literal 0
HcmV?d00001

-- 
GitLab


From f4a423f7e07dcf9fd94e86d274091324466a3a7b Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sat, 23 Jul 2022 15:59:10 +1000
Subject: [PATCH 03/10] fix consensual `<<sex>>` wrongly increasing stress

---
 game/base-system/widgets.twee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee
index b31661a924..4efe3fe780 100644
--- a/game/base-system/widgets.twee
+++ b/game/base-system/widgets.twee
@@ -447,7 +447,7 @@
 			<<stress _args[0] $_stress_multiplier>>
 			<<combattrauma _args[0]>>
 		<<else>>
-			<<stress _args[0] 10>>
+			<<stress _args[0] -10>>
 		<</if>>
 		<<set _arousal to 20 * _args[0]>>
 		<<arousal _arousal>>
-- 
GitLab


From e7c3edada05c6b807c4092f7afe9921a67ac9d63 Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sat, 23 Jul 2022 16:58:36 +1000
Subject: [PATCH 04/10] minor typo fixes for robin ubrothel event

---
 .../overworld-town/loc-domus-homes/demon.twee |  2 +-
 game/overworld-town/loc-home/rent.twee        |  2 +-
 .../loc-underground/main.twee                 | 21 ++++++++++---------
 .../loc-underground/robin.twee                |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/game/overworld-town/loc-domus-homes/demon.twee b/game/overworld-town/loc-domus-homes/demon.twee
index 77267c76da..8d5abf6d4c 100644
--- a/game/overworld-town/loc-domus-homes/demon.twee
+++ b/game/overworld-town/loc-domus-homes/demon.twee
@@ -925,7 +925,7 @@ You throw the cat o' nine tails out the window, where it disappears in a bush. Y
 "I've got a better idea," you say. You rummage in the bedside cabinet, and find what you need. <<His>> phone. You drop it in front of <<him>>. "Open it."
 <br><br>
 
-"Fuck off- Ah!" <<he>> cries as you strike <<him>> again. "Okay! Just stop hititng me!" <<He>> unlocks the phone. You keep the cat o' nine tails held menacingly aloft as you open a web browser. <<His>> homepage is an amateur porn site. It's already logged into <<his>> account.
+"Fuck off- Ah!" <<he>> cries as you strike <<him>> again. "Okay! Just stop hitting me!" <<He>> unlocks the phone. You keep the cat o' nine tails held menacingly aloft as you open a web browser. <<His>> homepage is an amateur porn site. It's already logged into <<his>> account.
 <br><br>
 
 "Hold still," you say, turning on the phone's camera.
diff --git a/game/overworld-town/loc-home/rent.twee b/game/overworld-town/loc-home/rent.twee
index bafb036fe4..84e113d13c 100644
--- a/game/overworld-town/loc-home/rent.twee
+++ b/game/overworld-town/loc-home/rent.twee
@@ -546,7 +546,7 @@ You trip a couple of times, prompting Bailey to drag you back to your feet and s
 	You hear a rustle of paper before being dragged further along the tunnel.
 	<br><br>
 	<<if _robinIsPresent>>
-		<<link [[Next|Underground Intro]]>><<set $baileySold to true>><<set $phase to 1>><<endevent "phaseless">><</link>>
+		<<link [[Next|Underground Intro]]>><<set $baileySold to true>><<endevent "phaseless">><<set $phase to 1>><</link>>
 	<<else>>
 		<<link [[Next|Underground Intro]]>><<set $baileySold to true>><</link>>
 	<</if>>
diff --git a/game/overworld-underground/loc-underground/main.twee b/game/overworld-underground/loc-underground/main.twee
index 4c574c7e30..a9dc411990 100644
--- a/game/overworld-underground/loc-underground/main.twee
+++ b/game/overworld-underground/loc-underground/main.twee
@@ -95,9 +95,10 @@
 :: Underground Intro
 <<set $outside to 0>><<set $location to "underground">><<effects>>
 <<if $phase is 1>>
+	/* endevent was called before setting phase to 1, regen all npcs */
 	<<set _withRobin to 1>>
 	<<set _robin to statusCheck("Robin")>>
-	<<npc Robin 1>><<generate2>><<generate3>>
+	<<npc Robin 1>><<generate2>><<generate3>><<generate4>>
 <</if>>
 
 <<if _withRobin>>
@@ -110,7 +111,7 @@
 	<br><br>
 
 	You are forced through the door and to your knees before a
-	<<generate4>><<person4>><<person>>, who crouches and grabs your neck.
+	<<person4>><<person>>, who crouches and grabs your neck.
 	<<He>> turns your head to examine one side of your face, then the other, then forces your mouth open and looks inside.
 	"<<pShe>> will do," <<he>> says, standing up. <<He>> then looks at Robin and does the same before making a sly grin in the torchlight.
 	<<person1>>"<<He>>'ll be popular, I can tell."
@@ -173,22 +174,22 @@
 	<<set _robin to statusCheck("Robin")>>
 <</if>>
 
-<<if _withRobin is 1>>
-	You and Robin enter another corridor, lined on one side with metal floor hatches. <<person3>><<He>> opens one of them, and shoves you inside. You land on something soft at least.
-	Soon you hear an adjacent hatch open and Robin lets out a yelp as you assume <<person1>><<hes>> tossed in as well.
+<<if _withRobin is 1>>/* 4 npcs are generated so far, person1 is robin */
+	You and Robin enter another corridor, lined on one side with metal floor hatches. <<person3>><<person>> opens one of them, and shoves you inside. You land on something soft at least.
+	Soon you hear an adjacent hatch open and <<person1>>Robin lets out a yelp as you assume <<hes>> tossed in as well.
 	<br><br>
 
-	"Both of you, your role here is simple. Do as you're told. You don't want to know what happened to the last <<girl>> who made a fuss."
-	<<person3>><<He>> slams the hatch shut, plunging you into complete darkness as you hear <<his>> receding footsteps.
+	<<person3>>"Both of you, your role here is simple. Do as you're told. You don't want to know what happened to the last <<girl>> who made a fuss."
+	<<He>> slams the hatch shut, plunging you into complete darkness as you hear <<his>> receding footsteps.
 	<br><br>
 
 	You fumble around in the dark, and find you fell on what feels like a mattress. There's also a locked metal door and a tap in the corner, but the room is otherwise bare.
 	<br><br>
 
-	"Are you there?" You hear Robin's<<if _robin.dom lte 40>> trembling<</if>> voice coming from nearby.
+	<<person1>>"Are you there?" You hear Robin's<<if _robin.dom lte 40>> trembling<</if>> voice coming from nearby.
 	As you trace the location of <<his>> voice, you find that there is a small hole in the wall that connects you.
-<<else>>
-	You enter another corridor, lined on one side with metal floor hatches. <<He>> opens one of them, and shoves you inside. You land on something soft at least.
+<<else>>/* 2 npcs are present */
+	You enter another corridor, lined on one side with metal floor hatches. <<person2>><<He>> opens one of them, and shoves you inside. You land on something soft at least.
 	"Your role here is simple. Do as you're told. You don't want to know what happened to the last <<girl>> who made a fuss."
 	<<He>> slams the hatch shut, plunging you into complete darkness.
 	<br><br>
diff --git a/game/overworld-underground/loc-underground/robin.twee b/game/overworld-underground/loc-underground/robin.twee
index 68dee3b147..60ecc1f4d3 100644
--- a/game/overworld-underground/loc-underground/robin.twee
+++ b/game/overworld-underground/loc-underground/robin.twee
@@ -1136,7 +1136,7 @@ You notice a pair of odd machines being wheeled in. Attached to them are chains
 	<label><<radiobutton "$phase" 0 autocheck>> Rest</label> |
 	<<if $anusfucked is 1 or $vaginafucked is 1 or $penisfucked is 1>>
 		<<if $machine.speed is 3>>
-			<label><<radiobutton "$phase" 1 autocheck>> <span class="brat">Ask them to slow down</span><</label> |
+			<label><<radiobutton "$phase" 1 autocheck>> <span class="brat">Ask them to slow down</span></label> |
 		<<elseif $machine.speed is 2>>
 			<label><<radiobutton "$phase" 2 autocheck>> <span class="brat">Ask them to slow down</span></label> |
 		<</if>>
-- 
GitLab


From 70c3f4bffa389b6c190baa87de8511346719972a Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sat, 23 Jul 2022 18:09:15 +1000
Subject: [PATCH 05/10] fix owl plushie materializing out of void

---
 game/overworld-town/special-robin/main.twee | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/game/overworld-town/special-robin/main.twee b/game/overworld-town/special-robin/main.twee
index 71e82ea20b..c1a022ba25 100644
--- a/game/overworld-town/special-robin/main.twee
+++ b/game/overworld-town/special-robin/main.twee
@@ -2460,12 +2460,14 @@ Robin leans on to you, panting, beads of sweat dripping down <<his>> naked body.
 <br><br>
 <<endcombat>>
 
-<<if $kylar_camera is 2 and !$syndromekylar>>
-	A dreadful shiver passes through you. <span class="blue">Something is watching you.</span><<set $kylar_mad to 1>>
-	<br><br>
-<<else>>
-	The owl plushie watches you, judging you from the gloom. <<gggksuspicion>><<npcincr Kylar rage 10>>
-	<br><br>
+<<if $kylar_camera is 2>>
+	<<if !$syndromekylar>>
+		A dreadful shiver passes through you. <span class="blue">Something is watching you.</span><<set $kylar_mad to 1>>
+		<br><br>
+	<<else>>
+		The owl plushie watches you, judging you from the gloom. <<gggksuspicion>><<npcincr Kylar rage 10>>
+		<br><br>
+	<</if>>
 <</if>>
 
 <<link [[Next|Bed]]>><<clotheson>><</link>>
-- 
GitLab


From 495092d2af9697083d2cffd243d6d0d14eb42043 Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sat, 23 Jul 2022 21:44:52 +1000
Subject: [PATCH 06/10] prevent despawning kylar prematurely during abduction

---
 game/overworld-town/special-kylar/abduction.twee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/overworld-town/special-kylar/abduction.twee b/game/overworld-town/special-kylar/abduction.twee
index 5728c39867..bff86f6272 100644
--- a/game/overworld-town/special-kylar/abduction.twee
+++ b/game/overworld-town/special-kylar/abduction.twee
@@ -659,9 +659,9 @@ Kylar breaks down in tears at your words. <<His>> head sags. <<He>> no longer ha
 <<unbind>>
 <br><br>
 
-<<link [[Comfort Kylar|Kylar Abduction Comfort]]>><<endevent>><</link>>
+<<link [[Comfort Kylar|Kylar Abduction Comfort]]>><</link>>
 <br>
-<<link [[Just leave|Kylar Abduction Leave]]>><<endevent>><</link>>
+<<link [[Just leave|Kylar Abduction Leave]]>><</link>>
 <br>
 
 :: Kylar Abduction Comfort
-- 
GitLab


From c1fdf08b8c269ae9622ad11529df258d69ddfee9 Mon Sep 17 00:00:00 2001
From: TonyFox <the_tonyfox@yahoo.com>
Date: Sat, 23 Jul 2022 22:49:22 +0000
Subject: [PATCH 07/10] tony's suggestion

---
 modules/02-array-extensions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/02-array-extensions.js b/modules/02-array-extensions.js
index b57e89cf36..6b6697597e 100644
--- a/modules/02-array-extensions.js
+++ b/modules/02-array-extensions.js
@@ -64,6 +64,6 @@ Object.defineProperty(Array.prototype, 'formatList', {
 		conjunction += " ";
 		if (this.length <= 2) return this.join(" " + conjunction);
 		const oxConj = (useOxfordComma ? separator : " ") + conjunction;
-		return this.slice(0, -1).join(separator) + oxConj + this[this.length - 1];
+		return this.slice(0, -1).join(separator) + oxConj + this.last();
 	}
 });
-- 
GitLab


From 8cd699c0766c747317f99b49bf092b0cc99b8059 Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sun, 24 Jul 2022 09:05:02 +1000
Subject: [PATCH 08/10] wardrobe fixes

---
 game/base-clothing/wardrobes.twee | 2 +-
 modules/css/base.css              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/base-clothing/wardrobes.twee b/game/base-clothing/wardrobes.twee
index a5c0670992..f96ac50961 100644
--- a/game/base-clothing/wardrobes.twee
+++ b/game/base-clothing/wardrobes.twee
@@ -47,7 +47,7 @@
 	<<if _equipSkip[_slot] is true>>
 		<<continue>>
 	<</if>>
-	<<if !Object.keys($worn).includes(_wardrobe_list)>>
+	<<if !Object.keys($worn).includes(_slot)>>
 		<<continue>>
 	<<else>>
 		<<set _wearId to V["wear_"+_slot]>>
diff --git a/modules/css/base.css b/modules/css/base.css
index 1504ac3534..feca30b016 100644
--- a/modules/css/base.css
+++ b/modules/css/base.css
@@ -3288,7 +3288,7 @@ label {
 	filter: saturate(0%) brightness(310%) sepia(10%);
 }
 
-.clothes-blue-steel {
+.clothes-blue-steel, .icon-blue-steel {
 	-webkit-filter: saturate(0%) brightness(160%) sepia(80%) hue-rotate(180deg);
 	filter: saturate(0%) brightness(160%) sepia(80%) hue-rotate(180deg);
 }
-- 
GitLab


From bafdb331322f2b20884c1c6f4f3a4f620a3536cf Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sun, 24 Jul 2022 09:18:27 +1000
Subject: [PATCH 09/10] fixed deviancy gains in combat

---
 game/base-system/deviancy.twee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/game/base-system/deviancy.twee b/game/base-system/deviancy.twee
index e868aef134..e6698a39fc 100644
--- a/game/base-system/deviancy.twee
+++ b/game/base-system/deviancy.twee
@@ -76,6 +76,7 @@
 
 <<widget "combatdeviancyN">>
 	<<if $consensual is 1>>
+		<<set $_n to _args[0]>>
 		<<set $_scaledDeviancyMax to 20 * $_n>>
 		<<if $deviancy lt $_scaledDeviancyMax>>
 			<<set $deviancy += ($control lt $controlmax ? 2 : 1)>>
-- 
GitLab


From 9fd64e15eced74c9b9f307720443297e315dd196 Mon Sep 17 00:00:00 2001
From: 123 <21133-noteleven@users.noreply.gitgud.io>
Date: Sun, 24 Jul 2022 09:41:46 +1000
Subject: [PATCH 10/10] ghostshrooms are not picked instantaneously

---
 game/overworld-town/special-kylar/manor.twee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/overworld-town/special-kylar/manor.twee b/game/overworld-town/special-kylar/manor.twee
index 3e60ee7571..ed888bce67 100644
--- a/game/overworld-town/special-kylar/manor.twee
+++ b/game/overworld-town/special-kylar/manor.twee
@@ -88,7 +88,7 @@ You are in the grounds behind Kylar's manor, an elevated patch of woodland full
 <br><br>
 
 <<if $manor_forage is undefined>>
-	<<ind>><<link [[Pick mushrooms (1:00)|Manor Forage]]>><<set $manor_forage to 1>><</link>><<tendingdifficulty 1 500>>
+	<<ind>><<link [[Pick mushrooms (1:00)|Manor Forage]]>><<set $manor_forage to 1>><<pass 60>><</link>><<tendingdifficulty 1 500>>
 	<br>
 <</if>>
 
-- 
GitLab