From 0405abf118c6e033544a007a6c35f6e2850ce30c Mon Sep 17 00:00:00 2001
From: LollipopScythe <11764-LollipopScythe@users.noreply.gitgud.io>
Date: Fri, 20 Dec 2024 13:47:12 +0000
Subject: [PATCH] School Night Pool Party Changes
---
game/03-JavaScript/time.js | 2 +-
game/03-JavaScript/ui.js | 1 +
game/overworld-town/loc-alley/industrial.twee | 2 +-
game/overworld-town/loc-alley/park.twee | 2 +-
game/overworld-town/loc-school/hallways.twee | 29 +-----
game/overworld-town/loc-school/main.twee | 90 ++++++++++++++-----
.../loc-school/special-night.twee | 8 +-
game/overworld-town/loc-street/oxford.twee | 2 +-
.../loc-sewers/main.twee | 8 +-
9 files changed, 81 insertions(+), 63 deletions(-)
diff --git a/game/03-JavaScript/time.js b/game/03-JavaScript/time.js
index 3b3e88ee5b..11b19fe2af 100644
--- a/game/03-JavaScript/time.js
+++ b/game/03-JavaScript/time.js
@@ -1695,7 +1695,7 @@ function dailySchoolEffects() {
delete V.temple_spar;
}
- if (V.weekly.schoolNightPoolParty == "intro") V.weekly.schoolNightPoolParty = false;
+ if (V.weekly.schoolNightPoolParty === "intro") V.weekly.schoolNightPoolParty = false;
return fragment;
}
diff --git a/game/03-JavaScript/ui.js b/game/03-JavaScript/ui.js
index 2d994c95b8..665af473fb 100644
--- a/game/03-JavaScript/ui.js
+++ b/game/03-JavaScript/ui.js
@@ -828,6 +828,7 @@ function moneyStatsProcess(stats) {
case "schoolProject":
case "schoolCondoms":
case "schoolStimulant":
+ case "schoolPoolParty":
compressTo = "school";
break;
case "bus":
diff --git a/game/overworld-town/loc-alley/industrial.twee b/game/overworld-town/loc-alley/industrial.twee
index 69a381df5b..f0fe1b1f30 100644
--- a/game/overworld-town/loc-alley/industrial.twee
+++ b/game/overworld-town/loc-alley/industrial.twee
@@ -60,7 +60,7 @@ There's a ladder to your right; you think it will take you to the rooftops. The
<br>
<<busstationicon>><<link [[Back door to bus station (0:02)|Bus Station Back Entrance]]>><<pass 2>><</link>>
<br>
- <<if $schoolBlocked is true>>
+ <<if $schoolBlocked>>
<span class="blue">The school guard is on high alert. You won't be able to sneak in tonight.</span>
<<else>>
<<fenceicon>><<link [[Climb over the fence into the school grounds (0:05)|School Rear Fence]]>><<pass 5>><</link>>
diff --git a/game/overworld-town/loc-alley/park.twee b/game/overworld-town/loc-alley/park.twee
index b5ae86f0ab..055b66106b 100644
--- a/game/overworld-town/loc-alley/park.twee
+++ b/game/overworld-town/loc-alley/park.twee
@@ -258,7 +258,7 @@ Tulips grow in great patches near the riverbank.
<</if>>
<<stormdrain>>
<<if $historytrait gte 1 and $parktunnelintro gte 1>>
- <<if $schoolBlocked is true>>
+ <<if $schoolBlocked>>
/* none */
<<else>>
<<add_link "<<schoolicon 'building'>><<link [[Secret tunnel to school (0:05)|School Rear Courtyard]]>><<pass 5>><</link>>">>
diff --git a/game/overworld-town/loc-school/hallways.twee b/game/overworld-town/loc-school/hallways.twee
index 35e33ffef1..01468ba482 100644
--- a/game/overworld-town/loc-school/hallways.twee
+++ b/game/overworld-town/loc-school/hallways.twee
@@ -25,11 +25,10 @@
<</if>>
<<else>>
The school hallways are empty.
- <br><br>
- <<if $weekly.schoolNightPoolParty is "admission" and Time.dayState is "night">>
+ <<if ["intro", "discover", "admission", "notPaid"].includes($weekly.schoolNightPoolParty) and Time.dayState is "night">>
<span class="blue">You can hear some sounds coming from the pool room.</span>
- <br><br>
<</if>>
+ <br><br>
<</if>>
<<if $arousal gte $arousalmax>>
<<orgasmLocation "schoolHallway">>
@@ -104,28 +103,6 @@
<</if>>
<<unset $whitneypantiesmaths>>
<<unset $whitneyskirtmaths>>
-<<elseif $weekly.schoolNightPoolParty is "discover" and Time.hour gte 21>>
- <<generateSecurity 1>><<person1>>
- Upon entering the building, a beam of light shines on you. A security guard approaches, torch in hand.
- <br><br>
- "What, another one?" <<He>> must have already caught the delinquents. "Well, whatever. Just pay up."
- <br><br>
- <<He>> holds <<his>> hand in front of you.
- <<if $schoolNightPoolParty gte 1>>
- You stare at <<him>> in confusion. "Didn't anyone tell you? It's 100 quid. Now."
- <<else>>
- "100 quid. Now."
- <</if>>
- <br><br>
-
- <<if $money gte 10000>>
- <<link [[Pay (£100)|School Night Pool Party Pay]]>><<set $phase to 0>><<set $money -= 10000>><</link>>
- <<else>>
- <span class="blue">You can't afford it.</span>
- <</if>>
- <br>
- <<link [[Refuse|School Night Pool Party Pay]]>><<set $phase to 1>><</link>>
- <br>
<<elseif $stress gte $stressmax>>
<<if isPregnancyEnding()>>
<<pregnancyPassout "schoolHallways">>
@@ -178,7 +155,7 @@
<br>
<<foodicon "eat">><<link [[Canteen (0:01)|Canteen]]>><<pass 1>><</link>>
<br>
- <<if $weekly.schoolNightPoolParty is "admission" and Time.dayState is "night">>
+ <<if ["intro", "discover", "admission", "notPaid"].includes($weekly.schoolNightPoolParty) and Time.dayState is "night">>
<<swimmingicon>><<link [[Pool (0:01)|School Night Pool Party Changing Room]]>><<pass 1>><</link>>
<<else>>
<<swimmingicon>><<link [[Pool (0:01)|School Pool Entrance]]>><<pass 1>><</link>>
diff --git a/game/overworld-town/loc-school/main.twee b/game/overworld-town/loc-school/main.twee
index b2b2aad0d6..30735cd19b 100644
--- a/game/overworld-town/loc-school/main.twee
+++ b/game/overworld-town/loc-school/main.twee
@@ -43,7 +43,7 @@
<</if>>
<<schoolperiodtext>>
-
+<<if ["intro", "discover"].includes($weekly.schoolNightPoolParty) and Time.hour gte 21 and $passagePrev is "hallway">><<set $weekly.schoolNightPoolParty to "admission">><</if>>
<<if $stress gte $stressmax>>
<<if isPregnancyEnding()>>
<<pregnancyPassout "school">>
@@ -61,35 +61,57 @@
<br>
<<link [[Just watch|School Sirris Watch]]>><</link>>
+<<elseif ["intro", "discover"].includes($weekly.schoolNightPoolParty) and Time.hour gte 21>>
+ <<generateSecurity 1>><<person1>>
+ A beam of light shines on you. A security guard approaches, torch in hand.
+ <br><br>
+ "What, another one?" <<He>> must have already caught <<if $weekly.schoolNightPoolParty is "discover">>the delinquents<<else>>some students<</if>>. "Well, whatever. Just pay up."
+ <br><br>
+ <<He>> holds <<his>> hand in front of you.
+ <<if $schoolNightPoolParty gte 1>>
+ You stare at <<him>> in confusion. "Didn't anyone tell you? It's 100 quid. Now."
+ <<else>>
+ "100 quid. Now."
+ <</if>>
+ <br><br>
+
+ <<if $money gte 10000>>
+ <<link [[Pay (£100)|School Night Pool Party Pay]]>><<set $phase to 0>><<money -10000 "schoolPoolParty">><</link>>
+ <<else>>
+ <span class="blue">You can't afford it.</span>
+ <</if>>
+ <br>
+ <<link [[Refuse|School Night Pool Party Pay]]>><<set $phase to 1>><</link>>
+ <br>
<<else>>
<<set $danger to random(1, 10000)>><<set $dangerevent to 0>>
-<<if $danger gte (9900 - $allure) and $eventskip is 0>>
- <<eventsschoolcourtyard>>
-<<else>>
- <<if !["early", "late", "earlynoschool", "latenoschool", "daynoschool"].includes($schoolstate) and $exposed gte 1>>
- <<sneakicon>><<link [[Sneak behind the school (0:05)|School Rear Courtyard]]>><<pass 5>><</link>>
- <br>
+ <<if $danger gte (9900 - $allure) and $eventskip is 0>>
+ <<eventsschoolcourtyard>>
<<else>>
- <<entranceicon>><<link [[Enter the school (0:01)|Hallways]]>><<pass 1>><</link>>
- <br>
- <<schoolicon "courtyard">><<link [[Rear courtyard (0:02)|School Rear Courtyard]]>><<pass 2>><</link>>
- <br><br>
- <<if $schoolstate is "afternoon" and $detention gte 1 and $daily.school.detentionAttended isnot 1 and $headnodetention isnot 1 and $pillory.tenant.special.name isnot "Leighton">>
- <<oxfordicon>><<link [[Leave the school|School Leave Stop]]>><<schoolclothesreset>><</link>>
- <br>
- <<elseif $schoolstate is "afternoon" and $bullytimer gte 1 and $bullytimeroutside gte 1 and $daily.whitney.bullyGate isnot 1 and C.npc.Whitney.init is 1 and !["dungeon", "pillory"].includes(C.npc.Whitney.state)>>
- <<oxfordicon>><<link [[Leave the school|School Leave Whitney]]>><<schoolclothesreset>><</link>>
- <br>
- <<elseif Time.schoolDay and Time.hour gte 7 and Time.hour lte 16>>
- <<oxfordicon>><<link [[Leave the school (0:01)|Oxford Street]]>><<schoolclothesreset>><<pass 1>><</link>>
+ <<if !["early", "late", "earlynoschool", "latenoschool", "daynoschool"].includes($schoolstate) and $exposed gte 1>>
+ <<sneakicon>><<link [[Sneak behind the school (0:05)|School Rear Courtyard]]>><<pass 5>><</link>>
<br>
<<else>>
- <<oxfordicon>><<link [[Leave the school|School Gate Exit]]>><<schoolclothesreset>><</link>>
+ <<entranceicon>><<link [[Enter the school (0:01)|Hallways]]>><<pass 1>><</link>>
<br>
+ <<schoolicon "courtyard">><<link [[Rear courtyard (0:02)|School Rear Courtyard]]>><<pass 2>><</link>>
+ <br><br>
+ <<if $schoolstate is "afternoon" and $detention gte 1 and $daily.school.detentionAttended isnot 1 and $headnodetention isnot 1 and $pillory.tenant.special.name isnot "Leighton">>
+ <<oxfordicon>><<link [[Leave the school|School Leave Stop]]>><<schoolclothesreset>><</link>>
+ <br>
+ <<elseif $schoolstate is "afternoon" and $bullytimer gte 1 and $bullytimeroutside gte 1 and $daily.whitney.bullyGate isnot 1 and C.npc.Whitney.init is 1 and !["dungeon", "pillory"].includes(C.npc.Whitney.state)>>
+ <<oxfordicon>><<link [[Leave the school|School Leave Whitney]]>><<schoolclothesreset>><</link>>
+ <br>
+ <<elseif Time.schoolDay and Time.hour gte 7 and Time.hour lte 16>>
+ <<oxfordicon>><<link [[Leave the school (0:01)|Oxford Street]]>><<schoolclothesreset>><<pass 1>><</link>>
+ <br>
+ <<else>>
+ <<oxfordicon>><<link [[Leave the school|School Gate Exit]]>><<schoolclothesreset>><</link>>
+ <br>
+ <</if>>
<</if>>
- <</if>>
-<</if>>
+ <</if>>
<</if>>
<<set $eventskip to 0>>
@@ -121,9 +143,31 @@
<</if>>
<<schoolperiodtext>>
-
+<<if ["intro", "discover"].includes($weekly.schoolNightPoolParty) and Time.hour gte 21 and $passagePrev is "hallway">><<set $weekly.schoolNightPoolParty to "admission">><</if>>
<<if $stress gte $stressmax>>
<<link [[Everything fades to black...|School Passout]]>><</link>>
+<<elseif ["intro", "discover"].includes($weekly.schoolNightPoolParty) and Time.hour gte 21>>
+ <<generateSecurity 1>><<person1>>
+ A beam of light shines on you. A security guard approaches, torch in hand.
+ <br><br>
+ "What, another one?" <<He>> must have already caught <<if $weekly.schoolNightPoolParty is "discover">>the delinquents<<else>>some students<</if>>. "Well, whatever. Just pay up."
+ <br><br>
+ <<He>> holds <<his>> hand in front of you.
+ <<if $schoolNightPoolParty gte 1>>
+ You stare at <<him>> in confusion. "Didn't anyone tell you? It's 100 quid. Now."
+ <<else>>
+ "100 quid. Now."
+ <</if>>
+ <br><br>
+
+ <<if $money gte 10000>>
+ <<link [[Pay (£100)|School Night Pool Party Pay]]>><<set $phase to 0>><<money -10000 "schoolPoolParty">><</link>>
+ <<else>>
+ <span class="blue">You can't afford it.</span>
+ <</if>>
+ <br>
+ <<link [[Refuse|School Night Pool Party Pay]]>><<set $phase to 1>><</link>>
+ <br>
<<elseif $town_projects.green is 1>>
<<set $town_projects.green to 2>>
You almost tread on an adder. It slips into a patch of tall, wild grass surrounding a large oak. Students avoid the area, as it's home to all sorts of pests. <span class="teal">An idea strikes you.</span> If the grass were cleared, there'd be a lot more room for students.
diff --git a/game/overworld-town/loc-school/special-night.twee b/game/overworld-town/loc-school/special-night.twee
index 23216ab79a..5c0b2f0872 100644
--- a/game/overworld-town/loc-school/special-night.twee
+++ b/game/overworld-town/loc-school/special-night.twee
@@ -1,10 +1,10 @@
:: School Night Pool Party Follow
<<effects>>
-You linger for a few minutes. When nothing else happens, you carefully follow them inside.
+When nothing else happens, you carefully follow them.
<br><br>
-<<link [[Next|Hallways]]>><<endevent>><<set $eventskip to 1>><</link>>
+<<link [[Next|School Rear Courtyard]]>><<endevent>><<set $eventskip to 1>><</link>>
<br>
:: School Night Pool Party Pay
@@ -27,7 +27,7 @@ You linger for a few minutes. When nothing else happens, you carefully follow th
<<link [[Next|Hallways]]>><<endevent>><<set $eventskip to 1>><</link>>
<br>
<<else>> /* Refuse */
- <<set $weekly.schoolNightPoolParty to false>>
+ <<set $weekly.schoolNightPoolParty to "notPaid">>
<<set $schoolBlocked to true>>
The guard frowns. "If you're not paying, then you're leaving. C'mon."
@@ -529,4 +529,4 @@ You just wish they had gotten your clothes too: you're totally naked!<<ruined>>
<br><br>
<<link [[Next|Industrial alleyways]]>><<endevent>><<set $eventskip to 1>><</link>>
-<br>
\ No newline at end of file
+<br>
diff --git a/game/overworld-town/loc-street/oxford.twee b/game/overworld-town/loc-street/oxford.twee
index 98f68f235c..a03fbbacf1 100644
--- a/game/overworld-town/loc-street/oxford.twee
+++ b/game/overworld-town/loc-street/oxford.twee
@@ -203,7 +203,7 @@ You are on Oxford Street. There's an eclectic mix of buildings, but most notable
<</if>>
Places of interest
<br>
- <<if $schoolBlocked is true>>
+ <<if $schoolBlocked>>
<span class="blue">The school guard is on high alert. You won't be able to sneak in tonight.</span>
<br>
<<elseif Time.schoolDay and Time.hour gte 7 and Time.hour lte 16>>
diff --git a/game/overworld-underground/loc-sewers/main.twee b/game/overworld-underground/loc-sewers/main.twee
index bbfd5d904a..e6d15a23e6 100644
--- a/game/overworld-underground/loc-sewers/main.twee
+++ b/game/overworld-underground/loc-sewers/main.twee
@@ -1026,12 +1026,8 @@ You tear off your <<print $worn.under_upper.name>>, and the slime with it. The f
<<park>>
<br>
<<if $historytrait gte 2 and $schooldrainintro gte 1>>
- <<if $schoolBlocked is true>>
- /* none */
- <<else>>
- <<schoolicon "building">><<link [[Secret tunnel to school (0:02)|School Toilets]]>><<pass 2>><</link>>
- <br>
- <</if>>
+ <<schoolicon "building">><<link [[Secret tunnel to school (0:02)|School Toilets]]>><<pass 2>><</link>>
+ <br>
<</if>>
<</widget>>
--
GitLab