From 5aaaf7ca41749fd7fcf5e477c889fbb719ca214b Mon Sep 17 00:00:00 2001 From: Andrest07 <57931603+Andrest07@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:59:54 +0700 Subject: [PATCH] modupdate widget --- game/04-Variables/variables-start.twee | 2 ++ game/04-Variables/variables-start2.twee | 1 + .../04-Variables/variables-versionUpdate.twee | 31 +++++++++++++++++++ game/base-combat/actions-speech.twee | 8 ++++- 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/game/04-Variables/variables-start.twee b/game/04-Variables/variables-start.twee index 33a687d6d0..a8185ed909 100644 --- a/game/04-Variables/variables-start.twee +++ b/game/04-Variables/variables-start.twee @@ -958,4 +958,6 @@ <<set $world_corruption_soft to 0>> <<set $world_corruption_hard to 2>> <<set $world_corruption_reduced to 0>> + + <<modupdate>> <</widget>> diff --git a/game/04-Variables/variables-start2.twee b/game/04-Variables/variables-start2.twee index 3d4080a5ed..518c8194df 100644 --- a/game/04-Variables/variables-start2.twee +++ b/game/04-Variables/variables-start2.twee @@ -364,4 +364,5 @@ <<run toggleConfirmDialogUponTabClose()>> <<run Furniture.update()>> + <<modupdate>> <</widget>> diff --git a/game/04-Variables/variables-versionUpdate.twee b/game/04-Variables/variables-versionUpdate.twee index 8dc64f9960..2b2b0885e2 100644 --- a/game/04-Variables/variables-versionUpdate.twee +++ b/game/04-Variables/variables-versionUpdate.twee @@ -4656,4 +4656,35 @@ <<set C.npc.Jordan.title to "priestess">> <</if>> + <<modupdate>> +<</widget>> + +<<widget "modupdate">> + <<if $angeltf is undefined>> + <<set $angeltf to 0>> + <</if>> + <<if $fallenangeltf is undefined>> + <<set $fallenangeltf to 0>> + <</if>> + <<if $fallenangelplustf is undefined>> + <<set $fallenangelplustf to 0>> + <</if>> + <<if $demontf is undefined>> + <<set $demontf to 0>> + <</if>> + <<if $cattf is undefined>> + <<set $cattf to 0>> + <</if>> + <<if $cowtf is undefined>> + <<set $cowtf to 0>> + <</if>> + <<if $wolftf is undefined>> + <<set $wolftf to 0>> + <</if>> + <<if $birdtf is undefined>> + <<set $birdtf to 0>> + <</if>> + <<if $foxtf is undefined>> + <<set $foxtf to 0>> + <</if>> <</widget>> diff --git a/game/base-combat/actions-speech.twee b/game/base-combat/actions-speech.twee index bfb85fbe90..fcc02293a3 100644 --- a/game/base-combat/actions-speech.twee +++ b/game/base-combat/actions-speech.twee @@ -68,9 +68,15 @@ <<if $wolfgirl gte 2>> <<set _mouthaction["Growl"] to "growl">> <</if>> - <<if $angel gte 6 and $angelforgive isnot 1>> + <<if ($angel gte 6 or $angeltf is 1) and $angelforgive isnot 1>> <<set _mouthaction["Forgive"] to "forgive">> <</if>> + <<if ($fallenangel gte 2 or $fallenangeltf to 1 or $fallenangelplustf to 1) and $fallenangelretribution isnot 1>> + <<set _mouthaction["Retribution"] to "retribution">> + <</if>> + <<if ($demon gte 6 or $demontf is 1) and $demonseduce isnot 1>> + <<set _mouthaction["Seduce"] to "seduce">> + <</if>> <<if $submissive lte 850>> <<if $fightTargets is undefined>> <<set _mouthaction["Demand"] to "demand">> -- GitLab