diff --git a/DoL Changelog.txt b/DoL Changelog.txt
index 6e5ae6628b6737247e65d0d49e897fd1b3ca7da5..4ac40bd0a40f8c832411214c1dd8a0d929e76a49 100644
Binary files a/DoL Changelog.txt and b/DoL Changelog.txt differ
diff --git a/devTools/androidsdk/image/cordova/config.xml b/devTools/androidsdk/image/cordova/config.xml
index b304a1a7f55d9a2fe2f3f194eeb842f3965a372e..171d6d03775c4a0c68ce6f373a49e6aa6b29622b 100644
--- a/devTools/androidsdk/image/cordova/config.xml
+++ b/devTools/androidsdk/image/cordova/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<widget
id="dol"
- version="0.3.3.2"
+ version="0.3.3.5"
xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0"
android-packageName="com.vrelnir.DegreesOfLewdity"
diff --git a/game/01-config/sugarcubeConfig.js b/game/01-config/sugarcubeConfig.js
index 9d1ea78cb7377924c8fab42a8fe4f2da4cd404a5..bd52c04a24e4df691cf7cdeee486679d7adfa775 100644
--- a/game/01-config/sugarcubeConfig.js
+++ b/game/01-config/sugarcubeConfig.js
@@ -21,7 +21,7 @@ window.StartConfig = {
"debug": false,
"enableImages": true,
"enableLinkNumberify": true,
- "version": "0.3.3.2",
+ "version": "0.3.3.4",
}
config.saves.autosave = "autosave";
diff --git a/game/04-Variables/variables-versionUpdate.twee b/game/04-Variables/variables-versionUpdate.twee
index ac853f468ef4b35755afcae6aed696188e1a9266..4dd0b98232efc78cb713de3621d13310e3b5feef 100644
--- a/game/04-Variables/variables-versionUpdate.twee
+++ b/game/04-Variables/variables-versionUpdate.twee
@@ -2213,6 +2213,16 @@
<</for>>
<</if>>
+<<if $perPronounFix is undefined or $perPronounFix is 1>>
+ <<set $perPronounFix to 2>>
+ <<set _keys to Object.keys($per_npc)>>
+ <<for _npc range _keys>>
+ <<if $per_npc[_npc].pronouns is undefined or $per_npc[_npc].pronouns.he is 0>>
+ <<generatePronouns $per_npc[_npc]>>
+ <</if>>
+ <</for>>
+<</if>>
+
<<if $sidebarRenderer is undefined>>
<<set $sidebarRenderer to 'canvas'>>
<</if>>
diff --git a/game/base-clothing/clothing-upper.twee b/game/base-clothing/clothing-upper.twee
index ffe021c144a2ba8efa4cc75e49358e6c924fca79..cff344aae153453a045e06cb2a377b035772d098 100644
--- a/game/base-clothing/clothing-upper.twee
+++ b/game/base-clothing/clothing-upper.twee
@@ -3663,7 +3663,7 @@ plural - widget will output "are" if 1, and "is" if 0. eg - Your hat <<upperplur
exposed_base: 0,
type: ["formal"],
set: "upper",
- gender: "n",
+ gender: "f",
warmth: 25,
cost: 12000,
description: "Displays your bosom.",
diff --git a/game/base-combat/actions-penis.twee b/game/base-combat/actions-penis.twee
index e1deac8f710d19a7f681e6c1e564108c98bddc5f..6456e18fcdd3b291a2848d942aae022fa9528275 100644
--- a/game/base-combat/actions-penis.twee
+++ b/game/base-combat/actions-penis.twee
@@ -421,7 +421,7 @@
<<for _j = $enemyno-1; _j gte _end; _j-->>
<<if $NPCList[_j].vagina is "penisentrance" or $NPCList[_j].vagina is "penisimminent">><<set $NPCList[_j].vagina to "penis">>
<<penis_lube_text>> <span class="pink">you <<peniletext>> thrust deep into <<personselect _j>><<combatpersons>> pussy.</span>
- <<sex 30>><<takeNPCVirginity $NPCList[_j].fullDescription "vaginal">><<penilestat>><<raped>><<penisraped>><<set $penisstate to "penetrated">>
+ <<sex 30>><<penilestat>><<raped>><<penisraped>><<set $penisstate to "penetrated">>
<<break>>
<</if>>
<</for>>
@@ -429,11 +429,12 @@
<<for _j = $enemyno-1; _j gte _end; _j-->>
<<if $NPCList[_j].vagina is "penisentrance" or $NPCList[_j].vagina is "penisimminent">><<set $NPCList[_j].vagina to "penis">>
<<penis_lube_text>> <span class="pink">you <<peniletext>> thrust your virgin penis into <<personselect _j>><<combatpersons>> pussy.</span><span class="red"> You feel your foreskin separate from your glans, forever robbing you of your purity.</span>
- <<sex 100>><<takeVirginity $NPCList[_j].fullDescription "penile">><<takeNPCVirginity $NPCList[_j].fullDescription "vaginal">><<bruise penis>><<penilestat>><<violence 30>><<raped>><<penisraped>><<set $penisstate to "penetrated">><<set $speechpenisvirgin to 1>>
+ <<sex 100>><<bruise penis>><<penilestat>><<violence 30>><<raped>><<penisraped>><<set $penisstate to "penetrated">><<set $speechpenisvirgin to 1>>
<<break>>
<</if>>
<</for>>
<</if>>
+ <<takeVirginity $NPCList[_j].fullDescription "penile">><<takeNPCVirginity $NPCList[_j].fullDescription "vaginal">>
<<else>>
<<set $penisaction to 0>>
<<for _j = $enemyno-1; _j gte _end; _j-->>
@@ -468,11 +469,11 @@
<<for _j = $enemyno-1; _j gte _end; _j-->>
<<if $NPCList[_j].vagina is "otheranusentrance" or $NPCList[_j].vagina is "otheranusimminent">><<set $NPCList[_j].vagina to "otheranus">>
<<penis_lube_text>> <span class="pink">you <<peniletext>> thrust deep into <<personselect _j>><<combatpersons>> ass.</span>
- <<sex 30>><<takeNPCVirginity $NPCList[_j].fullDescription "anal">><<penilestat>><<raped>><<penisraped>><<set $penisstate to "otheranus">>
+ <<sex 30>><<penilestat>><<raped>><<penisraped>><<set $penisstate to "otheranus">>
<<break>>
<<elseif $NPCList[_j].penis is "otheranusentrance" or $NPCList[_j].penis is "otheranusimminent">><<set $NPCList[_j].penis to "otheranus">>
<<penis_lube_text>> <span class="pink">you <<peniletext>> thrust deep into <<personselect _j>><<combatpersons>> ass.</span>
- <<sex 30>><<takeNPCVirginity $NPCList[_j].fullDescription "anal">><<penilestat>><<raped>><<penisraped>><<set $penisstate to "otheranus">>
+ <<sex 30>><<penilestat>><<raped>><<penisraped>><<set $penisstate to "otheranus">>
<<break>>
<</if>>
<</for>>
@@ -480,15 +481,16 @@
<<for _j = $enemyno-1; _j gte _end; _j-->>
<<if $NPCList[_j].vagina is "otheranusentrance" or $NPCList[_j].vagina is "otheranusimminent">><<set $NPCList[_j].vagina to "otheranus">>
<<penis_lube_text>> <span class="pink">you <<peniletext>> thrust your virgin penis into <<personselect _j>><<combatpersons>> ass.</span><span class="red"> You feel your foreskin separate from your glans, forever robbing you of your purity.</span>
- <<sex 100>><<takeVirginity $NPCList[_j].fullDescription "penile">><<takeNPCVirginity $NPCList[_j].fullDescription "anal">><<bruise penis>><<penilestat>><<violence 30>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
+ <<sex 100>><<bruise penis>><<penilestat>><<violence 30>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
<<break>>
<<elseif $NPCList[_j].penis is "otheranusentrance" or $NPCList[_j].penis is "otheranusimminent">><<set $NPCList[_j].penis to "otheranus">>
<<penis_lube_text>> <span class="pink">you <<peniletext>> thrust your virgin penis into <<personselect _j>><<combatpersons>> ass.</span><span class="red"> You feel your foreskin separate from your glans, forever robbing you of your purity.</span>
- <<sex 100>><<takeVirginity $NPCList[_j].fullDescription "penile">><<takeNPCVirginity $NPCList[_j].fullDescription "anal">><<bruise penis>><<penilestat>><<violence 30>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
+ <<sex 100>><<bruise penis>><<penilestat>><<violence 30>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
<<break>>
<</if>>
<</for>>
<</if>>
+ <<takeVirginity $NPCList[_j].fullDescription "penile">><<takeNPCVirginity $NPCList[_j].fullDescription "anal">>
<<else>>
<<set $penisaction to 0>>
<<for _j = $enemyno-1; _j gte _end; _j-->>
diff --git a/game/base-combat/actions-text.twee b/game/base-combat/actions-text.twee
index 6e6401d953209ac4a98fb46c39fe63787eb96333..c26ca5acd374887f80f17be09e286b3ded7610c3 100644
--- a/game/base-combat/actions-text.twee
+++ b/game/base-combat/actions-text.twee
@@ -3618,9 +3618,9 @@ You kiss the <<beasttype>> on the head.
<<for _j = $enemyno-1; _j gte _end; _j-->>
<<if $mockaction is $NPCList[_j].insecurity>>
<<if $consensual is 1>>
- <span class="teal">The <<personselect _j>><<person>> breathes faster as you speak.</span>
+ <span class="teal"><<personselect _j>><<combatPerson>> breathes faster as you speak.</span>
<<else>>
- <span class="teal">The <<personselect _j>><<person>> winces at your words.</span>
+ <span class="teal"><<personselect _j>><<combatPerson>> winces at your words.</span>
<<gcombatcontrol>>
<</if>>
<<set _insec to 1>>
diff --git a/game/base-combat/actions-vagina.twee b/game/base-combat/actions-vagina.twee
index 9bfe8c839be909db51a27452aaa1936664c2c476..85222c21ec165ee231fde8d1bd85b4f92ff7a4d5 100644
--- a/game/base-combat/actions-vagina.twee
+++ b/game/base-combat/actions-vagina.twee
@@ -214,7 +214,7 @@
<</if>>
<<for _j = $enemyno-1; _j gte _end; _j-->>
<<if $NPCList[_j].mouth is "vaginaimminent">>
- <<set _vaginaaction["Rub against" + $NPCList[_j].pronouns.his + " lips"] to "othermouthrub">>
+ <<set _vaginaaction["Rub against " + $NPCList[_j].pronouns.his + " lips"] to "othermouthrub">>
<<set _vaginaaction["Pull away"] to "othermouthescape">>
<<break>>
<</if>>
@@ -406,6 +406,7 @@
<<for _j = $enemyno-1; _j gte _end; _j-->>
<<if $NPCList[_j].penis is "vaginaentrance" or $NPCList[_j].penis is "vaginaimminent">>
<<if $vaginaWetness + ($vaginalskill / 10) gte ($NPCList[_j].penissize * 15) + random(1, 40) or random(1, 2) is 2>>
+ <<takeVirginity $NPCList[_j].fullDescription "vaginal">><<takeNPCVirginity $NPCList[_j].fullDescription "penile">>
<<if $player.virginity.vaginal isnot true>>
<<set $NPCList[_j].penis to "vagina">>
<<vagina_lube_text>> <span class="pink">you <<vaginaltext>> push against <<personselect _j>><<combatpersons>> $NPCList[_j].penisdesc, taking it deep into your <<pussy>>.</span>
@@ -419,7 +420,7 @@
<<default>>
<span class="lewd"></span>
<</switch>>
- <<sex 30>><<takeNPCVirginity $NPCList[_j].fullDescription "penile">><<vaginalstat>><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">>
+ <<sex 30>><<vaginalstat>><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">>
<<break>>
<<elseif $player.virginity.vaginal is true>>
<<set $NPCList[_j].penis to "vagina">>
@@ -443,7 +444,7 @@
<<violence 30>>
<</switch>>
<</if>>
- <<sex 100>><<takeNPCVirginity $NPCList[_j].fullDescription "penile">><<takeVirginity $NPCList[_j].fullDescription "vaginal">><<bruise vagina>><<vaginalstat>><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">><<set $speechvaginavirgin to 1>>
+ <<sex 100>><<bruise vagina>><<vaginalstat>><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">><<set $speechvaginavirgin to 1>>
<<break>>
<</if>>
<<else>>
diff --git a/game/base-combat/beast.twee b/game/base-combat/beast.twee
index 7a37144a6d315dfcb2b74735f6b0ebb371740a56..50485f4110f2a0b5a8c294220e8f71c8ca36b11a 100644
--- a/game/base-combat/beast.twee
+++ b/game/base-combat/beast.twee
@@ -199,9 +199,9 @@
<<violence 100>><<pain _pain>>
<</switch>>
<</if>>
- <<sex 100>><<set $NPCList[_n].penis to "vagina">><<takeVirginity $NPCList[_n].fullDescription "vaginal">><<bruise vagina>><<vaginalstat>><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">>
+ <<sex 100>><<set $NPCList[_n].penis to "vagina">><<bruise vagina>><<vaginalstat>><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">>
<</if>>
- <<takeNPCVirginity $NPCList[_n].fullDescription "penile">>
+ <<takeVirginity $NPCList[_n].fullDescription "vaginal">><<takeNPCVirginity $NPCList[_n].fullDescription "penile">>
<</if>>
<<set $rng to random(1, 100)>>
@@ -565,7 +565,7 @@
<<set $enemyanger += 5>><<arousal 300>><<set $speechotheranuswithhold to 1>>
<<elseif $player.virginity.penile isnot true>>
<span class="pink"><<bHe>> eases your <<penis>> into <<bhis>> ass, swallowing you to the base.</span>
- <<sex 30>><<set $NPCList[_n].penis to "otheranus">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">><<penilestat>><<bruise penis>><<violence 1>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechotheranuspenetrated to 1>>
+ <<sex 30>><<set $NPCList[_n].penis to "otheranus">><<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">><<penilestat>><<bruise penis>><<violence 1>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechotheranuspenetrated to 1>>
<<elseif $player.virginity.penile is true>>
<span class="pink"><<bHe>> eases your virgin penis into <<bhis>> ass,</span><span class="red"> separating your foreskin from your glans and forever robbing you of your purity.</span>
<<sex 100>><<set $NPCList[_n].penis to "otheranus">><<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
@@ -685,11 +685,12 @@
<<elseif $NPCList[_n].vagina is "penisimminent">>
<<if $player.virginity.penile isnot true>>
<span class="pink"><<bHe>> takes your <<penis>> deep into <<bhis>> <<pussy>>.</span>
- <<sex 30>><<set $NPCList[_n].vagina to "penis">><<takeNPCVirginity $NPCList[_n].fullDescription "vaginal">><<penilestat>><<bruise penis>><<violence 2>><<raped>><<penisraped>><<set $penisstate to "penetrated">>
+ <<sex 30>><<set $NPCList[_n].vagina to "penis">><<penilestat>><<bruise penis>><<violence 2>><<raped>><<penisraped>><<set $penisstate to "penetrated">>
<<elseif $player.virginity.penile is true>>
<span class="pink"><<bHe>> takes your <<penis>> deep into <<bhis>> pussy,</span><span class="red"> separating your foreskin from your glans and forever robbing you of your purity.</span>
- <<sex 100>><<set $NPCList[_n].vagina to "penis">><<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "vaginal">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "penetrated">>
+ <<sex 100>><<set $NPCList[_n].vagina to "penis">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "penetrated">>
<</if>>
+ <<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "vaginal">>
<</if>>
<<set $rng to random(1, 100)>>
@@ -898,7 +899,7 @@
<<set $enemyanger += 5>><<arousal 300>><<set $speechotheranuswithhold to 1>>
<<elseif $player.virginity.penile isnot true>>
<span class="pink"><<bHe>> eases your <<penis>> into <<bhis>> ass, swallowing you to the base.</span>
- <<sex 30>><<set $NPCList[_n].vagina to "otheranus">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">><<penilestat>><<bruise penis>><<violence 1>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechotheranuspenetrated to 1>>
+ <<sex 30>><<set $NPCList[_n].vagina to "otheranus">><<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">><<penilestat>><<bruise penis>><<violence 1>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechotheranuspenetrated to 1>>
<<elseif $player.virginity.penile is true>>
<span class="pink"><<bHe>> eases your virgin penis into <<bhis>> ass,</span><span class="red"> separating your foreskin from your glans and forever robbing you of your purity.</span>
<<sex 100>><<set $NPCList[_n].vagina to "otheranus">><<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
diff --git a/game/base-combat/effects.twee b/game/base-combat/effects.twee
index b973c16e9b91c04b953cb5aa23b3520cb9f6e7e1..2e946c1a053d05031637a2f6e0979b914cdd9000 100644
--- a/game/base-combat/effects.twee
+++ b/game/base-combat/effects.twee
@@ -1768,6 +1768,7 @@
<<if $feetaction is "confront">>
<<famescrap 1>>
You swivel around, and come face to face with the
+ <<person1>>
<<if $enemyno gte 2>>
<<person>> and <<his>> companions.
<<else>>
@@ -1941,7 +1942,7 @@
<<set $mouthactiondefault to "vaginalick">>
<<for _j = 0; _j lt $enemyno; _j++>>
<<if $NPCList[_j].vagina is 0 and ($enemytype isnot "man" or $NPCList[_j].location.genitals is 0)>>
- <span class="lblue">You <<oraltext>> move your mouth to <<hisselect _j>> <<npcVagina>><<if !$npcSub>> and <<he>> waits expectantly<</if>>.</span>
+ <span class="lblue">You <<oraltext>> move your mouth to <<hisselect _j>> <<npcVagina _j>><<if !$npcSub>> and <<he>> waits expectantly<</if>>.</span>
<<set $NPCList[_j].vagina to "mouth">><<set $mouthstate to "othervagina">><<set $mouthuse to "othervagina">><<oralskilluse>>
<<if $enemytype is "beast">><<set $NPCList[_j].stance to "topface">><</if>>
<<set $NPCList[_j].location.genitals to "head">>
diff --git a/game/base-combat/ejaculation-sydney.twee b/game/base-combat/ejaculation-sydney.twee
index 6ecdd67a164d8380d31f7c1a752ee279b8d419de..b6b61164fbdf03de7572542c5b3f243545588f35 100644
--- a/game/base-combat/ejaculation-sydney.twee
+++ b/game/base-combat/ejaculation-sydney.twee
@@ -262,7 +262,7 @@
<br><br>
<</if>>
<<else>>
- <<if !_sydneyStatus.includes("corrupt")>>
+ <<if !_sydneyStatus.includes("corrupt") and $NPCList[_nn].vagina isnot "none">>
<<He>> backs away, dazed and confused at what you've done.
<br><br>
<<elseif $NPCList[_nn].vagina is "footjob">>
@@ -846,7 +846,7 @@
<br><br>
<</if>>
<<else>>
- <<if !_sydneyStatus.includes("corrupt")>>
+ <<if !_sydneyStatus.includes("corrupt") and $NPCList[_nn].penis isnot "none">>
<<He>> backs away, dazed and confused at what you've done.
<br><br>
<<elseif $NPCList[_nn].penis is "idle">>
diff --git a/game/base-combat/end.twee b/game/base-combat/end.twee
index e7cf8fb227a6d30dd81371d9e402afe876cd9425..212529b1923138c71d9838fc1ba3b0a0e2fe2f15 100644
--- a/game/base-combat/end.twee
+++ b/game/base-combat/end.twee
@@ -523,6 +523,9 @@
<<set $NPCList[_i].penissize to 0>>
<<set $NPCList[_i].health to 0>>
<</if>>
+<<if $enemyno gt 0>>
+ <<set $enemyno -= 1>>
+<</if>>
<</widget>>
diff --git a/game/base-combat/init.twee b/game/base-combat/init.twee
index 0a4a319295702e93580d08cb40582a1e03d9c413..65baaef5c92c537b5f82f9afe8dd0ab9fb38261f 100644
--- a/game/base-combat/init.twee
+++ b/game/base-combat/init.twee
@@ -137,6 +137,11 @@
<</if>>
<<set $enemytype to "beast">>
+<<if $NPCList[0].monster is "monster">>
+ <<set $monster to 1>>
+<<else>>
+ <<set $monster to 0>>
+<</if>>
<!--Used to prevent certain variables being repeated during re-generation-->
<<set $combatTrain.generateInit to 0>>
diff --git a/game/base-combat/machine/machine.twee b/game/base-combat/machine/machine.twee
index 6e6ae8a45dc44cb8736fe61b3b93a74c6f35c6fb..fc8dfa0ab7e10bd6f3605ef102169a3dbccbe31d 100644
--- a/game/base-combat/machine/machine.twee
+++ b/game/base-combat/machine/machine.twee
@@ -212,7 +212,7 @@
<span class="pink">The <<machine_damage vaginal>> phallic machine thrusts into your <<pussy>>.</span>
<<else>>
<<sex 100>>
- <<takeVirginity "sex machine" "vaginal">><<bruise vagina>><<vaginalstat>><<raped>><<vaginaraped>>
+ <<bruise vagina>><<vaginalstat>><<raped>><<vaginaraped>>
<<set $vaginastate to "penetrated">><<set $machine.vaginal.state to "penetrated">>
<span class="red">The <<machine_damage vaginal>> phallic machine thrusts into your virgin pussy,
<<if $sexStats.vagina.pregnancy.totalBirthEvents gt 0>>
@@ -222,6 +222,7 @@
<</if>>
</span>
<</if>>
+ <<takeVirginity "sex machine" "vaginal">>
<<case "penetrated">>
<<set $rng to random(1, 5)>>
diff --git a/game/base-combat/man-combat.twee b/game/base-combat/man-combat.twee
index dc45037733c177fbd89f85ceb52e1c69f2ab4763..dc2250f39e1b7b58169ce59555a6c0e51486d54f 100644
--- a/game/base-combat/man-combat.twee
+++ b/game/base-combat/man-combat.twee
@@ -2225,10 +2225,10 @@
<<violence 100>>
<</switch>>
<</if>>
- <<sex 100>><<set $NPCList[_n].penis to "vagina">><<takeVirginity $NPCList[_n].fullDescription "vaginal">><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">><<set $speechvaginavirgin to 1>><<bruise vagina>><<vaginalstat>>
+ <<sex 100>><<set $NPCList[_n].penis to "vagina">><<raped>><<vaginaraped>><<set $vaginastate to "penetrated">><<set $speechvaginavirgin to 1>><<bruise vagina>><<vaginalstat>>
<<if $enemyanger gte 100>><<set _pain *= 1.5>><</if>><<pain _pain>>
<</if>>
- <<takeNPCVirginity $NPCList[_n].fullDescription "penile">>
+ <<takeNPCVirginity $NPCList[_n].fullDescription "penile">><<takeVirginity $NPCList[_n].fullDescription "vaginal">>
<<else>>
Respecting your wishes, <<he>> presses <<his>> $NPCList[_n].penisdesc against your <<pussy>> but does not penetrate.
<<sex 15>><<set $speechvaginawithhold to 1>>
@@ -2266,7 +2266,7 @@
<<He>> pushes <<his>> $NPCList[_n].penisdesc against your <<pussy>>. <<vagina_lube_text>><span class="pink">the tip presses into you, a thrust away from penetrating.</span>
<<sex 20>><<set $NPCList[_n].penis to "vaginaimminent">><<set $vaginastate to "imminent">><<set $speechvaginaimminent to 1>>
<<else>>
- <<if $npcSub>>You push<<else>><<He>> pushes<</if>><<his>> $NPCList[_n].penisdesc against your <<pussy>>, <span class="blue">but fail<<if !$npcSub>>s<</if>> to penetrate,</span> instead angling away and rubbing it against your <<clit>>.
+ <<if $npcSub>>You push<<else>><<He>> pushes<</if>> <<his>> $NPCList[_n].penisdesc against your <<pussy>>, <span class="blue">but fail<<if !$npcSub>>s<</if>> to penetrate,</span> instead angling away and rubbing it against your <<clit>>.
<<sex 5>><<set $speechvaginaimminent to 1>>
<<if $enemyarousal gte ($enemyarousalmax / 2) and random(1, 3) is 3>>
Precum leaks from the tip, <span class="blue">lubricating your pussy.</span>
@@ -2356,10 +2356,10 @@
<span class="green"> While your ass is technically no longer virgin, you can barely feel it.</span>
<<default>>
<</switch>>
- <<sex 100>><<set $NPCList[_n].penis to "anus">><<takeVirginity $NPCList[_n].fullDescription "anal">><<bruise anus>><<analstat>><<violence 50>><<raped>><<anusraped>><<set $anusstate to "penetrated">><<set $speechanusvirgin to 1>>
+ <<sex 100>><<set $NPCList[_n].penis to "anus">><<bruise anus>><<analstat>><<violence 50>><<raped>><<anusraped>><<set $anusstate to "penetrated">><<set $speechanusvirgin to 1>>
<<if $enemyanger gte 100>><<set _pain *= 1.5>><</if>><<pain _pain>>
<</if>>
- <<takeNPCVirginity $NPCList[_n].fullDescription "penile">>
+ <<takeNPCVirginity $NPCList[_n].fullDescription "penile">><<takeVirginity $NPCList[_n].fullDescription "anal">>
<<else>>
Respecting your wishes, <<he>> presses <<his>> $NPCList[_n].penisdesc against your anus but does not penetrate.
<<sex 15>><<set $speechanuswithhold to 1>>
@@ -2397,7 +2397,7 @@
<<He>> presses <<his>> $NPCList[_n].penisdesc against your <<bottom>>. <<anus_lube_text>><span class="pink">the tip presses into you, a thrust away from penetrating.</span>
<<sex 20>><<set $NPCList[_n].penis to "anusimminent">><<set $anusstate to "imminent">><<set $speechanusimminent to 1>>
<<else>>
- <<if $npcSub>>You push<<else>><<He>> pushes<</if>><<his>> $NPCList[_n].penisdesc against your <<bottom>>, <span class="blue">but fail<<if !$npcSub>>s<</if>> to penetrate,</span> instead angling away and rubbing it between your cheeks.
+ <<if $npcSub>>You push<<else>><<He>> pushes<</if>> <<his>> $NPCList[_n].penisdesc against your <<bottom>>, <span class="blue">but fail<<if !$npcSub>>s<</if>> to penetrate,</span> instead angling away and rubbing it between your cheeks.
<<sex 5>><<set $speechanusimminent to 1>>
<<if $enemyarousal gte ($enemyarousalmax / 2) and random(1, 3) is 3>>
Precum leaks from the tip, <span class="blue">lubricating your ass.</span>
@@ -2608,9 +2608,9 @@
<<sex 30>><<set $NPCList[_n].penis to "otheranus">><<penilestat>><<bruise penis>><<violence 1>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechotheranuspenetrated to 1>>
<<elseif $player.virginity.penile is true>>
<span class="pink"><<He>> eases your virgin penis into <<his>> ass,</span><span class="red"> separating your foreskin from your glans and forever robbing you of your purity.</span>
- <<sex 100>><<set $NPCList[_n].penis to "otheranus">><<takeVirginity $NPCList[_n].fullDescription "penile">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
+ <<sex 100>><<set $NPCList[_n].penis to "otheranus">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
<</if>>
- <<takeNPCVirginity $NPCList[_n].fullDescription "anal">>
+ <<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">>
<<if $penissize gte 4>>
<<He>> looks proud to have taken something so big.
<</if>>
@@ -2772,9 +2772,9 @@
<<sex 30>><<set $NPCList[_n].vagina to "penis">><<penilestat>><<bruise penis>><<violence 1>><<raped>><<penisraped>><<set $penisstate to "penetrated">><<set $speechpenispenetrated to 1>>
<<elseif $player.virginity.penile is true>>
<span class="pink"><<He>> eases your virgin penis into <<his>> pussy,</span><span class="red"> separating your foreskin from your glans and forever robbing you of your purity.</span>
- <<sex 100>><<set $NPCList[_n].vagina to "penis">><<takeVirginity $NPCList[_n].fullDescription "penile">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "penetrated">><<set $speechpenisvirgin to 1>>
+ <<sex 100>><<set $NPCList[_n].vagina to "penis">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "penetrated">><<set $speechpenisvirgin to 1>>
<</if>>
- <<takeNPCVirginity $NPCList[_n].fullDescription "vaginal">>
+ <<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "vaginal">>
<<if $penissize gte 4>>
<<He>> looks proud to have taken something so big.
<</if>>
@@ -3070,9 +3070,9 @@
<<sex 30>><<set $NPCList[_n].vagina to "otheranus">><<penilestat>><<bruise penis>><<violence 1>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechotheranuspenetrated to 1>>
<<elseif $player.virginity.penile is true>>
<span class="pink"> <<He>> eases your virgin penis into <<his>> ass,</span><span class="red"> separating your foreskin from your glans and forever robbing you of your purity.</span>
- <<sex 100>><<set $NPCList[_n].vagina to "otheranus">><<takeVirginity $NPCList[_n].fullDescription "penile">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
+ <<sex 100>><<set $NPCList[_n].vagina to "otheranus">><<bruise penis>><<penilestat>><<violence 100>><<raped>><<penisraped>><<set $penisstate to "otheranus">><<set $speechpenisvirgin to 1>>
<</if>>
- <<takeNPCVirginity $NPCList[_n].fullDescription "anal">>
+ <<takeVirginity $NPCList[_n].fullDescription "penile">><<takeNPCVirginity $NPCList[_n].fullDescription "anal">>
<<if $penissize gte 4>>
<<He>> looks proud to have taken something so big.
<</if>>
diff --git a/game/base-combat/speech-sydney.twee b/game/base-combat/speech-sydney.twee
index 0ff9a1b8b052eecafdbc0eb6c9a9adaf85d11e32..fb119d1d26d780c80a92a8e475da0c9b2bb413a1 100644
--- a/game/base-combat/speech-sydney.twee
+++ b/game/base-combat/speech-sydney.twee
@@ -17,7 +17,7 @@
<<if $speechpenisvirgin is 1 or $speechvaginavirgin is 1 or $speechanusvirgin is 1>>
<<if _sydneyStatus.includes("corrupt")>>
<<if $sydneySeen.includes("corruptroom")>>
- <<set _sydneyText to `<<He>> moans, looking <<printTo>> you with pure ecstasy. "The feeling of you ruining me gets better each time. We belong to each other, now and forever!" <<He>> holds on <<printTo>> you tight. <<set $corruptionEvent to 1>><<npcincr Sydney purity -5>><<llspurity>>`>>
+ <<set _sydneyText to `<<He>> moans, looking <<printTo>> you with pure ecstasy. "The feeling of you ruining me gets better each time. We belong <<printTo>> each other, now <<printAnd>> forever!" <<He>> holds on <<printTo>> you tight. <<set $corruptionEvent to 1>><<npcincr Sydney purity -5>><<llspurity>>`>>
<<else>>
<<set _sydneyText to `<<He>> moans, looking <<printTo>> you with pure ecstasy. "You did it. You defiled me at last. We belong <<printTo>> each other forever now!" <<He>> holds on <<printTo>> you tight. <<set $corruptionEvent to 1>><<npcincr Sydney purity -20>><<lllspurity>>`>>
<</if>>
@@ -31,7 +31,7 @@
<<else>>
<<if _sydneyStatus.includes("corrupt")>>
<<if $sydneySeen.includes("corruptroom")>>
- <<set _sydneyText to `<<He>> moans, looking <<printTo>> you with pure ecstasy. "The feeling of you ruining me gets better every time! I belong to you, now and forever!" <<He>> holds on <<printTo>> you tightly. <<set $corruptionEvent to 1>><<npcincr Sydney purity -5>><<llspurity>>`>>
+ <<set _sydneyText to `<<He>> moans, looking <<printTo>> you with pure ecstasy. "The feeling of you ruining me gets better every time! I belong <<printTo>> you, now <<printAnd>> forever!" <<He>> holds on <<printTo>> you tightly. <<set $corruptionEvent to 1>><<npcincr Sydney purity -5>><<llspurity>>`>>
<<else>>
<<set _sydneyText to `<<He>> moans, looking <<printTo>> you with pure ecstasy. "You did it. You defiled me at last. We belong <<printTo>> each other forever now!" <<He>> holds on <<printTo>> you tight. <<set $corruptionEvent to 1>><<npcincr Sydney purity -20>><<lllspurity>>`>>
<</if>>
@@ -73,7 +73,7 @@
<<case "Whitney">>
<<set _sydneyText to `<<He>> balks. "H... <<nnpc_him "Whitney">>?!"`>>
<<case "Robin" "Kylar">>
- <<set _sydneyText to `<<He>> freezes. "I... though you were just friends. You mean...?"`>>
+ <<set _sydneyText to `<<He>> freezes. "I... thought you were just friends. You mean...?"`>>
<<default>>
<<set _sydneyText to `<<He>> freezes. "Wh... who? Who is it?!"`>>
<</switch>>
@@ -82,11 +82,11 @@
<<if $speechspank is 1>>
<<switch _sydneyStatus>>
<<case "pure" "pureLust">>
- <<set _sydneyText to `<<He>> looks down at you with confusion. "This is supposed to be painful, what... what is this?" <<npcincr Sydney purity -2>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> looks down at you with confusion. "This is supposed <<printTo>> be painful, what... what is this?" <<npcincr Sydney purity -2>><<lspurity>>`>>
<<case "corrupt" "corruptLust">>
- <<set _sydneyText to `<<He>> smiles at you <<printAnd>> giggles. "Seeing you struggle and writhe just makes it better." <<npcincr Sydney purity -2>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> smiles at you <<printAnd>> giggles. "Seeing you struggle <<printAnd>> writhe just makes it better." <<npcincr Sydney purity -2>><<lspurity>>`>>
<<default>>
- <<set _sydneyText to `<<He>> looks to you with a mixture of panic and confusion as you climax. <<npcincr Sydney purity -2>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> looks <<printTo>> you with a mixture of panic <<printAnd>> confusion as you climax. <<npcincr Sydney purity -2>><<lspurity>>`>>
<</switch>>
<<else>>
<<switch _sydneyStatus>>
@@ -104,7 +104,7 @@
<</if>>
<<set $sydneySeen.pushUnique("player climax")>>
<<elseif $speechgenitals is 1 and $worn.genitals.type.includesAll("chastity", "hidden") and !$sydneySeen.includes("chastity")>>
- <<set _sydneyText to `<<His>> eyebrows raise in surprise upon seeing your $worn.genitals.name. <<npcincr Sydney purity 2>><<gspurity>>`>>
+ <<set _sydneyText to `<<His>> eyebrows raise in surprise upon seeing your <<printChastity>> <<npcincr Sydney purity 2>><<gspurity>>`>>
<<set $sydneySeen.pushUnique("chastity")>>
<<set $sydneyUniqueComments.pushUnique("chastity")>>
<<elseif $speechpenispenetrated is 1 and $sydneyComments.penetrated is 0>>
@@ -414,7 +414,7 @@
<<switch _sydneyStatus>>
<<case "pure" "pureLust">>
<<if $rng lte 35>>
- <<set _sydneyText to `<<He>> blushes. "Th-this is supposed to be a punishment!"`>>
+ <<set _sydneyText to `<<He>> blushes. "Th-this is supposed <<printTo>> be a punishment!"`>>
<<elseif $rng lte 70>>
<<set _sydneyText to `<<He>> blushes. "I don't understand, am I not punishing you hard enough?"`>>
<<else>>
@@ -424,17 +424,17 @@
<<if $rng lte 35>>
<<set _sydneyText to `<<He>> smirks. "I knew you were into this." <<npcincr Sydney purity -1>><<lspurity>>`>>
<<elseif $rng lte 70>>
- <<set _sydneyText to `<<He>> smirks. "Naughty <<girls>> get punished, and I love it when you're naughty." <<npcincr Sydney purity -1>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> smirks. "Naughty <<girls>> get punished, <<printAnd>> I love it when you're naughty." <<npcincr Sydney purity -1>><<lspurity>>`>>
<<else>>
- <<set _sydneyText to `<<He>> smirks. "I want to savour your moans. I should spank you more often." <<npcincr Sydney purity -1>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> smirks. "I want <<printTo>> savour your moans. I should spank you more often." <<npcincr Sydney purity -1>><<lspurity>>`>>
<</if>>
<<default>>
<<if $rng lte 35>>
- <<set _sydneyText to `<<He>> pouts. "This is supposed to be discipline, you know."`>>
+ <<set _sydneyText to `<<He>> pouts. "This is supposed <<printTo>> be discipline, you know."`>>
<<elseif $rng lte 70>>
<<set _sydneyText to `<<He>> blushes. "Are you... into this?" <<npcincr Sydney purity -1>><<lspurity>>`>>
<<else>>
- <<set _sydneyText to `<<He>> blushes. "This is supposed to be a punishment! Stop moaning like that!" <<npcincr Sydney purity -1>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> blushes. "This is supposed <<printTo>> be a punishment! Stop moaning like that!" <<npcincr Sydney purity -1>><<lspurity>>`>>
<</if>>
<</switch>>
<<else>>
@@ -525,19 +525,19 @@
<<case "pure" "pureLust" "neutral" "neutralLust">>
<<if _sydneyChastity>>
<<if $rng lte 35>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "We're matching!"`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "We're matching!"`>>
<<elseif $rng lte 70>>
<<set _sydneyText to `<<He>> speaks. "We're both still pure if we both have chastity devices, right?"`>>
<<else>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "At least we don't have <<printTo>> worry since we're both protected."`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "At least we don't have <<printTo>> worry since we're both protected."`>>
<</if>>
<<else>>
<<if $rng lte 35>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "You got me <<printTo>> remove mine, but now you have one?"`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "You got me <<printTo>> remove mine, but now you have one?"`>>
<<elseif $rng lte 70>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "So this is how it feels."`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "So this is how it feels."`>>
<<else>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "Oh."`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "Oh."`>>
<</if>>
<</if>>
<<case "corrupt" "corruptLust">>
@@ -547,15 +547,15 @@
<<elseif $rng lte 70>>
<<set _sydneyText to `<<He>> speaks. "We need <<printTo>> find the keys for our chastity devices soon."`>>
<<else>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "I guess we're both just lusty sinners, <<printAnd>> can't do anything about it."`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "I guess we're both just lusty sinners, <<printAnd>> can't do anything about it."`>>
<</if>>
<<else>>
<<if $rng lte 35>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "You're kidding me, right?"`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "You're kidding me, right?"`>>
<<elseif $rng lte 70>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "Is this a joke?"`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "Is this a joke?"`>>
<<else>>
- <<set _sydneyText to `<<He>> stares at your $worn.genitals.name. "Oh you absolute sextease, you got me <<printTo>> remove mine just <<printTo>>-"`>>
+ <<set _sydneyText to `<<He>> stares at your <<printChastity>> "Oh you absolute sextease, you got me <<printTo>> remove mine just <<printTo>>-"`>>
<</if>>
<</if>>
<</switch>>
@@ -776,23 +776,23 @@
<<set $sydneyUniqueComments.pushUnique("clothes")>>
<<if $worn.upper.name is "nun's habit" or $worn.upper.name is "monk's habit">>
<<if _sydneyStatus.includes("corrupt")>>
- <<set _sydneyText to `<<He>> runs <<his>> hands over your $worn.upper.name. <<He>> almost seems nostalgic. <<npcincr Sydney purity 2>><<gspurity>>`>>
+ <<set _sydneyText to `<<He>> runs <<his>> hands over your ` + $worn.upper.name + `. <<He>> almost seems nostalgic. <<npcincr Sydney purity 2>><<gspurity>>`>>
<<else>>
- <<set _sydneyText to `<<He>> looks over your $worn.upper.name. "Does... wearing that make this all okay?" <<npcincr Sydney purity 2>><<gspurity>>`>>
+ <<set _sydneyText to `<<He>> looks over your ` + $worn.upper.name + `. "Does... wearing that make this all okay?" <<npcincr Sydney purity 2>><<gspurity>>`>>
<</if>>
<<elseif $worn.neck.name is "holy pendant" or $worn.neck.name is "stone pendant">>
<<set $sydneySeen.pushUnique("holy pendant")>>
<<if _sydneyStatus.includes("corrupt")>>
- <<set _sydneyText to `<<He>> stares at your $worn.neck.name. <<He>> almost seems nostalgic. <<npcincr Sydney purity 2>><<gspurity>>`>>
+ <<set _sydneyText to `<<He>> stares at your ` + $worn.neck.name + `. <<He>> almost seems nostalgic. <<npcincr Sydney purity 2>><<gspurity>>`>>
<<else>>
- <<set _sydneyText to `<<He>> looks over your $worn.neck.name. "Does... wearing that make this all okay?" <<npcincr Sydney purity 2>><<gspurity>>`>>
+ <<set _sydneyText to `<<He>> looks over your ` + $worn.neck.name + `. "Does... wearing that make this all okay?" <<npcincr Sydney purity 2>><<gspurity>>`>>
<</if>>
<<elseif $worn.neck.name is "dark pendant">>
<<set $sydneySeen.pushUnique("dark pendant")>>
<<if _sydneyStatus.includes("corrupt")>>
- <<set _sydneyText to `<<He>> stares at your $worn.neck.name. <<He>> seems <<printTo>> get lost in it for a moment. <<npcincr Sydney purity -2>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> stares at your ` + $worn.neck.name + `. <<He>> seems <<printTo>> get lost in it for a moment. <<npcincr Sydney purity -2>><<lspurity>>`>>
<<else>>
- <<set _sydneyText to `<<He>> looks over your $worn.neck.name. "It's... so pretty, but also a little unsettling..." <<npcincr Sydney purity -2>><<lspurity>>`>>
+ <<set _sydneyText to `<<He>> looks over your ` + $worn.neck.name + `. "It's... so pretty, but also a little unsettling..." <<npcincr Sydney purity -2>><<lspurity>>`>>
<</if>>
<<elseif $location is "school" and $exposed lte 0 and (!$worn.upper.type.includes("school") and !$worn.lower.type.includes("school"))>>
<<if _sydneyStatus.includes("corrupt")>>
diff --git a/game/base-combat/struggle.twee b/game/base-combat/struggle.twee
index d24c6e87483c8cb96a8622af14c8f73f698eaf6e..efcab13e13566eebbda7206a630332a7df8b6874 100644
--- a/game/base-combat/struggle.twee
+++ b/game/base-combat/struggle.twee
@@ -1857,9 +1857,10 @@ and $orgasmdown lte 0 and ($pain lt 100 or $willpowerpain is undefined)>>
<<else>>
<span class="red">breaking your hymen and forever robbing you of your purity.</span>
<</if>>
- <<takeVirginity $struggle.vagina.creature "vaginal">><<set $vaginastate to "struggle_pen">><<vaginalstat>><<vaginaraped>>
+ <<set $vaginastate to "struggle_pen">><<vaginalstat>><<vaginaraped>>
<<sex 30>><<pain _pain>>
<</if>>
+ <<takeVirginity $struggle.vagina.creature "vaginal">>
<<if $consensual isnot 1>><<bruise vagina>><<violence 2>><<raped>><<vaginaraped>><</if>>
<<neutral 5>>
<<case 5>>
@@ -1903,9 +1904,10 @@ and $orgasmdown lte 0 and ($pain lt 100 or $willpowerpain is undefined)>>
<<sex 30>><<pain _pain>>
<<else>>
The <<print $struggle.penis.creature>> <span class="pink">forces your <<penis>> into its body,</span> <span class="red">separating your foreskin from your glans and forever robbing you of your purity.</span>
- <<takeVirginity $struggle.penis.creature "penile">><<set $penisstate to "struggle_pen">><<penilestat>><<penisraped>>
+ <<set $penisstate to "struggle_pen">><<penilestat>><<penisraped>>
<<sex 30>><<pain _pain>>
<</if>>
+ <<takeVirginity $struggle.penis.creature "penile">>
<<if $consensual isnot 1>><<bruise penis>><<violence 2>><<raped>><<penisraped>><</if>>
<<neutral 5>>
<<case 5>>
diff --git a/game/base-combat/tentacles/tentacle-action.twee b/game/base-combat/tentacles/tentacle-action.twee
index ca16c75053372c1c91d1ade3ec5518220183fe05..b8e339a000ae3e852ae6b88dad8d9a0e78f0d4ba 100644
--- a/game/base-combat/tentacles/tentacle-action.twee
+++ b/game/base-combat/tentacles/tentacle-action.twee
@@ -146,10 +146,10 @@
<span class="red">tearing your hymen and forever robbing you of your purity.</span>
<<violence 100>>
<</if>>
- <<takeVirginity $tentacles[$tentacleindex].fullDesc "vaginal">>
<<else>>
<span class="pink"> and thrusts into your <<pussy>>.</span>
<</if>>
+ <<takeVirginity $tentacles[$tentacleindex].fullDesc "vaginal">>
<<set $vaginastate to "tentacle">><<set $tentacles[$tentacleindex].head to "vagina">><<sex 5>><<raped>><<vaginaraped>><<vaginalstat>><<violence 1>>
<</if>>
@@ -185,10 +185,11 @@
<<if $tentacles[$tentacleindex].head is "penisimminent">>
<<if $player.virginity.penile is true>>
<span class="pink"> and thrusts against your <<penis>>, swallowing you to the base and</span> <span class="red"> tearing the membrane between your glans and foreskin, forever robbing you of your purity.</span>
- <<takeVirginity $tentacles[$tentacleindex].fullDesc "penile">><<violence 100>>
+ <<violence 100>>
<<else>>
<span class="pink"> and thrusts against your <<penis>>, swallowing you to the base.</span>
<</if>>
+ <<takeVirginity $tentacles[$tentacleindex].fullDesc "penile">>
<<set $penisstate to "tentacle">><<set $tentacles[$tentacleindex].head to "penis">><<sex 5>><<raped>><<penisraped>><<penilestat>><<violence 1>>
<</if>>
diff --git a/game/base-combat/tentacles/tentacle-adv.twee b/game/base-combat/tentacles/tentacle-adv.twee
index 5aa2d39063eaa4e3cf5ab67a50783e6566a90562..5b69e16b2c44a0b7619e182079cd6895157411e0 100644
--- a/game/base-combat/tentacles/tentacle-adv.twee
+++ b/game/base-combat/tentacles/tentacle-adv.twee
@@ -152,7 +152,6 @@ The _tentacle.desc tentacle writhes between your feet.
<</switch>>
<<violence 100>>
<</if>>
- <<takeVirginity _tentacle.fullDesc "vaginal">>
<<else>>
<<switch _tentacle.size>>
<<case 3>>
@@ -162,6 +161,7 @@ The _tentacle.desc tentacle writhes between your feet.
<</switch>>
<</if>>
<br>
+ <<takeVirginity _tentacle.fullDesc "vaginal">>
<<set $vaginastate to "tentacle">><<set _tentacle.head to "vagina">><<sex 5>><<raped>><<vaginaraped>><<vaginalstat>><<violence 1>><<pain $vaginalPain>>
<</if>>
@@ -200,11 +200,12 @@ The _tentacle.desc tentacle writhes between your feet.
<<if _tentacle.head is "penisimminent">>
<<if $player.virginity.penile is true>>
<span class="pink"> and thrusts against your <<penis>>, swallowing you to the base and</span> <span class="red"> tearing the membrane between your glans and foreskin, forever robbing you of your purity.</span>
- <<takeVirginity _tentacle.fullDesc "penile">><<violence 100>>
+ <<violence 100>>
<<else>>
<span class="pink"> and thrusts against your <<penis>>, swallowing you to the base.</span>
<</if>>
<br>
+ <<takeVirginity _tentacle.fullDesc "penile">>
<<set $penisstate to "tentacle">><<set _tentacle.head to "penis">><<sex 5>><<raped>><<penisraped>><<penilestat>><<violence 1>>
<</if>>
diff --git a/game/base-combat/widgets.twee b/game/base-combat/widgets.twee
index 8ced40bafb4b2799fd655486dac2ed2a065839cc..935e56a202cf70a1d992291126ca7b92442a753d 100644
--- a/game/base-combat/widgets.twee
+++ b/game/base-combat/widgets.twee
@@ -2,21 +2,21 @@
<<widget "takeVirginity">>
<<if $args[1]>>
- <<if $args[1] is "vaginal" or $args[1] is "penile">>
- <<switch $args[0]>>
- <<case "Robin">><<earnFeat "Robin the Lover">>
- <<case "Kylar">><<earnFeat "Kylar the Obsessed">>
- <<case "Eden">><<earnFeat "Eden the Lonely">>
- <<case "Whitney">><<earnFeat "Whitney the Tsundere">>
- <<case "Avery">><<earnFeat "Avery the Moneybags">>
- <<case "Leighton">><<earnFeat "Leighton the Shady">>
- <<case "Alex">><<earnFeat "Alex the Robust">>
- <<case "Great Hawk">><<earnFeat "Great Hawk the Terror">>
- <<case "Wren">><<earnFeat "Wren the Sly">>
- <<case "Black Wolf">><<earnFeat "Great Wolf the Alpha">>
- <</switch>>
- <</if>>
<<if $player.virginity[$args[1]] is true>>
+ <<if $args[1] is "vaginal" or $args[1] is "penile">>
+ <<switch $args[0]>>
+ <<case "Robin">><<earnFeat "Robin the Lover">>
+ <<case "Kylar">><<earnFeat "Kylar the Obsessed">>
+ <<case "Eden">><<earnFeat "Eden the Lonely">>
+ <<case "Whitney">><<earnFeat "Whitney the Tsundere">>
+ <<case "Avery">><<earnFeat "Avery the Moneybags">>
+ <<case "Leighton">><<earnFeat "Leighton the Shady">>
+ <<case "Alex">><<earnFeat "Alex the Robust">>
+ <<case "Great Hawk">><<earnFeat "Great Hawk the Terror">>
+ <<case "Wren">><<earnFeat "Wren the Sly">>
+ <<case "Black Wolf">><<earnFeat "Great Wolf the Alpha">>
+ <</switch>>
+ <</if>>
<<if $args[0] isnot undefined and $args[0] isnot 0>>
<<set $player.virginity[$args[1]] to $args[0]>>
<<else>>
diff --git a/game/base-system/bodywriting-objects.twee b/game/base-system/bodywriting-objects.twee
index 85e5e89fd63ddd7f5e6b0825b231a130806d1f30..3da7d8c416b76586ef1cac1ce758d19f5e0b423d 100644
--- a/game/base-system/bodywriting-objects.twee
+++ b/game/base-system/bodywriting-objects.twee
@@ -1336,7 +1336,6 @@
lewd: 1,
degree: 0
},
-
dumb_bitch: {
index: 121,
writing: "Dumb bitch",
diff --git a/game/base-system/bodywriting.twee b/game/base-system/bodywriting.twee
index d6095c1a2cae72523ff212373f5fdb386591809f..981455d4f0638c84c2bd61fac4e761bd6d063b96 100755
--- a/game/base-system/bodywriting.twee
+++ b/game/base-system/bodywriting.twee
@@ -1291,7 +1291,7 @@ Second arg: tool */
<</widget>>
<<widget "bodypart_admire_chance">>
-<<if random(1, 5) is 5 and $NPCList[_n].mouth is 0>>
+<<if random(1, 5) is 5 and $NPCList[_n].mouth is 0 and $enemytype isnot "beast">>
<<bodypart_admire $args[0]>>
<</if>>
<</widget>>
diff --git a/game/base-system/named-npcs.twee b/game/base-system/named-npcs.twee
index 500b3f3a35a293de5c59e3a3969abdef3c7cf479..190cd32a4ac2efab8ee310fc0b40869d156f2981 100644
--- a/game/base-system/named-npcs.twee
+++ b/game/base-system/named-npcs.twee
@@ -469,10 +469,6 @@ Zohar
<<if _npcno is 0 and $enemyno gte 1>>
<<set $endeventerror to $lastgenerated>>
<<endevent phaseless>>
-<<elseif $NPCList[_npcno].gender isnot 0 and $NPCList[_npcno].description>>
- <span class="red"> Error: an NPC is already defined in row _npcno. Ending event now.
- <<set $endeventerror to $lastgenerated>>
- <<endevent phaseless>>
<</if>>
<<set $lastgenerated to $passage>>
diff --git a/game/base-system/orgasm.twee b/game/base-system/orgasm.twee
index 817f33863139a886e4433ceb5666b00f7ce1196e..69a303f22ff2127407a7b90bed8a65ba00d547fa 100644
--- a/game/base-system/orgasm.twee
+++ b/game/base-system/orgasm.twee
@@ -116,7 +116,7 @@
<<if $leftaction is "mpenisshaft" and !$worn.genitals.type.includes("chastity") and $semen_amount / 10 gte random(50,150)>>
<<set $leftFingersSemen to 1>>
<</if>>
- <<if $$rightaction is "mpenisshaft" and !$worn.genitals.type.includes("chastity") and $semen_amount / 10 gte random(50,150)>>
+ <<if $rightaction is "mpenisshaft" and !$worn.genitals.type.includes("chastity") and $semen_amount / 10 gte random(50,150)>>
<<set $rightFingersSemen to 1>>
<</if>>
<</if>>
diff --git a/game/base-system/text.twee b/game/base-system/text.twee
index fd5a3c19706df755f5501b173eb2481878dfaa10..d9c9030ce14c0b565664b6abcdebef533628deae 100644
--- a/game/base-system/text.twee
+++ b/game/base-system/text.twee
@@ -1292,6 +1292,10 @@
<<set _text_output to _text_output + "'s">>
<</silently>><<print _text_output>><</widget>>
+<<widget "combatPerson">><<silently>>
+ <<combatperson>><<set _text_output to _text_output.toLocaleUpperFirst()>>
+<</silently>><<print _text_output>><</widget>>
+
<<widget "personselect">>
<!-- This replaces calls person1 person2 etc. Used for NPC object calls -->
<!-- Note calls are 0-5 corresponding to NPCs 1-6 -->
@@ -1353,6 +1357,15 @@
<<set $_text_output to ($pronoun is "m" ? "father" : "mother")>>
<</silently>><<print $_text_output>><</widget>>
+<<widget "father">><<silently>>
+<<if $pronoun is "m">>
+ <<set $_text_output to "father">>
+<<else>>
+ <<set $_text_output to "mother">>
+<</if>>
+<</silently>><<if $_text_output>><<print $_text_output>><</if>>
+<</widget>>
+
<<widget "girl">><<silently>>
<<set _text_output to ($player.gender_appearance is "m"? "boy" : "girl")>>
<</silently>><<print _text_output>><</widget>>
@@ -5851,6 +5864,10 @@ to
and
<</widget>>
+<<widget "printChastity">>
+$worn.genitals.name
+<</widget>>
+
<<widget "timeAfterXHours">><<silently>>
<<if $args[0]>>
<<if $timestyle is "military">>
@@ -6192,4 +6209,4 @@ and
<<else>>
<span class="purple"><<He>> casts aside the fabric.</span>
<</if>>
-<</widget>>
+<</widget>>
\ No newline at end of file
diff --git a/game/base-system/time.twee b/game/base-system/time.twee
index 0cced45f3acc41490e86332888f5c32ea533fb09..ffd451c3c19982a08026d0a3b1c5c4e4495752ba 100644
--- a/game/base-system/time.twee
+++ b/game/base-system/time.twee
@@ -777,7 +777,7 @@
<<calchairlengthstage>>
<<if $schoolterm is 1>>
- <<if $weekday is 2 or $weekday is 3 or $weekday is 4 or $weekday is 5 or $weekday is 6>>
+ <<if $weekday is 3 or $weekday is 4 or $weekday is 5 or $weekday is 6 or $weekday is 7>>
<<set _delinquencyDecay to 1>>
<<if $NPCName[$NPCNameList.indexOf("Leighton")].love gte $npclovehigh>>
<<set _delinquencyDecay += 1>>
@@ -1059,6 +1059,7 @@
<<set $sydneyDaily.sex to 0>>
<<unset $sydneyScienceWarn>>
<<unset $sydneyPunish>>
+ <<unset $sydneyTempleSkip>>
<<if $sydneyromance is 1 and $sydneyChastityKnown and $NPCName[$NPCNameList.indexOf("Sydney")].love gte 90 and _sydneyStatus.includes("Lust") and $NPCName[$NPCNameList.indexOf("Sydney")].chastity.anus.includes("shield")>>
<<set $NPCName[$NPCNameList.indexOf("Sydney")].chastity.anus to "">>
@@ -1379,12 +1380,10 @@
<<case "garden">>
<<if $temple_garden gte 1>>
<<set $temple_garden += 1>>
- <<set $temple_garden = Math.clamp($temple_garden, 0, 100)>>
<</if>>
<<case "quarters">>
<<if $temple_quarters gte 1>>
<<set $temple_quarters += 1>>
- <<set $temple_quarters = Math.clamp($temple_quarters, 0, 100)>>
<</if>>
<<default>>
/* Do Nothing */
diff --git a/game/overworld-forest/loc-forest/widgets.twee b/game/overworld-forest/loc-forest/widgets.twee
index 723cce49a4d4a99743171ca362cb154677eca5b5..9161cd2b46fe356b5e5a24d3112793b1f96e07fa 100644
--- a/game/overworld-forest/loc-forest/widgets.twee
+++ b/game/overworld-forest/loc-forest/widgets.twee
@@ -963,7 +963,7 @@ or $lowerwetstage gte 3 and $underlowerwetstage gte 3>>
<<if $forest lte 20>>
<<if _forest_item is 1>>
<<if !$plants_known.includes("lily")>>
- <<if $science gte 300>>
+ <<if $sciencetrait gte 1>>
<<link [[Search for seeds (0:30)|Forest Lily]]>><<pass 30>><<tending 6>><<set $plants_known.push("lily")>><</link>><<gtending>>
<br>
<<else>>
@@ -985,7 +985,7 @@ or $lowerwetstage gte 3 and $underlowerwetstage gte 3>>
<<elseif $forest lte 50>>
<<if _forest_item is 1>>
<<if !$plants_known.includes("red_rose")>>
- <<if $science gte 400>>
+ <<if $sciencetrait gte 2>>
<<link [[Search for seeds (0:30)|Forest Red Rose]]>><<pass 30>><<tending 6>><<set $plants_known.push("red_rose")>><<pain 6>><</link>><<gpain>><<gtending>>
<br>
<<else>>
@@ -1013,7 +1013,7 @@ or $lowerwetstage gte 3 and $underlowerwetstage gte 3>>
<<else>>
<<if _forest_item is 1>>
<<if !$plants_known.includes("orchid")>>
- <<if $science gte 500>>
+ <<if $sciencetrait gte 3>>
<<link [[Search for seeds (0:30)|Forest Orchid]]>><<pass 30>><<tending 6>><<set $plants_known.push("orchid")>><</link>><<gtending>>
<br>
<<else>>
diff --git a/game/overworld-forest/loc-lake/main.twee b/game/overworld-forest/loc-lake/main.twee
index a3640c07c542e724e6d75d05b3495685ac935849..e3ebffc1a62e2221e9e981f3f25fe66940cf448b 100644
--- a/game/overworld-forest/loc-lake/main.twee
+++ b/game/overworld-forest/loc-lake/main.twee
@@ -381,7 +381,7 @@ There's a rocky alcove where you could store your clothes.
<<if $schoolday isnot 1 and $weather is "rain" and $daystate is "day">>
Someone is swimming further out, past the dock.
<</if>>
-<<if $science gte 400 and !$plants_known.includes("lotus")>>
+<<if $sciencetrait gte 2 and !$plants_known.includes("lotus")>>
Lotus flowers float by you.
<</if>>
<br><br>
@@ -473,7 +473,7 @@ There's a rocky alcove where you could store your clothes.
<<link [[Make a skirt out of plants (0:20)|Lake Shallows]]>><<pass 20>><<set $phase to 2>><</link>>
<br>
<</if>>
- <<if $science gte 400 and !$plants_known.includes("lotus")>>
+ <<if $sciencetrait gte 2 and !$plants_known.includes("lotus")>>
<<link [[Search for seeds (0:30)|Lake Lotus]]>><<set $plants_known.push("lotus")>><<pass 30>><<tending 6>><</link>><<gtending>>
<br>
<</if>>
@@ -540,7 +540,7 @@ There's a rocky alcove where you could store your clothes.
You are stood alone on the frozen lake near the shore. The sound of the forest fills the air.
<</if>>
<</if>>
-<<if $science gte 400 and !$plants_known.includes("lotus")>>
+<<if $sciencetrait gte 2 and !$plants_known.includes("lotus")>>
You see lotus flowers trapped within the ice.
<</if>>
<br><br>
@@ -561,7 +561,7 @@ There's a rocky alcove where you could store your clothes.
<<link [[Ice skate (0:30)|Lake Skate]]>><<pass 30>><<tiredness 5>><<danceskill 5>><</link>><<gtiredness>> | <span class="green">+ Dancing Skill</span>
<br>
- <<if $science gte 400 and !$plants_known.includes("lotus")>>
+ <<if $sciencetrait gte 2 and !$plants_known.includes("lotus")>>
<<link [[Search for seeds (0:30)|Lake Lotus Ice]]>><<set $plants_known.push("lotus")>><<pass 30>><<tending 6>><</link>><<gtending>>
<br>
<</if>>
diff --git a/game/overworld-plains/loc-estate/cards.twee b/game/overworld-plains/loc-estate/cards.twee
index 5b87d7aff1cca4666617f815320b13f00ca0eff2..d70847e0dd65c2d2b72638649b1a2a428ddb2df5 100644
--- a/game/overworld-plains/loc-estate/cards.twee
+++ b/game/overworld-plains/loc-estate/cards.twee
@@ -1335,7 +1335,6 @@ Wren doesn't hesitate.
<<if $estate.cards.position is "penile">>
<<He>> pushes down on your shoulders, moving <<his>> pelvis above yours and resting <<his>> pussy against your <<penis>><<if $semen_amount gte 1>>, catching your seed.<<else>>.<</if>> Your spasms leave you helpless as <<he>> lets <<his>> weight push <<him>> down, <span class="pink">swallowing you to the base.</span>
<<if $player.virginity.penile is true>>
- <<takeVirginity "Wren" "penile">>
<span class="red">Your foreskin separates from your glans, forever robbing you of your purity.</span>
<br><br>
<<penileejacstat>>
@@ -1343,7 +1342,7 @@ Wren doesn't hesitate.
<<else>>
<<He>> gasps against your ear as you enter <<him>>. "I need this," <<he>> whispers. "Now be a good <<girl>> and hold still."
<</if>>
- <<takeNPCVirginity "Wren" "vaginal">>
+ <<takeVirginity "Wren" "penile">><<takeNPCVirginity "Wren" "vaginal">>
<br><br>
<<bruise penis>><<penilestat>><<raped>><<penisraped>>
<<if $semen_amount gte 1>>
@@ -1356,7 +1355,6 @@ Wren doesn't hesitate.
<<elseif $estate.cards.position is "vaginal">>
<<He>> grasps your <<bottom>> and lifts you, pushing your <<pussy>> against the tip of <<his>> <<print $NPCList[0].penisdesc>>. <<He>> eases you down, your spasms leaving you helpless as <<he>> <span class="pink">pushes into you,</span>
<<if $player.virginity.vaginal is true>>
- <<takeVirginity "Wren" "vaginal">>
<span class="red">tearing your hymen and forever robbing you of your purity.</span>
<br><br>
@@ -1364,7 +1362,7 @@ Wren doesn't hesitate.
<<else>>
filling you. <<He>> gasps against your ear as <<he>> enters. "I need this," <<he>> whispers. "Now be a good <<girl>> and hold still."
<</if>>
- <<takeNPCVirginity "Wren" "penile">>
+ <<takeVirginity "Wren" "vaginal">><<takeNPCVirginity "Wren" "penile">>
<br><br>
<<bruise vagina>><<vaginalstat>><<raped>><<vaginaraped>>
diff --git a/game/overworld-plains/loc-farm/main.twee b/game/overworld-plains/loc-farm/main.twee
index de0cf69c64f69dc1ec3c071064051e27fd3f24b7..5c42b70b3503e3b9f0acfdb5d27770a1c11625e1 100644
--- a/game/overworld-plains/loc-farm/main.twee
+++ b/game/overworld-plains/loc-farm/main.twee
@@ -2059,7 +2059,7 @@ Alex deflates. "My work here is useful," <<he>> says. "Or it will be. Soon."
<<link [[Agree|Farm Stage 9 Agree]]>><</link>>
<br>
-<<link [[Object|Farm Stage 9 Object]]>><</link>>
+<<link [[Object|Farm Stage 9 Object]]>><<npcincr Alex love -1>><</link>><<llove>>
<br>
diff --git a/game/overworld-plains/loc-farm/work.twee b/game/overworld-plains/loc-farm/work.twee
index f378ff51e0943e0ae96081ebb083895066398e34..1f3c1c80579893b5ddcc6d507a3429c597d39dba 100644
--- a/game/overworld-plains/loc-farm/work.twee
+++ b/game/overworld-plains/loc-farm/work.twee
@@ -636,6 +636,7 @@ You are on Alex's farm. A rustic farmhouse overlooks a yard and chicken coop. Ot
<<else>>
<<link [[Barn (0:02)|Farm Cattle Milk]]>><<pass 2>><</link>>
<</if>>
+ <br>
<</if>>
<<if $farm_stage gte 9>>
<<link [[Lab (0:01)|Farm Still]]>><<pass 1>><</link>>
diff --git a/game/overworld-town/loc-alley/park.twee b/game/overworld-town/loc-alley/park.twee
index 4e57c70a92c6f562c6a0b4d8e1a503481a8dafa7..65fe50198d17960a9b68401adcbb1afe5fea5599 100644
--- a/game/overworld-town/loc-alley/park.twee
+++ b/game/overworld-town/loc-alley/park.twee
@@ -67,7 +67,7 @@ Tulips grow in great patches near the riverbank.
<br>
<</if>>
<<if !$plants_known.includes("tulip")>>
- <<if $science gte 300>>
+ <<if $sciencetrait gte 1>>
<<link [[Search for seeds (0:30)|Park Tulip]]>><<set $plants_known.push("tulip")>><<pass 30>><<tending 6>><</link>><<gtending>>
<br>
<<else>>
diff --git a/game/overworld-town/loc-brothel/basement.twee b/game/overworld-town/loc-brothel/basement.twee
index 8cc03402b0fc068851284f4c2e43500619730758..43eb1cfcf98dc14d17bcdb0bc8c4d72ced5d063b 100644
--- a/game/overworld-town/loc-brothel/basement.twee
+++ b/game/overworld-town/loc-brothel/basement.twee
@@ -21,14 +21,8 @@
<br><br>
A sign by the stairs reads <<printmoney $brothel_basement_price>>.
<br><br>
- <<if $promiscuity gte 15>>
- <<link [[Occupy a room (0:10)|Brothel Gloryhole]]>><<pass 10>><<set $phase to 1>><</link>><<promiscuous2>>
- <br>
- <<elseif $uncomfortable.prostituting is false>>
- <br>
- The thought repulses you, but you need the money.
- <br><br>
- <<link [[Occupy a room (0:10)|Brothel Gloryhole]]>><<pass 10>><<set $desperateaction to 1>><<set $phase to 1>><</link>><<promiscuous2>>
+ <<if $promiscuity gte 55>>
+ <<link [[Occupy a room (0:10)|Brothel Gloryhole]]>><<pass 10>><<set $phase to 1>><</link>><<promiscuous4>>
<br>
<<else>>
You aren't promiscuous enough to work at the gloryholes.
diff --git a/game/overworld-town/loc-brothel/shows.twee b/game/overworld-town/loc-brothel/shows.twee
index 2f7d2cb25a39d8ac2f5f6a54d31dd0fbd5b6631d..0581e88d90f219a1d99cec279a048d8ce6861bb1 100644
--- a/game/overworld-town/loc-brothel/shows.twee
+++ b/game/overworld-town/loc-brothel/shows.twee
@@ -93,7 +93,7 @@
<<else>>
Your $farm.steed steed produces an eager neigh.
<</if>>
- You take <<bhim>> by the reins, and walk onto the bright stage. There's a table in the middle, covered with pick cushions. You can't see the audience in the dark, but you can hear their astonished and eager murmurings. It sounds packed.
+ You take <<bhim>> by the reins, and walk onto the bright stage. There's a table in the middle, covered with pink cushions. You can't see the audience in the dark, but you can hear their astonished and eager murmurings. It sounds packed.
<br><br>
"Ladies and gentlemen!" Briar announces to the audience. "Today we have a special treat. A young rider, fresh from winning a coveted trophy. It's only fitting that <<pshe>> reward the beast that gave <<phim>> victory."
diff --git a/game/overworld-town/loc-compound/main.twee b/game/overworld-town/loc-compound/main.twee
index 42abd16209aad2664bc0acd67dfd973757a88785..95380164e1c7de5eb1fd45a1744eeaad6ae714fb 100644
--- a/game/overworld-town/loc-compound/main.twee
+++ b/game/overworld-town/loc-compound/main.twee
@@ -890,7 +890,7 @@ The inside is dominated by a large lift. You see no way to operate it, but a lap
"This junk was worth bringing up," the <<person1>><<person>> says, strapping the baton to <<his>> side.
<br><br>
- "Shut it down," the <<person2>><<person>> says. "I'll let downstairs know." <<He>> unclips a radio from <<his>> side
+ "Shut it down," the <<person2>><<person>> says. "I'll let downstairs know." <<He>> unclips a radio from <<his>> side.
<br><br>
diff --git a/game/overworld-town/loc-domus-homes/work.twee b/game/overworld-town/loc-domus-homes/work.twee
index 4f57b979afa2727df1d4be686cdee1bc862359f9..d2d510f218ff880556df7916362c866801d85ac0 100644
--- a/game/overworld-town/loc-domus-homes/work.twee
+++ b/game/overworld-town/loc-domus-homes/work.twee
@@ -1347,25 +1347,25 @@ The bathroom is <<print either("small","tiny","very clean")>>.
<<pass 2 hour>>
<<if $penisexist is 1 and $vaginaexist is 1>>
<<if $fameexhibitionism gte 600>>
- One <<print either("woman","man")>> laughs as you take the stage. "You paid <<phim>> to strip?! I don't think I've ever seen <<phim>> in clothes."
+ One <<personsimple>> laughs as you take the stage. "You paid <<phim>> to strip?! I don't think I've ever seen <<phim>> in clothes."
<br><br>
"Good thing too," another adds. "Keeping that cute cock and pussy to <<pherself>> would be a tragedy."
<br><br>
<<elseif $fameexhibitionism gte 40>>
- One <<print either("woman","man")>> double-takes as you take the stage. "I'm impressed. <<pShes>> kind of famous for this."
+ One <<personsimple>> double-takes as you take the stage. "I'm impressed. <<pShes>> kind of famous for this."
<br><br>
"Not surprised," another adds, staring at your genitals. "I'd flaunt it too if I were so blessed."
<br><br>
<<else>>
- There's a murmur of excitement as they take in your genitals. One <<print either("woman","man")>> applauds. "You really know how to find interesting ones."
+ There's a murmur of excitement as they take in your genitals. One <<personsimple>> applauds. "You really know how to find interesting ones."
<br><br>
<</if>>
<<else>>
<<if $fameexhibitionism gte 600>>
- One <<print either("woman","man")>> laughs as you take the stage. "You paid <<phim>> to strip?! I don't think I've ever seen <<phim>> in clothes."
+ One <<personsimple>> laughs as you take the stage. "You paid <<phim>> to strip?! I don't think I've ever seen <<phim>> in clothes."
<br><br>
<<elseif $fameexhibitionism gte 400>>
- One <<print either("woman","man")>> double-takes as you take the stage. "I'm impressed. <<pShes>> kind of famous for this."
+ One <<personsimple>> double-takes as you take the stage. "I'm impressed. <<pShes>> kind of famous for this."
<br><br>
<</if>>
<</if>>
diff --git a/game/overworld-town/loc-home/events.twee b/game/overworld-town/loc-home/events.twee
index 0624fcfc8d6055004f4a88703c498b6f5668f02c..368b886ff4308add733569c95deb1cd85cd16c1a 100644
--- a/game/overworld-town/loc-home/events.twee
+++ b/game/overworld-town/loc-home/events.twee
@@ -934,7 +934,7 @@ You listen in on the conversation.
<<if $orphan_hope lte 0 and $watersportsdisable is "f">>
They're joking about what liquids <<nnpc_he "Robin">> may actually be selling instead. The <<person1>><<person>> laughs.
<<else>>
- They think the lemonade is tasty, and they're inspired by <<nnpc_his "Robin">> efforts. <<hope 1>><<reb 1>><<ghope>><<greb>>
+ They think the lemonade is tasty, and they're inspired by <<nnpc_his "Robin">> efforts. <<hope 1>><<ghope>>
<</if>>
<<elseif $rng gte 35>>
diff --git a/game/overworld-town/loc-park/science-project.twee b/game/overworld-town/loc-park/science-project.twee
index 82ebe1a7d62d7c99e08ebb2ca3774c75d9871829..25c885f8daae35d0a35f1489162c5ff09331c5ad 100644
--- a/game/overworld-town/loc-park/science-project.twee
+++ b/game/overworld-town/loc-park/science-project.twee
@@ -160,7 +160,7 @@ You talk with Avery over the drinks. <<He>> asks a lot of questions, but is relu
:: Park Lichen Refuse
<<set $outside to 0>><<set $location to "park">><<effects>>
-<<He>> frowns for a moment, but covers it with a smile. "Of course," <<he>> says. I'm sure you're busy. I'll see you around."
+<<He>> frowns for a moment, but covers it with a smile. "Of course," <<he>> says. "I'm sure you're busy. I'll see you around."
<br><br>
<<if $scienceproject is "ongoing">>
diff --git a/game/overworld-town/loc-pub/seduction.twee b/game/overworld-town/loc-pub/seduction.twee
index 5a3f70511d1552a03106d7a277e5b8e40975c5cf..bf0033d862c1156efb9183f8994935183394b326 100644
--- a/game/overworld-town/loc-pub/seduction.twee
+++ b/game/overworld-town/loc-pub/seduction.twee
@@ -78,7 +78,7 @@ You sit near the <<person>> and smile at <<him>>.
You can't bring yourself to drink while you know you’re with child.
<br>
<<else>>
- <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink to 2000>><</link>><span class="red">+ + Alcohol</span>
+ <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink to 2000>><</link>> | <span class="red">+ + Alcohol</span>
<br>
<</if>>
<<link [[Say goodbye|Pub]]>><<endevent>><</link>>
@@ -250,7 +250,7 @@ You lean over and whisper something into the <<persons>> ear.
<<He>> laughs. "You're an interesting one. I think you need another drink."
<br><br>
- <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>><span class="red">+ + Alcohol</span>
+ <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>> | <span class="red">+ + Alcohol</span>
<br>
<<link [[Refuse|Pub]]>><<endevent>><</link>>
<br>
@@ -450,7 +450,7 @@ You lean over and whisper something into the <<persons>> ear.
<<link [[Seduce (0:01)|Pub Seduce]]>><<pass 1>><</link>><<promiscuous2>>
<br>
<</if>>
- <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>><span class="red">+ + Alcohol</span>
+ <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>> | <span class="red">+ + Alcohol</span>
<br>
<<link [[Say goodbye|Pub]]>><<endevent>><</link>>
<br>
@@ -464,7 +464,7 @@ You lean over and whisper something into the <<persons>> ear.
<<link [[Seduce (0:01)|Pub Seduce]]>><<pass 1>><</link>><<promiscuous2>>
<br>
<</if>>
- <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>><span class="red">+ + Alcohol</span>
+ <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>> | <span class="red">+ + Alcohol</span>
<br>
<<link [[Say goodbye|Pub]]>><<endevent>><</link>>
<br>
@@ -477,7 +477,7 @@ You lean over and whisper something into the <<persons>> ear.
<<link [[Seduce (0:01)|Pub Seduce]]>><<pass 1>><</link>><<promiscuous2>>
<br>
<</if>>
- <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>><span class="red">+ + Alcohol</span>
+ <<link [[Accept (0:20)|Pub Drink]]>><<set $drunk += 200>><<pass 20>><<set $pubdrink += 2000>><</link>> | <span class="red">+ + Alcohol</span>
<br>
<<link [[Say goodbye|Pub]]>><<endevent>><</link>>
<br>
diff --git a/game/overworld-town/loc-school/main.twee b/game/overworld-town/loc-school/main.twee
index f19ce7057756643288d7ea7a23e19da2004edfa3..a1ce24cad7ab433d4f58ad36116750b1e819e382 100644
--- a/game/overworld-town/loc-school/main.twee
+++ b/game/overworld-town/loc-school/main.twee
@@ -203,7 +203,7 @@ The school gate is shut and sealed by a sturdy padlock.
<</if>>
<<if $player.gender is "m" and $changingroomstate is "empty">>
- <<femaleicon>><<link [[Girls' changing coom|School Girl Changing Room]]>><<arousal 300>><</link>><<garousal>>
+ <<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<arousal 300>><</link>><<garousal>>
<br><br>
<<elseif $player.gender is "m" and $schoolrep.crossdress gte 3>>
<<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<arousal 600>><<stress 12>><</link>><<ggarousal>>
diff --git a/game/overworld-town/loc-school/toilets.twee b/game/overworld-town/loc-school/toilets.twee
index 85583a3babf9bdf4c84f033c3b72be993b81fca0..d22997fc6050265d9d0efd5928bc9f7d94b55884 100644
--- a/game/overworld-town/loc-school/toilets.twee
+++ b/game/overworld-town/loc-school/toilets.twee
@@ -18,13 +18,8 @@ You are in the antechamber outside the school toilets.
<br><br>
<</if>>
<<if $brothel_basement_intro is 1>>
- <<if $promiscuity gte 15>>
- <<link [[Set up gloryhole in antechamber|School Gloryhole Start]]>><</link>><<promiscuous2>>
- <br><br>
- <<elseif $uncomfortable.prostituting is false>>
- The thought repulses you, but you need the money.
- <br>
- <<link [[Set up gloryhole in antechamber|School Gloryhole Start]]>><</link>><<set $desperateaction to 1>><<promiscuous2>>
+ <<if $promiscuity gte 55>>
+ <<link [[Set up gloryhole in antechamber|School Gloryhole Start]]>><</link>><<promiscuous4>>
<br><br>
<</if>>
<</if>>
diff --git a/game/overworld-town/loc-school/widgets-events.twee b/game/overworld-town/loc-school/widgets-events.twee
index 9ada05abdfd8cf9541ff12c4f51c3910f80e8517..922bd06b7dd9e016471725bac7d17ec5bcc5477d 100644
--- a/game/overworld-town/loc-school/widgets-events.twee
+++ b/game/overworld-town/loc-school/widgets-events.twee
@@ -974,7 +974,7 @@ Other students ignore what is happening, or watch in amusement.
<<playground>>
<<else>>
Some students recognise you and wave. You wave back.
- <<lstress>><<stress -12>>
+ <<lstress>><<stress -6>>
<br><br>
<<endevent>>
diff --git a/game/overworld-town/loc-school/widgets.twee b/game/overworld-town/loc-school/widgets.twee
index 0210fa61bb2847023715a878a7d6cbd8b95ca0ce..66964d6ca44b8ca3879f74c8d21e394b6a193293 100644
--- a/game/overworld-town/loc-school/widgets.twee
+++ b/game/overworld-town/loc-school/widgets.twee
@@ -1604,7 +1604,7 @@ Doren asks you to demonstrate your grammar on the whiteboard. As you walk to the
Winter begins discussing the outfit, but Robin's demeanor makes the class uncomfortable. You included. Winter cuts the demonstration short.
<br><br>
- "Please change and come with me," Winter says is a soft voice. Robin does as instructed, and follows Winter outside.
+ "Please change and come with me," Winter says in a soft voice. Robin does as instructed, and follows Winter outside.
<br><br>
Winter returns without Robin a few minutes later. The lesson continues.
diff --git a/game/overworld-town/loc-shop/stolenClothes.twee b/game/overworld-town/loc-shop/stolenClothes.twee
index f721029216183a5d7dd464527793e734267a51b8..765c2ad39e9bd52c7a20dded3ad60dd6b2f3d745 100644
--- a/game/overworld-town/loc-shop/stolenClothes.twee
+++ b/game/overworld-town/loc-shop/stolenClothes.twee
@@ -97,7 +97,7 @@ You decide to run and hide.
<<else>>
However, before being able to get past the security guard, <<he>> pulls on you hard enough for you to fall right on your ass.
<br><br>
- "You'll regret trying to run from me," <<He>> says with a grin on <<his>> face. "There aren't any cameras here."
+ "You'll regret trying to run from me," <<he>> says with a grin on <<his>> face. "There aren't any cameras here."
<br><br>
<<link [[Next|Clothing Shop Night Guard Molestation]]>><<set $molestationstart to 1>><</link>>
<</if>>
@@ -158,13 +158,13 @@ You decide to run and hide.
:: Clothing Shop Night Guard Molestation Finish
<<if $enemyhealth lte 0>>
- You're able to hurt <<him>> enough to get away, you end up running to the rooftop.
+ You're able to hurt <<him>> enough to get away. <<tearful>> you flee the shop.
<<clotheson>>
<<endcombat>>
<<link [[Roof|Commercial rooftops]]>><<endevent>><</link>>
<<elseif $enemyarousal gte $enemyarousalmax>>
<<ejaculation>>
- "Well, that was fun," <<he>> says, "But I think its time for you to leave."
+ "Well, that was fun," <<he>> says, "But I it's time for you to leave."
<<clotheson>>
<<endcombat>>
<<link [[Leave|High Street]]>><<endevent>><</link>>
diff --git a/game/overworld-town/loc-street/events.twee b/game/overworld-town/loc-street/events.twee
index eb88317f027a4068d20adac1b3e23334fc2f9023..e08edc5897b11244c03042708602782ab765dd86 100644
--- a/game/overworld-town/loc-street/events.twee
+++ b/game/overworld-town/loc-street/events.twee
@@ -2419,19 +2419,18 @@ Your cries attract the attention of the people passing by the alley's entrance.
<<neutral 1>>
<<molested>>
- <!-- save the dog npc for after combat and shift the human npcs down one index -->
- <<saveNPC 0 street_collar_dog>>
- <<set $NPCList[0] to clone($NPCList[1])>>
- <<set $NPCList[1] to clone($NPCList[2])>>
- <<clearsinglenpc 2>>
-
- <<maninit>>
- <<set $outside to 0>>
<<if $phase is 1>>
+ <!-- save the dog npc for after combat and shift the human npcs down one index -->
+ <<saveNPC 0 street_collar_dog>>
+ <<set $NPCList[0] to clone($NPCList[1])>>
+ <<set $NPCList[1] to clone($NPCList[2])>>
+ <<clearsinglenpc 2>>
+ <<maninit>>
They seem taken aback and angered by your refusal. "You need to learn your place," says the <<person2>><<person>> as <<he>> clenches <<his>> fist.
<br><br>
<<set $enemyanger += 100>>
- <<elseif $phase is 2>>
+ <<else>>
+ <<maninit>>
<</if>>
<</if>>
<<effects>>
@@ -6069,7 +6068,6 @@ Surprised by your reaction, <<he>> relaxes and mumbles "Uhmm... Yeah... just be
:: Street Bottom Endure
<<effects>>
-<<generate1>><<person1>>
You let the <<person>> grope and fondle your <<bottom>> as <<he>> pleases. <<He>> takes full advantage, and molests you for a couple of minutes. You try not to think about how it looks to passers-by.
<br><br>
diff --git a/game/overworld-town/loc-temple/garden.twee b/game/overworld-town/loc-temple/garden.twee
index 187f92168f1b110a36d3ca70321324d29bacdab3..3b7cc900d8f006ad7e0b90ebf993a1bb97c5525a 100644
--- a/game/overworld-town/loc-temple/garden.twee
+++ b/game/overworld-town/loc-temple/garden.twee
@@ -836,6 +836,7 @@ You keep low as you move between hedges, peeking around each corner before makin
Maybe they've stored some nearby out of the snow.
<</if>>
<br><br>
+<<set $rng to random(1, 100)>>
<<if $rng gte 51>><!-- Modified for Beast People -->
<<beastNEWinit 1 wolf>>
You hear something behind you.
diff --git a/game/overworld-town/special-robin/main.twee b/game/overworld-town/special-robin/main.twee
index c793ccf149bcdfaa486cac1751dc09d56c3b61c9..9fd46001e5cd25c22d264b7afbd35825e9a31068 100644
--- a/game/overworld-town/special-robin/main.twee
+++ b/game/overworld-town/special-robin/main.twee
@@ -201,7 +201,7 @@ Robin clings to you and smiles.
<</if>>
<<else>><<set _mouthful to 1>>
<<if $penisexist is 1>>
- <<set $penisuse to "othermouth">><<set $penisstate to "othermouth">>
+ <<set $penisuse to "othermouth">><<set $penisstate to "othermouth">><<takeNPCVirginity "Robin" "oral">>
<</if>>
playful. "And now," <<he>> smiles. "<<print either("I make you squeal.","You squeal.","It's your turn.","You cum.","I make you cum.","I get you off.")>>"
<br>
@@ -1903,7 +1903,7 @@ Robin clings to you and smiles.
<</if>>
<<else>><<set _mouthful to 1>>
<<if $penisexist is 1>>
- <<set $penisuse to "othermouth">><<set $penisstate to "othermouth">>
+ <<set $penisuse to "othermouth">><<set $penisstate to "othermouth">><<takeNPCVirginity "Robin" "oral">>
<</if>>
playful. "And now," <<he>> smiles. "<<print either("I make you squeal.","You squeal.","It's your turn.","You cum.","I make you cum.","I get you off.")>>"
<br>
diff --git a/game/overworld-town/special-robin/walk.twee b/game/overworld-town/special-robin/walk.twee
index d48c5a7f42903643b1c41fbcf92161ced30f8d52..957abba39f294aa88f1c934385dc4d6f650e4024 100644
--- a/game/overworld-town/special-robin/walk.twee
+++ b/game/overworld-town/special-robin/walk.twee
@@ -1471,10 +1471,6 @@ You arrive at Wolf Street just in time to see the <<nnpc_gendery "Gwylan">> disa
<br><br>
<<He>> looks about your age, with mousy hair and a hint of freckles. "I'm older than I look," <<he>> says, as if reading your mind. "I'm Gwylan," <<he>> reaches forward and shakes both your and Robin's hand. "Pleased to meet you. I sell-" <<he>> pauses. "My grand<<if $pronoun is "m">>father<<else>>mother<</if>> sells-" another pause. "I sell knick-knacks here. Things you won't find in normal shops. Even I don't know what I have in stock!" <<He>> sounds proud.
- <br><br>
-
- <<link [[Next|Robin Forest Shop 5]]>><</link>>
- <br><br>
<</if>>
<<else>>
@@ -1500,11 +1496,9 @@ You arrive at Wolf Street just in time to see the <<nnpc_gendery "Gwylan">> disa
<<set $gwylan_aborted to 0>>
<<He>> turns to you with an apologetic smile. "By the way, sorry for not saving you before, but I'm not messing with the alpha. I don't want the entire pack breaking my door down." Robin blinks, but doesn't question it.
<</if>>
- <br><br>
-
- <<link [[Next|Robin Forest Shop 5]]>><</link>>
- <br>
<</if>>
+ <br><br>
+ <<link [[Next|Robin Forest Shop 5]]>><</link>>
<<else>>
<<endevent>><<npc Gwylan>><<person1>>Gwylan greets you as you enter. "I'm glad to see you again," <<he>> says, shaking both your and Robin's hand. "Let me know if you need anything."
diff --git a/game/overworld-town/special-sydney/main.twee b/game/overworld-town/special-sydney/main.twee
index 0c31a478875788dbd8a3275bfabb6e06dd828d75..aa28cee25933d45cbb80022ad65e189103be7129 100644
--- a/game/overworld-town/special-sydney/main.twee
+++ b/game/overworld-town/special-sydney/main.twee
@@ -534,13 +534,13 @@
<<His>> hand trails down, reaching your plumage. <<His>> eyes widen. <<if $rng is 1>>"The plumage of Accipiter Gentilis Gigantus, the Giant Goshawk. I've seen these before. Somewhere."<<else>>"Th-these are..."<</if>> <<He>> looks as though <<hes>> remembered something, but the look fades quickly.
<br><br>
<<elseif $angel gte 4 and $transformationParts.angel.halo isnot "hidden">>
- <<His>> eyes widen, and you see the reflection of your halo in <<his>> <<if $sydney.glasses isnot "contacts">><<sydneyGlasses>><<else>>eyes<</if>>. <<He>> blinks and rubs <<his>> face, and the reflection is no longer there. "I thought I saw..." <<he>> shakes <<his>> head, looking<<if _sydneyStatus.includes("corrupt")>>conflicted<<else>>giddy<</if>>. <<npcincr Sydney purity 2>><<gspurity>>
+ <<His>> eyes widen, and you see the reflection of your halo in <<his>> <<if $sydney.glasses isnot "contacts">><<sydneyGlasses>><<else>>eyes<</if>>. <<He>> blinks and rubs <<his>> face, and the reflection is no longer there. "I thought I saw..." <<he>> shakes <<his>> head, looking <<if _sydneyStatus.includes("corrupt")>>conflicted<<else>>giddy<</if>>. <<npcincr Sydney purity 2>><<gspurity>>
<br><br>
<<elseif $fallenangel gte 2 and $transformationParts.fallenAngel.halo isnot "hidden">>
- <<His>> eyes widen, and you see the reflection of your broken halo in <<his>> <<if $sydney.glasses isnot "contacts">><<sydneyGlasses>><<else>>eyes<</if>>. <<He>> blinks and rubs <<his>> face, and the reflection is no longer there. "I thought I saw..." <<he>> shakes <<his>> head, looking<<if _sydneyStatus.includes("corrupt")>>guilty<<else>>saddened<</if>>. <<npcincr Sydney purity -2>><<lspurity>>
+ <<His>> eyes widen, and you see the reflection of your broken halo in <<his>> <<if $sydney.glasses isnot "contacts">><<sydneyGlasses>><<else>>eyes<</if>>. <<He>> blinks and rubs <<his>> face, and the reflection is no longer there. "I thought I saw..." <<he>> shakes <<his>> head, looking <<if _sydneyStatus.includes("corrupt")>>guilty<<else>>saddened<</if>>. <<npcincr Sydney purity -2>><<lspurity>>
<br><br>
<<elseif $demon gte 2 and $transformationParts.demon.horns isnot "hidden">>
- <<His>> eyes widen, and you see the reflection of your horns in <<his>> <<if $sydney.glasses isnot "contacts">><<sydneyGlasses>><<else>>eyes<</if>>. <<He>> blinks and rubs <<his>> face, and the reflection is no longer there. "I thought I saw..." <<he>> shakes <<his>> head, looking<<if _sydneyStatus.includes("corrupt")>>smug<<else>>distraught<</if>>. <<npcincr Sydney purity -2>><<lspurity>>
+ <<His>> eyes widen, and you see the reflection of your horns in <<his>> <<if $sydney.glasses isnot "contacts">><<sydneyGlasses>><<else>>eyes<</if>>. <<He>> blinks and rubs <<his>> face, and the reflection is no longer there. "I thought I saw..." <<he>> shakes <<his>> head, looking <<if _sydneyStatus.includes("corrupt")>>smug<<else>>distraught<</if>>. <<npcincr Sydney purity -2>><<lspurity>>
<br><br>
<<elseif $cow gte 2 and $transformationParts.cow.horns isnot "hidden">>
<<He>> stops at your horns. "I saw some props like this when unpacking at <<sydneymum>>'s new shop," <<he>> says. "I wonder what purpose they serve. I'm surprised they let you wear these here."
@@ -639,13 +639,13 @@
<<set $outside to 0>><<set $location to "school">><<schooleffects>><<effects>><<sydneyStatusCheck>>
<<if $schoolstate is "early" or $schoolstate is "morning">>
Sydney's pen trails up your arm,
- <<if !$skin.right_shoulder.writing>>
+ <<if !$skin.right_shoulder.pen>>
and <<he>> absentmindedly leaves part of <<his>> notes on your skin. Your right shoulder now reads: <<bodywriting_npc_sydney_science right_shoulder "pen">>
- <<elseif $skin.right_shoulder.writing is "pen" or $skin.right_shoulder.writing is "lipstick" or $skin.right_shoulder.writing is "mud">>
+ <<elseif $skin.right_shoulder.pen is "pen" or $skin.right_shoulder.pen is "lipstick" or $skin.right_shoulder.pen is "mud">>
and <<he>> absentmindedly leaves part of <<his>> notes on your skin, covering your <<tattoo right_shoulder>>.<<bodywriting_clear right_shoulder>> Your right shoulder now reads: <<bodywriting_npc_sydney_science right_shoulder "pen">>
- <<elseif !$skin.left_shoulder.writing>>
+ <<elseif !$skin.left_shoulder.pen>>
and <<he>> absentmindedly leaves part of <<his>> notes on your skin. Your left shoulder now reads: <<bodywriting_npc_sydney_science left_shoulder "pen">>
- <<elseif $skin.left_shoulder.writing is "pen" or $skin.left_shoulder.writing is "lipstick" or $skin.left_shoulder.writing is "mud">>
+ <<elseif $skin.left_shoulder.pen is "pen" or $skin.left_shoulder.pen is "lipstick" or $skin.left_shoulder.pen is "mud">>
and <<he>> absentmindedly leaves part of <<his>> notes on your skin, covering your <<tattoo left_shoulder>>.<<bodywriting_clear left_shoulder>> Your left shoulder now reads: <<bodywriting_npc_sydney_science left_shoulder "pen">>
<<else>>
but <<he>> only leaves a few incoherent scribbles.
@@ -654,13 +654,13 @@
You nudge <<him>> back into place, which startles <<him>> awake. <<He>> looks around, and quickly notices the pen on your skin. "S-sorry!" <<His>> face turns red, and <<he>> resumes copying <<his>> notes.
<<else>>
Sydney's pen trails up your arm,
- <<if !$skin.right_shoulder.writing>>
+ <<if !$skin.right_shoulder.pen>>
and <<he>> scribbles something on your right shoulder. It now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly right_shoulder "pen">><</if>>
- <<elseif $skin.right_shoulder.writing is "pen" or $skin.right_shoulder.writing is "lipstick" or $skin.right_shoulder.writing is "mud">>
+ <<elseif $skin.right_shoulder.pen is "pen" or $skin.right_shoulder.pen is "lipstick" or $skin.right_shoulder.pen is "mud">>
and <<he>> wipes away your <<tattoo right_shoulder>>, scribbling something of <<his>> own.<<bodywriting_clear right_shoulder>> Your right shoulder now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly right_shoulder "pen">><</if>>
- <<elseif !$skin.left_shoulder.writing>>
+ <<elseif !$skin.left_shoulder.pen>>
and <<he>> scribbles something on your left shoulder. It now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly left_shoulder "pen">><</if>>
- <<elseif $skin.left_shoulder.writing is "pen" or $skin.left_shoulder.writing is "lipstick" or $skin.left_shoulder.writing is "mud">>
+ <<elseif $skin.left_shoulder.pen is "pen" or $skin.left_shoulder.pen is "lipstick" or $skin.left_shoulder.pen is "mud">>
and <<he>> wipes away your <<tattoo left_shoulder>>, scribbling something of <<his>> own.<<bodywriting_clear left_shoulder>> Your left shoulder now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly right_shoulder "pen">><</if>>
<<else>>
but <<he>> frowns upon seeing your <<tattoo right_shoulder>>. <<He>> tries to wipe it away, but fails. "Maybe next time."
@@ -692,8 +692,10 @@ You sit back in Sydney's chair, and <<he>> <<if ["early","morning","first","seco
You and Sydney stay like that for a few minutes, before a loud bang disrupts the library. You look around, and see that Kylar has dropped a dictionary on the floor. Sydney grumbles about the noise and climbs away from you. "Sorry about that..." <<He>> returns to the counter, frowning. The other students return to what they were doing.
<br><br>
- You notice Kylar curling <<nnpc_his "Kylar">> lip at Sydney in a silent snarl. <<He>> meets your eye, before looking away.
+ You notice Kylar curling <<nnpc_his "Kylar">> lip at Sydney in a silent snarl. <<nnpc_He "Kylar">> meets your eye, before looking away.
<<stress 6>><<npcincr Kylar rage 3>><<gstress>><<ggksuspicion>>
+ <br><br>
+ <<sydneyOptions>>
<<else>>
<<pass 30>>
You and Sydney stay like that, you stroking <<his>> hair and <<him>> snoring through a smile. With how hard <<he>> works, you think <<he>> deserves this.
@@ -2878,11 +2880,11 @@ Sydney stretches and yawns.
<br>
<</if>>
<<else>>
- A pair of hands, belonging to a <<person2>><<person>>, grasp at <<person1>><<his>> face, seemingly try to grab something that isn't there. Sydney slaps away the hands instinctively.
+ A pair of hands, belonging to a <<person2>><<person>>, grasp at <<person1>><<his>> face, seemingly trying to grab something that isn't there. Sydney slaps away the hands instinctively.
<br><br>
The <<person2>><<person>> looks annoyed. "When did you stop wearing glasses? I was planning on breaking them as payback for writing on my forehead." <<He>> looks to you. "Oh, of course, you got a <<girlfriend>>. I'll get you back yet."
<br><br>
- Sydney looks perplexed, but smiles at you. "Looks like the contacts were a good idea after all. Thank you." <<He>> finishes eating. "I've got to get back to the library. Thanks for the company." <<He>> gathers <<his>> books and speedwalks out of the canteen<<if $sydneyromance is 1>>, blowing you a kiss on the way out<</if>>.
+ Sydney looks perplexed, but smiles at you. "Looks like the contacts were a good idea after all. Thank you." <<person1>><<He>> finishes eating. "I've got to get back to the library. Thanks for the company." <<He>> gathers <<his>> books and speedwalks out of the canteen<<if $sydneyromance is 1>>, blowing you a kiss on the way out<</if>>.
<br><br>
<<if $NPCName[$NPCNameList.indexOf("Kylar")].state is "active">>
Kylar watches from across the canteen.
@@ -3033,13 +3035,13 @@ You shake your head. <<He>> frowns. "Sorry, it's a bad habit." <<He>> returns to
:: Sydney Canteen Bodywriting Allow
<<sydneyStatusCheck>>
Sydney's pen trails up your arm,
-<<if !$skin.right_shoulder.writing>>
+<<if !$skin.right_shoulder.pen>>
and <<he>> scribbles something on your right shoulder. It now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly right_shoulder "pen">><</if>>
-<<elseif $skin.right_shoulder.writing is "pen" or $skin.right_shoulder.writing is "lipstick" or $skin.right_shoulder.writing is "mud">>
+<<elseif $skin.right_shoulder.pen is "pen" or $skin.right_shoulder.pen is "lipstick" or $skin.right_shoulder.pen is "mud">>
and <<he>> wipes away your <<tattoo right_shoulder>>, scribbling something of <<his>> own.<<bodywriting_clear right_shoulder>> Your right shoulder now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly right_shoulder "pen">><</if>>
-<<elseif !$skin.left_shoulder.writing>>
+<<elseif !$skin.left_shoulder.pen>>
and <<he>> scribbles something on your left shoulder. It now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly left_shoulder "pen">><</if>>
-<<elseif $skin.left_shoulder.writing is "pen" or $skin.left_shoulder.writing is "lipstick" or $skin.left_shoulder.writing is "mud">>
+<<elseif $skin.left_shoulder.pen is "pen" or $skin.left_shoulder.pen is "lipstick" or $skin.left_shoulder.pen is "mud">>
and <<he>> wipes away your <<tattoo left_shoulder>>, scribbling something of <<his>> own.<<bodywriting_clear left_shoulder>> Your left shoulder now reads: <<if $sydneyromance is 1>><<bodywriting_npc_sydney right_shoulder "pen">><<else>><<bodywriting_npc_sydney_friendly right_shoulder "pen">><</if>>
<<else>>
but <<he>> frowns upon seeing your <<tattoo right_shoulder>>. <<He>> tries to wipe it away, but fails. "Maybe next time."
@@ -3260,8 +3262,7 @@ You get on your knees and crawl under the counter.
You grin back and part <<his>> knees, <<if $pronoun is "m">>pulling down <<his>> trousers<<else>>lifting <<his>> skirt<</if>>. <<sydneyExpose>>
<<if _sydneyChastity is 1>>You can see through <<his>> chastity device that <<hes>><<else>><<Hes>><</if>> already <<if $NPCName[$NPCNameList.indexOf("Sydney")].gender is "m">>erect<<else>>dripping wet<</if>>.
- <<npcincr Sydney purity -2>><<lspurity>>
- <<promiscuity4>>
+ <<promiscuity4>><<npcincr Sydney purity -2>><<lspurity>>
<<if ["early","late"].includes($schoolstate)>>
<<He>> glances around the library, noticing how empty it is, before sliding off <<his>> chair and joining you under the counter. "Wouldn't be fair if only I got off," <<he>> whispers. <<He>> clambers over you and gently pushes you into a lying position, before getting on top of you. "But if you're that eager to taste me, I can think of something."
@@ -3628,10 +3629,10 @@ You get on your knees and crawl under the counter.
"I'm fine," Sydney sighs happily. "My <<girlfriend>> was just <<if $NPCName[$NPCNameList.indexOf("Sydney")].gender is "m">>sucking me off<<else>>eating me out<</if>> under the counter, sorry for the inconvenience."
<br><br>
- <<tearful>> you climb to your feet. There's a <<person>> standing at the counter<<if $sydneyOral.Book is 2>>, with "<span class="pink">Book Crimlax/xa&*gh=</span>" written on <<his>> forehead. You must have messed up Sydney's handwriting<</if>>. The <<person>> glances at you, then back at Sydney. <<He>> makes finger guns at you and walks away.
+ <<tearful>> you climb to your feet. There's a <<person2>><<person>> standing at the counter<<if $sydneyOral.Book is 2>>, with "<span class="pink">Book Crimlax/xa&*gh=</span>" written on <<his>> forehead. You must have messed up Sydney's handwriting<</if>>. The <<person>> glances at you, then back at Sydney. <<He>> makes finger guns at you and walks away.
<<status 1>><<gcool>>
<<else>>
- "I-I'm fine," Sydney stammers. "Just... a cold. That's all." <<He>> waves the <<personsimple>> off.
+ "I-I'm fine," Sydney stammers. "Just... a cold. That's all." <<person1>><<He>> waves the <<person2>><<personsimple>> off.
<<if $sydneyOral.Book is 2>>
"Please remember to be punctual next time!"
<<else>>
@@ -3641,6 +3642,7 @@ You get on your knees and crawl under the counter.
<<tearful>> you climb to your feet. Sydney leans against you. "That was... with so many people around... So sinful..."
<</if>>
+ <<person1>>
<<else>>
<<if !["early","late"].includes($schoolstate)>>
<<switch _sydneyStatus>>
diff --git a/game/overworld-town/special-sydney/temple.twee b/game/overworld-town/special-sydney/temple.twee
index 7174ddfbf31624e6295efb1ca5cae93d22a4461f..3105347bf5829592f25d188613f136a3f1ae3a1a 100644
--- a/game/overworld-town/special-sydney/temple.twee
+++ b/game/overworld-town/special-sydney/temple.twee
@@ -365,7 +365,7 @@ The two of you walk back to the main area of the temple. It takes some time, but
<br>
:: Temple Sydney Pray
-<<set _sydneyPray to true>><<sydneySchedule>><<sydneyStatusCheck>><<temple_effects>><<effects>><<set $corruptionEvent to 1>>
+<<set $outside to 0>><<set _sydneyPray to true>><<sydneySchedule>><<sydneyStatusCheck>><<temple_effects>><<effects>><<set $corruptionEvent to 1>>
<<switch $phase>>
<<case 2>>
You pray for salvation. Your thoughts drift to your hopes for the future, and how things could be better.
@@ -750,7 +750,7 @@ The two of you walk back to the main area of the temple. It takes some time, but
<<endevent>><<npc "Sydney">><<person1>>
<<sydneyOptions>>
-:: Sydney Pray Tell Acceptance
+:: Temple Sydney Pray Tell Acceptance
<<sydneyStatusCheck>><<sydneySchedule>><<temple_effects>><<effects>>
You smile at Sydney, and tell <<him>> that you just overcame a huge obstacle.
<br><br>
diff --git a/game/overworld-town/special-sydney/walk.twee b/game/overworld-town/special-sydney/walk.twee
index 613d5695bece9e5e9baf0042b34009ced46a991b..c08aabcf715cfae404fa63047f838cc0b8c0b8d2 100644
--- a/game/overworld-town/special-sydney/walk.twee
+++ b/game/overworld-town/special-sydney/walk.twee
@@ -810,7 +810,7 @@ You approach the shelves of folded up swimwear. You can't help but think that so
<<if _sydneyStatus.includes("corrupt")>>
<<He>> looks at it incredulously. "Sorry, but, uh... I'm a bit too... well-endowed down there for this to work." <<He>> pushes <<his>> pants against <<his>> groin. "It's a fun idea, though."
<<else>>
- <<His>> face turns brght red. "Th-that's for girls! Everyone would see my... it's too... I'm sorry, I can't."
+ <<His>> face turns bright red. "Th-that's for girls! Everyone would see my... it's too... I'm sorry, I can't."
<</if>>
<<else>>
<<if $sydneySeen.includes("swimcross")>>
@@ -842,7 +842,7 @@ You approach the shelves of folded up swimwear. You can't help but think that so
<<if _sydneyStatus.includes("corrupt")>>
<<He>> looks at it incredulously. "Sorry, but, uh... I'm a bit too... well-endowed up here for this to work." <<He>> pushes <<his>> <<print $NPCName[$NPCNameList.indexOf("Sydney")].breastsdesc>> up and lets them drop again. "It's a fun idea, though."
<<else>>
- <<His>> face turns brght red. "I can't go topless! Everyone would see my... they're too... I'm sorry, we can't."
+ <<His>> face turns bright red. "I can't go topless! Everyone would see my... they're too... I'm sorry, we can't."
<</if>>
<<else>>
<<if $sydneySeen.includes("swimcross")>>
@@ -2172,6 +2172,7 @@ You are in a small wooden changing room. You can hear Sydney in the adjacent roo
:: Sydney Leave Temple
<<set $outside to 0>><<set $location to "temple">><<set $bus to "wolf">><<effects>><<sydneyStatusCheck>>
+<<set $sydneyTempleSkip to true>>
You nod, and Sydney smiles at you. You and <<him>> walk towards Wolf Street.
<<if $sydneyromance is 1>>
<<if _sydneyStatus.includes("corrupt")>>
@@ -2205,6 +2206,7 @@ You reach the temple without incident.
:: Temple Sydney Walk
<<set $outside to 1>><<set $location to "temple">><<set $bus to "wolf">><<effects>><<sydneyStatusCheck>><<sydneySchedule>>
+<<set $sydneyTempleSkip to true>>
You nod, and Sydney smiles at you. <<He>> finishes cleaning up, and you walk to Wolf Street with <<him>>.
<<if $sydneyromance is 1>>
<<if _sydneyStatus.includes("corrupt")>>
diff --git a/game/overworld-town/special-sydney/widgets.twee b/game/overworld-town/special-sydney/widgets.twee
index 518ba57fb6051a28b79e00ff16f003886d732e30..25744e0663b91fe507beefe3757c33f515344bb1 100644
--- a/game/overworld-town/special-sydney/widgets.twee
+++ b/game/overworld-town/special-sydney/widgets.twee
@@ -209,7 +209,7 @@
<<widget "sydneyOptions">>
<<sydneySchedule>><<sydneyStatusCheck>>
-<<if $bus is "schoollibrary">>
+<<if $bus is "schoollibrary" or $location is "school">>
<<switch _sydney_location>>
<<case "library">>
<<sydneyOptionsTalk>>
@@ -258,7 +258,7 @@
<<if $detention gte 1 and $detentionattended isnot 1 and $headnodetention isnot 1 and $pillory_tenant.special.name isnot "Leighton">>
"It's closing time. The <<nnpc_title "Leighton">> said you're not allowed to leave the premises until you serve your detention at the end of the day. Sorry."
<br><br>
- <<elseif $sydneySeen.includes("mass") or $sydneySeen.includes("intiate")>>
+ <<elseif $sydneySeen.includes("mass") or $sydneySeen.includes("initiate")>>
"It's closing time. I'm off to the temple.<<if $sydneyromance is 1>> Would you... mind walking me there?<<else>> There's plenty to be done, would you like to come with me?<</if>>"
<br><br>
<<wolficon>><<link [[Go with Sydney (0:25)|Temple Sydney Walk]]>><<pass 25>><<stress -3>><<npcincr Sydney love 1>><</link>><<lstress>><<glove>>
@@ -333,6 +333,21 @@
<<link [[Next|Temple]]>><<endevent>><</link>>
<br>
<</if>>
+ <<case "shop">>
+ <<if $sydneySeen.includes("shop")>>
+ <!-- Currently Unobtainable, will be able to help set up shop in the future. -->
+ Sydney stretches. "I'm off to help set up the new shop." <<He>> gathers <<his>> things<<if $sydneyromance is 1>>, and kisses you on the cheek before leaving<</if>>.
+ <<else>>
+ Sydney stretches. "I'm off to help my <<sydneymum>> with some work." <<He>> gathers <<his>> things<<if $sydneyromance is 1>>, and kisses you on the cheek before leaving<</if>>.
+ <</if>>
+ <br><br>
+ <<link [[Next|Temple]]>><<endevent>><<set $eventskip to 1>><</link>>
+ <br>
+ <<default>>
+ Sydney stretches. "Time to get back to work. I'll be around." <<if $sydneyromance is 1>><<He>> kisses you on the cheek before leaving.<</if>>
+ <br><br>
+ <<link [[Next|Temple]]>><<endevent>><<set $eventskip to 1>><</link>>
+ <br>
<</switch>>
<</if>>
<</widget>>
@@ -520,9 +535,13 @@
<<elseif ["second", "third"].includes($schoolstate)>>
<<set _sydney_location to "class">>
<<elseif $schoolstate is "lunch" and $luncheaten isnot 1 and $minute lte 15>>
- <<set _sydney_location to "canteen">>
+ <<set _sydney_location to "canteen">>
<<elseif $hour lte 15 or ($hour is 16 and $minute lte 40)>>
- <<set _sydney_location to "library">>
+ <<if $sydneyTempleSkip>>
+ <<set _sydney_location to "temple">>
+ <<else>>
+ <<set _sydney_location to "library">>
+ <</if>>
<<elseif $hour gte 16 and $hour lte 22>>
<<set _sydney_location to "temple">>
<<else>>
@@ -641,7 +660,7 @@
<<else>>
<<if _bodywriting_exposed gte 1 and $skin[_bodypart].special is "Sydney">>
However, <<he>> stops upon seeing the <<tattoo _bodypart>> on your <<bodypart _bodypart>>. <<His>> face begins to turn a bright red. You catch <<him>> looking into your eyes, before looking away again. "B...be more courteous next time, please. You may go."
- <<elseif !$skin.forehead.writing>>
+ <<elseif !$skin.forehead.pen>>
<<He>> scribbles something on your forehead, and holds up a small pocket mirror. Your forehead now reads: <<bodywriting_npc_sydney_book forehead "marker">>
<<if $sydneyromance is 1>>
<<He>> finishes with a kiss on your forehead, pulling away with a loud "Mwah!"
@@ -650,7 +669,7 @@
Kylar stares from across the library. <<gksuspicion>><<npcincr Kylar rage 1>><<set $kylarsydneywriting to 1>>
<</if>>
<</if>>
- <<elseif $skin.forehead.writing is "pen" or $skin.forehead.writing is "lipstick" or $skin.forehead.writing is "mud">>
+ <<elseif $skin.forehead.pen is "pen" or $skin.forehead.pen is "lipstick" or $skin.forehead.pen is "mud">>
<<He>> wipes away your <<tattoo forehead>> on your forehead, and scribbles something of <<his>> own. <<bodywriting_clear forehead>> Your forehead now reads: <<bodywriting_npc_sydney_book forehead "marker">>
<<if $sydneyromance is 1>>
<<He>> finishes with a kiss on your forehead, pulling away with a loud "Mwah!"
@@ -659,7 +678,7 @@
Kylar stares from across the library. <<gksuspicion>><<npcincr Kylar rage 1>><<set $kylarsydneywriting to 1>>
<</if>>
<</if>>
- <<elseif !$skin.left_cheek.writing>>
+ <<elseif !$skin.left_cheek.pen>>
<<He>> scribbles something on your left cheek, and holds up a small pocket mirror. Your left cheek now reads: <<bodywriting_npc_sydney_book left_cheek "marker">>
<<if $sydneyromance is 1>>
<<He>> finishes with a kiss on your cheek, pulling away with a loud "Mwah!"
@@ -668,7 +687,7 @@
Kylar stares from across the library. <<gksuspicion>><<npcincr Kylar rage 1>><<set $kylarsydneywriting to 1>>
<</if>>
<</if>>
- <<elseif $skin.left_cheek.writing is "pen" or $skin.left_cheek.writing is "lipstick" or $skin.left_cheek.writing is "mud">>
+ <<elseif $skin.left_cheek.pen is "pen" or $skin.left_cheek.pen is "lipstick" or $skin.left_cheek.pen is "mud">>
<<He>> wipes away your <<tattoo left_cheek>> on your left cheek, and scribbles something of <<his>> own. <<bodywriting_clear left_cheek>> Your left cheek now reads: <<bodywriting_npc_sydney_book left_cheek "marker">>
<<if $sydneyromance is 1>>
<<He>> finishes with a kiss on your cheek, pulling away with a loud "Mwah!"
@@ -677,7 +696,7 @@
Kylar stares from across the library. <<gksuspicion>><<npcincr Kylar rage 1>><<set $kylarsydneywriting to 1>>
<</if>>
<</if>>
- <<elseif !$skin.right_cheek.writing>>
+ <<elseif !$skin.right_cheek.pen>>
<<He>> scribbles something on your right cheek, and holds up a small pocket mirror. Your right cheek now reads: <<bodywriting_npc_sydney_book right_cheek "marker">>
<<if $sydneyromance is 1>>
<<He>> finishes with a kiss on your cheek, pulling away with a loud "Mwah!"
@@ -686,7 +705,7 @@
Kylar stares from across the library. <<gksuspicion>><<npcincr Kylar rage 1>><<set $kylarsydneywriting to 1>>
<</if>>
<</if>>
- <<elseif $skin.right_cheek.writing is "pen" or $skin.right_cheek.writing is "lipstick" or $skin.right_cheek.writing is "mud">>
+ <<elseif $skin.right_cheek.pen is "pen" or $skin.right_cheek.pen is "lipstick" or $skin.right_cheek.pen is "mud">>
<<He>> wipes away your <<tattoo right_cheek>> on your right cheek, and scribbles something of <<his>> own. <<bodywriting_clear right_cheek>> Your right cheek now reads: <<bodywriting_npc_sydney_book right_cheek "marker">>
<<if $sydneyromance is 1>>
<<He>> finishes with a kiss on your cheek, pulling away with a loud "Mwah!"
diff --git a/game/special-masturbation/effects.twee b/game/special-masturbation/effects.twee
index 7752a1360a1b0df61e7012f2a954491c088d0118..11f6a0c498a12184dbf91cf43d92e25bd1ee0e7f 100644
--- a/game/special-masturbation/effects.twee
+++ b/game/special-masturbation/effects.twee
@@ -801,8 +801,8 @@ Your <<genitals 1>> aches for your touch, but there's nothing you can do.
<</if>>
<<if $vaginaaction is "mpenisflowerpenetrate">>
- <<set $vaginaactiondefault to "mpenisflowerbounce">><<set $vaginaaction to 0>><<set $vaginause to "mpenisflowerpenetrate">><<arousal 1000>><<vaginalstat>>
- You lower yourself down, allowing the plant to penetrate you, <<if $player.virginity.vaginal is true>><<takeVirginity "phallus plant" "vaginal">>you almost scream out as your vagina struggles to accommodate the plant, but the pain is gone within moments.<<vaginaraped>><<else>>you've never felt anything quite like it before.<</if>>
+ <<set $vaginaactiondefault to "mpenisflowerbounce">><<set $vaginaaction to 0>><<set $vaginause to "mpenisflowerpenetrate">><<arousal 1000>><<vaginalstat>><<vaginaraped>><<takeVirginity "phallus plant" "vaginal">>
+ You lower yourself down, allowing the plant to penetrate you, <<if $player.virginity.vaginal is true>>you almost scream out as your vagina struggles to accommodate the plant, but the pain is gone within moments.<<else>>you've never felt anything quite like it before.<</if>>
<</if>>
<<if $vaginaaction is "mpenisflowerstop">>
diff --git a/game/special-templates/main.twee b/game/special-templates/main.twee
index 560f359eab1ab1b60356eb80f96739a71b89f1c7..672a4c44dfe9a36780ed786e8152a94ce5cafa26 100644
--- a/game/special-templates/main.twee
+++ b/game/special-templates/main.twee
@@ -2,10 +2,9 @@
<<location "sea">><<effects>>
<<endcombat>>
-<<npc River>><<generates2>><<person2>>
-
-
-<<He>>
+<<generate1>><<person1>>
+<<endcombat>>
+<<generate1>><<person1>>
:: Robin
<<set $NPCName[$NPCNameList.indexOf("Robin")].love to 50>>
diff --git a/img/clothes/upper/monster/0.png b/img/clothes/upper/monster/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..145643ccbf952104de606e58b50f510ab4662cfe
Binary files /dev/null and b/img/clothes/upper/monster/0.png differ
diff --git a/img/clothes/upper/shadbelly/left cover.png b/img/clothes/upper/shadbelly/left_cover.png
similarity index 100%
rename from img/clothes/upper/shadbelly/left cover.png
rename to img/clothes/upper/shadbelly/left_cover.png
diff --git a/img/clothes/upper/shadbelly/right cover.png b/img/clothes/upper/shadbelly/right_cover.png
similarity index 100%
rename from img/clothes/upper/shadbelly/right cover.png
rename to img/clothes/upper/shadbelly/right_cover.png
diff --git a/version b/version
index 52411b99b3c6d7bce004abe0fd123b30831efaac..9184b1dc9b1e9ea94559601157ffc7c8788d3719 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.3.3.2
\ No newline at end of file
+0.3.3.4
\ No newline at end of file