diff --git a/game/base-combat/beast-generation.twee b/game/base-combat/beast-generation.twee index 342f2617456f0d76b590be061eaa44e6757942f7..24943c655b4ae13c31eb1d7cb8c1d682c36cb504 100644 --- a/game/base-combat/beast-generation.twee +++ b/game/base-combat/beast-generation.twee @@ -41,8 +41,6 @@ genitals: 0, }>> -<<set $NPCList[_n].bold to 0>> - <<if $enemyno lt 6>><<set $enemyno += 1>><</if>> <<beastattribute _n _type>> diff --git a/game/base-combat/machine/machine.twee b/game/base-combat/machine/machine.twee index bf4520ae115a10a2c9473806fa3e0adcee0203a1..c81a7283943003f9f7f19afb9835b443950900ef 100644 --- a/game/base-combat/machine/machine.twee +++ b/game/base-combat/machine/machine.twee @@ -19,7 +19,6 @@ <<set $leftactiondefault to "rest">> <<set $rightactiondefault to "rest">> <<set $feetactiondefault to "rest">> -<<set $NPCList[0].bold to 0>> <</widget>> <<widget "machine_damage">> diff --git a/game/base-combat/struggle.twee b/game/base-combat/struggle.twee index 66a99b4e12b6b34d4a191161499e5e78363622f2..a6465ed567fa36b5101178bc6cc5e4bd60906d30 100644 --- a/game/base-combat/struggle.twee +++ b/game/base-combat/struggle.twee @@ -18,7 +18,6 @@ <<set $rightleg to "bound">> <<set $feetuse to "bound">> <</if>> - <<set $NPCList[0].bold to 0>> <</widget>> <<widget "struggle_creatures">> diff --git a/game/base-combat/swarms.twee b/game/base-combat/swarms.twee index 44b459733d0d1ba8e7d818e4c1bb2e91db9d3db1..784fa1c5e77ed22354108267f54e047db809bb2f 100644 --- a/game/base-combat/swarms.twee +++ b/game/base-combat/swarms.twee @@ -35,8 +35,6 @@ } }>> - <<set $NPCList[0].bold to 0>> - <</widget>> <<widget "swarm">> diff --git a/game/base-combat/tentacles/tentacles.twee b/game/base-combat/tentacles/tentacles.twee index 17eaace3a60ec0e8d5c9f5105ca5a5a8599569c9..d6e45fadc5f27890affa2756f7b5dd28d0dc896d 100644 --- a/game/base-combat/tentacles/tentacles.twee +++ b/game/base-combat/tentacles/tentacles.twee @@ -150,8 +150,6 @@ <<set $tentacleColour to "tentacles-purple">> <</if>> <</if>> - -<<set $NPCList[0].bold to 0>> <</widget>> diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee index 04cb6529ecaea5f6aac1c91be4753a6d98fd975c..17951149751330c5dc6554e6da0cac45af2e1479 100644 --- a/game/base-system/widgets.twee +++ b/game/base-system/widgets.twee @@ -632,7 +632,7 @@ <<set $_stress_multiplier to 10>> <</if>> <<stress _args[0] $_stress_multiplier>> - <<combattrauma `-_args[0]`>> + <<combattrauma `-1 * _args[0]`>> <<if _args[1] is "demanding">> <<set $enemyanger += 20 * _args[0]>> <<elseif $NPCList[0].legs isnot "walk">> @@ -640,7 +640,7 @@ <</if>> <<def `_args[0] / 4`>> <<set $enemytrust -= 2>> - <<set $NPCList[0].bold -= (_args[0] * 10)>> + <<set $NPCList[0].bold to ($NPCList[0].bold gte _args[0] * 10 ? $NPCList[0].bold - _args[0] * 10 : 0)>> <</if>> <</widget>>