summaryrefslogtreecommitdiff
path: root/app/models/character.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/character.rb')
-rw-r--r--app/models/character.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/character.rb b/app/models/character.rb
index b3d8c25..4fd524b 100644
--- a/app/models/character.rb
+++ b/app/models/character.rb
@@ -279,6 +279,9 @@ class Character < ApplicationRecord
def can_do_activity?(activity, ignore_cost: false, ignore_requirements: false)
return false unless activity.innate? || self.learned_activities.exists?(activity: activity)
+
+ return false if activity.can_result_in_combat? && !can_fight?
+
unless ignore_cost
activity.whatnot[:cost]&.each do |cost|
case cost[:type]