diff --git a/devTools/androidsdk/image/cordova/config.xml b/devTools/androidsdk/image/cordova/config.xml
index a4c1475d04c6afd872a582dace05fba97f1a4e13..6f155cc81e2804c45f6d8930af6103c99adbf5bc 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.2.22.2"
+ version="0.2.22.4"
xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0"
android-packageName="com.vrelnir.DegreesOfLewdity"
diff --git a/devTools/androidsdk/image/cordova/package.json b/devTools/androidsdk/image/cordova/package.json
index 8bb050f1c038eff1739e2b4f0fdfda905cf4dd7a..3ffd066ede41f9e4a5d5f3a629f20cfa4d02c482 100644
--- a/devTools/androidsdk/image/cordova/package.json
+++ b/devTools/androidsdk/image/cordova/package.json
@@ -1,6 +1,6 @@
{
"name": "degrees-of-lewdity-android-app",
- "version": "0.2.22.2",
+ "version": "0.2.22.4",
"description": "This sub-project exists to build DoL as an Android app",
"main": "Degrees of Lewdity.html",
"scripts": {
diff --git a/game/01-config/start.twee b/game/01-config/start.twee
index 3f5efeb08d856704236329df85258bf3e2766023..678e0ade4842f33fa6da1576c7c82d4937ea3208 100644
--- a/game/01-config/start.twee
+++ b/game/01-config/start.twee
@@ -15,13 +15,14 @@ This work of fiction contains content of a sexual nature and is inappropriate fo
Save files are stored in your browser's cache. Save to file or text in the "Export/Import" tab in "Saves/Options" to avoid losing them.
<br><br>
+If the image on the "Feat Boosts" tab is broken, please ensure that you have properly extracted the zip file.
/*
<<if $images is 1>>
- If the image in the "Feat Boosts" tab is broken, please ensure that you have properly extracted the zip file. If you have, you may want to overwrite the "img" folder with one from a fresh download of the game.
- <br><br>
+ If you have, you may want to overwrite the "img" folder with one from a fresh download of the game.
+
<</if>>
*/
-
+<br><br>
<span class="red">The Quick Start, Character, and Feat Boosts tabs can only be accessed at the start of the game.</span> Other settings can be changed in your room.
<br><br>
diff --git a/game/01-config/sugarcubeConfig.js b/game/01-config/sugarcubeConfig.js
index 491578fce95b62183ec3764ecf40e63cdc9fd2a0..1d4ce4c9eaac50badd647b2cb02a292a98d6841d 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.2.22.2",
+ "version": "0.2.22.3",
}
config.saves.autosave = "autosave";
diff --git a/game/04-Variables/variables-versionUpdate.twee b/game/04-Variables/variables-versionUpdate.twee
index e2c743e64745b3748c09f1a94a34b0312e69608a..5f1d98301862ee41630dc2415b30f282766a5133 100644
--- a/game/04-Variables/variables-versionUpdate.twee
+++ b/game/04-Variables/variables-versionUpdate.twee
@@ -1969,5 +1969,11 @@
<<set $outbuildingBeast to "dog">>
<</if>>
+<<if $o_long_and_beautiful gt 10>>
+ <<set $o_long_and_beautiful to 10>>
+<<elseif !$hy_parent and !$hy_student and $o_long_and_beautiful is 10>>
+ <<set $o_long_and_beautiful to 9>>
+<</if>>
+
<</nobr>><</widget>>
diff --git a/game/base-combat/effects.twee b/game/base-combat/effects.twee
index 4f8a0d5ccae5c6e0d452f41e9c3020766bfb8d04..7ff22aa433b3f6bc768765b40da84a081c5467be 100644
--- a/game/base-combat/effects.twee
+++ b/game/base-combat/effects.twee
@@ -1097,7 +1097,7 @@
<<if $mouthaction is "plead">>
<<set $mouthaction to 0>>
<<if $neckuse is "hand" and $oxygen lt $oxygenmax and $asphyxiaLvl gte 2>>
- <<wheeze `"plead with <<him>>"`>>
+ <<wheeze "plead with <<him>>">>
<<else>>
<<set $mouthactiondefault to "plead">>
<<actionsplead>><<set $speechplead to 1>>
@@ -1142,7 +1142,7 @@
<<if $mouthaction is "mock">>
<<set $mouthaction to 0>>
<<if $neckuse is "hand" and $oxygen lt $oxygenmax and $asphyxiaLvl gte 2>>
- <<wheeze `'mock <<him>>'`>>
+ <<wheeze "mock <<him>>">>
<<else>>
<<set $mouthactiondefault to "mock">>
<<actionsmock>><<set $speechdemand to 1>>
@@ -2495,7 +2495,7 @@ You try to pull your head away from the penis threatening your mouth.
<<if $mouthaction is "finish">>
<<set $mouthaction to 0>>
<<if $neckuse is "hand" and $oxygen lt $oxygenmax and $asphyxiaLvl gte 2 and $gamemode isnot "soft">>
- <<wheeze `'tell <<him>> you want to stop'`>>
+ <<wheeze "tell <<him>> you want to stop">>
<<else>>
<<set $mouthactiondefault to "plead">><<brat 10>>
You tell <<him>> you've had enough and want to stop.
@@ -2527,7 +2527,7 @@ You try to pull your head away from the penis threatening your mouth.
<<if $mouthaction is "novaginal">>
<<set $mouthaction to 0>>
<<if $neckuse is "hand" and $oxygen lt $oxygenmax and $asphyxiaLvl gte 2>>
- <<wheeze `'tell <<him>> you don't want anything penetrating your vagina'`>>
+ <<wheeze "tell <<him>> you don't want anything penetrating your vagina">>
<<else>>
<<set $mouthactiondefault to "plead">><<brat 5>><<if !$gloryhole and $gamemode isnot "soft">><<seductionskillusecombat>><</if>>
<<if $player.virginity.vaginal is true>>
@@ -2557,7 +2557,7 @@ You try to pull your head away from the penis threatening your mouth.
<<if $mouthaction is "noanal">>
<<set $mouthaction to 0>>
<<if $neckuse is "hand" and $oxygen lt $oxygenmax and $asphyxiaLvl gte 2>>
- <<wheeze `'tell <<him>> you don't want anything inside your anus'`>>
+ <<wheeze "tell <<him>> you don't want anything inside your anus">>
<<else>>
<<set $mouthactiondefault to "plead">><<brat 5>><<if !$gloryhole and $gamemode isnot "soft">><<seductionskillusecombat>><</if>>
<<if $player.virginity.anal is true>>
@@ -2587,7 +2587,7 @@ You try to pull your head away from the penis threatening your mouth.
<<if $mouthaction is "nopenile">>
<<set $mouthaction to 0>>
<<if $neckuse is "hand" and $oxygen lt $oxygenmax and $asphyxiaLvl gte 2>>
- <<wheeze `'tell <<him>> you don't want your penis put inside anything'`>>
+ <<wheeze "tell <<him>> you don't want your penis put inside anything">>
<<set $mouthactiondefault to "plead">><<brat 5>><<if !$gloryhole and $gamemode isnot "soft">><<seductionskillusecombat>><</if>>
<<if $player.virginity.penile is true>>
You tell <<him>> you don't want your penis put inside anything, you are a virgin after all.
diff --git a/game/base-combat/ejaculation.twee b/game/base-combat/ejaculation.twee
index 74e47255904b5dcb2e05a4acafc0826e2d7ef0c2..1505d77431f19d73d8e40a007d2fb2b15f6521fb 100644
--- a/game/base-combat/ejaculation.twee
+++ b/game/base-combat/ejaculation.twee
@@ -1407,7 +1407,7 @@
<<switch random(1)>>
<<case 0>>
<<He>> presses down on your face as <<he>> reaches forward, pinching your nipples
- <<if $worn.upper.exposed gte 2 and $worn.under_upper.exposed gte 1>> through your <<topcomma>><</if>>
+ <<if $worn.upper.exposed gte 2 and $worn.under_upper.exposed gte 1>> through your <<top>>,<</if>>
and twisting them hard. You cry out but it is heavily muffled by <<his>> pussy and ass.
<<if $enemyno gte 2>>
<<His>> <<if $enemyno gt 2>>friends laugh<<else>>friend laughs<</if>> as <<he>> tortures you like this, before <<he>> eventually gets up off of you.
diff --git a/game/base-combat/man-combat.twee b/game/base-combat/man-combat.twee
index 3b23398788401e7ae957e4b43504cfa5a249f928..5eb0ccace5f3c3a3a58f063b777517f4119d336f 100644
--- a/game/base-combat/man-combat.twee
+++ b/game/base-combat/man-combat.twee
@@ -3598,7 +3598,7 @@
<<if $enemyarousal gte (($enemyarousalmax / 5) * 4)>>
You feel <<his>> vagina twitch and throb around your length as <<he>> fucks you.
<<elseif $enemyarousal gte (($enemyarousalmax / 5) * 2)>>
- <<He>> continues to violate your <<penis>> , using you as a sex toy.
+ <<He>> continues to violate your <<penis>>, using you as a sex toy.
<<else>>
<<He>> fucks your <<penis>>, taking as much of you into <<his>> vagina as <<he>> can.
<</if>>
diff --git a/game/base-system/settings.twee b/game/base-system/settings.twee
index 1447aa114d9d7ab314d6ac4596d56d43eeeef98a..c6d90ba34db3f5efe3c3b47e5397b96ac21fea94 100644
--- a/game/base-system/settings.twee
+++ b/game/base-system/settings.twee
@@ -245,7 +245,7 @@
monsters:{"When Hallucinating":"monstersDefault", "No Monsters":"monstersNone", "All Monsters":"monstersAll"},
kink:{"Reasonably Debauched":"kinkDefault", "Vanilla":"kinkVanilla", "No Beasts":"kinkNoBeasts", "Everything Goes":"kinkEverything"},
game:{
- "Normal ":"gameNormal","Soft (No Feats)":"gameSoft","Hard":"gameHard","Masochist":"gameMasochist","Journalist (No Feats)":"gameSoftCheats","Normal with Cheats (No Feats)":"gameNormalCheats","Hard with Cheats (No Feats)":"gameHardCheats","Masochist with Cheats (No Feats)":"gameMasochistCheats"
+ "Normal ":"gameNormal","Soft (No Feats)":"gameSoft","Hard":"gameHard","Masochist":"gameMasochist","Soft with Cheats (No Feats)":"gameSoftCheats","Normal with Cheats (No Feats)":"gameNormalCheats","Hard with Cheats (No Feats)":"gameHardCheats","Masochist with Cheats (No Feats)":"gameMasochistCheats"
},
images:{"Default":"imagesdefault","High Quality":"imagesHigh","Low Quality":"imagesLow","Performance Mode":"imagesPerformance","Disable images":"imagesDisable"},
settings:{"PC, Tips":"settingPCTip","PC, no Tips":"settingPCNoTip","Mobile, Tips":"settingMobileTips","Mobile, no Tips":"settingMobileNoTips"},
diff --git a/game/overworld-forest/loc-asylum/events.twee b/game/overworld-forest/loc-asylum/events.twee
index 520739c93ab817481b94482d35f901450b2b14d3..e5a150af57c7acbdee5f3e24ac61b7817e351a31 100644
--- a/game/overworld-forest/loc-asylum/events.twee
+++ b/game/overworld-forest/loc-asylum/events.twee
@@ -207,7 +207,7 @@ You refuse to press the button.<br>
<<set $outside to 0>><<set $location to "asylum">><<asylumeffects>><<effects>>
Harper shakes <<his>> head. "I'm disappointed. You can go."
<br><br>
-The long-haired girl's eyes seem to follow you as you leave.<<set $o_long_and_beautiful += 1>>
+The long-haired girl's eyes seem to follow you as you leave.<<if $o_long_and_beautiful lt 9>><<set $o_long_and_beautiful += 1>><</if>>
<br><br>
<<endevent>>
<<link [[Next|Asylum]]>><</link>>
diff --git a/game/overworld-forest/loc-asylum/main.twee b/game/overworld-forest/loc-asylum/main.twee
index 07d06cd64822c4e202d3b094208235f3c9625e98..839ed28bac2e6a4bb21aa2e86e38c495a6729fff 100644
--- a/game/overworld-forest/loc-asylum/main.twee
+++ b/game/overworld-forest/loc-asylum/main.twee
@@ -625,7 +625,7 @@ You chat with the other patients.
<<print either("living in some future supercomputer's artificial reality","NPCs in someone else's game","characters in a book","ghosts who don't realise we've died","katra passing through the infinite cycle of death and rebirth")>>
- but no-one recognises the truth."
<</if>>
-<<elseif $o_long_and_beautiful gte 8 and $o_long_and_beautiful lte 9>> /* aprox 1/3 chance once right stage is reached. */
+<<elseif $o_long_and_beautiful gte 8 and $o_long_and_beautiful lte 9 and $hy_sibling and $hy_parent>> /* aprox 1/3 chance once right stage is reached. */
<<generate2>><<set $NPCList[0] to clone($hy_sibling)>><<set $NPCList[1] to clone($hy_parent)>><<person1>>
Everyone seems phased out today. No one is talking. As you slump into a chair trying to figure out what to do next,
a voice behind you starts singing an upbeat pop song from a year or so ago. <span class="teal">It sounds familiar.</span>
@@ -1159,7 +1159,7 @@ You strip slowly, just fast enough to keep the orderlies at bay. By the time you
<<set $outside to 0>><<set $location to "asylum">><<asylumeffects>><<effects>>
<<pass 25>>
Completely naked, you sit for a time with the slim, long haired girl. You don't touch her, you just keep quietly talking to her.
-<<if $english gte 500>>After a time, you notice her looking at you. Your eloquence seems to be getting through.<<set $o_long_and_beautiful += 1>>
+<<if $english gte 500>>After a time, you notice her looking at you. Your eloquence seems to be getting through.<<if $o_long_and_beautiful lt 9>><<set $o_long_and_beautiful += 1>><</if>>
<<else>>After a time, she seems to come round.
<</if>><br><br>
@@ -1595,9 +1595,9 @@ Each patient is given a bed of soil to work as they please. Many are untended, b
<<link [[Search for seeds (0:30)|Asylum Garden Seeds]]>><<set $plants_known.push("poppy")>><<pass 30>><</link>>
<br>
<<elseif $rng % 4 == 0 and $o_long_and_beautiful gte 1 and $o_long_and_beautiful lte 7>>/*1 in 4 chance if in right stage*/
- <<set $o_long_and_beautiful += 1>><br>
+ <<if $o_long_and_beautiful lt 9>><<set $o_long_and_beautiful += 1>><</if>><br>
A girl with long, messy, matted hair seems to be watching from a plot nearby.
- <<if $tending gte 600>>She might be impressed by your tending skills. It's hard to tell.<<set $o_long_and_beautiful += 1>><</if>>
+ <<if $tending gte 600>>She might be impressed by your tending skills. It's hard to tell.<<if $o_long_and_beautiful lt 9>><<set $o_long_and_beautiful += 1>><</if>><</if>>
<</if>>
<br>
diff --git a/game/overworld-forest/loc-wolfpack/events.twee b/game/overworld-forest/loc-wolfpack/events.twee
index cfd9b36281508627a802fecc9c33b2ff201e66d8..5082df988f55b43e87f9b333bc9a11aac4942b05 100644
--- a/game/overworld-forest/loc-wolfpack/events.twee
+++ b/game/overworld-forest/loc-wolfpack/events.twee
@@ -6,7 +6,7 @@
<<neutral 1>>
<<beastCombatInit>>
-You shift your body to make things easier for the horny wolf.
+You shift your body to make things easier for the horny <<beasttype>>.
<<deviancy1>><<set $enemytrust -= 20>>
<<if $wolfpackharmony gte 1>>
<<set $rescue to 1>>
@@ -134,31 +134,43 @@ The <<beasttype>> yawns and lies down.
<<if $phase is 0>>
-You stroke the low ranking <<print $combatTrain.beastTypes[0]>>, and its ears perk up. The more dominant <<print $combatTrain.beastTypes[1]>> growls, but doesn't press it.
+You stroke the low ranking <<beasttype 0>>, and its ears perk up. The more dominant <<beasttype 1>> growls, but doesn't press it.
<<gharmony>><<lferocity>><<deviancy1>>
+<<endevent>>
+<<loadNPC 0 wolf_rank_1>>
+<<clearNPC wolf_rank_1>>
+<<clearNPC wolf_rank_2>>
+
<<link [[Next|Wolf Cave Fight]]>><<set $sexstart to 1>><</link>>
<br>
<<elseif $phase is 1>>
-You stroke the high ranking <<print $combatTrain.beastTypes[1]>>. The less dominant <<print $combatTrain.beastTypes[0]>> walks away with its tail down.
+You stroke the high ranking <<beasttype 1>>. The less dominant <<beasttype 0>> walks away with its tail down.
<<lharmony>><<gferocity>><<deviancy1>>
+<<endevent>>
+<<loadNPC 0 wolf_rank_2>>
+<<clearNPC wolf_rank_1>>
+<<clearNPC wolf_rank_2>>
<<link [[Next|Wolf Cave Fight]]>><<set $sexstart to 1>><</link>>
<br>
<<elseif $phase is 2>>
-You stroke both of them. The dominant <<print $combatTrain.beastTypes[1]>> seems less pleased, but doesn't cause a fuss. It insists it takes you first.
+You stroke both of them. The dominant <<beasttype 1>> seems less pleased, but doesn't cause a fuss. It insists it takes you first.
<<gharmony>><<gferocity>><<deviancy2>>
+<<clearNPC wolf_rank_1>>
+<<clearNPC wolf_rank_2>>
+
<<link [[Next|Wolf Cave Fight Duo]]>><<set $sexstart to 1>><</link>>
<br>
<<else>>
-You turn away from them both. The more dominant <<print $combatTrain.beastTypes[1]>> growls, but doesn't press it.
+You turn away from them both. The more dominant <<beasttype 1>> growls, but doesn't press it.
<br><br>
<<endevent>>
@@ -561,6 +573,7 @@ You play fight with the young <<beasttype>>. <<bHe>> bites your arm and tries to
<<consensual>>
<<set $consensual to 1>>
<<neutral 1>>
+ <<beastCombatInit>>
<<beastTrainGenerate>>
diff --git a/game/overworld-forest/loc-wolfpack/widgets.twee b/game/overworld-forest/loc-wolfpack/widgets.twee
index e98960943716024ab7029614f81e9cbf49700829..f9d7e93799a2cbd94cecb3705561b8dd235a7132 100644
--- a/game/overworld-forest/loc-wolfpack/widgets.twee
+++ b/game/overworld-forest/loc-wolfpack/widgets.twee
@@ -83,10 +83,11 @@
<<destinationwolfcave>>
<<elseif $rng gte 41>>
- <<beastNEWinit 1 wolf>>
+ <<beastNEWinit 2 wolf>>
A low ranking <<print $combatTrain.beastTypes[0]>> approaches you wishing to mate. A more dominant <<print $combatTrain.beastTypes[1]>> tries to steal your attention.
<br><br>
-
+ <<saveNPC 0 wolf_rank_1>>
+ <<saveNPC 0 wolf_rank_2>>
<<link [[Favour the low ranking wolf|Wolf Cave Rank]]>><<set $phase to 0>><</link>><<deviant1>>
<br>
<<link [[Favour the high ranking wolf|Wolf Cave Rank]]>><<set $phase to 1>><</link>><<deviant1>>
diff --git a/game/overworld-plains/loc-livestock/jobs.twee b/game/overworld-plains/loc-livestock/jobs.twee
index 8bf9f8d21dc373ba4fd424bfa336e1640d572a96..12653fcca70e47761382a9621dc3c6412b8b586f 100644
--- a/game/overworld-plains/loc-livestock/jobs.twee
+++ b/game/overworld-plains/loc-livestock/jobs.twee
@@ -1426,7 +1426,7 @@ Niki interrupts. "It's alright. I got what I needed. We're ready for the proper
Despite restraining you in a mating posture, <span class="green">the <<if $farm_phase is 1>>pigs do<<else>>pig does<</if>> nothing.</span> <<if $farm_phase is 1>>They<<else>>It<</if>> saw your aggression, and <<if $farm_phase is 1>>are<<else>>is<</if>> afraid of provoking you. No amount of Remy's discipline can convince <<if $farm_phase is 1>>them<<else>>it<</if>> otherwise.
<br><br>
- Niki shakes <<endevent>><<npc Niki>><<person1>><<his>> head. "We need them to cooperate," <<he>> says. "Perhaps another day."
+ Niki shakes <<nnpc_his "Niki">> head. "We need them to cooperate," <<nnpc_he "Niki">> says. "Perhaps another day."
<br><br>
Remy takes your leash and pulls you from the barn as the farmhands help Niki dismantle the set.
@@ -1444,7 +1444,7 @@ Niki interrupts. "It's alright. I got what I needed. We're ready for the proper
They restrain you in a mating posture until you get the<<if $farm_phase is 1>> first<</if>> pig's attention.
<br><br>
- <<endevent>>
+
<<if $farm_phase is 1>>
<<link [[Next|Livestock Job Pig Gang Rape]]>><<set $molestationstart to 1>><</link>>
<<else>>
@@ -1457,7 +1457,7 @@ Niki interrupts. "It's alright. I got what I needed. We're ready for the proper
:: Livestock Job Pig Plead [nobr]
<<effects>>
-<<endevent>><<npc Niki>><<person1>>
+
<<if $worn.face.type.includes("gag")>>
You try to plead with Niki, though you can't do much than make noises into your $worn.face.name.
<<elseif $submissive gte 1150>>
@@ -1467,16 +1467,17 @@ Niki interrupts. "It's alright. I got what I needed. We're ready for the proper
<<else>>
"Please help me," you say Niki. "This is wrong."
<</if>>
-<<His>> eyes make contact with yours, but <<he>> looks away. <<He>> doesn't look again.
-<br><br>
+<<nnpc_His "Niki">> eyes make contact with yours, but <<nnpc_he "Niki">> looks away.
+
<<if $NPCName[$NPCNameList.indexOf("Niki")].love gte 30>>
+ <br><br>
<<pass 60>>
Niki finishes setting up, <span class="green">but seems to be having problems.</span>
<br><br>
- "It's no use," <<he>> says. "Equipment's faulty. We need to call it off." <<He>> glances at you again.
+ "It's no use," <<nnpc_he "Niki">> says. "Equipment's faulty. We need to call it off." <<nnpc_He "Niki">> glances at you again.
<<llove>><<npcincr Niki love -1>>
<br><br>
@@ -1489,12 +1490,14 @@ Niki interrupts. "It's alright. I got what I needed. We're ready for the proper
<<link [[Next|Livestock Job Resist End]]>><<endevent>><</link>>
<br>
<<else>>
+ <<nnpc_He "Niki">> doesn't look again.
+ <br><br>
<<pass 60>>
- Niki finishes setting up. <span class="red"><<He>> sticks <<his>> thumb out, giving the go-ahead.</span> Remy leads you to the mat. That's all the prompting the<<if $farm_phase is 1>> first<</if>> pig needs.
+ Niki finishes setting up. <span class="red"><<nnpc_He "Niki">> sticks <<nnpc_his "Niki">> thumb out, giving the go-ahead.</span> Remy leads you to the mat. That's all the prompting the<<if $farm_phase is 1>> first<</if>> pig needs.
<br><br>
- <<endevent>>
+
<<if $farm_phase is 1>>
<<link [[Next|Livestock Job Pig Gang Rape]]>><<set $molestationstart to 1>><</link>>
<<else>>
diff --git a/game/overworld-plains/loc-moor/events.twee b/game/overworld-plains/loc-moor/events.twee
index 531543684ee631e06f92c61cc06d334047d6d6f8..0d8031f561561a4e96a388f437c674b0c3e80c0e 100644
--- a/game/overworld-plains/loc-moor/events.twee
+++ b/game/overworld-plains/loc-moor/events.twee
@@ -1118,7 +1118,7 @@ You leave your clothes lying beneath an overhanging outcrop, and slip into the w
You pull the wild carrots from the ground,
<<if $tending gte random(300, 600)>>
<span class="green">and have soon gathered a large number of saleable specimens.</span>
- <<tending_pick wild_carrot 50 250>>
+ <<tending_pick wild_carrot 20 50>>
<br><br>
<<if !$plants_known.includes("wild_carrot")>>
@@ -1142,7 +1142,7 @@ You pull the wild carrots from the ground,
You pull the onions from the ground,
<<if $tending gte random(300, 600)>>
<span class="green">and have soon gathered a large number of saleable specimens.</span>
- <<tending_pick onion 35 200>>
+ <<tending_pick onion 15 40>>
<br><br>
<<if !$plants_known.includes("onion")>>
@@ -1166,7 +1166,7 @@ You pull the onions from the ground,
You pull the garlic bulbs from the ground,
<<if $tending gte random(300, 600)>>
<span class="green">and have soon gathered a large number of saleable specimens.</span>
- <<tending_pick garlic_bulb 50 250>>
+ <<tending_pick garlic_bulb 30 50>>
<br><br>
<<if !$plants_known.includes("garlic_bulb")>>
diff --git a/game/overworld-plains/loc-moor/widgets.twee b/game/overworld-plains/loc-moor/widgets.twee
index 1e550e665a3ba4979164c3ac1400066fe4325d00..742f3767ad1657fc66f5ceea0b0c0c26f9645246 100644
--- a/game/overworld-plains/loc-moor/widgets.twee
+++ b/game/overworld-plains/loc-moor/widgets.twee
@@ -189,7 +189,7 @@
The hair stands on the back of your neck. Your turn and face a pair of yellow eyes as a <<if $monster isnot 1>>large <</if>><<beasttype>> sprints towards you.
<br><br>
- <<link [[Next|Moor Cat]]>><<endevent>><<set $molestationstart to 1>><</link>>
+ <<link [[Next|Moor Cat]]>><<set $molestationstart to 1>><</link>>
<br>
<<case 2>>
diff --git a/game/overworld-town/loc-brothel/shows.twee b/game/overworld-town/loc-brothel/shows.twee
index a545179555ba6a48939f6c7243200707178e6575..a093d82e45f990be59b7a6486ea198748c0d2894 100644
--- a/game/overworld-town/loc-brothel/shows.twee
+++ b/game/overworld-town/loc-brothel/shows.twee
@@ -37,11 +37,12 @@
<<set $brothelshow to "none">><<set $brothelshowdone to 1>>
Briar turns to you. "We're all set and ready. Just waiting for the star." The cage beside <<him>> shakes. "The beast is a bit worked up, but I'm sure you can handle it." You walk onto the stage. A single white light turns on above you, and the din of the dark room falls quiet. You can't see beyond the edge of the stage, but you can feel the eyes on you.
<br><br>
+ <<endevent>>
<<beastNEWinit 1 pig>>
"Ladies and gentlemen!" Briar's voice rings throughout the room. "We have a special treat for you today. The tale of a <<girl>> lost in the woods, attacked by a ravenous beast!" You hear the cage open, and the <<beasttype>> walks onto the stage. A leash is attached to <<bhis>> neck and trails behind the set. It has slack enough to reach you. The audience cheers it on.
<<deviancy5>>
<br><br>
- <<endevent>>
+
<<link [[Next|Brothel Show Pig]]>><<set $sexstart to 1>><</link>>
<br>
<<elseif $brothelshow is "swarm">>
diff --git a/game/overworld-town/loc-danube-homes/skulduggery.twee b/game/overworld-town/loc-danube-homes/skulduggery.twee
index d4042fb1d07e2f7a2fdb9da9735f12ad0a80b8f0..efce1ccceaa877ff621a4c54b9d9d0a7cce0079e 100644
--- a/game/overworld-town/loc-danube-homes/skulduggery.twee
+++ b/game/overworld-town/loc-danube-homes/skulduggery.twee
@@ -335,6 +335,7 @@ With a little luck, they will take a while to notice you were ever there.
<<consensual>>
<<set $consensual to 1>>
<<neutral 1>>
+ <<beastCombatInit>>
<<set $enemytrust -= 40>>
You drop to the ground and adopt a mating posture. The <<beasttype 0>> raises <<bhis 0>> head and stares at you. <<bHe 0>> paces closer.
diff --git a/game/overworld-town/loc-domus-homes/work.twee b/game/overworld-town/loc-domus-homes/work.twee
index 882d1384054d782f202db43f06e4703f7b23f83f..624969a4f4f7f4241f32e91a1fcb6ae69aa171f5 100644
--- a/game/overworld-town/loc-domus-homes/work.twee
+++ b/game/overworld-town/loc-domus-homes/work.twee
@@ -1294,7 +1294,7 @@ The chain breaks free from its mooring, and the <<beasttype>> leaps towards you.
<br>
<<else>>
-
+<<endevent>>
You turn back to the door.
<br><br>
@@ -1306,7 +1306,7 @@ You turn back to the door.
<br>
<</if>>
-<<endevent>>
+
:: Domus House Ignore [nobr]
<<set $outside to 0>><<set $location to "town">><<effects>>
diff --git a/game/overworld-town/loc-school/widgets-events.twee b/game/overworld-town/loc-school/widgets-events.twee
index 8dfad7aec2a6361d409ecbdc76e903e27eca7724..9a5614d4af82bcca058c0b2fece5995ea925a6c5 100644
--- a/game/overworld-town/loc-school/widgets-events.twee
+++ b/game/overworld-town/loc-school/widgets-events.twee
@@ -179,9 +179,10 @@
<<if $cat gte 6>>
<<link [[Hiss|School Toilets Hiss]]>><</link>><<cat>>
<br>
+ <</if>>
<<link [[Fight|School Toilets Cat]]>><<set $molestationstart to 1>><</link>>
<br>
- <</if>>
+
<</if>>
<</nobr>><</widget>>
diff --git a/game/overworld-town/loc-shop/cosmetics.twee b/game/overworld-town/loc-shop/cosmetics.twee
index 2e2e7031b160916dd9752686380f48088ec59be2..dff697739f251861acea299e0745bce6f31e1a81 100644
--- a/game/overworld-town/loc-shop/cosmetics.twee
+++ b/game/overworld-town/loc-shop/cosmetics.twee
@@ -22,10 +22,10 @@
You are in the cosmetics store. Several shelvings stand before you, filled with all kinds of colourful tubes, jars and boxes.
<br><br>
-<<link [[Take a look at lipsticks|Cosmetics Lipstick]]>><</link>><br>
-<<link [[Take a look at eye shadows|Cosmetics Eyeshadow]]>><</link>><br>
-<<link [[Take a look at mascaras|Cosmetics Mascara]]>><</link>><br>
-<<link [[Take a look at hair dyes|Cosmetics Dyes]]>><</link>><br>
+<<link [[Look at lipsticks|Cosmetics Lipstick]]>><</link>><br>
+<<link [[Look at eye shadows|Cosmetics Eyeshadow]]>><</link>><br>
+<<link [[Look at mascaras|Cosmetics Mascara]]>><</link>><br>
+<<link [[Look at hair dyes|Cosmetics Dyes]]>><</link>><br>
<<link [[Leave|Shopping Centre Top]]>><</link>>
:: Cosmetics Lipstick [nobr]
diff --git a/game/overworld-town/loc-shop/hairDressers.twee b/game/overworld-town/loc-shop/hairDressers.twee
index c1a7cef31d5b10497ecad0734fc641c35fe3da44..b009ff7311af5281a54fc8f511f7871f572ad78d 100644
--- a/game/overworld-town/loc-shop/hairDressers.twee
+++ b/game/overworld-town/loc-shop/hairDressers.twee
@@ -68,6 +68,7 @@ Eyebrows dye: £20"
<<set $hairOption to $hairlength>>
<<set $fringeOption to $fringelength>>
<<set $dyeOption to "noChange">>
+<<set $browsDyeOption to "noChange">>
<div id="currentCost" class="gold">
To pay: £0
</div>
@@ -204,7 +205,7 @@ You hand over the money and <<he>> gets to work.
<</listbox>>
<br><br>
<<elseif $hairlength gt 100>>
- Not enough money to cut your hair.
+ You don't have enough money to cut your hair.
<br><br>
<</if>>
@@ -225,8 +226,8 @@ You hand over the money and <<he>> gets to work.
<</listbox>>
<br><br>
<<elseif $fringelength gte 100>>
- Not enough money to cut your fringe.
- <br><br><br>
+ You don't have enough money to cut your fringe.
+ <br><br>
<</if>>
<<set _dyeNames to ["Red","Jet black", "Black", "Blond", "Soft Blond", "Platinum blond", "Golden", "Ashy blond", "Strawberry blond", "Dark Brown", "Soft brown", "Brown", "Light brown", "Burnt Orange", "Ginger", "Blood Orange", "Blue", "Deep Blue", "Neon Blue", "Green", "Dark Lime", "Toxic Green", "Teal", "Pink", "Bright Pink", "Hot pink", "Soft pink", "Crimson", "Purple", "Medium Purple", "Bright Purple", "White", "Snow white"]>>
@@ -264,6 +265,9 @@ You hand over the money and <<he>> gets to work.
<<else>>
<br><br>
<</if>>
+<<else>>
+ You don't have enough money to dye your hair.
+ <br><br>
<</if>>
<<if $money gte _currentCost + 1000 or $browsDyeOption isnot "noChange">>
@@ -298,6 +302,9 @@ You hand over the money and <<he>> gets to work.
<<else>>
<br><br>
<</if>>
+<<else>>
+ You don't have enough money to dye your brow.
+ <br><br>
<</if>>
<<if _currentCost gt 0>>
diff --git a/game/overworld-town/loc-street/bondage-widgets.twee b/game/overworld-town/loc-street/bondage-widgets.twee
index b7884eb5a2760882fbc6ce969f696670c91b0493..b0cc6e2ed982c9e59d5e7f5d4d01f6abe74f09b6 100644
--- a/game/overworld-town/loc-street/bondage-widgets.twee
+++ b/game/overworld-town/loc-street/bondage-widgets.twee
@@ -367,7 +367,7 @@
<<elseif $rng gte 31>>
<!-- Modified for Beast People -->
<<beastNEWinit 3 dog>>
- <<generate1>><<person1>>
+ <<generate4>><<person4>>
You hear several <<beastsplural>> barking. They're approaching fast, and soon surround you.
<br><br>
@@ -376,7 +376,6 @@
One of the <<beastsplural>> pushes you to the ground.
<br><br>
- <<endevent>>
<<link [[Next|Bondage Three Dogs Rape]]>><<set $molestationstart to 1>><</link>>
<br>
<!--
diff --git a/game/special-masturbation/main.twee b/game/special-masturbation/main.twee
index 68d0daa52b8a58d7b1347dc702239ce1e8900538..f6823a759c90babc992a4a722895eecc5582cf5f 100644
--- a/game/special-masturbation/main.twee
+++ b/game/special-masturbation/main.twee
@@ -1120,7 +1120,7 @@ Still flushed from your play, you sprawl yourself across your desk. You fix a <<
<<npc River>><<person1>>
River soon comes to and looks around with bleary eyes. <<He>> fixes you with a gaze, but doesn't say anything. <<He>> climbs to <<his>> feet and continues the lesson as if nothing happened.
<br><br>
-<<link [[Next|Maths Lesson Daydream]]>><</link>>
+<<link [[Next|Maths Lesson Daydream]]>><<endevent>><</link>>
:: English Rub [nobr]
diff --git a/game/special-templates/main.twee b/game/special-templates/main.twee
index 38a9ffa5cd9510cac63836b9e6922c74d52b9e51..0099ce332299779ae93d1402ca1cbb76f425fed6 100644
--- a/game/special-templates/main.twee
+++ b/game/special-templates/main.twee
@@ -2,8 +2,8 @@
<<set $location to "underground">><<set $outside to 1>><<effects>>
<<endcombat>>
-
-<<set $spraymax += 1>><<set $spray += 1>>
+<<link [[Sea Vore]]>><<set $molestationstart to 1>><</link>>
+<br>
:: Test2 [nobr]