From 14e861e9d0eff3c2597af0983b8ac0f0d24e1479 Mon Sep 17 00:00:00 2001 From: Andrest07 <57931603+Andrest07@users.noreply.github.com> Date: Tue, 19 Dec 2023 00:15:42 +0700 Subject: [PATCH] More bugfixes --- game/base-combat/init.twee | 2 +- game/base-combat/npc-damage.twee | 4 ++-- game/overworld-forest/loc-lake/ivory/widgets.twee | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/game/base-combat/init.twee b/game/base-combat/init.twee index ec7c83bd76..248d1424a4 100644 --- a/game/base-combat/init.twee +++ b/game/base-combat/init.twee @@ -1003,7 +1003,7 @@ * This will prevent said NPC from entering combat plus deal with all the rest of the math. * Optional arguments [1] and [2] for health and arousal respectivelly. If the original health or arousal values for the NPCs haven't been changed, no need to use those arguments. */ - <<set $_hpToReduce to _args[1] || $NPCList[_args[0]].healthmax * $npcHealthMult>> + <<set $_hpToReduce to _args[1] || $NPCList[_args[0]].healthmax * ($npcHealthMult / 100)>> <<set $_arousalToReduce to _args[2] || $enemyarousalmax/$enemyno>> <<if _args[0] isnot undefined and $NPCList[_args[0]]>> <<if $NPCList[_args[0]].active isnot "inactive">> diff --git a/game/base-combat/npc-damage.twee b/game/base-combat/npc-damage.twee index c53050b992..24e6ffbe3e 100644 --- a/game/base-combat/npc-damage.twee +++ b/game/base-combat/npc-damage.twee @@ -238,9 +238,9 @@ <!-- Remove Defeated NPC from loops --> <<set $enemyno-->> <!-- Reset Group attributes--> - <<set $enemyarousalmax to 500 * $enemyno * $npcArousalMult>> + <<set $enemyarousalmax to 500 * $enemyno * ($npcArousalMult / 100)>> <<set $enemyarousal to $enemyarousal * ($enemyno / ($enemyno +1))>> - <<set $enemyhealthmax -= $NPCList[_i].healthmax * $npcHealthMult>> + <<set $enemyhealthmax -= $NPCList[_i].healthmax * ($npcHealthMult / 100)>> <<set $_excessdamage to (0-$NPCList[_i].health)>> <!-- Debug message --> diff --git a/game/overworld-forest/loc-lake/ivory/widgets.twee b/game/overworld-forest/loc-lake/ivory/widgets.twee index 3c21c83bdc..7b0c1c1469 100644 --- a/game/overworld-forest/loc-lake/ivory/widgets.twee +++ b/game/overworld-forest/loc-lake/ivory/widgets.twee @@ -202,8 +202,8 @@ <<generateWraith 1>> <<initWraith _wraithSelect>> <<set $NPCList[0].intro to 0>> - <<if $wraithHealth lt ($enemyhealth * 0.2) * $npcHealthMult>> - <<set $enemyhealth to $enemyhealth * 0.2 * $npcHealthMult>> + <<if $wraithHealth lt ($enemyhealth * 0.2) * ($npcHealthMult / 100)>> + <<set $enemyhealth to $enemyhealth * 0.2 * ($npcHealthMult / 100)>> <<else>> <<set $enemyhealth to $wraithHealth>> <</if>> -- GitLab