Skip to content
Snippets Groups Projects
Commit 77571b69 authored by nesokax's avatar nesokax Committed by Vrelnir
Browse files

Several strap-on improvements

parent 3d2f67bc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/base-combat/actions-hands.twee
+ 20
− 8
View file @ 77571b69
...@@ -307,17 +307,23 @@ $NPCList[5].lefthand is "pen" or $NPCList[5].righthand is "pen">> ...@@ -307,17 +307,23 @@ $NPCList[5].lefthand is "pen" or $NPCList[5].righthand is "pen">>
<</if>> <</if>>
<<if $worn.lower.vagina_exposed is 1 and $worn.under_lower.vagina_exposed is 1>> <<if $worn.lower.vagina_exposed is 1 and $worn.under_lower.vagina_exposed is 1>>
<<set _penis to playerHasStrapon() ? 'strap-on' : 'penis'>>
<<set _straponDisplaced to (!playerHasStrapon() && $worn.under_lower.type.includes("strap-on"))>>
<<if $NPCList[0].state is "stalk" and $NPCList[0].legs isnot "run">> <<if $NPCList[0].state is "stalk" and $NPCList[0].legs isnot "run">>
<<if $penisuse is "cover">> <<if $penisuse is "cover">>
<<set _leftaction["Keep covering your penis"] to "leftcoverpenismeek">> <<set _leftaction["Keep covering your _penis"] to "leftcoverpenismeek">>
<<elseif $penisuse is 0>> <<elseif $penisuse is 0>>
<<set _leftaction["Cover your penis"] to "leftcoverpenismeek">> <<if !_straponDisplaced>>
<<set _leftaction["Cover your _penis"] to "leftcoverpenismeek">>
<</if>>
<</if>> <</if>>
<<elseif $lefttarget is "self" or $targetYourself is false or _targetnumber is 1 or $NPCList[0].state is "stalk">> <<elseif $lefttarget is "self" or $targetYourself is false or _targetnumber is 1 or $NPCList[0].state is "stalk">>
<<if $penisuse is "cover">> <<if $penisuse is "cover">>
<<set _leftaction["Keep covering your penis"] to "leftcoverpenis">> <<set _leftaction["Keep covering your _penis"] to "leftcoverpenis">>
<<elseif $penisuse is 0>> <<elseif $penisuse is 0>>
<<set _leftaction["Cover your penis"] to "leftcoverpenis">> <<if !_straponDisplaced>>
<<set _leftaction["Cover your _penis"] to "leftcoverpenis">>
<</if>>
<</if>> <</if>>
<</if>> <</if>>
<</if>> <</if>>
...@@ -746,17 +752,23 @@ $NPCList[5].lefthand is "pen" or $NPCList[5].righthand is "pen">> ...@@ -746,17 +752,23 @@ $NPCList[5].lefthand is "pen" or $NPCList[5].righthand is "pen">>
<</if>> <</if>>
<<if $worn.lower.vagina_exposed is 1 and $worn.under_lower.vagina_exposed is 1>> <<if $worn.lower.vagina_exposed is 1 and $worn.under_lower.vagina_exposed is 1>>
<<set _penis to playerHasStrapon() ? 'strap-on' : 'penis'>>
<<set _straponDisplaced to (!playerHasStrapon() && $worn.under_lower.type.includes("strap-on"))>>
<<if $NPCList[0].state is "stalk" and $NPCList[0].legs isnot "run">> <<if $NPCList[0].state is "stalk" and $NPCList[0].legs isnot "run">>
<<if $penisuse is "cover">> <<if $penisuse is "cover">>
<<set _rightaction["Keep covering your penis"] to "rightcoverpenismeek">> <<set _rightaction["Keep covering your _penis"] to "rightcoverpenismeek">>
<<elseif $penisuse is 0>> <<elseif $penisuse is 0>>
<<set _rightaction["Cover your penis"] to "rightcoverpenismeek">> <<if !_straponDisplaced>>
<<set _rightaction["Cover your _penis"] to "rightcoverpenismeek">>
<</if>>
<</if>> <</if>>
<<elseif $righttarget is "self" or $targetYourself is false or _targetnumber is 1 or $NPCList[0].state is "stalk">> <<elseif $righttarget is "self" or $targetYourself is false or _targetnumber is 1 or $NPCList[0].state is "stalk">>
<<if $penisuse is "cover">> <<if $penisuse is "cover">>
<<set _rightaction["Keep covering your penis"] to "rightcoverpenis">> <<set _rightaction["Keep covering your _penis"] to "rightcoverpenis">>
<<elseif $penisuse is 0>> <<elseif $penisuse is 0>>
<<set _rightaction["Cover your penis"] to "rightcoverpenis">> <<if !_straponDisplaced>>
<<set _rightaction["Cover your _penis"] to "rightcoverpenis">>
<</if>>
<</if>> <</if>>
<</if>> <</if>>
<</if>> <</if>>
......
game/base-combat/end.twee
+ 1
− 1
View file @ 77571b69
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
<<if $penileskillup gte 1>> <<if $penileskillup gte 1>>
<<set $penileskillup to 0>> <<set $penileskillup to 0>>
<<if $penileskill lt 1000>> <<if $penileskill lt 1000>>
<span class="gold">You feel more confident in your ability to pleasure others with your penis.</span> <span class="gold">You feel more confident in your ability to pleasure others with <<= $player.penisExist ? "your penis" : "a strap-on">>.</span>
<br> <br>
<</if>> <</if>>
<</if>> <</if>>
......
game/base-combat/widgets.twee
+ 1
− 1
View file @ 77571b69
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<<set $_straponvirginityIgnore to ($_vType is "penile" and npcHasStrapon($_npcId))>> <<set $_straponvirginityIgnore to ($_vType is "penile" and npcHasStrapon($_npcId))>>
<</if>> <</if>>
<<if $_npc and $_vType and $_npc.virginity and $_npc.virginity[$_vType] and (!$wraith or $wraith.mimic isnot $_npc.nam) and !_straponvirginityIgnore>> <<if $_npc and $_vType and $_npc.virginity and $_npc.virginity[$_vType] and (!$wraith or $wraith.mimic isnot $_npc.nam) and !$_straponvirginityIgnore>>
/* note: virginity must be exactly equal to true; only true means that they still have their virginity. */ /* note: virginity must be exactly equal to true; only true means that they still have their virginity. */
<<if $_npc.virginity[$_vType] is true>> <<if $_npc.virginity[$_vType] is true>>
<<set $_npc.virginity[$_vType] to "player">> <<set $_npc.virginity[$_vType] to "player">>
......
game/base-system/text.twee
+ 5
− 1
View file @ 77571b69
...@@ -5699,8 +5699,12 @@ School finishes on the first Monday of December. ...@@ -5699,8 +5699,12 @@ School finishes on the first Monday of December.
<br> <br>
<</if>> <</if>>
<<switch _args[1]>> <<switch _args[1]>>
<<case "vaginal" "penile">> <<case "vaginal">>
<span class="red"> This action will deflower <<him>>.</span> <span class="red"> This action will deflower <<him>>.</span>
<<case "penile">>
<<if !npcHasStrapon(V.NPCList.findIndex(npc => npc.fullDescription === _args[0]))>>
<span class="red"> This action will deflower <<him>>.</span>
<</if>>
<<case "anal">> <<case "anal">>
<span class="red"> This action will take <<his>> anal virginity.</span> <span class="red"> This action will take <<his>> anal virginity.</span>
<<case "oral">> <<case "oral">>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment