From cbf397f73f9dde44bbd0c811b80839415eaabb9d Mon Sep 17 00:00:00 2001 From: Trinidad <anchaiscastilla@gmail.com> Date: Wed, 10 May 2023 20:02:20 +0000 Subject: [PATCH] Adding "phaseless" to <<endcombat>> and fixes --- game/base-combat/end.twee | 2 +- game/base-combat/tentacles/tentacles.twee | 2 +- game/overworld-plains/loc-farm/road.twee | 10 ++++------ game/overworld-town/special-whitney/street.twee | 4 +--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/game/base-combat/end.twee b/game/base-combat/end.twee index a222611fb5..f062b48805 100644 --- a/game/base-combat/end.twee +++ b/game/base-combat/end.twee @@ -101,7 +101,7 @@ <<unset $enemytype>> - <<endevent>> + <<endevent _args[0]>> <<struggle_end>> <<set $combat to 0>> diff --git a/game/base-combat/tentacles/tentacles.twee b/game/base-combat/tentacles/tentacles.twee index 7673848483..d4a0d6b9a5 100644 --- a/game/base-combat/tentacles/tentacles.twee +++ b/game/base-combat/tentacles/tentacles.twee @@ -322,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><br> <</if>> <</widget>> diff --git a/game/overworld-plains/loc-farm/road.twee b/game/overworld-plains/loc-farm/road.twee index c5241a9903..6dc9ee6921 100644 --- a/game/overworld-plains/loc-farm/road.twee +++ b/game/overworld-plains/loc-farm/road.twee @@ -2169,9 +2169,8 @@ You shake your head and take a few steps backwards. The <<person1>><<person>> hu <</if>> <br><br> <<clotheson>> -<<set _phase to $phase>> -<<endcombat>> -<<if _phase is 1>> +<<endcombat "phaseless">> +<<if $phase is 1>> <<link [[Next|Harvest Street]]>><<endevent>><<pass 1>><<set $eventskip to 1>><</link>> <<else>> <<link [[Next|Farmland]]>><<endevent>><<pass 1>><<set $eventskip to 1>><</link>> @@ -2280,9 +2279,8 @@ The <<person>> doesn't spare you another look as <<he>> rolls the window back up <</if>> <br><br> <<clotheson>> -<<set _phase to $phase>> -<<endcombat>> -<<if _phase is 1>> +<<endcombat "phaseless">> +<<if $phase is 1>> <<link [[Next|Harvest Street]]>><<set $eventskip to 1>><</link>> <<else>> <<link [[Next|Farmland]]>><<set $eventskip to 1>><</link>> diff --git a/game/overworld-town/special-whitney/street.twee b/game/overworld-town/special-whitney/street.twee index 9dfe588455..7860271554 100644 --- a/game/overworld-town/special-whitney/street.twee +++ b/game/overworld-town/special-whitney/street.twee @@ -563,14 +563,12 @@ <<destinationeventend>> <<else>> - <<set _phase to $phase>> You fall to the ground, too hurt to continue. <br><br> <<clotheson>> - <<endcombat>> + <<endcombat "phaseless">> <<npc Whitney>><<person1>> - <<set $phase to _phase>> <<switch $bullyeventstreet>> <<case 11>> -- GitLab