Merge branch 'master' into dev

game/base-combat/actions-feet.twee

@@ -140,7 +140,7 @@
 
 <<widget "feetDodge">>
 	<<if $feettarget isnot "self">>
-		<<if $consensual isnot 1 and ($fightTargets is undefined or $fightTargets.includes($feettarget)) and $combatExtended.stabilityLost is 0>>
+		<<if $consensual isnot 1 and ($fightTargets is undefined or $fightTargets.includes($feettarget)) and $combatExtended.stabilityLost is 0 and $combatExtended.activeDodging is 1>>
 			<<set _feetaction["Dodge"] to "dodge">>
 		<</if>>
 	<</if>>
@@ -148,7 +148,7 @@
 
 <<widget "feetPlant">>
 	<<if $feettarget isnot "self">>
-		<<if $consensual isnot 1 and $combatExtended.stabilityLost is 0>>
+		<<if $consensual isnot 1 and $combatExtended.stabilityLost is 0 and $combatExtended.standingFights is 1>>
 			<<set _feetaction["Plant"] to "plant">>
 		<</if>>
 	<</if>>
@@ -156,7 +156,7 @@
 
 <<widget "feetSubmit">>
 	<<if $feettarget isnot "self">>
-		<<if $consensual isnot 1 and $combatExtended.stabilityLost is 0>>
+		<<if $consensual isnot 1 and $combatExtended.stabilityLost is 0 and $combatExtended.standingFights is 1>>
 			<<set _feetaction["Submit"] to "submit">>
 		<</if>>
 	<</if>>