diff --git a/game/base-combat/actions-text.twee b/game/base-combat/actions-text.twee index b8cee936b50bf4cd672bd7f9c5f09e19fb2cc2f0..31abdd7533b279c234cdce06b557eff292075306 100644 --- a/game/base-combat/actions-text.twee +++ b/game/base-combat/actions-text.twee @@ -2583,7 +2583,7 @@ <<elseif $arousal lte ($arousalmax / 5) * 4>> "Get out! I belong to the hunter!" <<else>> - "Y...you're tresspassing on Eden's... AAH! Property!" + "Y...you're trespassing on Eden's... AAH! Property!" <</if>> <<elseif $penisstate is "penetrated" or $penisstate is "otheranus">> <<if $arousal lte $arousalmax / 5>> @@ -2591,7 +2591,7 @@ <<elseif $arousal lte ($arousalmax / 5) * 4>> "Get off of me! I belong to the hunter!" <<else>> - "Y...you're tresspassing on Eden's... AAH! Property!" + "Y...you're trespassing on Eden's... AAH! Property!" <</if>> <<elseif $exposed gte 2>> <<switch random(1,3)>> diff --git a/game/base-combat/audience.twee b/game/base-combat/audience.twee index b4bf4db517ebe2b48a9f26fa9cd9c81a9d351c42..aa0fd4fe39891b9699cf41e2d91053a590b9a1b8 100644 --- a/game/base-combat/audience.twee +++ b/game/base-combat/audience.twee @@ -189,7 +189,7 @@ <<elseif $penisstate is "otheranusimminent">> <<if $orgasmdown gte 1>> <<if $face is "covered">> - "Don't be shy, letting the camera see your orgasm face." + "Don't be shy, let the camera see your orgasm face." <<else>> "Just pressing your ass against <<pher>> dick is making <<phim>> cum." <</if>> diff --git a/game/base-system/effect.js b/game/base-system/effect.js index 6fd2b34dbd50f073f2211410b3df5d0886e667e4..7c81a08cfe7b7142276770b422fe070cb148accd 100644 --- a/game/base-system/effect.js +++ b/game/base-system/effect.js @@ -252,7 +252,7 @@ function effects() { if (V.speechcycle >= 7) V.speechcycle = 0; if (!V.inwater && V.squidcount) { - element("span", `The squidV.${V.squidcount > 1 ? "s" : ""} drop off you, seeking water.`, "blue"); + element("span", `The squid${V.squidcount > 1 ? "s" : ""} drop${V.squidcount > 1 ? "" : "s"} off you, seeking water.`, "blue"); V.squidcount = 0; } V.inwater = 0; diff --git a/game/base-system/overlays/statistics.twee b/game/base-system/overlays/statistics.twee index a710bef602715e621b69fa078bf4eb53611c9ba8..81245e58c6bb0fe0a9f512af1e7db819bc4fb7a7 100644 --- a/game/base-system/overlays/statistics.twee +++ b/game/base-system/overlays/statistics.twee @@ -23,7 +23,7 @@ Temple vow: <<print ($player.virginity.temple is true ? "Unbroken" : "Broken by " + ($player.virginity.temple is false ? "unknown" : $player.virginity.temple))>> <br> <</if>> - <br><br> + <br> <</foldout>> <<foldout false "_virginitiesTakenFoldout">> @@ -102,7 +102,6 @@ Products sold at the brothel: $brothelVending.total <br> <</if>> - <br> <<if $confessionsDone>> Sins confessed: $confessionsDone <br> @@ -111,6 +110,7 @@ Confessions taken: $confessionsTaken <br> <</if>> + <br> <</foldout>> <<foldout false "_sexFoldout">> @@ -522,7 +522,6 @@ <br> <</if>> <<if $saveDetails isnot undefined>> - <br> Normal saves count: <<print $saveDetails.slot.count>> <br> Exported saves count: <<print $saveDetails.exported.count>> @@ -967,6 +966,7 @@ <</if>> <</if>> <</if>> + <br> <</foldout>> <<set $_menstruation to $sexStats.vagina.menstruation>> <<if $cycledisable is "f">> @@ -980,6 +980,7 @@ Last day in cycle: <<print $_menstruation.currentDaysMax>> <br> Most risky days: <<print $_menstruation.stages[2]>> + <br> <</if>> <br> <</foldout>> diff --git a/game/base-system/overlays/traits.twee b/game/base-system/overlays/traits.twee index 784fe6c88e2e7b6d83650c9815b037d21bd8bb08..36d3e6f43703e460e41b46a55169566f6706e905 100644 --- a/game/base-system/overlays/traits.twee +++ b/game/base-system/overlays/traits.twee @@ -171,13 +171,13 @@ name: "Parasite Broodmother", colour: "lewd", has: $sexStats.anus.pregnancy.motherStatus is 2 or $sexStats.vagina.pregnancy.motherStatus is 2, - text: "You've become host to an endless number of little critters<<if $sexStats.anus.pregnancy.motherStatus is 2 and $sexStats.vagina.pregnancy.motherStatus is 2>> <span class='lewd'>in multiple places in your body</span><</if>><span class='hidden'></span>", + text: "You've become host to an endless number of little critters<<if $sexStats.anus.pregnancy.motherStatus is 2 and $sexStats.vagina.pregnancy.motherStatus is 2>> <span class='lewd'>in multiple places in your body</span><</if>><span class='hidden'></span>.", }, { name: "Parasite Mother", colour: "lewd", has: ($sexStats.anus.pregnancy.motherStatus is 1 or $sexStats.vagina.pregnancy.motherStatus is 1) and !($sexStats.anus.pregnancy.motherStatus is 2 or $sexStats.vagina.pregnancy.motherStatus is 2), - text: "You have given birth to little critters<<if $sexStats.anus.pregnancy.motherStatus is 1 and $sexStats.vagina.pregnancy.motherStatus is 1>> <span class='lewd'>in multiple places in your body</span><</if>><span class='hidden'></span>", + text: "You have given birth to little critters<<if $sexStats.anus.pregnancy.motherStatus is 1 and $sexStats.vagina.pregnancy.motherStatus is 1>> <span class='lewd'>in multiple places in your body</span><</if>><span class='hidden'></span>.", }, { name: "Lactating", diff --git a/game/base-system/sleep.twee b/game/base-system/sleep.twee index 3f6047406d7d1ded2c26a872ba6070d7d47a2606..5fe2ffb62ac112156c2711e23c0bb4bcb14f57e1 100644 --- a/game/base-system/sleep.twee +++ b/game/base-system/sleep.twee @@ -62,7 +62,7 @@ <<if $sleepWraith>> <!-- Do nothing. Wraith mimicking Robin guarantees an uninterrupted sleep --> - <<elseif $kylarenglish is 1 and _kylarStatus.includes("Love") and _kylarStatus.includes("Lust") and Time.dayState is "night" and $kylarbed is undefined and $robinbed is undefined and $rng gte 96 and C.npc.Kylar.state is "active">> + <<elseif $kylarenglish gte 1 and _kylarStatus.includes("Love") and _kylarStatus.includes("Lust") and Time.dayState is "night" and $kylarbed is undefined and $robinbed is undefined and $rng gte 96 and C.npc.Kylar.state is "active">> <<set _sleepinterrupt to 1>> <<set _kylarWake to 1>> <<set $kylarSleepEvent to 1>> diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee index dde5d955a53c350f21cae4bc376804f4ce7cfb02..d69c43a5a50ce46a200682a9addb096e9c2e3f02 100644 --- a/game/base-system/widgets.twee +++ b/game/base-system/widgets.twee @@ -3902,7 +3902,7 @@ <<if (!$worn.over_lower.type.includes("naked") or !$worn.lower.type.includes("naked")) and $worn.under_lower.type.includes("naked") and ["notWorn", "notBought", "sold", "given"].includes($worn.under_lower.exposedType) and $exposed lte 0 and $exhibitionism lt 19 and !$daily.no_underwear>> <<set $no_underwear += 1>> <</if>> - <<if $no_underwear gte 20>> + <<if $no_underwear gte 8>> <<set $daily.no_underwear to true>> <<set $no_underwear to 0>> <<set $effectsmessage to 1>> diff --git a/game/overworld-forest/loc-tentacle-world/forest.twee b/game/overworld-forest/loc-tentacle-world/forest.twee index 5f029dd1ebe4b07a8e7699eeca80c7184cbd7442..3822e328a0ea02486f42ea8c2f0d8366ae2be5fb 100644 --- a/game/overworld-forest/loc-tentacle-world/forest.twee +++ b/game/overworld-forest/loc-tentacle-world/forest.twee @@ -1229,7 +1229,7 @@ You enter, passing corridors leading away from the main tunnel, but the movement You draw close enough to make out a writhing mass. There's a figure in the centre. They hang limp, suspended by violating tentacles. One curls around their head, covering their eyes. Yet you can tell who it is. <span class="pink">It's Quinn, the mayor.</span><<gggawareness>><<awareness 24>> <br><br> -You hear a thud, then a shattering of glass. You can't pinpoint the source. "This tresspass," echoes a disembodied voice. "Will have consequences." The walls vanish brick by brick as the voice reverberates down the tunnel. +You hear a thud, then a shattering of glass. You can't pinpoint the source. "This trespass," echoes a disembodied voice. "Will have consequences." The walls vanish brick by brick as the voice reverberates down the tunnel. <br><br> <span class="blue">You glimpse an expanse behind the wall.</span> <span class="pink">Your mind rejects it,</span> and reality unravels to escape it. diff --git a/game/overworld-forest/loc-tentacle-world/main.twee b/game/overworld-forest/loc-tentacle-world/main.twee index 8b56deea4b45cd220fb618e5d0d53d5bc82273b2..2f795f2054e8da0e29c6df5100708f0ad238f6a4 100644 --- a/game/overworld-forest/loc-tentacle-world/main.twee +++ b/game/overworld-forest/loc-tentacle-world/main.twee @@ -737,7 +737,7 @@ You rear your head back and howl to the bleak sky. A much louder, more energetic You shove them both into your mouth without a moment's hesitation. <br><br> - You immediately realise how stupid that was to do. <<drugs 70>><<ghallucinogens>> + You immediately realise how stupid that was to do. <<drugs 70>><<gdrugged>> <br><br> <<link [[Next|Tentacle Plains]]>><</link>> <br> diff --git a/game/overworld-plains/loc-farm/meadow.twee b/game/overworld-plains/loc-farm/meadow.twee index 9a91d2c5f03d7c530955ac70417ab8335f56ea46..679aac8e0182ec758da58b0b3a7038103634e586 100644 --- a/game/overworld-plains/loc-farm/meadow.twee +++ b/game/overworld-plains/loc-farm/meadow.twee @@ -468,58 +468,30 @@ You turn away from the water, and walk back down the tunnel. "Now what shall I do with you?" you ask. <<bHe>> squirms, as if to protect <<bhis>> neck. You have something else in mind. <br><br> -<<if $pronoun is "m">> - <<if $NPCList[0].penis is "none">> - You release one of his arms, and place your fingers against his labia. He yelps in surprise. - <br><br> - - "This is what you get for crossing me," you say. You push a finger against his entrance, then thrust it inside. - <br><br> - - He stops struggling, but remains wary as you add a second finger. You release his other arm and scratch your nails against his chest. "Steal from me again," you say, picking up the pace. "and you'll regret it." You add a third finger. He squirms as much in discomfort as pleasure, but trembles as he approaches his peak. - <br><br> - - With a moan, his whole body shudders in orgasm. - <br><br> - <<else>> - You release one of his arms, and place your hand on his penis. He yelps in surprise. - <br><br> +<<if $NPCList[0].penis is "none">> + You release one of <<bhis>> arms, and place your fingers against <<bhis>> labia. <<bHe>> yelps in surprise. + <br><br> - "This is what you get for crossing me," you say. You take his cock in your palm, and begin to knead it. It's soon erect. - <br><br> + "This is what you get for crossing me," you say. You push a finger against <<bhis>> entrance, then thrust it inside. + <br><br> - He stops struggling, but remains wary as you pump his length. You release his other arm and scratch your nails against his chest. "Steal from me again," you say, picking up the pace. "and you'll regret it." You pump faster still. He squirms as much in discomfort as pleasure, but trembles as he approaches his peak. - <br><br> + <<bHe>> stops struggling, but remains wary as you add a second finger. You release <<bhis>> other arm and scratch your nails against <<bhis>> chest. "Steal from me again," you say, picking up the pace. "and you'll regret it." You add a third finger. <<bHe>> squirms as much in discomfort as pleasure, but trembles as <<bhe>> approaches <<bhis>> peak. + <br><br> - With a gasp, he ejaculates all over his stomach. - <br><br> - <</if>> + With a moan, <<bhis>> whole body shudders in orgasm. + <br><br> <<else>> - <<if $NPCList[0].penis isnot "none">> - You release one of her arms, and place your hand on her penis. She yelps in surprise. - <br><br> - - "This is what you get for crossing me," you say. You take her cock in your palm, and begin to knead it. It's soon erect. - <br><br> - - She stops struggling, but remains wary as you pump her length. You release her other arm and pinch her nipple. "Steal from me again," you say, picking up the pace. "and you'll regret it." You pump faster still. She squirms as much in discomfort as pleasure, but trembles as she approaches her peak. - <br><br> - - With a gasp, she ejaculates all over her stomach. - <br><br> - <<else>> - You release one of her arms, and place your fingers against her labia. She yelps in surprise. - <br><br> + You release one of <<bhis>> arms, and place your hand on <<bhis>> penis. <<bHe>> yelps in surprise. + <br><br> - "This is what you get for crossing me," you say. You push a finger against her entrance, then thrust it inside. - <br><br> + "This is what you get for crossing me," you say. You take <<bhis>> cock in your palm, and begin to knead it. It's soon erect. + <br><br> - She stops struggling, but remains wary as you add a second finger. You release her other arm and pinch her nipple. "Steal from me again," you say, picking up the pace. "and you'll regret it." You add a third finger. She squirms as much in discomfort as pleasure, but trembles as she approaches her peak. - <br><br> + <<bHe>> stops struggling, but remains wary as you pump <<bhis>> length. You release <<bhis>> other arm and scratch your nails against <<bhis>> chest. "Steal from me again," you say, picking up the pace. "and you'll regret it." You pump faster still. <<bHe>> squirms as much in discomfort as pleasure, but trembles as <<bhe>> approaches <<bhis>> peak. + <br><br> - With a moan, her whole body shudders in orgasm. - <br><br> - <</if>> + With a gasp, <<bhe>> ejaculates all over <<bhis>> stomach. + <br><br> <</if>> <<link [[Next|Meadow Cave Punish 2]]>><</link>> @@ -1060,58 +1032,30 @@ You release the <<beasttype>>. "I don't think so," you say. "You're right where I want you." <<bHe>> tries to squirm free, -<<if $NPCList[0].pronoun is "m">> - <<if $NPCList[0].penis is "none">> - but you reach beneath him, and place your fingers against his labia. He yelps in surprise. - <br><br> - - "This is what you get for crossing me," you say. You push a finger against his entrance, then thrust it inside. - <br><br> - - He stops struggling, but remains wary as you add a second finger. You run your other hand down his shoulder. "Steal from me again," you say, picking up the pace. "and you'll regret it." You add a third finger. He squirms as much in discomfort as pleasure, but trembles as he approaches his peak. - <br><br> - - With a moan, his whole body shudders in orgasm. - <br><br> - <<else>> - but you reach beneath him, and wrap your fingers around his penis. He yelps in surprise. - <br><br> +<<if $NPCList[0].penis is "none">> + but you reach beneath <<bhim>>, and place your fingers against <<bhis>> labia. <<bHe>> yelps in surprise. + <br><br> - "This is what you get for crossing me," you say. You take his cock in your palm, and begin to knead it. It's soon erect. - <br><br> + "This is what you get for crossing me," you say. You push a finger against <<bhis>> entrance, then thrust it inside. + <br><br> - He stops struggling, but remains wary as you pump his length. You run your other hand down his shoulder. "Steal from me again," you say, picking up the pace. "and you'll regret it." You pump faster still. He squirms as much in discomfort as pleasure, but trembles as he approaches his peak. - <br><br> + <<bHe>> stops struggling, but remains wary as you add a second finger. You run your other hand down <<bhis>> shoulder. "Steal from me again," you say, picking up the pace. "and you'll regret it." You add a third finger. <<bHe>> squirms as much in discomfort as pleasure, but trembles as he approaches <<bhis>> peak. + <br><br> - With a gasp, he ejaculates onto the forest floor. - <br><br> - <</if>> + With a moan, <<bhis>> whole body shudders in orgasm. + <br><br> <<else>> - <<if $NPCList[0].penis isnot "none">> - but you reach beneath her, and place your hand on her penis. She yelps in surprise. - <br><br> - - "This is what you get for crossing me," you say. You take her cock in your palm, and begin to knead. It's soon erect. - <br><br> - - She stops struggling, but remains wary as you pump her length. You run your other hand down her shoulder. "Steal from me again," you say, picking up the pace. "and you'll regret it." You pump faster still. She squirms as much in discomfort as pleasure, but trembles as she approaches her peak. - <br><br> - - With a gasp, she ejaculates all over the forest floor. - <br><br> - <<else>> - but you reach beneath her, and place your fingers against her labia. She yelps in surprise. - <br><br> + but you reach beneath <<bhim>>, and wrap your fingers around <<bhis>> penis. <<bHe>> yelps in surprise. + <br><br> - "This is what you get for crossing me," you say. You push a finger against her entrance, then thrust it inside. - <br><br> + "This is what you get for crossing me," you say. You take <<bhis>> cock in your palm, and begin to knead it. It's soon erect. + <br><br> - She stops struggling, but remains wary as you add a second finger. You run your other hand down her shoulder. "Steal from me again," you say, picking up the pace. "and you'll regret it." You add a third finger. She squirms as much in discomfort as pleasure, but trembles as she approaches her peak. - <br><br> + <<bHe>> stops struggling, but remains wary as you pump <<bhis>> length. You run your other hand down <<bhis>> shoulder. "Steal from me again," you say, picking up the pace. "and you'll regret it." You pump faster still. <<bHe>> squirms as much in discomfort as pleasure, but trembles as he approaches <<bhis>> peak. + <br><br> - With a moan, her whole body shudders in orgasm. - <br><br> - <</if>> + With a gasp, <<bhe>> ejaculates onto the forest floor. + <br><br> <</if>> <<link [[Next|Meadow Chase Hill Punish 2]]>><</link>> diff --git a/game/overworld-plains/loc-farm/widgets.twee b/game/overworld-plains/loc-farm/widgets.twee index 0084ecd57757d8a62dd0d2569583236399f4a6b4..f803ca55d6c41ade13d1063bb8ca4b3943f9a093 100644 --- a/game/overworld-plains/loc-farm/widgets.twee +++ b/game/overworld-plains/loc-farm/widgets.twee @@ -963,12 +963,13 @@ <<if Time.hour is 21 and $farm_end is undefined and $alex_to_bed isnot 1>> <<set $farm_end to 1>> <<npc Alex>><<person1>> + Alex enters the barn, wiping the sweat off <<his>> forehead as <<he>> approaches you. "Done for another day," <<he>> says, <<if $exposed gt 0 and Time.season is "winter">> - Alex enters the barn, wiping the sweat off <<his>> forehead as <<he>> approaches you. "Done for another day," <<he>> says, blushing. "It's getting rather cold, you might want to wear something warmer." <<glust>><<npcincr Alex lust 1>> + blushing. "It's getting rather cold, you might want to wear something warmer." <<glust>><<npcincr Alex lust 1>> <<elseif $exposed gt 0>> - Alex enters the barn, wiping the sweat off <<his>> forehead as <<he>> approaches you. "Done for another day," <<he>> says, blushing. "It'll be getting colder, you might want to wear a little more." <<glust>><<npcincr Alex lust 1>> + blushing. "It'll be getting colder, you might want to wear a little more." <<glust>><<npcincr Alex lust 1>> <<else>> - Alex enters the barn, wiping the sweat off <<his>> forehead as <<he>> approaches you. "Done for another day," <<he>> says, smiling. + smiling. <</if>> <<if $farm_count gte 1 and $farm_stage lte 6>> "Here's a little extra." <<He>> hands you <<moneyGain $farm.wage>>. diff --git a/game/overworld-plains/loc-moor/widgets.twee b/game/overworld-plains/loc-moor/widgets.twee index 09b85651d4a8eddf1d46b5a80da6b3d16cec1745..a94b4a0b0aea918dfb4f16c838c4825d852a58bc 100644 --- a/game/overworld-plains/loc-moor/widgets.twee +++ b/game/overworld-plains/loc-moor/widgets.twee @@ -592,7 +592,7 @@ <<link [[Next|Moor]]>><<set $eventskip to 1>><</link>> <br> <<else>> - You try to the leap aside, <span class="red">but the earth shakes too much.</span> You fall into the crack. + You try to leap aside, <span class="red">but the earth shakes too much.</span> You fall into the crack. <br><br> <<link [[Next|Moor Crack]]>><</link>> diff --git a/game/overworld-town/loc-bus/chikan.twee b/game/overworld-town/loc-bus/chikan.twee index bb0a30b14015e6b7cfea4d85f4f8962908f42419..a285ba4578c47644c6d6cd7e4c1ca0875c0af201 100644 --- a/game/overworld-town/loc-bus/chikan.twee +++ b/game/overworld-town/loc-bus/chikan.twee @@ -51,7 +51,7 @@ They all seem to be crowding around you. <span class="purple">Something's not ri Without saying a word, the <<person1>><<person>> simply smirks knowingly at the <<person4>><<persons>> crude remarks. <</if>> <br><br> - A few moments later, as if emboldened by the <<person4>><<persons>> remarks, the <<person1>><<persons>> begins rubbing your leg through your $worn.lower.name. + A few moments later, as if emboldened by the <<person4>><<persons>> remarks, the <<person1>><<person>> begins rubbing your leg through your $worn.lower.name. <<chikanmolestactions>> <<elseif $rng gte 40>> During the trip, the <<person4>><<person>> steps closer to the <<person3>><<person>> and places <<person4>><<his>> hand<<person3>> diff --git a/game/overworld-town/loc-docks/skulduggery.twee b/game/overworld-town/loc-docks/skulduggery.twee index 9fd1b17d3050dc9ed5439729da4300d6dd267b09..a64267a5b032556426598cc7f4da316ac212fffb 100644 --- a/game/overworld-town/loc-docks/skulduggery.twee +++ b/game/overworld-town/loc-docks/skulduggery.twee @@ -580,7 +580,7 @@ You're sat in the guardhouse beside the front gate. The <<person1>><<person>> wa <<towelup>> <<else>> They escort you through the gate. - <</if>> "I don't want to catch you tresspassing again," the <<person1>><<person>> says. "Go on. Off with you." + <</if>> "I don't want to catch you trespassing again," the <<person1>><<person>> says. "Go on. Off with you." <br><br> <<endcombat>> diff --git a/game/overworld-town/loc-home/main.twee b/game/overworld-town/loc-home/main.twee index 0729e0fa0646592129aa1f706bfa5db30b06341a..ec0c1ad163d55c55ddd3a14ce51e261e202b0571 100644 --- a/game/overworld-town/loc-home/main.twee +++ b/game/overworld-town/loc-home/main.twee @@ -707,6 +707,7 @@ When you wake up, you notice a note pushed under your door. You read it. <br><br> <span class="red">This is Robin's handwriting.</span> +<br><br> <<link [[Next|Bedroom]]>><</link>> diff --git a/game/overworld-town/loc-museum/museumAntiques.twee b/game/overworld-town/loc-museum/museumAntiques.twee index 63cf5bd8936e8485c034ab6200c78717782f4fd3..323004dde9c7329e1df81398e8980f60cd60746a 100644 --- a/game/overworld-town/loc-museum/museumAntiques.twee +++ b/game/overworld-town/loc-museum/museumAntiques.twee @@ -421,7 +421,7 @@ You look around the museum. The pedestals are grooved, as if awaiting specific o icon: "antique_gold_compass.png" }, "antiqueswordcane":{ - hint:`"For a sword cane," Winter says while gesturing at an empty pedestal. "Over a century old. More than a novelty than a real weapon."<br><br> <<He>> turns away. "Still, I suspect it's found its way into the hands of those with a penchant for violence."`, + hint:`"For a sword cane," Winter says while gesturing at an empty pedestal. "Over a century old. More of a novelty than a real weapon."<br><br> <<He>> turns away. "Still, I suspect it's found its way into the hands of those with a penchant for violence."`, museum:"The sword cane rests behind glass.", name:"Sword Cane", journal: `"For a sword cane, held by those of violent temperament."`, diff --git a/game/overworld-town/loc-police/main.twee b/game/overworld-town/loc-police/main.twee index 23c8fcf7720d23b8a89f0c12894450bdc65923c3..4f9951e45a922c6d68005d74d0f00dd83a89f57a 100644 --- a/game/overworld-town/loc-police/main.twee +++ b/game/overworld-town/loc-police/main.twee @@ -305,5 +305,5 @@ You get the feeling the police aren't going to be helpful. At least you tried to <</if>> <br><br> -<<link [[Leave|Police Back Office]]>><</link>> +<<link [[Leave|Police Back Office]]>><<set $phase to 0>><</link>> <br> diff --git a/game/overworld-town/loc-pub/fame.twee b/game/overworld-town/loc-pub/fame.twee index 2529d3be73c63f715908e9c3190d344462167be7..af4ab83b10f88490961b1584473f850bb90abf0e 100644 --- a/game/overworld-town/loc-pub/fame.twee +++ b/game/overworld-town/loc-pub/fame.twee @@ -312,7 +312,7 @@ Landry looks over the <<persons>> face for a moment. "I recognise you," <<nnpc_h "You should. I come here more often than I-" <br> -Landry cuts <<him>> off. "March 3rd, 2009. Nightingale Street." All the colour fades from the <<persons>> face. "So you know what I'm talking about. I wasn't there myself, but I've heard the stories. You were the talk of the town.<<if Time.month is 3 and Time.day is 3>> Happy anniversary, by the way.<</if>>" +Landry cuts <<him>> off. "March 3rd, 2009. Nightingale Street." All the colour fades from the <<persons>> face. "So you know what I'm talking about. I wasn't there myself, but I've heard the stories. You were the talk of the town.<<if Time.month is 3 and Time.monthDay is 3>> Happy anniversary, by the way.<</if>>" <br><br> "I-I..." The <<person>> jabs a finger at Landry. "You're not with the fuzz. You won't turn me in." diff --git a/game/overworld-town/loc-school/library.twee b/game/overworld-town/loc-school/library.twee index e35b7e0c495067afa4956ebda2a931a754637844..0bc06f066baea6d0103acb1c754c1b7ab072d817 100644 --- a/game/overworld-town/loc-school/library.twee +++ b/game/overworld-town/loc-school/library.twee @@ -123,7 +123,7 @@ Next to it is a small basket with returned and not yet sorted books. <br> "Yeah, it's a proven fact. The more you fuck, the more airheaded you get." <br> - "I see...just like a certain student I could mention." + "I see... just like a certain student I could mention." <<elseif $rng gte 31>> "Hey, have you heard about masturbation? They say it's dangerous!" <br> diff --git a/game/overworld-town/loc-school/widgets.twee b/game/overworld-town/loc-school/widgets.twee index b1b93f418af6a8cfd8ae6a1a0e71b531d06e8643..930eaf0f6e84b88dc53eb83360b75726cce5457f 100644 --- a/game/overworld-town/loc-school/widgets.twee +++ b/game/overworld-town/loc-school/widgets.twee @@ -1596,7 +1596,7 @@ <<if $nectarcount gte 5>> <<addinlineevent "englishNectar">> <<npc Doren>><<person1>> - Doren stops beside your desk. "You smell... ood," <<he>> says. "Is that perfume? Cologne?" + Doren stops beside your desk. "You smell... odd," <<he>> says. "Is that perfume? Cologne?" <br><br> <<generates2>><<person2>>A <<person>> cuts <<person1>><<him>> off. "<<pShe>> smells sweet, <<sir>>. Really sweet." Some of the students sniff the air and chatter to themselves. @@ -3264,9 +3264,11 @@ <<if $submissive lte 850>> <<link [[$_linkText|Events Swimming Tail]]>><<set $phase to $_linkText>><</link>><<lstress>><<print $_tf>> + <br> <</if>> - <<if>> _tf.demonTail>> + <<if _tf.demonTail>> <<link [[Wiggle your butt seductively|Events Swimming Tail]]>><<set $phase to "Wiggle">><</link>><<print $_tf>> + <br> <</if>> <<link [[Endure|Events Swimming Tail]]>><<set $phase to "Endure">><</link>><<gstress>> <</if>> diff --git a/game/overworld-town/loc-street/barb.twee b/game/overworld-town/loc-street/barb.twee index 1f7d658eda8d92b136971b47d064c77ebfb447f1..1cedfc6ed26b7fa7ea6a32c73c719eba87ab9d87 100644 --- a/game/overworld-town/loc-street/barb.twee +++ b/game/overworld-town/loc-street/barb.twee @@ -100,7 +100,8 @@ You are on Barb Street. Silver blocks of flats tower all around, most separated <br> <</if>> <<if $phase is 10>> - <<policeicon>><<link [[Sneak into police station side door (0:05)|Police Back Office]]>><<pass 5>><<set $phase is 0>><</link>> + <<set $phase to 0>> + <<policeicon>><<link [[Sneak into police station side door (0:05)|Police Back Office]]>><<pass 5>><</link>> <br> <</if>> <<if $town_projects.bridge gte 4>> diff --git a/game/overworld-town/loc-street/starfish.twee b/game/overworld-town/loc-street/starfish.twee index b31188345ff97faaa464223b4b1cc5cbd0ba1b99..53fb1e04267fbb96bcd3b1c4a9b7c055c24a2f61 100644 --- a/game/overworld-town/loc-street/starfish.twee +++ b/game/overworld-town/loc-street/starfish.twee @@ -236,4 +236,4 @@ When you're a block away, you open the box. There's <<moneyGain 500>> and anothe You pocket the money and walk away. <<set $exhibitionismrun to undefined>><<set $exhibitionismrunon to 3>><<set $challengetimer to 10>><<clotheson>> -<<link [[Next|Starfish Street]]>><<pass 3>><</link>> +<<link [[Next|Starfish Street]]>><<pass 3>><<endevent>><</link>> diff --git a/game/overworld-town/loc-temple/main.twee b/game/overworld-town/loc-temple/main.twee index 22a8a918d913a83ca92aa92c79ad3acf83c9c9c4..677b0c95c9338b6d15f3db9dd27e1646dca34545 100644 --- a/game/overworld-town/loc-temple/main.twee +++ b/game/overworld-town/loc-temple/main.twee @@ -2603,7 +2603,7 @@ You hear a set of doors open behind you, followed by footsteps and laughter. <<elseif $temple_arcade_phase is 2>><<set $temple_arcade_phase += 1>> The bell rings again. Another group enters, as eager as the last. <br><br> - The dark-haired $temple_wall_victim tries to squirm free from the wall. <span class="red">They fail.</span> + The dark-haired $temple_wall_victim tries to squirm free from the wall. <span class="red"><<if $temple_wall_victim is "boy">>He<<else>>She<</if>> fails.</span> <br><br> <span class="lewd">Someone grabs your <<bottom>>.</span> <br><br> @@ -2624,7 +2624,7 @@ You hear a set of doors open behind you, followed by footsteps and laughter. The bell rings again. Another group enters, as eager as the last. <br><br> - <span class="red">The dark-haired $temple_wall_victim hangs limp.</span> The freckled $temple_wall_victim cradles their face in their hands. <span class="red">Tears fall between their fingers.</span> + <span class="red">The dark-haired $temple_wall_victim hangs limp.</span> The freckled $temple_wall_victim cradles <<if $temple_wall_victim is "boy">>his<<else>>her<</if>> face in <<if $temple_wall_victim is "boy">>his<<else>>her<</if>> hands. <span class="red">Tears fall between <<if $temple_wall_victim is "boy">>his<<else>>her<</if>> fingers.</span> <br><br> <span class="lewd">Someone grabs your <<bottom>>.</span> <br><br> diff --git a/game/overworld-town/special-kylar/abduction.twee b/game/overworld-town/special-kylar/abduction.twee index a9e56b1bc897177a5fa91e08ed5f29fa52bc9923..e1df4fbd8c1cda59043e892504efd75e613b56d9 100644 --- a/game/overworld-town/special-kylar/abduction.twee +++ b/game/overworld-town/special-kylar/abduction.twee @@ -898,7 +898,7 @@ Bailey disappears from view. You hear a heavy rap on a door, followed by a squea "I'm from the orphanage," Bailey says. "Are you living alone here?" <br> -"No," replies Kylar from higher up. You can't see either, but Kylar must be talking from an upstairs window. "My parents live here too. L-leave right now. You're tresspassing." +"No," replies Kylar from higher up. You can't see either, but Kylar must be talking from an upstairs window. "My parents live here too. L-leave right now. You're trespassing." <br> "I'll have to meet your parents-" <br><br> diff --git a/game/overworld-town/special-kylar/main.twee b/game/overworld-town/special-kylar/main.twee index 7706a5e5b3b264ac2dbad7fa15bb77d1f2e1d629..1647f00595972113eb825e51d8f8399284ec8ffc 100644 --- a/game/overworld-town/special-kylar/main.twee +++ b/game/overworld-town/special-kylar/main.twee @@ -77,7 +77,7 @@ <br><br> <<kylaroptionsleave "manor">> - <<elseif $bus is "kylarmanor" and Time.hour lt 18>> + <<elseif $bus is "kylarmanor" and Time.hour lte 6>> <<unset $kylar_action>> Kylar looks at a monitor. "I should sleep," <<he>> says. <<He>> walks over to <<his>> bed and collapses atop it, fully dressed. <<He>> watches you, longing on <<his>> face, but <<he>> doesn't say anything. <br><br> diff --git a/game/overworld-town/special-kylar/manor.twee b/game/overworld-town/special-kylar/manor.twee index f88ff157c2327b074bea29dce305a707f03a4654..4deaa58d067a43533a887344f28806724d5342f8 100644 --- a/game/overworld-town/special-kylar/manor.twee +++ b/game/overworld-town/special-kylar/manor.twee @@ -42,7 +42,7 @@ Kylar's parents' room looks like the master bedroom. The four-poster bed is unto <br><br> <<if $daily.manorParents is undefined and $kylar_parents_trust lt 100>> - <<link [[Soothe Kylar's parents (1:00)|Manor Parents Room Soothe]]>><<set $daily.manorParents to 1>><<kylar_parents_trust 1>><<pass 60>><</link>><<gstress>><<gtrust>> + <<link [[Soothe Kylar's parents (1:00)|Manor Parents Room Soothe]]>><<set $daily.manorParents to 1>><<kylar_parents_trust 1>><<stress 6>><<pass 60>><</link>><<gstress>><<gtrust>> <br><br> <</if>> diff --git a/game/overworld-underground/loc-cave/widgets.twee b/game/overworld-underground/loc-cave/widgets.twee index be0c649594294282f1617b64196c2a46471b47ad..f7b404fda5ff61e1c6d218c6fbbd57b6d39e6a37 100644 --- a/game/overworld-underground/loc-cave/widgets.twee +++ b/game/overworld-underground/loc-cave/widgets.twee @@ -473,7 +473,7 @@ <</widget>> <<widget "pub_cave_arrival">> - <<tearful>> you're pushed through the tunnel. Your captors chat either side of you, until the <<person1>><<person>> points out that you're probably listening. + <<tearful>> you're pushed through the tunnel. Your captors chat on either side of you, until the <<person1>><<person>> points out that you're probably listening. <br><br> The water becomes shallow, then disappears entirely. It still sounds like you're in the cave, but you can hear voices up ahead. Many voices. You walk closer, and your captors pull you to a stop. A great cheer erupts. You catch some words through the babble. diff --git a/game/overworld-underground/loc-underground/main.twee b/game/overworld-underground/loc-underground/main.twee index b8e4cf718b94334cc6abc78f9dac4abaa501e423..47b1c513959ebba7c262387dc2093fa0f36ac9e4 100644 --- a/game/overworld-underground/loc-underground/main.twee +++ b/game/overworld-underground/loc-underground/main.twee @@ -64,6 +64,8 @@ <</widget>> <<widget "undergroundReturnToCell">> + <<clearNPC handler>> + <<tearful>> you sit on the mattress. <<if _args[0] is "Robin">> At least Robin got away. @@ -342,7 +344,7 @@ You are in an underground cell. You can't see a thing but can tell that the wall <br> <<elseif $undergroundbrothel.time is 8>> <<run delete $undergroundbrothel.robinSpoke>> - <<generate1>><<person1>> + <<generate1>><<person1>><<saveNPC 0 handler>> <<if $undergroundbrothel.robin>> The lights turn on once more, and a <<person1>><<person>> enters. "Time for another performance," <<he>> says, yanking your leash. <br><br> diff --git a/game/overworld-underground/loc-underground/robin.twee b/game/overworld-underground/loc-underground/robin.twee index 3b9b09c3d1787096e9c69be67b2fd59abe6a841b..619b8797cbdc10e57234c0eb99cf384c29cc6d41 100644 --- a/game/overworld-underground/loc-underground/robin.twee +++ b/game/overworld-underground/loc-underground/robin.twee @@ -8,6 +8,7 @@ <</widget>> <<widget "undergroundEscapeForestRobin">> + <<clearNPC handler>> <<endcombat>> <<clotheson>> @@ -874,7 +875,7 @@ The <<person>> steps forward. :: Underground Robin Tentacles Intro <<effects>><<set $robinMetal to true>><<undergroundRobinTopic "tentacles" "undiscussed">> -<<generate1>><<person1>> +<<loadNPC 0 handler>><<person1>> You are led once more to the stage, where the crowd awaits. Robin is already there. <<covered>> <br><br> @@ -882,7 +883,7 @@ You are led once more to the stage, where the crowd awaits. Robin is already the You notice Robin is stripped naked, and held to the wall by metal cuffs. <<nnpc_He "Robin">> looks up at you pleadingly. <br><br> -"Do your best to get <<nnpc_him "Robin">> off," the <<person>> says. "For your own sake." The metal shutter doors open, and a swarm of mettalic red tentacles surge toward you. Robin squeezes <<nnpc_his "Robin">> eyes shut. +"Do your best to get <<nnpc_him "Robin">> off," the <<person>> says. "For your own sake." The metal shutter doors open, and a swarm of metallic red tentacles surge toward you. Robin squeezes <<nnpc_his "Robin">> eyes shut. <br><br> <<link [[Next|Underground Robin Tentacles]]>><<endevent>><<set $molestationstart to 1>><</link>> @@ -916,7 +917,7 @@ You notice Robin is stripped naked, and held to the wall by metal cuffs. <<nnpc_ <<actionsOmni>> <<if _combatend or ($tentacles.active lte ($tentacles.max / 2))>> - <span id="next"><<link [[Next|Underground Robin Tentacles Finish]]>><</link>></span><<nexttext>> + <span id="next"><<link [[Next|Underground Robin Tentacles Finish]]>><</link>><<endevent>></span><<nexttext>> <<else>> <span id="next"><<link [[Next|Underground Robin Tentacles]]>><</link>></span><<nexttext>> <</if>> @@ -931,6 +932,7 @@ You notice Robin is stripped naked, and held to the wall by metal cuffs. <<nnpc_ <<undergroundReturnToCell>> <<else>> + <<loadNPC 0 handler>><<person1>> The metal tentacles shudder, spark, and fall inert. The cuffs around Robin automatically retract. <br><br> @@ -940,6 +942,7 @@ You notice Robin is stripped naked, and held to the wall by metal cuffs. <<nnpc_ <<undergroundEscapeForestRobin>> <</if>> + :: Underground Robin Machine Intro <<effects>> <<set _robin to statusCheck("Robin")>>