Prevent characters from starting or finishing an activity that might result in combat if the character is at max wounds

1 files changed, 3 insertions, 1 deletions

diff --git a/app/lib/activity_processor.rb b/app/lib/activity_processor.rb
index b8456c8..e8ca82e 100644
--- a/app/lib/activity_processor.rb
+++ b/app/lib/activity_processor.rb
@@ -25,6 +25,8 @@ class ActivityProcessor
       return
     end
 
+    raise TooManyWoundsError if @character.activity.can_result_in_combat? && !@character.can_fight?
+
     Character.transaction do
       if @character.rested_duration > 0
         remaining_rested_duration = @character.rested_duration - @character.rested_duration_to_spend_on_activity
@@ -191,7 +193,7 @@ class ActivityProcessor
   rescue TooManyWoundsError
     @character.stop_activity
     @results.replace([{ type: "error",
-                        message: "You can't fight in your condition. You'll have to heal a wound." }])
+                        message: "In your condition, you can't do anything that might result in combat. You'll have to heal a wound first." }])
   rescue MonsterSpawnError
     @character.stop_activity
     @results.replace([{ type: "error",