diff --git a/game/04-Variables/variables-start.twee b/game/04-Variables/variables-start.twee
index 544120b35581a5bbd8d5a269a18629514ae3dabb..48c44f154dbe0125fb7611f247735d794205abd4 100644
--- a/game/04-Variables/variables-start.twee
+++ b/game/04-Variables/variables-start.twee
@@ -141,7 +141,7 @@
<<set $gymmod to 1>>
<<set $gympaid to 0>>
<<set $gymdojo to 0>>
-<<set $jojotipsonly to false>>
+<<set $options.jojotipsonly to false>>
<<npcList>>
<<npcNamed>>
diff --git a/game/base-clothing/images.twee b/game/base-clothing/images.twee
index 998fba637a571db1e5746158c232be39541393a9..3dc9883e8bf5f73c664c1d2dec55c98a18fba141 100644
--- a/game/base-clothing/images.twee
+++ b/game/base-clothing/images.twee
@@ -6,7 +6,7 @@
<div id="img" @class="limitedColourContainerClasses() + ($options.sidebarAnimations isnot false ? '':' noAnimations') + ' offset-sidebar-img'">
/*alter*/
<<if $location is "limbo">>
- <<set $sidebarAnimations to false>>
+ <<set $options.sidebarAnimations to false>>
<<set $worn.over_upper to clone(setup.clothes.over_upper[0])>>
<<set $worn.over_lower to clone(setup.clothes.over_lower[0])>>
<<set $worn.upper to clone(setup.clothes.upper[0])>>
diff --git a/game/base-combat/actionsGeneration.twee b/game/base-combat/actionsGeneration.twee
index 34ae1c1fef1b33ce5942bcc34671c7a1db3460da..8aa110346bf12f6a7717b14b941e2416f7be2f1a 100644
--- a/game/base-combat/actionsGeneration.twee
+++ b/game/base-combat/actionsGeneration.twee
@@ -228,7 +228,7 @@
<<if $stand.active gte 1>>
<<if $stand.canfight[0] is 0>>
<<else>>
- <div id="standaction" @class="$combatControls + 'Control'">
+ <div id="standaction" @class="$options.combatControls + 'Control'">
<<standActionInit>>
</div>
<</if>>
@@ -2508,7 +2508,7 @@
/*<<if $stand.canfight[1] is 1>>
<<set _targetliststand[$swarm.type.toUpperFirst()] to "swarm">>
<</if>>*/
- <<if $targetYourself is true>>
+ <<if $options.targetYourself is true>>
<<set _targetYourself to true>>
<</if>>
<<if _firsttarget is undefined>>
@@ -3547,7 +3547,7 @@
/*alter*/
<<if Object.values(_targetliststand).length gte 1>>
- <div id="standaction" @class="$combatControls + 'Control'">
+ <div id="standaction" @class="$options.combatControls + 'Control'">
<<switch $standtarget>>
<<case "self">>
<<standActionInitSelf>>
diff --git a/game/base-combat/end.twee b/game/base-combat/end.twee
index 6d9798adab49aad864a75b80e7e06d2662e40b22..dc143f88d8fcbe93ad106130bbc148559610003c 100644
--- a/game/base-combat/end.twee
+++ b/game/base-combat/end.twee
@@ -257,6 +257,8 @@
<<set $stand.type.vines to 0>>
<<set $stand.type.vinesarmor to 0>>
<<set $stand.type.vineallactions.splice(0)>>
+ <<case "none">>
+
<</switch>>
<</if>>
/*alter8*/
diff --git a/game/base-combat/machine/actions.twee b/game/base-combat/machine/actions.twee
index 40f8755320ecc29382e865a6d2fe1d9a01b64537..29f4bc23d98ff030b57634830e6398fe1ef56bf6 100644
--- a/game/base-combat/machine/actions.twee
+++ b/game/base-combat/machine/actions.twee
@@ -25,7 +25,7 @@
/*alter*/
<<if $stand.canfight[0] is 1>>
- <div id="standaction" @class="$combatControls + 'Control'">
+ <div id="standaction" @class="$options.combatControls + 'Control'">
<<standActionInitMachine>>
</div>
<</if>>
diff --git a/game/base-combat/stalk/stalk.twee b/game/base-combat/stalk/stalk.twee
index 3891854114c908fb6058d2f30da40d490f9510e6..912c98b323f58d0d03a174bb7aad9a690cdbfd2c 100644
--- a/game/base-combat/stalk/stalk.twee
+++ b/game/base-combat/stalk/stalk.twee
@@ -37,10 +37,8 @@
<<if $NPCList[_n].distance lte _n>>
<<if !$stalk_end>>
- <<if $NPCList[0].fullDescription isnot "Ivory Wraith" and ($NPCList[_n].legs is "run" or $NPCList[0].bold gte random(1, 1000))
- or $NPCList[0].fullDescription is "Ivory Wraith" and C.npc["Ivory Wraith"].lust gte random(5,15)>>
/*alter*/
- <<elseif ($stand.type.reverb.includes("wee-woo") and C.area_name is "town") or ($stand.type.reverb.includes("grrrr") and C.area_name is "forest") and $rng gte 37>>
+ <<if ($stand.type.reverb.includes("wee-woo") and C.area_name is "town") or ($stand.type.reverb.includes("grrrr") and C.area_name is "forest") and $rng gte 37>>
A <<person1>><<person>>
<<switch $enemyno>>
<<case 6>>
@@ -76,7 +74,8 @@
<<set $stalk_end to "hawk">>
<<elseif $stand.type.reverb.includes("WHAT ARE YOU DOING IN MY SWAMP?")>>
<<set $stalk_end to "shrek">>
- <<elseif $NPCList[_n].legs is "run" or $NPCList[0].bold gte random(1, 1000)>>
+ <<elseif $NPCList[0].fullDescription isnot "Ivory Wraith" and ($NPCList[_n].legs is "run" or $NPCList[0].bold gte random(1, 1000))
+ or $NPCList[0].fullDescription is "Ivory Wraith" and C.npc["Ivory Wraith"].lust gte random(5,15)>>
<span class="red">You are accosted.</span>
<<if $npcrow.includes(0)>>
<<stalk_nnpc_text_attack $NPCList[0].fullDescription>>
diff --git a/game/base-combat/struggle.twee b/game/base-combat/struggle.twee
index 848955bbd8f43294a5e02874f5a9a7e4499b0c0e..1d4c5601f6a172892d1d2242dc79d3b170a79c1b 100644
--- a/game/base-combat/struggle.twee
+++ b/game/base-combat/struggle.twee
@@ -208,7 +208,7 @@
<</if>>
/*alter*/
<<if $stand.active gte 1 and $stand.canfight[1] is 1>>
- <div id="standaction" @class="$combatControls + 'Control'">
+ <div id="standaction" @class="$options.combatControls + 'Control'">
<<standActionInitStruggle>>
</div>
<</if>>
diff --git a/game/base-combat/tentacles/abomination.twee b/game/base-combat/tentacles/abomination.twee
index a738342aed1b8e33a950e7c3ba15c4082ae67232..052aede08eab1f0c59e9140bd2d62d8bfe70f1c9 100644
--- a/game/base-combat/tentacles/abomination.twee
+++ b/game/base-combat/tentacles/abomination.twee
@@ -253,7 +253,7 @@
<<if $stand.active gte 1>>
<<if $stand.canfight[0] is 0>>
<<else>>
- <div id="standaction" @class="$combatControls + 'Control'">
+ <div id="standaction" @class="$options.combatControls + 'Control'">
<<if $standtarget is "self">>
<<standActionInitSelf>>
<<elseif ($standtarget is "tentacles" and Object.values(_targetliststand).includes("tentacles")) or Object.values(_targetlistall)[0] is "tentacles">>
diff --git a/game/base-combat/tentacles/tentacleActionsGeneration.twee b/game/base-combat/tentacles/tentacleActionsGeneration.twee
index 7162d13a59ab66c3270682f0a35e9eed319766ed..31234e8271c5f48d9050b4473dca20711c4e098b 100644
--- a/game/base-combat/tentacles/tentacleActionsGeneration.twee
+++ b/game/base-combat/tentacles/tentacleActionsGeneration.twee
@@ -200,7 +200,7 @@
<<if $stand.active gte 1>>
<<if $stand.canfight[1] is 0 and $stand.type.name isnot "echoes">>
<<else>>
- <div id="standaction" @class="$combatControls + 'Control'">
+ <div id="standaction" @class="$options.combatControls + 'Control'">
<<standActionInitTentacle>>
</div>
<</if>>
diff --git a/game/base-system/mobileStats.twee b/game/base-system/mobileStats.twee
index 599970ef7fb7daac4688ccf81dad003ddf565942..a2ade7908111d7bca4df23a23b80f56a34f690c4 100644
--- a/game/base-system/mobileStats.twee
+++ b/game/base-system/mobileStats.twee
@@ -47,7 +47,7 @@
Al
</div>
/*alter*/
-<<if $vampire.active gte 1 and ($sidebarStats is "All" or $vampire.thirst gt 800)>>
+<<if $vampire.active gte 1 and ($options.sidebarStats is "All" or $vampire.thirst gt 800)>>
<<mobileStatsColor "vampire">>
<div @class="'stat ' + _mobileColor">
Th
diff --git a/game/base-system/tips.twee b/game/base-system/tips.twee
index a83d84234cbcc1b2f6f6238675fc7ba4ab9f8c41..c7c54fbe982f77fbecfbc6de554b2fa1afbbc17e 100644
--- a/game/base-system/tips.twee
+++ b/game/base-system/tips.twee
@@ -204,7 +204,7 @@
<<widget "tips">>
/*alter*/
-<<if $jojotipsonly is true>>
+<<if $options.jojotipsonly is true>>
<<print setup.tips.jojo.random()>>
<<else>>
<<print setup.tipsList.random()>>
diff --git a/game/jojomod/widgets/mod-widgets-general.twee b/game/jojomod/widgets/mod-widgets-general.twee
index 1ef3c21e92d4718898936607712a0f63830529a8..21ee1720814d17f6c70f7d8db4f19503ef92f091 100644
--- a/game/jojomod/widgets/mod-widgets-general.twee
+++ b/game/jojomod/widgets/mod-widgets-general.twee
@@ -166,8 +166,8 @@
<<init_tips>>
<</if>>
- <<if $jojotipsonly is undefined>>
- <<set $jojotipsonly to false>>
+ <<if $options.jojotipsonly is undefined>>
+ <<set $options.jojotipsonly to false>>
<</if>>
<<if $specialClothes.breathingmask is undefined>>
@@ -479,8 +479,8 @@
<<if setup.tips.jojo is undefined>>
<<init_tips>>
<</if>>
- <<if $jojotipsonly is undefined>>
- <<set $jojotipsonly to false>>
+ <<if $options.jojotipsonly is undefined>>
+ <<set $options.jojotipsonly to false>>
<</if>>
<</if>>
@@ -571,8 +571,7 @@
/* VERSION 14.6 AND OLDER */
<<if $modversionsave lt 14.7>>
<<if $stand.type.name is "haze">>
- <<set $stand.type.distortion to "">><<set $standuse to "hidden">>
- <<set $stand.type.virusmax to 6>><<set $hospitalvirusvisit to 1>>
+ <<set $hospitalvirusvisit to 1>>
<</if>>
<</if>>
<</widget>>
@@ -1682,12 +1681,17 @@ The sun rises at 7:00 (7AM) and sets at 20:00 (8PM).<br><br>
<</if>>
<<set _bizarreKill to $numberToKill>>
<<elseif $stand.active gte 2 and $stand.canfight[0] is 1 and $angel gte 6 and $player.divinePriority is true>>
+
Seeing the <<if $numberToKill gte 2>>wretches<<else>>wretch<</if>> who assaulted you lying helpless before you, <span class="yellow">a righteous fury</span> fills you at having been so blatantly assaulted by a being so bent on your defilement.
<br><br>
As your fury builds, you lash out, revealing to them, and only them, your true Angelic glory, your many wings bright and your many eyes glaring as the Heavenly flames smite the lesser <<if $numberToKill gte 2>>beings<<else>>being<</if>> who had attempted to defile you, leaving only ash, and you turn away from their remains as their <<if $numberToKill gte 2>>souls are<<else>>soul is<</if>> condemned to the Pit.
<br><br>
Making sure there are no witnesses, not that it would matter anyway, you leave the scene with a smile on your face, content.
<<set $_nocrime to true>>
+ <<elseif $stand.active gte 2 and $stand.canfight[0] is 1 and $demon gte 6 and $physique gte 5000 and $player.divinePriority is true>>
+ Now is time for you to have some fun. <<if $numberToKill gte 2>>You go after them, one by one, to get your revenge. Even better, your prize.<<else>> <<He>> could have seen this coming, but apparently wasn't cautious enough.<</if>><br>
+ After finding your target, you pin <<him>> down. Quick as a lighting, you remove <<his>> clothes and get to work. Your demon powers help you get more frequent and powerful orgasms on your victim. Even when <<he>> screamed for you to stop you kept going. And going. And going. <<His>> consciousness fade away faster after each orgasm. Once <<hes>> completely gone, you take <<his>> life force and savor it.
+ <<elseif $angel gte 6>>
<<elseif $stand.active gte 2 and $stand.canfight[0] is 1>>
<<if $killstat is 0>>
<<switch $stand.type.name>>
diff --git a/game/jojomod/widgets/mod-widgets-stands.twee b/game/jojomod/widgets/mod-widgets-stands.twee
index 63f7b84c390f654b0598602f0bbac173ae38250d..ff2757079e0453d6389bb64cc367a7f22376aa8c 100644
--- a/game/jojomod/widgets/mod-widgets-stands.twee
+++ b/game/jojomod/widgets/mod-widgets-stands.twee
@@ -2123,7 +2123,7 @@ Precision:
<</if>>
<</if>>
<<standAbilities>>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<standAbilitiesSelf>>
<</if>>
<<case "pain">>
@@ -2133,7 +2133,7 @@ Precision:
<<standAbilitiesHuman>>
<</if>>
<<standAbilities>>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<standAbilitiesSelf>>
<</if>>
<<case "aggressive">>
@@ -2143,7 +2143,7 @@ Precision:
<<standAbilitiesHuman>>
<</if>>
<<standAbilities>>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<standAbilitiesSelf>>
<</if>>
<<case "freeze">>
@@ -3190,7 +3190,7 @@ Precision:
<</if>>
<</if>>
<<standAbilities>>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<standAbilitiesSelf>>
<</if>>
<<case "pain">>
@@ -3221,12 +3221,12 @@ Precision:
<</if>>
<</if>>
<<standAbilities>>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<standAbilitiesSelf>>
<</if>>
<<case "aggressive">>
<<standAbilities>>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<standAbilitiesSelf>>
<</if>>
<<case "tentacle">>
@@ -3247,7 +3247,7 @@ Precision:
<</if>>
<</if>>
<<standAbilities>>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<standAbilitiesSelf>>
<</if>>
<<case "freeze">>
@@ -4573,7 +4573,7 @@ Precision:
<<vinesactionspertarget>>
<</switch>>
<</if>>
-<<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+<<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<switch $stand.type.name>>
<<case "golden">>
<<if $standability gte 6 and $stand.type.frog[1] is 0>>
@@ -10897,7 +10897,7 @@ Soon <<yourstand>> finds <<him>>. $peppersearchnpc is currently <span style="col
<<widget "echoesbigsound">><<silently>>
<<set _bigsoundopt to []>>
<<if _args[0] is undefined or _args[0] is "Man">>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<set _bigsoundopt.push("fwoosh")>>
<<if $stand.mastery gte 260 and $standability gte 2 and $consensual isnot 1>>
<<set _bigsoundopt.push("sizzle")>>
@@ -10921,7 +10921,7 @@ Soon <<yourstand>> finds <<him>>. $peppersearchnpc is currently <span style="col
<</if>>
<</if>>
<<elseif _args[0] is "Tentacles">>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<set _bigsoundopt.push("fwoosh")>>
<<if $stand.mastery gte 260 and $standability gte 2 and $consensual isnot 1>>
<<set _bigsoundopt.push("sizzle")>>
@@ -10942,14 +10942,14 @@ Soon <<yourstand>> finds <<him>>. $peppersearchnpc is currently <span style="col
<</if>>
<</if>>
<<elseif _args[0] is "Swarm">>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<set _bigsoundopt.push("fwoosh")>>
<<if $stand.mastery gte 290 and $standability gte 3 and $consensual isnot 1>>
<<set _bigsoundopt.push("boom")>>
<</if>>
<</if>>
<<elseif _args[0] is "Machine">>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<set _bigsoundopt.push("brrrr")>>/*alter9
<<if $stand.mastery gte 270>>
<<set _bigsoundopt.push("boing")>>
@@ -10967,14 +10967,14 @@ Soon <<yourstand>> finds <<him>>. $peppersearchnpc is currently <span style="col
<</if>>
<</if>>
<<elseif _args[0] is "Vore">>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<set _bigsoundopt.push("fwoosh")>>
<<if $stand.mastery gte 280>>
<<set _bigsoundopt.push("splash")>>
<</if>>
<</if>>
<<elseif _args[0] is "Struggle">>
- <<if $standtarget is "self" or $targetYourself is false or _targetnumber is 1>>
+ <<if $standtarget is "self" or $options.targetYourself is false or _targetnumber is 1>>
<<set _bigsoundopt.push("fwoosh")>>
<<if $stand.mastery gte 280>>
<<set _bigsoundopt.push("splash")>>
@@ -13345,7 +13345,7 @@ Yellowish:
<<else>>
Could come in handy.<<set _howmany to 7>>
<</if>>
- <<set V.sexStats.pills["pills"]["breast grownth"].owned += _howmany>><<boughtOnce>>
+ <<set V.sexStats.pills["pills"]["breast growth"].owned += _howmany>><<boughtOnce>>
<<unset _howmany>>
<<elseif _rng lte 800 and $penisexist is 1>>
some pills in a bottle. The label says "penis growth blocker".
diff --git a/img/jojo/body/hamon/hamon_aura.png b/img/jojo/body/hamon/hamon_aura.png
index 1ebf06876931628c39f50272a74aa2b44be04880..2b6f269e7fdf8c78c610021b9a392b3762526446 100644
Binary files a/img/jojo/body/hamon/hamon_aura.png and b/img/jojo/body/hamon/hamon_aura.png differ
diff --git a/img/jojo/body/hamon/hamon_aura_blue.png b/img/jojo/body/hamon/hamon_aura_blue.png
index d264717d5e9936167663466da5d5d6bd723b58a7..08e84942dece9cebacb52c443a31deef179febe3 100644
Binary files a/img/jojo/body/hamon/hamon_aura_blue.png and b/img/jojo/body/hamon/hamon_aura_blue.png differ
diff --git a/img/jojo/body/hamon/hamon_aura_blue_old.png b/img/jojo/body/hamon/hamon_aura_blue_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..d264717d5e9936167663466da5d5d6bd723b58a7
Binary files /dev/null and b/img/jojo/body/hamon/hamon_aura_blue_old.png differ
diff --git a/img/jojo/body/hamon/hamon_aura_old.png b/img/jojo/body/hamon/hamon_aura_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ebf06876931628c39f50272a74aa2b44be04880
Binary files /dev/null and b/img/jojo/body/hamon/hamon_aura_old.png differ
diff --git a/img/jojo/body/hamon/hamon_aura_scarlet.png b/img/jojo/body/hamon/hamon_aura_scarlet.png
index 32bf10a2d4930f7d4480214ee4ec385c155a3d8d..2c9255ccd301fab40849fd12c7ae04819fefb5d5 100644
Binary files a/img/jojo/body/hamon/hamon_aura_scarlet.png and b/img/jojo/body/hamon/hamon_aura_scarlet.png differ
diff --git a/img/jojo/body/hamon/hamon_aura_scarlet_old.png b/img/jojo/body/hamon/hamon_aura_scarlet_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..32bf10a2d4930f7d4480214ee4ec385c155a3d8d
Binary files /dev/null and b/img/jojo/body/hamon/hamon_aura_scarlet_old.png differ