From 6a921e2841d117fd1b0e6d2a7e53fb7b646452c5 Mon Sep 17 00:00:00 2001
From: Purity <purityguydol@gmail.com>
Date: Fri, 29 Mar 2024 23:50:32 +0000
Subject: [PATCH] Bug fixes
---
game/03-JavaScript/canvasmodel-editor.js | 5 +++-
game/base-combat/ejaculation-alex.twee | 9 +++++-
game/base-combat/end.twee | 2 +-
game/base-system/text.js | 6 ++--
.../loc-lake/ivory/underwater-prison.twee | 30 +++++++++++++++++++
game/overworld-town/loc-adultshop/events.twee | 6 ++--
game/overworld-town/loc-office/filing.twee | 2 +-
game/overworld-town/loc-pound/widgets.twee | 4 +--
game/overworld-town/loc-school/widgets.twee | 2 +-
.../special-kylar/kylar-functions.js | 2 +-
game/overworld-town/special-robin/main.twee | 9 ++++--
game/overworld-town/special-sydney/main.twee | 5 ++--
12 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/game/03-JavaScript/canvasmodel-editor.js b/game/03-JavaScript/canvasmodel-editor.js
index f03117164c..37fa622cd5 100644
--- a/game/03-JavaScript/canvasmodel-editor.js
+++ b/game/03-JavaScript/canvasmodel-editor.js
@@ -478,6 +478,9 @@ Macro.add("canvasModelEditor", {
const options = model.options;
function redraw() {
+ let options = model.options;
+ model.reset();
+ model.options = options;
model.redraw();
}
@@ -614,7 +617,7 @@ Macro.add("canvasModelEditor", {
);
return;
}
- const bodyWritings = ["", ...Object.keys()];
+ const bodyWritings = ["", ...Object.keys(setup.bodywriting)];
const hairColourOptions = [...Object.keys(setup.colours.hair_map), "custom"];
const xhairColourOptions = ["", ...Object.keys(setup.colours.hair_map), "custom"];
diff --git a/game/base-combat/ejaculation-alex.twee b/game/base-combat/ejaculation-alex.twee
index f5a57f5e86..b3fcb7e60a 100644
--- a/game/base-combat/ejaculation-alex.twee
+++ b/game/base-combat/ejaculation-alex.twee
@@ -247,8 +247,15 @@
<</if>>
<!-- Male ALEX -->
+ <<if _condomResult is "leaked">>
+ <span class="red">The condom broke.</span>
+ <<elseif _condomResult is "burst">>
+ <span class="red">The tip of the condom bursts and rips, exposing the head of <<his>> penis.</span>
+ <</if>>
<<if $consensual is 1>>
- <<if $NPCList[_nn].penis is "idle">>
+ <<if _condomResult is "contained">>
+ <<genericCondomEjaculation>>
+ <<elseif $NPCList[_nn].penis is "idle">>
<<He>> groans as a wet patch forms on <<his>> trousers. You giggle at the sight.
<<elseif $NPCList[_nn].penis is "thighs">>
diff --git a/game/base-combat/end.twee b/game/base-combat/end.twee
index 19b0d209a5..10d26e2760 100644
--- a/game/base-combat/end.twee
+++ b/game/base-combat/end.twee
@@ -12,7 +12,7 @@
<</if>>
<</if>>
- <<if $demonabsorb gte 1>>
+ <<if $demonabsorb gte 1 and !$stalk>>
<<if $enemytype is "tentacles" or $enemytype is "struggle">>
<<pain `-(5 * $demonabsorb)`>>
<<set $stress -= (300 * $demonabsorb)>>
diff --git a/game/base-system/text.js b/game/base-system/text.js
index ca89985876..51f49ef44f 100644
--- a/game/base-system/text.js
+++ b/game/base-system/text.js
@@ -456,21 +456,21 @@ statDisplay.create("gspurity", () => {
if (C.npc.Sydney.purity >= 1) {
return statDisplay.statChange("Sydney's Purity", 1, "teal");
}
- return statDisplay.statChange("Sydney's Corruption", -1, "purple");
+ return statDisplay.statChange("Sydney's Corruption", -1, "teal");
});
statDisplay.create("ggspurity", () => {
T.warnstate = 2;
if (C.npc.Sydney.purity >= 1) {
return statDisplay.statChange("Sydney's Purity", 2, "teal");
}
- return statDisplay.statChange("Sydney's Corruption", -2, "purple");
+ return statDisplay.statChange("Sydney's Corruption", -2, "teal");
});
statDisplay.create("gggspurity", () => {
T.warnstate = 3;
if (C.npc.Sydney.purity >= 1) {
return statDisplay.statChange("Sydney's Purity", 3, "teal");
}
- return statDisplay.statChange("Sydney's Corruption", -3, "purple");
+ return statDisplay.statChange("Sydney's Corruption", -3, "teal");
});
statDisplay.create("lslust", () => {
diff --git a/game/overworld-forest/loc-lake/ivory/underwater-prison.twee b/game/overworld-forest/loc-lake/ivory/underwater-prison.twee
index 3ff8fa74fa..2b66576895 100644
--- a/game/overworld-forest/loc-lake/ivory/underwater-prison.twee
+++ b/game/overworld-forest/loc-lake/ivory/underwater-prison.twee
@@ -371,6 +371,36 @@ Its grip on you loosens<<if $wraith.state is "haunt">>, and you gasp for breath<
<<link [[Next|Lake Prison Intro Fight]]>><</link>>
<br>
<</if>>
+<<else>>
+ It suddenly lifts you, and begins to carry you. You're helpless to resist.
+ You're placed in a decrepit cage, right next to the centre of the lichen colony. There's no door.
+ <<if $wraith.state is "haunt">>
+ <<if !$wraithPrison.vision>>
+ "<span class="wraith">I will break open your mind, and then I will show you. And then you will. Give. It. Back.</span>"
+ <<else>>
+ "<span class="wraith">The descent begins again. Isn't it beautiful?</span>"
+ <</if>>
+ <<elseif $wraith.state is "despair">>
+ <<if !$wraithPrison.vision>>
+ "<span class="wraith">Help me find it. See what I've seen. Stay.</span>"
+ <<else>>
+ "<span class="wraith">Again. Again. Descending. Where is it?</span>"
+ <</if>>
+ <</if>>
+ <<if $worn.neck.cursed is 1>>
+ It rests a hand against your $worn.neck.name. There's a flash of light, a deep groaning sound, and the metal is no more.
+ <<set $worn.neck.type.push("broken")>>
+ <<neckruined>>
+ <</if>>
+ It floats away from the cell, out of sight. <<tearful>> you look around, trying to think of a way out. The figure is nowhere to be seen.
+ <<set $wraithPrison.timer to 60>>
+ <<set $wraithPrison.state to "recovering">>
+ <<clotheson>>
+ <<endcombat>>
+ <<endWraith>>
+ <br><br>
+ <<link [[Next|Lake Ruin Prison]]>><<unset $wraithParasite>><</link>>
+ <br>
<</if>>
:: Lake Ruin Prison
diff --git a/game/overworld-town/loc-adultshop/events.twee b/game/overworld-town/loc-adultshop/events.twee
index cac0214191..78ef9ab549 100644
--- a/game/overworld-town/loc-adultshop/events.twee
+++ b/game/overworld-town/loc-adultshop/events.twee
@@ -3,7 +3,9 @@
<<widget "sydneyEvent1AnalBeads">>
<<npc "Sydney">><<person1>>
<<run statusCheck("Sydney")>>
-
+ You earn <<adultShopWage>><<moneyGain _wage>>.
+ <br><br>
+
<<if _sydneyStatus.includes("corrupt")>>
Something whips your <<bottom>>.
<<if $awarelevel gte 1>>
@@ -120,8 +122,6 @@
"A rosary," <<he>> giggles to <<himself>>. "Was I really that naive?"<<npcincr Sydney purity -1>><<lspurity>>
<br><br>
- You earn <<adultShopWage>><<moneyGain _wage>>.
- <br><br>
<<link [[Next|Adult Shop]]>><<endevent>><</link>>
<br>
<</if>>
diff --git a/game/overworld-town/loc-office/filing.twee b/game/overworld-town/loc-office/filing.twee
index 86aa55e5f5..f80c9feba8 100644
--- a/game/overworld-town/loc-office/filing.twee
+++ b/game/overworld-town/loc-office/filing.twee
@@ -614,7 +614,7 @@ As you fall, the fabric remains snagged and pulls the ladder out from under the
Your $worn.lower.name
<<if $worn.lower.integrity lte 0>>
<<lowerruined>><<clothesruinstat>><<set $loweroff to 0>>
- <span class="lewd">is torn from your body
+ <span class="lewd">is torn from your body</span>
<<else>>
tears
<</if>>
diff --git a/game/overworld-town/loc-pound/widgets.twee b/game/overworld-town/loc-pound/widgets.twee
index 882db2b34f..8a27cc1547 100644
--- a/game/overworld-town/loc-pound/widgets.twee
+++ b/game/overworld-town/loc-pound/widgets.twee
@@ -10,9 +10,9 @@
<<widget "pound_text">>
<<if ($monsterchance gte $rng and $hallucinations gte 1) or ($monsterchance gte $rng and $monsterhallucinations is "f")>>
<<if $monsterchance gte 100 or $bestialitydisable is "f">>
- <<if maleChance() is 100>>
+ <<if beastMaleChance() is 100>>
<<set _text_output to "dogboys">>
- <<elseif maleChance() is 0>>
+ <<elseif beastMaleChance() is 0>>
<<set _text_output to "doggirls">>
<<else>>
<<set _text_output to "dogpeople">>
diff --git a/game/overworld-town/loc-school/widgets.twee b/game/overworld-town/loc-school/widgets.twee
index c59dcf4c54..cbb153cb2b 100644
--- a/game/overworld-town/loc-school/widgets.twee
+++ b/game/overworld-town/loc-school/widgets.twee
@@ -787,7 +787,7 @@
<<He>> starts passing the tiny boxes to the students in front, who begin passing them back in sequence. You hear a few students giggle as they inspect their boxes, while others show signs of intense embarrassment.
<br><br>
- "These are condoms. You're in primes of your lives and your hormones are raging, so you'll want to keep some of these around at all times. Not only will they make it less likely for you to have an unplanned kid on your hands, but they'll keep you clean." Sirris produces a large, conspicuously-shaped fruit from under <<his>> desk.
+ "These are condoms. You're in the primes of your lives and your hormones are raging, so you'll want to keep some of these around at all times. Not only will they make it less likely for you to have an unplanned kid on your hands, but they'll keep you clean." Sirris produces a large, conspicuously-shaped fruit from under <<his>> desk.
<br><br>
"They're very simple to put on. Tear the wrapper here, place against the tip, and roll down. Don't push this part down, though. That's called a reservoir tip, and it will prevent any fluid from leaking out." The motion of Sirris putting the condom on the fruit seems to have left some of the students flushed. <<arousal 200>><<garousal>>
diff --git a/game/overworld-town/special-kylar/kylar-functions.js b/game/overworld-town/special-kylar/kylar-functions.js
index cf90ce3b55..3ea72a5b4e 100644
--- a/game/overworld-town/special-kylar/kylar-functions.js
+++ b/game/overworld-town/special-kylar/kylar-functions.js
@@ -79,7 +79,7 @@ window.getKylarSchoolLocation = getKylarSchoolLocation;
/** @returns {DolLocation} Kylar's location in school lunchtime */
function getKylarLocationInLunchtime() {
- if (V.daily.school.lunchEaten === undefined) {
+ if (V.daily.school.lunchEaten === 0) {
return { area: "canteen", state: "lunch" };
}
if (!["rain", "snow"].contains(V.weather)) {
diff --git a/game/overworld-town/special-robin/main.twee b/game/overworld-town/special-robin/main.twee
index 46bcdc2651..ccd84e815e 100644
--- a/game/overworld-town/special-robin/main.twee
+++ b/game/overworld-town/special-robin/main.twee
@@ -11,7 +11,12 @@
<br><br>
A <<npc Robin>><<generatey2>><<person2>><<person>> walks by. You grasp <<his>> arm. "Robin always leaves a note," you say. "Has something happened?"
<br><br>
- The <<person>> looks frightened. "D-don't let anyone know I told you," <<he>> says. "But Robin couldn't afford to pay, so Bailey took <<person1>><<him>> somewhere." <<if $robindebtknown isnot 1>><span class="red">You wonder why Robin never told you <<he>> had to pay Bailey, and realise you never told Robin either.</span><</if>>
+ <<if $exposed gte 2>>
+ The <<person>> looks frightened, doubly so due to your lack of care at your own exposure.
+ <<else>>
+ The <<person>> looks frightened.
+ <</if>>
+ "D-don't let anyone know I told you," <<he>> says. "But Robin couldn't afford to pay, so Bailey took <<person1>><<him>> somewhere." <<if $robindebtknown isnot 1>><span class="red">You wonder why Robin never told you <<he>> had to pay Bailey, and realise you never told Robin either.</span><</if>>
<br><br>
<<set $robindebtknown to 1>>
"I'm not sure," the <<person2>><<person>> says. "But I think Bailey said something about the <span class="gold">docks.</span> I hope Robin's okay." You release <<person2>><<his>> arm.
@@ -129,7 +134,7 @@ Finally, you stand victorious outside of Robin's room,
<</if>>
<br><br>
-<<if $robin_naked_room is 1>>
+<<if $robin_naked_room is 1 or ($robindebt gte $robindebtlimit and $robindebtintro isnot 1 and $robinpaid isnot 1) or $robinmissing isnot 0>>
<<link [[Next|Robin's Room Entrance]]>><</link>>
<<elseif $robin_naked_fail is 1>>
<<link [[Next|Robin Room Naked Fail]]>><</link>>
diff --git a/game/overworld-town/special-sydney/main.twee b/game/overworld-town/special-sydney/main.twee
index 5c6d543278..083a6422b2 100644
--- a/game/overworld-town/special-sydney/main.twee
+++ b/game/overworld-town/special-sydney/main.twee
@@ -1892,9 +1892,9 @@ Your palm comes down on Sydney's rear with a resounding slap. <<He>> cries out,
<<default>>
causing <<him>> to moan as <<he>> instinctively moves in motion with you.
<</switch>>
- <<npcincr "Kylar" "rage" 20>><<gggksuspicion>>
- <br><br>
<<if $isKylarPresent>>
+ <<npcincr "Kylar" "rage" 20>><<gggksuspicion>>
+ <br><br>
Before you can deliver the final spank, you hear a shelf fall behind you. The sound startles all of you.
"Who is in here?!" Leighton yells out. There is no response.
"I expect you two to clean that up after this is over," Leighton states plainly.
@@ -1908,6 +1908,7 @@ Your palm comes down on Sydney's rear with a resounding slap. <<He>> cries out,
Sydney whimpers in disappointment.
<<npcincr Sydney lust 3>><<npcincr Sydney purity -5>><<ggslust>><<llspurity>>
<<else>>
+ <br><br>
You release <<him>>, giving <<him>> one last hard spank.
<<if _sydneyStatus.includes("Lust")>>
<<He>> yelps, finally reaching climax at your hit. Leighton laughs. "Not so pure after all, are we?"
--
GitLab