From 409a81d92c8fdebd71a9034912d0cb58c941e115 Mon Sep 17 00:00:00 2001
From: Jino Wills <jinowills2409@gmail.com>
Date: Mon, 29 Apr 2024 02:52:25 +0700
Subject: [PATCH] More fixes and additions.
---
.../loc-lake/ivory/widgets.twee | 4 +-
.../loc-school/classes/english-events.twee | 2 +-
.../loc-school/widgets-events.twee | 2 +-
game/overworld-town/loc-spa/work.twee | 2 +-
game/overworld-town/special-whitney/main.twee | 211 +++++++++++++++++-
5 files changed, 207 insertions(+), 14 deletions(-)
diff --git a/game/overworld-forest/loc-lake/ivory/widgets.twee b/game/overworld-forest/loc-lake/ivory/widgets.twee
index 153ece15d7..516125d04b 100644
--- a/game/overworld-forest/loc-lake/ivory/widgets.twee
+++ b/game/overworld-forest/loc-lake/ivory/widgets.twee
@@ -1166,7 +1166,7 @@
<<if _args[0] is "stress" and $stress gte $stressmax>>
<<set $_wraithStress to true>>
<</if>>
- <<He>> approaches you,
+ <<He>> approach you,
<<if $wraith.type is "tentacles" or $wraith.gen is "abomination">>
pushing some tentacles aside.
<<if $tentacleMouth>>
@@ -1184,7 +1184,7 @@
cupping your cheek with a surprising gentleness.
<</if>>
<</if>>
- <<He>> kisses you, and your ears immediately begin to ring. Your fingers and toes go cold, and your face becomes fiery hot.
+ <<He>> kiss you, and your ears immediately begin to ring. Your fingers and toes go cold, and your face becomes fiery hot.
Until it, too, grows cold. You feel as though some part of you was drained away.
<<takeKissVirginity "Ivory Wraith" "rape">>
<<arousal 2000 "mouth">><<gggarousal>>
diff --git a/game/overworld-town/loc-school/classes/english-events.twee b/game/overworld-town/loc-school/classes/english-events.twee
index f689da93d7..4738f8f394 100644
--- a/game/overworld-town/loc-school/classes/english-events.twee
+++ b/game/overworld-town/loc-school/classes/english-events.twee
@@ -520,7 +520,7 @@ You stare back at <<person1>><<him>> with empty eyes, unable to shake off the ni
It feels good to let it out. <<lltrauma>><<lstress>>
<br><br>
- "<<pShes>> crying," a student <<print $cool gte 160 ? "murmurs" : $cool lte 80 ? "snickers" : "says">>. You hear the rest of the class talking about you. <<lcool>>
+ "<<pShes>> crying," a student <<print $cool gte 160 ? "murmurs" : $cool lte 80 ? "snickers" : "says">>. You hear the rest of the class talking about you. <<lcool>><<status -1>>
<br><br>
"Settle down, everyone," Doren says, <<his>> voice stern. The class quiets down, but a few people continue whispering.
diff --git a/game/overworld-town/loc-school/widgets-events.twee b/game/overworld-town/loc-school/widgets-events.twee
index fa8a01d6a4..881d1ca814 100644
--- a/game/overworld-town/loc-school/widgets-events.twee
+++ b/game/overworld-town/loc-school/widgets-events.twee
@@ -1653,7 +1653,7 @@
<<link [[Ignore|Hallways]]>><<endevent>><<set $eventskip to 1>><</link>>
<br>
<<if $submissive lte 500>>
- <<link [[Trip Whitney|Bully Trip]]>><<def 1>><</link>><<defianttext>><<npcincr Whitney dom -1>><<ldom>>
+ <<link [[Trip Whitney|Bully Trip]]>><<def 1>><<npcincr Whitney dom -1>><</link>><<defianttext>><<ldom>>
<br>
<</if>>
<<else>>
diff --git a/game/overworld-town/loc-spa/work.twee b/game/overworld-town/loc-spa/work.twee
index db53bdde5a..e4d7ab95b9 100644
--- a/game/overworld-town/loc-spa/work.twee
+++ b/game/overworld-town/loc-spa/work.twee
@@ -1790,7 +1790,7 @@ You grasp the <<persons>> cheeks in both hands, and squeeze.
<<effects>>
<<if $phase is 1>>
- You bend down and <<oral skill>> lick <<his>> asshole, circling the rim with the tip of <<his>> tongue.
+ You bend down and <<oral skill>> lick <<his>> asshole, circling the rim with the tip of your tongue.
<<He>> grunts and runs <<his>> fingers through your hair as you service <<him>>.
<br><br>
diff --git a/game/overworld-town/special-whitney/main.twee b/game/overworld-town/special-whitney/main.twee
index 7f795fdc47..33c8bd9d8d 100644
--- a/game/overworld-town/special-whitney/main.twee
+++ b/game/overworld-town/special-whitney/main.twee
@@ -5996,7 +5996,7 @@ Finally, Whitney reacts.
<<link [[Next|Whitney Rescue Break 2]]>><</link>>
<br>
<<else>>
- <<He>> shoves you away with a frown. "You really are fucked," <<he>> mutters,
+ <<He>> shoves you away with a frown<<if $whitneyRescueUniform>>, dropping the clothes on top of you<</if>>. "You really are fucked," <<he>> mutters,
<<if $whitneyRescueAlone>>
turning away with distaste. "I don't play with broken toys."
<<else>>
@@ -6018,6 +6018,54 @@ Finally, Whitney reacts.
casting a glance over <<his>> shoulder as <<he>> leaves.
<br><br>
+ <<if $whitneyRescueUniform>>
+ <<set _rng to random(1, 100)>>
+ <<if $worn.upper.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<upperwear 5>>
+ <<elseif _rng gte 20>>
+ <<upperwear 58>>
+ <<else>>
+ <<upperwear 37>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<upperwear 5>>
+ <<elseif _rng gte 40>>
+ <<upperwear 59>>
+ <<elseif _rng gte 20>>
+ <<upperwear 60>>
+ <<else>>
+ <<upperwear 5>>
+ <</if>>
+ <</if>>
+ <<set $worn.upper.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+ <<if $worn.lower.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<lowerwear 6>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 53>>
+ <<else>>
+ <<lowerwear 28>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<lowerwear 7>>
+ <<elseif _rng gte 40>>
+ <<lowerwear 54>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 56>>
+ <<else>>
+ <<lowerwear 26>>
+ <</if>>
+ <</if>>
+ <<set $worn.lower.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+ <</if>>
+
<<whitneyRescueEnd>>
<</if>>
@@ -6048,12 +6096,59 @@ Finally, Whitney reacts.
"Fuckers," <<he>> murmurs. "If anyone's gonna break you, it'll be me." <<He>> slinks to the floor, pulling you down with <<him>>. You don't resist, settling into <<his>> embrace. It's oddly comforting.<<trauma -24>><<llltrauma>>
<br><br>
- You stay like this for a moment, until Whitney pushes off you. <<He>> throws the door open and kicks you outside. "Go. Bother me with this shit again, and I'll really give you something to cry about."
+ You stay like this for a moment, until Whitney pushes off you. <<He>> throws the door open<<if $whitneyRescueUniform>>, shoves the bundle of clothes against your chest <</if>> and kicks you outside. "Go. Bother me with this shit again, and I'll really give you something to cry about."
<br><br>
You numbly comply, staggering back towards the school grounds as you try to make sense of what just happened.
<br><br>
+ <<if $whitneyRescueUniform>>
+ <<set _rng to random(1, 100)>>
+ <<if $worn.upper.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<upperwear 5>>
+ <<elseif _rng gte 20>>
+ <<upperwear 58>>
+ <<else>>
+ <<upperwear 37>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<upperwear 5>>
+ <<elseif _rng gte 40>>
+ <<upperwear 59>>
+ <<elseif _rng gte 20>>
+ <<upperwear 60>>
+ <<else>>
+ <<upperwear 5>>
+ <</if>>
+ <</if>>
+ <<set $worn.upper.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+ <<if $worn.lower.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<lowerwear 6>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 53>>
+ <<else>>
+ <<lowerwear 28>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<lowerwear 7>>
+ <<elseif _rng gte 40>>
+ <<lowerwear 54>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 56>>
+ <<else>>
+ <<lowerwear 26>>
+ <</if>>
+ <</if>>
+ <<set $worn.lower.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+ <</if>>
<<set $whitneyRescueExit to "hallways">>
<<whitneyRescueEnd>>
<</if>>
@@ -6094,19 +6189,68 @@ Finally, Whitney reacts.
<<npcincr Whitney lust -20>><<llust>>
<br><br>
- <<He>> unlocks the door. <<He>> stands in the doorway for a moment, staring down at you, before slamming it shut.
+ <<He>> unlocks the door. <<He>> stands in the doorway for a moment, staring down at you, before slamming it shut. <<if $whitneyRescueUniform>><<He>> leaves behind the clothes in a heap on the floor.<</if>>
<<elseif $enemyhealth lte 0>>
- Whitney curses in pain as <<he>> crashes into a shelf. "The hell's wrong with you?" <<he>> groans. "You seriously need your head checked." <<He>> throws the door open and storms outside without sparing so much as a glance at you.
+ Whitney curses in pain as <<he>> crashes into a shelf. "The hell's wrong with you?" <<he>> groans. "You seriously need your head checked." <<He>> throws the door open and storms outside without sparing so much as a glance at you. <<if $whitneyRescueUniform>><<He>> leaves behind the clothes in a heap on the floor.<</if>>
<<else>>
- Whitney shoves you away, throwing <<his>> hands up in frustration. "Whatever. I was only trying to help." <<He>> throws the door open and storms outside, shooting you a look over <<his>> shoulder.
+ Whitney shoves you away, throwing <<his>> hands up in frustration. "Whatever. I was only trying to help." <<He>> throws the door open and storms outside, <<if $whitneyRescueUniform>>leaving the clothes in a heap on the floor.<<else>>shooting you a look over <<his>> shoulder.<</if>>
<</if>>
<br><br>
<<clotheson>>
<<endcombat>>
-<<tearful>> you hasten outside after <<nnpc_him "Whitney">><<if $exposed gte 1>>, grabbing some towels off a shelf on your way out<</if>>.
-<<towelup>>
+<<tearful>> you hasten outside after <<nnpc_him "Whitney">>.
+<<if $exposed gte 1>>
+ You grab some towels off a shelf on your way out.
+ <<towelup>>
+<<elseif $whitneyRescueUniform>>
+ <<set _rng to random(1, 100)>>
+ <<if $worn.upper.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<upperwear 5>>
+ <<elseif _rng gte 20>>
+ <<upperwear 58>>
+ <<else>>
+ <<upperwear 37>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<upperwear 5>>
+ <<elseif _rng gte 40>>
+ <<upperwear 59>>
+ <<elseif _rng gte 20>>
+ <<upperwear 60>>
+ <<else>>
+ <<upperwear 5>>
+ <</if>>
+ <</if>>
+ <<set $worn.upper.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+ <<if $worn.lower.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<lowerwear 6>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 53>>
+ <<else>>
+ <<lowerwear 28>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<lowerwear 7>>
+ <<elseif _rng gte 40>>
+ <<lowerwear 54>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 56>>
+ <<else>>
+ <<lowerwear 26>>
+ <</if>>
+ <</if>>
+ <<set $worn.lower.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+<</if>>
<br><br>
<<set $whitneyRescueExit to "hallways">>
@@ -6121,8 +6265,57 @@ You turn your head away and weakly kick at Whitney. It's hardly forceful, but it
"I don't know," <<he>> mutters. Even through <<his>> agitated tone, <<his>> voice is softer than usual. "I don't fucking know."
<br><br>
-<<He>> throws the door open and storms outside. You lie still for a moment before following suit<<if $exposed gte 1>>, grabbing some towels off a shelf on your way out<</if>>.
-<<towelup>>
+<<He>> throws the door open and storms outside<<if $whitneyRescueUniform>>, leaving the clothes in a heap on the floor<</if>>. You lie still for a moment before following suit.
+<<if $exposed gte 1>>
+ You grab some towels off a shelf on your way out.
+ <<towelup>>
+<<elseif $whitneyRescueUniform>>
+ <<set _rng to random(1, 100)>>
+ <<if $worn.upper.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<upperwear 5>>
+ <<elseif _rng gte 20>>
+ <<upperwear 58>>
+ <<else>>
+ <<upperwear 37>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<upperwear 5>>
+ <<elseif _rng gte 40>>
+ <<upperwear 59>>
+ <<elseif _rng gte 20>>
+ <<upperwear 60>>
+ <<else>>
+ <<upperwear 5>>
+ <</if>>
+ <</if>>
+ <<set $worn.upper.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+ <<if $worn.lower.name is "naked">>
+ <<if $whitneyRescueUniform is "m">>
+ <<if _rng gte 40>>
+ <<lowerwear 6>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 53>>
+ <<else>>
+ <<lowerwear 28>>
+ <</if>>
+ <<else>>
+ <<if _rng gte 60>>
+ <<lowerwear 7>>
+ <<elseif _rng gte 40>>
+ <<lowerwear 54>>
+ <<elseif _rng gte 20>>
+ <<lowerwear 56>>
+ <<else>>
+ <<lowerwear 26>>
+ <</if>>
+ <</if>>
+ <<set $worn.lower.colour to either("black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "yellow")>>
+ <</if>>
+<</if>>
<br><br>
<<set $whitneyRescueExit to "hallways">>
--
GitLab