diff --git a/game/03-JavaScript/04-Pregnancy/pregnancy.js b/game/03-JavaScript/04-Pregnancy/pregnancy.js
index fe4616b8651e2b78fe8277ca8076806652d356ae..1aba3f824a783469f32b7aabe0d0dbd04a26dc57 100644
--- a/game/03-JavaScript/04-Pregnancy/pregnancy.js
+++ b/game/03-JavaScript/04-Pregnancy/pregnancy.js
@@ -160,13 +160,19 @@ function playerPregnancyAttempt(baseMulti = 1, genital = "vagina") {
if (V.skin.pubic.pen === "magic" && V.skin.pubic.special === "pregnancy") {
fertilityBoost -= 0.4;
}
- let baseChance = Math.floor((100 - V.basePlayerPregnancyChance) * Math.clamp(fertilityBoost, 0.1, 1) * baseMulti);
+ /* The lower basePenalty is, the easier it is for the player to get pregnant */
+ let basePenalty = Math.floor((100 - V.basePlayerPregnancyChance) * Math.clamp(fertilityBoost, 0.1, 1) * baseMulti);
- if (V.earSlime.growth >= 100 && V.earSlime.focus === "pregnancy") baseChance = Math.floor(baseChance * 2);
- if (V.earSlime.growth >= 100 && V.earSlime.focus === "impregnation") baseChance = Math.floor(baseChance / 2);
+ if (V.earSlime.growth >= 100 && V.earSlime.focus === "pregnancy") basePenalty = Math.floor(basePenalty * 2);
+ if (V.earSlime.growth >= 100 && V.earSlime.focus === "impregnation") basePenalty = Math.floor(basePenalty / 2);
- const rng = random(0, spermArray.length - 1 > baseChance ? spermArray.length - 1 : baseChance);
+ /*
+ When spermArray.length - 1 is lower than basePenalty, it uses basePenalty to determin if the pregnancy should occur or not
+ When spermArray.length - 1 is higher than basePenalty, the player will always get pregnant, so it uses spermArray.length - 1 to give all sperm a chance to impregnate the player
+ */
+ const rng = random(0, spermArray.length - 1 > basePenalty ? spermArray.length - 1 : basePenalty);
+ /* When spermArray[rng] is undefined, the player failed to get pregnant */
if (spermArray[rng]) {
const fatherKnown = Object.keys(trackedNPCs).length === 1;
@@ -547,8 +553,9 @@ function namedNpcPregnancyAttempt(npcName, forcePregnancy = false) {
const fertility = pregnancy.pills === "fertility" ? 0.8 : 1;
const contraceptive = pregnancy.pills === "contraceptive";
- const baseChance = Math.floor((20 - V.baseNpcPregnancyChance) * fertility);
- let rng = random(0, spermArray.length > baseChance ? spermArray.length : baseChance);
+ /* Works in a similar way to playerPregnancyAttempt */
+ const basePenalty = Math.floor((20 - V.baseNpcPregnancyChance) * fertility);
+ let rng = random(0, spermArray.length > basePenalty ? spermArray.length : basePenalty);
if (forcePregnancy && !spermArray[rng]) rng = 0;
if (contraceptive && random(0, 100) >= 10) {
diff --git a/game/04-Variables/variables-start2.twee b/game/04-Variables/variables-start2.twee
index 3d4080a5eda6b9a2b6eb9965ac0ef39791eb0ca6..3fd31e42485ca6eb093b182d0a2249a5df80dbc3 100644
--- a/game/04-Variables/variables-start2.twee
+++ b/game/04-Variables/variables-start2.twee
@@ -29,7 +29,7 @@
<<initnpcgender>>
<<initnpcskin>>
- <<if $debug is 1>>
+ <<if $debug is 1 and $spraymax lt 1>>
<<set $spraymax += 1>>
<<set $spray += 1>>
<</if>>
diff --git a/game/base-system/parasites.twee b/game/base-system/parasites.twee
index 941a1151725b2084ede30d309bae27c590d25fae..accca7594c76cf9e85c3a73db3d77fe45534e998 100644
--- a/game/base-system/parasites.twee
+++ b/game/base-system/parasites.twee
@@ -106,7 +106,7 @@
<<for _type range $parasite.types>>
<<set $parasite[_type].delete(_temp0)>>
<</for>>
- <<if $parasite.left_ear.name isnot "slime" and $parasite.right_ear.name isnot "slime" and ($earSlime.days or $earSlime.corruption or $earSlime.growth)>>
+ <<if $parasite.left_ear.name isnot "slime" and $parasite.right_ear.name isnot "slime" and $earslime and ($earSlime.days or $earSlime.corruption or $earSlime.growth)>>
<<resetEarSlime true>>
<</if>>
<</if>>
diff --git a/game/overworld-town/loc-cafe/chef.twee b/game/overworld-town/loc-cafe/chef.twee
index 8b0434a8db75bf9753154fc6e3d2274f7adc6ce9..f0296628945c916cd7bc3938fd578f895cca63fb 100644
--- a/game/overworld-town/loc-cafe/chef.twee
+++ b/game/overworld-town/loc-cafe/chef.twee
@@ -77,13 +77,13 @@ You whip up another bun, stuffed with extra cream. Sam arrives to collect and de
<div id="masturbationButtons">
<<if $timer lte 1>>
<div id="next"><<link [[Continue|Chef Help Masturbation Finish]]>><</link>><<nexttext>></div>
- <div><<link [[Stop|Chef Help Masturbation Finish]]>><<set $finish to 1>><</link>></div>
+ <div id="stop"><<link [[Stop|Chef Help Masturbation Finish]]>><<set $finish to 1>><</link>></div>
<<elseif $masturbation_fluid gte 30>>
<div id="next"><<link [[Continue|Chef Help Masturbation Finish]]>><</link>><<nexttext>></div>
- <div><<link [[Stop|Chef Help Masturbation Finish]]>><<set $finish to 1>><</link>></div>
+ <div id="stop"><<link [[Stop|Chef Help Masturbation Finish]]>><<set $finish to 1>><</link>></div>
<<else>>
<div id="next"><<link [[Continue|Chef Help Masturbation]]>><</link>><<nexttext>></div>
- <div><<link [[Stop|Chef Help Masturbation Finish]]>><<set $finish to 1>><</link>></div>
+ <div id="stop"><<link [[Stop|Chef Help Masturbation Finish]]>><<set $finish to 1>><</link>></div>
<</if>>
</div>
<br><br><br><br><br>
diff --git a/game/overworld-town/loc-island/main.twee b/game/overworld-town/loc-island/main.twee
index 04dbb3b3f7b0bbf6b6db2927bd57394b4aa1bc83..2a660d9728c4463ed89c71ab8bf792376fd7cb91 100644
--- a/game/overworld-town/loc-island/main.twee
+++ b/game/overworld-town/loc-island/main.twee
@@ -307,7 +307,7 @@ A small stream trickles from a rock wall, beneath a sheltered overhang. You're n
<<set $island.home to "rocky_hillock">>
<i>Food isn't readily available on the island. You'll need to find some.</i>
<br><br>
-<<link [[Next|Island]]>><</link>>
+<<link [[Next|Island]]>><<endevent>><</link>>
<br>
:: Island
diff --git a/game/overworld-town/loc-museum/museumAntiques.twee b/game/overworld-town/loc-museum/museumAntiques.twee
index 3eeed8c89034832e6ad5d932eb9cdf00e3b1b9e2..c7411990a75533af14337efd1f9687042437e380 100644
--- a/game/overworld-town/loc-museum/museumAntiques.twee
+++ b/game/overworld-town/loc-museum/museumAntiques.twee
@@ -591,7 +591,7 @@ You look around the museum. The pedestals are grooved, as if awaiting specific o
<<if $museumAntiques.antiques.antiqueteacaddy is undefined>>
<<set $museumAntiques.antiques.antiqueteacaddy to "notFound">>
<</if>>
- <<if $museumAntiques.antiquewoodenfigurine is undefined>>
+ <<if $museumAntiques.antiques.antiquewoodenfigurine is undefined>>
<<set $museumAntiques.antiques.antiquewoodenfigurine to "notFound">>
<</if>>
<<if $museumAntiques.antiques.antiquecopperring is undefined>>
diff --git a/game/overworld-town/loc-pirates/events.twee b/game/overworld-town/loc-pirates/events.twee
index 7c8929c57438956a4136285358bbe868b4983695..77a87eecf71ea5dbdd1a68b3eac2db83eca8dab7 100644
--- a/game/overworld-town/loc-pirates/events.twee
+++ b/game/overworld-town/loc-pirates/events.twee
@@ -101,7 +101,11 @@ You walk up to the <<person1>><<person>>. When within arm's reach, <<he>> grasps
<<else>>
You walk on, ignoring the <<person1>><<person>> and <<his>> friends. "Don't you walk away from me," the <<person>> says. You hear <<his>> chair grind against the wooden floor as <<he>> stands. <<He>> marches towards you, snatching a bottle of dark liquid off a shelf on <<his>> way over. "Take a swig of this. It'll brighten you're mood. Promise."
<br><br>
- <<link [[Drink|Pirate Scum Cabin Drink]]>><<pirate_status 1>><<alcohol 120>><</link>><<grespect>><<ggalcohol>>
+ <<if playerIsPregnant() and playerAwareTheyArePregnant()>>
+ <span class="blue">You can't bring yourself to drink while you know you're with child.</span>
+ <<else>>
+ <<link [[Drink|Pirate Scum Cabin Drink]]>><<pirate_status 1>><<alcohol 120>><</link>><<grespect>><<ggalcohol>>
+ <</if>>
<br>
<<link [[Refuse|Pirate Scum Cabin Drink Refuse]]>><<pirate_status -1>><</link>><<lrespect>>
<br>
@@ -123,8 +127,11 @@ You walk up to the <<person1>><<person>>. When within arm's reach, <<he>> grasps
<br><br>
"Smart mouth have you," <<he>> says, marching closer. "Here's something else then." <<he>> picks up a bottle of dark liquid off a shelf on <<his>> way over. "Here. Take a swig. I insist."
<br><br>
-
-<<link [[Drink|Pirate Scum Cabin Drink]]>><<pirate_status 1>><<alcohol 120>><</link>><<grespect>><<ggalcohol>>
+<<if playerIsPregnant() and playerAwareTheyArePregnant()>>
+ <span class="blue">You can't bring yourself to drink while you know you're with child.</span>
+<<else>>
+ <<link [[Drink|Pirate Scum Cabin Drink]]>><<pirate_status 1>><<alcohol 120>><</link>><<grespect>><<ggalcohol>>
+<</if>>
<br>
<<link [[Refuse|Pirate Scum Cabin Drink Refuse]]>><<pirate_status -1>><</link>><<lrespect>>
<br>
diff --git a/game/overworld-town/loc-pirates/main.twee b/game/overworld-town/loc-pirates/main.twee
index fcb2537026f57c6af6335ca6040daef169648572..495a19c9b39d557e3fc33316f12cafd4da5a35e0 100644
--- a/game/overworld-town/loc-pirates/main.twee
+++ b/game/overworld-town/loc-pirates/main.twee
@@ -908,7 +908,7 @@ You are in the bilge, deep within the pirate ship. The walls creak and groan.
<<link [[Bed|Pirate Bed]]>><</link>>
<br><br>
- <<link [[Cabin (0:01|Pirate Cabin]]>><<pass 1>><</link>>
+ <<link [[Cabin (0:01)|Pirate Cabin]]>><<pass 1>><</link>>
<br>
<</if>>
@@ -1487,7 +1487,7 @@ You are beside your bed, if it could be called that, in the bilge of the pirate
<<ind>><<link [[Attitudes]]>><<set $attitudesExitPassage to $passage>><</link>>
<</if>>
<br>
-<<ind>><<link [[Settings|Temple Settings]]>><</link>>
+<<ind>><<link [[Settings|Pirate Settings]]>><</link>>
<br>
@@ -1509,7 +1509,7 @@ You are beside your bed, if it could be called that, in the bilge of the pirate
<<wearoutfit>>
<<nightmareCheck "Pirate Sleep">>
-<<if $fatigue gte 4000 or Time.dayState is "night">>
+<<if $tiredness gte 4000 or Time.dayState is "night">>
<<generateSleepLinks "Pirate Sleep">>
<<else>>
The groaning of the ship is one thing, but the noisy pirates make falling asleep here difficult. <span class="blue">You won't be able to sleep here until night, or at least until you're more fatigued.</span>
diff --git a/game/overworld-town/loc-school/main.twee b/game/overworld-town/loc-school/main.twee
index 0f6ba632265b2c87fdc665141d3ff77aba62f07a..9974a66a1b50a628bb01091648acafbb3110d75a 100644
--- a/game/overworld-town/loc-school/main.twee
+++ b/game/overworld-town/loc-school/main.twee
@@ -1884,7 +1884,7 @@ You march over to the pair, who look at you. You must look angry, given their st
<<link [[Fight them both|Courtyard Crush Fight]]>><<set $fightstart to 1>><</link>>
<br>
- <<link [[Walk away|Courtyard Crush Robin Walk]]>><<stress 6>><</link>><<lstress>>
+ <<link [[Walk away|Courtyard Crush Sydney Walk]]>><<stress 6>><</link>><<lstress>>
<br>
<</if>>
<<else>>
@@ -1893,7 +1893,7 @@ You march over to the pair, who look at you. You must look angry, given their st
<<link [[Fight them both|Courtyard Crush Fight]]>><<set $fightstart to 1>><</link>>
<br>
- <<link [[Walk away|Courtyard Crush Robin Walk]]>><<stress 6>><</link>><<lstress>>
+ <<link [[Walk away|Courtyard Crush Sydney Walk]]>><<stress 6>><</link>><<lstress>>
<br>
<</if>>
diff --git a/modules/css/base.css b/modules/css/base.css
index ac2146b0a862d88d529a44798dd68952b46a00cc..8eb38b2d91a53cf9cd4ac05114c3574143633e05 100644
--- a/modules/css/base.css
+++ b/modules/css/base.css
@@ -1294,7 +1294,6 @@ input.heart:hover {
}
#ui-bar-body {
- overflow: hidden;
line-height: 1.32em;
}
@@ -2089,30 +2088,39 @@ span.suit {
.skybox_dawn {
background-color: #fd7d01;
}
+
.skybox_dawn_haze {
background-image: linear-gradient(#fd7d01, #e5d397 65%);
}
+
.skybox_day {
background-color: #408aca;
}
+
.skybox_day_haze {
background-image: linear-gradient(#408aca, #d0ffea 65%);
}
+
.skybox_dusk {
background-color: #fad6a5;
}
+
.skybox_dusk_haze {
background-image: linear-gradient(#fad6a5, #d7a350 65%);
}
+
.skybox_night {
background-color: #280137;
}
+
.skybox_night_haze {
background-image: linear-gradient(#280137, #1a2753 65%);
}
+
.skybox_bloodmoon {
background-image: linear-gradient(#8b0804, #280137 20%);
}
+
.skybox_bloodmoon_haze {
background-image: linear-gradient(#8b0804, #280137 20%, #4f284e 65%);
}
@@ -2120,18 +2128,21 @@ span.suit {
.skybox_dawn_tentacle {
background-color: #44056d;
}
+
.skybox_day_tentacle {
background-color: #69159d;
}
+
.skybox_dusk_tentacle {
background-color: #550e81;
}
+
.skybox_night_tentacle {
background-color: #2e0854;
}
.skybox_blank {
- background-color: #000000;
+ background-color: #000;
}
#world_map {