From d27b10633100eb6ce6e08fb6996c4bb3ce5cd32b Mon Sep 17 00:00:00 2001
From: Crimson Tide <literallyjustrandomletters@gmail.com>
Date: Thu, 20 Oct 2022 19:00:51 +0000
Subject: [PATCH] Brothel tentacles and painful tentacles
---
game/base-combat/tentacles/tentacle-adv.twee | 92 +++++++++------
game/base-combat/tentacles/tentacles.twee | 11 +-
game/overworld-town/loc-brothel/main.twee | 12 ++
game/overworld-town/loc-brothel/shows.twee | 114 +++++++++++++++++++
4 files changed, 190 insertions(+), 39 deletions(-)
diff --git a/game/base-combat/tentacles/tentacle-adv.twee b/game/base-combat/tentacles/tentacle-adv.twee
index e4076b3ef5..26328a761f 100644
--- a/game/base-combat/tentacles/tentacle-adv.twee
+++ b/game/base-combat/tentacles/tentacle-adv.twee
@@ -146,9 +146,10 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $chestuse is 0>>
moves away from your <<breasts>>
<<set _tentacle.head to 0>>
- <<else>>
- then<<if _tentacle.shaft is "breasts">> <<slithers>><</if>> up between your <<breasts>>, rubbing itself between them.
+ <<else>>
+ then<<if _tentacle.shaft is "breasts">> <<slithers>><</if>> up between your <<breasts>>, rubbing itself between them.
<<neutralbreast 2>>
+ <<tentacle_skin "breasts">>
<</if>>
<br>
<</if>>
@@ -158,6 +159,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $ejactrait gte 1>>
The sensation of the thick liquid flowing down your throat makes you shiver.
<</if>>
+ <<tentacle_skin "mouth">>
<br>
<<purity -1>><<internalejac>><<sex 5>>
<<if _fluid is "nectar">><<nectarfed 5>><<else>><<drugs 3>><</if>><<bodyliquid "mouth" _fluid>>
@@ -172,6 +174,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if _tentacle.head is "mouth">>
and continues thrusting into your mouth.<span class="pink"> The tip opens and begins oozing a sweet _fluid.</span>
+ <<tentacle_skin "mouth">>
<br>
<<purity -1>><<internalejac>><<sex 5>>
<<set $mouthstate to "tentacledeep">><<set _tentacle.head to "mouthdeep">>
@@ -204,6 +207,7 @@ _The _tentacle.fullDesc writhes between your feet.
<span class="pink"> and thrusts between your lips.</span>
<</switch>>
<</if>>
+ <<tentacle_skin "mouth">>
<br>
<<set $mouthstate to "tentacle">><<set _tentacle.head to "mouth">><<sex 5>><<raped>><<oralstat>>
<</if>>
@@ -224,6 +228,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if _tentacle.head is "vaginadeep">>
and <<slithers>> into your <<pussy>> where it pumps a viscous _fluid at the apex of each thrust.
+ <<tentacle_skin "vagina">>
<br>
<<purity -1>><<internalejac>><<sex 5>>
<<drugs 3>><<bodyliquid "vagina" _fluid>><<pain $vaginalPain>>
@@ -238,6 +243,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if _tentacle.head is "vagina">>
and continues thrusting into your <<pussy>>.<span class="pink"> The tip opens and begins oozing a viscous _fluid.</span>
+ <<tentacle_skin "vagina">>
<br>
<<purity -1>><<internalejac>>
<<set $vaginastate to "tentacledeep">><<set _tentacle.head to "vaginadeep">><<pain $vaginalPain>>
@@ -270,6 +276,7 @@ _The _tentacle.fullDesc writhes between your feet.
<span class="pink"> and thrusts into your <<pussy>>.</span>
<</switch>>
<</if>>
+ <<tentacle_skin "vagina">>
<br>
<<takeVirginity `$abomination is 1 ? $NPCList[0].fullDescription + "'s " + _tentacle.fullDesc : _tentacle.fullDesc` "vaginal">>
<<set $vaginastate to "tentacle">><<set _tentacle.head to "vagina">><<sex 5>><<raped>><<vaginaraped>><<vaginalstat>><<violence 1>><<pain $vaginalPain>>
@@ -286,14 +293,14 @@ _The _tentacle.fullDesc writhes between your feet.
<<else>>
and presses against your <<pussy>>, <span class="blue">but fails to gain purchase.</span>
<<sex 5>>
- <<if random(1, 3) gte 3>>
- <span class="purple">_Slimy _fluid squirts from the tip, lubricating you.</span>
- <<bodyliquid "vaginaoutside" _fluid>>
- <</if>>
+ <<if random(1, 3) gte 3>>
+ <span class="purple">_Slimy _fluid squirts from the tip, lubricating you.</span>
+ <<bodyliquid "vaginaoutside" _fluid>>
+ <</if>>
<</if>>
<<else>>
- and tries to find a way inside. Failing, it lashes the metal.
- <<set $worn.genitals.integrity -= 10>><<violence 1>>
+ and tries to find a way inside. Failing, it lashes the metal.
+ <<set $worn.genitals.integrity -= 10>><<violence 1>>
<</if>>
<<set $tentacleVagina to _tentacle.fullDesc>>
<br>
@@ -305,11 +312,13 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $abomination is 1>>
<<set $enemyarousal += 3>>
<</if>>
+ <<tentacle_skin "penis">>
<br>
<</if>>
<<if _tentacle.head is "penis">>
and continues thrusting against your <<penis>>.<span class="pink"> It sucks and kneads your length, trying to milk you of your cum.</span>
+ <<tentacle_skin "penis">>
<br>
<<set $penisstate to "tentacledeep">><<set _tentacle.head to "penisdeep">><<sex 5>>
<</if>>
@@ -324,6 +333,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<else>>
<span class="pink"> and thrusts against your <<penis>>, swallowing you to the base.</span>
<</if>>
+ <<tentacle_skin "penis">>
<br>
<<takeVirginity `$abomination is 1 ? $NPCList[0].fullDescription + "'s " + _tentacle.fullDesc : _tentacle.fullDesc` "penile">>
<<set $penisstate to "tentacle">><<set _tentacle.head to "penis">><<sex 5>><<raped>><<penisraped>><<penilestat>><<violence 1>>
@@ -342,9 +352,10 @@ _The _tentacle.fullDesc writhes between your feet.
<<bodyliquid "penis" _fluid>>
<</if>>
<</if>>
+ <<tentacle_skin "penis">>
<<else>>
- and tries to find a way inside. Failing, it lashes the metal.
- <<set $worn.genitals.integrity -= 10>><<violence 1>>
+ and tries to find a way inside. Failing, it lashes the metal.
+ <<set $worn.genitals.integrity -= 10>><<violence 1>>
<</if>>
<br>
<<set $tentaclePenis to _tentacle.fullDesc>>
@@ -368,6 +379,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $abomination is 1>>
<<set $enemyarousal += 3>>
<</if>>
+ <<tentacle_skin "anus">>
<br>
<</if>>
@@ -381,6 +393,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<purity -1>><<internalejac>><<sex 5>>
<<set $anusstate to "tentacledeep">><<set _tentacle.head to "anusdeep">>
<<analejacstat>><<ejacstat>><<pain $analPain>>
+ <<tentacle_skin "anus">>
<br>
<</if>>
@@ -407,6 +420,7 @@ _The _tentacle.fullDesc writhes between your feet.
<</if>>
<<set $anusstate to "tentacle">><<set _tentacle.head to "anus">>
<<sex 5>><<raped>><<anusraped>><<analstat>><<violence 1>><<pain $analPain>>
+ <<tentacle_skin "anus">>
<br>
<</if>>
@@ -681,7 +695,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $chestuse is "squeezed">>
<<upperslither>><span class="blue">and<<if _tentacle.shaft is "breasts">> <<slithers>><</if>> up between your squeezed <<breasts>>.</span>
<<set _tentacle.head to "chest">><<neutralbreast 2>><<set $chestuse to "tentaclerub">><<cheststat>><<set $chesttarget to "tentacles">>
- <<tentacle_skin breasts>>
+ <<tentacle_skin "breasts">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -691,7 +705,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<upperslither>> <<playWithBreasts>><span class="blue">and teases your left nipple.</span>
<<neutralbreast 2>>
<<set _tentacle.head to "leftnipple">><<set $leftnipple to "tentacle">>
- <<tentacle_skin breasts>>
+ <<tentacle_skin "breasts">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -701,7 +715,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<upperslither>> <<playWithBreasts>><span class="blue">and teases your right nipple.</span>
<<neutralbreast 2>>
<<set _tentacle.head to "rightnipple">><<set $rightnipple to "tentacle">>
- <<tentacle_skin breasts>>
+ <<tentacle_skin "breasts">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -711,7 +725,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<upperslither>> <span class="blue">and<<if _tentacle.shaft is "breasts">> <<slithers>><</if>> up toward your mouth.</span>
<<neutral 2>>
<<set $mouthuse to "tentacle">><<set $mouthstate to "tentacleentrance">><<set _tentacle.head to "mouthentrance">><<set $mouthtarget to "tentacles">>
- <<tentacle_skin left_cheek right_cheek>>
+ <<tentacle_skin "left_cheek" "right_cheek">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -724,7 +738,7 @@ _The _tentacle.fullDesc writhes between your feet.
<</if>>
<<neutral 2>>
<<set $anususe to "tentacle">><<set $anusstate to "tentacleentrance">><<set _tentacle.head to "anusentrance">><<set $anustarget to "tentacles">>
- <<tentacle_skin left_bottom right_bottom>>
+ <<tentacle_skin "left_bottom" "right_bottom">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -734,7 +748,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<underslither>> <span class="blue">and <<slithers>> toward your <<pussy>>.</span>
<<neutralgenitals 2>>
<<set $vaginause to "tentacle">><<set $vaginastate to "tentacleentrance">><<set _tentacle.head to "vaginaentrance">><<set $vaginatarget to "tentacles">>
- <<tentacle_skin pubic>>
+ <<tentacle_skin "pubic">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -744,7 +758,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<underslither>> <span class="blue">and <<slithers>> toward your <<penis>>.</span>
<<neutralgenitals 2>>
<<set $penisuse to "tentacle">><<set $penisstate to "tentacleentrance">><<set _tentacle.head to "penisentrance">><<set $penistarget to "tentacles">><<set $tentaclePenis to _tentacle.fullDesc>>
- <<tentacle_skin pubic>>
+ <<tentacle_skin "pubic">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -764,7 +778,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<underslither>> <span class="blue">where it <<slithers>> between your thighs and against your tummy and <<pussy>>.</span>
<</if>>
<<set $vaginause to "tentaclerub">><<set $thighuse to "tentaclerub">><<set _tentacle.head to "vaginarub">><<sex 3>><<thighstat>><<set $vaginatarget to "tentacles">>
- <<tentacle_skin left_thigh right_thigh>>
+ <<tentacle_skin "left_thigh" "right_thigh">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -773,7 +787,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $anusstate is 0 and $anususe is 0 and $analdisable is "f">>
<<underslither>> <span class="blue">and <<slithers>> between your <<bottom>> cheeks and against your back.</span>
<<set $anusstate to "tentaclerub">><<set $anususe to "tentaclerub">><<set _tentacle.head to "anusrub">><<sex 1>><<bottomstat>><<set $anustarget to "tentacles">>
- <<tentacle_skin back>>
+ <<tentacle_skin "back">>
<<else>>
<<tentacleadvdefault _tentacle>>
<</if>>
@@ -798,33 +812,33 @@ _The _tentacle.fullDesc writhes between your feet.
<<neutral 1>>
<br>
<<set _tentacle.shaft to "thighs">>
- <<tentacle_skin left_thigh right_thigh>>
+ <<tentacle_skin "left_thigh" "right_thigh">>
<<elseif $rng lte 30>>
<<if $position isnot "wall">>
<<if $player.breastsize gte 2 and $chestuse is 0>>
_The _tentacle.fullDesc <<slithers>> around your <<breasts>>, <span class="blue">squeezing them together.</span>
<<neutralbreast 1>><<set _tentacle.shaft to "breasts">><<set $chestuse to "squeezed">>
- <<tentacle_skin breasts>>
+ <<tentacle_skin "breasts">>
<<else>>
_The _tentacle.fullDesc gently slaps your <<bottom>>.
<<violence 1>><<hitstat>>
- <<tentacle_skin left_bottom right_bottom>>
+ <<tentacle_skin "left_bottom" "right_bottom">>
<</if>>
<<else>>
_The _tentacle.fullDesc gently slaps your <<bottom>>.
<<violence 1>><<hitstat>>
- <<tentacle_skin left_bottom right_bottom>>
+ <<tentacle_skin "left_bottom" "right_bottom">>
<</if>>
<br>
<<elseif $rng lte 40>>
<<if $position isnot "wall">>
_The _tentacle.fullDesc winds its way around your chest, beneath your <<breasts>>.
<<neutralbreast 1>><<set _tentacle.shaft to "chest">>
- <<tentacle_skin breasts>>
+ <<tentacle_skin "breasts">>
<<else>>
_The _tentacle.fullDesc gently slaps your <<bottom>>.
<<violence 1>><<hitstat>>
- <<tentacle_skin left_bottom right_bottom>>
+ <<tentacle_skin "left_bottom" "right_bottom">>
<</if>>
<br>
<<elseif $rng lte 50>>
@@ -836,7 +850,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $head is 0 and $nochoke isnot 1 and $asphyxiaLvl gte 1>>
_The _tentacle.fullDesc winds its way around your neck, <span class="blue">restraining your head.</span>
<<neutral 1>><<set _tentacle.shaft to "neck">><<set $head to "grappled">>
- <<tentacle_skin left_cheek right_cheek>>
+ <<tentacle_skin "left_cheek" "right_cheek">>
<<else>>
_The _tentacle.fullDesc winds its way around your shoulders.
<<neutral 1>><<set _tentacle.shaft to "shoulders">>
@@ -844,20 +858,20 @@ _The _tentacle.fullDesc writhes between your feet.
<br>
<<else>>
_The _tentacle.fullDesc gently slaps your <<bottom>>.
- <<tentacle_skin left_bottom right_bottom>>
+ <<tentacle_skin "left_bottom" "right_bottom">>
<br>
<<violence 1>><<hitstat>>
<</if>>
<<elseif $rng lte 70>>
_The _tentacle.fullDesc gently slaps your <<bottom>>.
- <<tentacle_skin left_bottom right_bottom>>
+ <<tentacle_skin "left_bottom" "right_bottom">>
<br>
<<violence 1>><<hitstat>>
<<elseif $rng lte 80>>
<<if $leftleg is 0>>
_The _tentacle.fullDesc winds its way around your left leg, <span class="blue">restraining it.</span>
<<neutral 1>><<feettentacledisable>><<set _tentacle.shaft to "leftleg">><<set $leftleg to "grappled">><<set $feettarget to "tentacles">>
- <<tentacle_skin left_thigh>>
+ <<tentacle_skin "left_thigh">>
<<else>>
_The _tentacle.fullDesc tickles your feet.
<<neutral 1>>
@@ -867,7 +881,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $rightleg is 0>>
_The _tentacle.fullDesc winds its way around your right leg, <span class="blue">restraining it.</span>
<<neutral 1>><<feettentacledisable>><<set _tentacle.shaft to "rightleg">><<set $rightleg to "grappled">><<set $feettarget to "tentacles">>
- <<tentacle_skin right_thigh>>
+ <<tentacle_skin "right_thigh">>
<<else>>
_The _tentacle.fullDesc tickles your feet.
<<neutral 1>>
@@ -877,7 +891,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $leftarm is 0>>
_The _tentacle.fullDesc winds its way around your left arm, <span class="blue">restraining it.</span>
<<neutral 1>><<leftarmtentacledisable>><<set _tentacle.shaft to "leftarm">><<set $leftarm to "tentgrappled">><<set $leftarmstate to 0>><<set $lefttarget to "tentacles">>
- <<tentacle_skin left_arm>>
+ <<tentacle_skin "left_arm">>
<<else>>
_The _tentacle.fullDesc tickles your armpit.
<<neutral 1>>
@@ -887,7 +901,7 @@ _The _tentacle.fullDesc writhes between your feet.
<<if $rightarm is 0>>
_The _tentacle.fullDesc winds its way around your right arm, <span class="blue">restraining it.</span>
<<rightarmtentacledisable>><<neutral 1>><<set _tentacle.shaft to "rightarm">><<set $rightarm to "tentgrappled">><<set $rightarmstate to 0>><<set $righttarget to "tentacles">>
- <<tentacle_skin right_arm>>
+ <<tentacle_skin "right_arm">>
<<else>>
_The _tentacle.fullDesc tickles your armpit.
<<neutral 1>>
@@ -895,7 +909,7 @@ _The _tentacle.fullDesc writhes between your feet.
<br>
<<elseif $rng lte 100>>
_The _tentacle.fullDesc <<slithers>> against your <<bottom>>.
- <<tentacle_skin left_bottom right_bottom>>
+ <<tentacle_skin "left_bottom" "right_bottom">>
<br>
<<neutral 1>>
<</if>>
@@ -2090,7 +2104,15 @@ _The _tentacle.fullDesc writhes between your feet.
<</widget>>
<<widget "tentacle_skin">>
-<<if $skin[_args[0]] and $skin[_args[0]].special is "holy" or $skin[_args[1]] and $skin[_args[1]].special is "holy">>
- The holy symbol on your skin burns with a white light, <span class="pink">searing you,</span> <span class="teal">and the tentacle.</span><<pain 8>><<set _tentacle.tentaclehealth -= 12>><<tentacleadvdisable _tentacle>>
+<<if $skin[_args[0]] and $skin[_args[0]].special is "holy" or $skin[_args[1]] and $skin[_args[1]].special is "holy" and !$banishDisable>>
+ The holy symbol on your skin burns with a white light, <span class="pink">searing you,</span> <span class="teal">and _the _tentacle.fullDesc.</span><<pain 8>><<set _tentacle.tentaclehealth -= 12>><<tentacleadvdisable _tentacle>>
+<<elseif _tentacle.traits.includes("pain") and _args[0] isnot "pubic">>
+ <<if _args[0].includes("_")>>
+ <<set _bodypart to _args[0].split("_").pop()>>
+ <<else>>
+ <<set _bodypart to _args[0]>>
+ <</if>>
+ You wince as _the _tentacle.fullDesc rubs against your _bodypart.
+ <<pain 1>><<gpain>>
<</if>>
<</widget>>
diff --git a/game/base-combat/tentacles/tentacles.twee b/game/base-combat/tentacles/tentacles.twee
index 107af97047..bfa5261416 100644
--- a/game/base-combat/tentacles/tentacles.twee
+++ b/game/base-combat/tentacles/tentacles.twee
@@ -54,6 +54,7 @@
{"desc":"thin","baby":0,"size":1,"traits":[]},
{"desc":"narrow","baby":0,"size":1,"traits":[]},
{"desc":"squishy","baby":0,"size":2,"traits":[]},
+ {"desc":"rough","baby":0,"size":2,"traits":["pain"]},
]>>
<<if _args[3]>>
@@ -67,6 +68,7 @@
{"desc":"ethereal","baby":0,"size":1,"traits":[]},
{"desc":"incandescent","baby":0,"size":3,"traits":["hypno"]},
{"desc":"iridescent","baby":_babyType,"size":2,"traits":["hypno"]},
+ {"desc":"searing","baby":0,"size":3,"traits":["pain"]},
)>>
<<elseif _args[3] is "vine">>
<<set _tentacledescs.push(
@@ -77,6 +79,7 @@
{"desc":"climbing","baby":0,"size":2,"traits":[]},
{"desc":"mossy","baby":0,"size":2,"traits":[]},
{"desc":"grassy","baby":0,"size":2,"traits":[]},
+ {"desc":"thorny","baby":0,"size":2,"traits":["pain"]},
{"desc":"pistil","baby":_babyType,"size":1,"traits":[]},
{"desc":"leafy","baby":0,"size":1,"traits":[]},
{"desc":"sprouting","baby":0,"size":1,"traits":[]},
@@ -86,10 +89,10 @@
<<set _tentacledescs.push(
{"desc":"jerking","baby":0,"size":3,"traits":[]},
{"desc":"plated","baby":0,"size":3,"traits":[]},
- {"desc":"sparking","baby":0,"size":2,"traits":[]},
+ {"desc":"sparking","baby":0,"size":2,"traits":["pain"]},
{"desc":"shiny","baby":0,"size":2,"traits":[]},
{"desc":"labelled","baby":_babyType,"size":2,"traits":[]},
- {"desc":"jolting","baby":0,"size":2,"traits":[]},
+ {"desc":"jolting","baby":0,"size":2,"traits":["pain"]},
{"desc":"rusted","baby":0,"size":2,"traits":[]},
{"desc":"wired","baby":0,"size":1,"traits":["hypno"]},
{"desc":"stainless","baby":0,"size":1,"traits":[]},
@@ -198,7 +201,7 @@
<</for>>
</div>
-<br><br>
+<br>
<</widget>>
<<widget "actionstentacles">>
<div @class="($debugLines ? 'debugLines-actionstentacles' : '')">
@@ -319,7 +322,7 @@
<<sexcheck>>
<<if $ejaculating isnot 1>>
You count <<number $tentacles.active>> <<print $tentacles[0].type>><<if $tentacles.active isnot 1>>s<</if>> surrounding you.
- <br><br>
+ <br>
<</if>>
<</widget>>
diff --git a/game/overworld-town/loc-brothel/main.twee b/game/overworld-town/loc-brothel/main.twee
index 664b685e62..f9446a6b2e 100644
--- a/game/overworld-town/loc-brothel/main.twee
+++ b/game/overworld-town/loc-brothel/main.twee
@@ -1189,6 +1189,12 @@ You are led down a dim corridor. You can hear music playing somewhere above. The
<<if $brothel_machine_repair gte 4 and ($player.vaginaExist or $analdisable is "f")>>
"There's the repaired sex machine as well," <<he>> says. "It'll have to be a private show. No loose tongues allowed. The audience will appreciate the novelty, but <span class="lewd">they'll want to see penetration.</span> £1500 if you go through with it."
+ <<if $tentacledisable is "f">>
+ <<He>> taps <<his>> chin. "I think it has a tentacle mode, if that suits you better. Same pay, and you'll still need penetration."
+ <</if>>
+ <br><br>
+<<elseif $brothel_machine_repair gte 4 and $tentacledisable is "f">>
+ "There's the repaired sex machine as well," <<he>> says. "It has a tentacle mode. It'll have to be a private show. No loose tongues allowed. The audience will appreciate the novelty, but <span class="lewd">they'll want to see penetration.</span> £1500 if you go through with it."
<br><br>
<</if>>
@@ -1230,6 +1236,10 @@ You are led down a dim corridor. You can hear music playing somewhere above. The
<<link [[Sex machine|Briar's Office Show 2]]>><<acceptbrothelshow "machine">><</link>><<promiscuous5>>
<br>
<</if>>
+<<if $brothel_machine_repair gte 4 and $promiscuity gte 75 and $tentacledisable is "f">>
+ <<link [[Sex machine, tentacle mode|Briar's Office Show 2]]>><<acceptbrothelshow "tentacles">><</link>><<promiscuous5>>
+ <br>
+<</if>>
<!-- Modified for Monster People -->
<<if $deviancy gte 75 and ($bestialitydisable is "f" or $monsterchance gte 1 and ($hallucinations gte 1 or $monsterhallucinations is "f"))>>
<<link [[Pig|Briar's Office Show 2]]>><<acceptbrothelshow "pig">><</link>><<deviant5>>
@@ -1259,6 +1269,8 @@ You are led down a dim corridor. You can hear music playing somewhere above. The
You agree to be submerged in a terrarium filled with small creatures on stage. "You're a kinky one," <<he>> says as <<he>> stands up. "I like that, and I'm sure the audience will like it too.
<<elseif $brothelshowdata.type is "machine">>
You agree to use the repaired sex machine. Briar claps <<his>> hands together. "Excellent.
+<<elseif $brothelshowdata.type is "tentacles">>
+ You agree to use the repaired sex machine, in tentacle mode. Briar claps <<his>> hands together. "Excellent.
<<elseif $brothelshowdata.type is "horse">>
You suggest performing with a horse. Briar laughs. "That would be a show to remember," <<he>> says. "But I don't have access to a horse."
<br><br>
diff --git a/game/overworld-town/loc-brothel/shows.twee b/game/overworld-town/loc-brothel/shows.twee
index 9d88eca7d5..17d1652da2 100644
--- a/game/overworld-town/loc-brothel/shows.twee
+++ b/game/overworld-town/loc-brothel/shows.twee
@@ -123,6 +123,16 @@
<<link [[Next|Brothel Show Machine Intro]]>><</link>>
<br>
+<<elseif $brothelshowdata.type is "tentacles">>
+ <<startbrothelshow "tentacles">>
+ <<endevent>><<generate1>><<generate2>><<person1>>
+ Briar turns to you. "We're all set and ready. Just waiting for the star. Remember, the audience want to see penetration." You walk onto the stage, and stand beside the waiting table. There are fewer in the audience than usual. Briar mentioned this being a private show. A single white light turns on above you, plunging the audience into darkness.
+ <br><br>
+ "Ladies and gentlemen!" Briar's voice rings throughout the room. "Today we witness a proud student test <<pher>> science project. <<pShe>> hasn't realised just how successful it is." A <<fullGroup>>, dressed in black bodysuits, wheel the sex machine onto the stage behind you. Some of the panels rattle.
+ <br><br>
+
+ <<link [[Next|Brothel Show Tentacles Intro]]>><</link>>
+ <br>
<<elseif $brothelshowdata.type is "horse">>
<<startbrothelshow "horse">>
<<endevent>><<loadNPC 0 "saddled_steed">><<person1>>
@@ -730,7 +740,111 @@ You return to the dressing room.
<<link [[Next|Brothel Dressing Room]]>><<endevent>><</link>>
<br>
+:: Brothel Show Tentacles Intro
+<<effects>>
+
+You turn to the machine. "Oh gosh," you say as Briar's employees stand aside. "I'm sure to win the science fair with my new invention. Just one final test." You pretend to press a button on the side, and Briar activates the machine remotely. It shudders into life.
+<br><br>
+
+You let out a mock scream as a hoard of metallic red tentacles emerge, wrapping around your body and lifting you into the air.
+
+<<if $exposed lt 2>>
+ The tentacles strip your clothes off with startling efficiency. Their movements appear brutal, but they're actually very careful to avoid damaging your clothes.
+ <br><br>
+
+ "M-my clothes!" you shout as the machine exposes you to the audience. "Bad machine!"
+<</if>>
+A red light glows from the front as it scans you. The metal tentacles swarm around you.
+<br><br>
+
+<<saveNPC 0 "brothel_tentacles_0">>
+<<saveNPC 1 "brothel_tentacles_1">>
+<<endevent>>
+
+<<strip>>
+<<link [[Next|Brothel Show Tentacles]]>><<set $sexstart to 1>><</link>>
+<br>
+
+:: Brothel Show Tentacles
+<<set $location to "landfill">><<set $outside to 1>><<effects>>
+
+<<if $sexstart is 1>>
+ <<set $sexstart to 0>>
+ <<consensual>>
+ <<set $consensual to 1>>
+ <<set $enemytype to "tentacles">>
+ <<neutral 1>>
+ <<tentaclestart 12 15 "tentacle" "metal">>
+<</if>>
+
+<<statetentacles>>
+<<effects>>
+<<effectstentacles>>
+
+<<if $phase is 0>>
+ Your eyes adjusted to the light, you can make out the audience once more. They're well-dressed, and mostly seated.
+ <<set $phase to 1>>
+ <br><br>
+<<elseif $phase is 1 and ($penisfucked is 1 or $vaginafucked is 1 or $anusfucked is 1)>>
+ <<if $vaginafucked is 1>>
+ <<set _tentacle to $tentacleVagina>>
+ <<elseif $penisfucked is 1>>
+ <<set _tentacle to $tentaclePenis>>
+ <<else>>
+ <<set _tentacle to $tentacleAnus>>
+ <</if>>
+ The audience erupt into polite applause as the _tentacle connects with you. You hear the clinking of glasses.
+ <<set $phase to 2>>
+ <br><br>
+<</if>>
+
+<<tentacles>>
+<<actionstentacles>>
+
+<<if $tentacles.active lte ($tentacles.max / 2)>>
+ <span id="next"><<link [[Next|Brothel Show Tentacles Finish]]>><</link>></span><<nexttext>>
+<<else>>
+ <span id="next"><<link [[Next|Brothel Show Tentacles]]>><</link>></span><<nexttext>>
+<</if>>
+
+:: Brothel Show Tentacles Finish
+<<effects>>
+
+<<loadNPC 0 "brothel_machine_0">>
+<<loadNPC 1 "brothel_machine_1">>
+<<clearNPC "brothel_machine_0">>
+<<clearNPC "brothel_machine_1">>
+
+<<if $anusfucked is 1 or $vaginafucked is 1 or $penisfucked is 1>>
+ The audience applaud again as the machine powers down and the metal tentacles unwrap you.
+ <br><br>
+ Briar walks onto the stage. "Another round for our star!" You climb off the table, and bow. The applause redoubles, but remains polite. The <<fullGroup>> usher you off the stage, and hand over your clothing.
+ <br><br>
+
+ <<clotheson>>
+ <<endevent>>
+ <<npc Briar>><<person1>>
+ Briar climbs off the stage. "Nice work," <<he>> says. "It didn't come with a manual, and can be unpredictable. Here's your pay."
+ <br><br>
+ You've earned <<moneyGain 1500>>
+ <br><br>
+<<else>>
+ Sparks fly from the machine, and the tentacles withdraw into the machine as it falls inert. The audience break into discussion as Briar walks onto the stage. "There's been a technical fault-" The <<fullGroup>> usher you off the stage, and hand over your clothing.
+ <br><br>
+
+ <<clotheson>>
+ <<endevent>>
+
+ <<npc Briar>><<person1>>
+ Briar climbs off the stage. "Disappointing," <<he>> says. "The damage isn't severe, but that isn't what our audience paid for. Try to give a proper show next time."
+ <br><br>
+<</if>>
+
+You return to the dressing room.
+<br><br>
+<<link [[Next|Brothel Dressing Room]]>><<endevent>><</link>>
+<br>
:: Brothel Show Horse Intro
<<effects>>
--
GitLab