Making actions instance methods on Player for cleaner Ruby syntax

lib/magic/action.rb

@@ -1,10 +1,10 @@
 module Magic
   class Action
-    attr_reader :player, :game
+    attr_reader :game, :player
 
-    def initialize(player:)
+    def initialize(game:, player:)
+      @game = game
       @player = player
-      @game = player.game
     end
   end
 end

lib/magic/actions/activate_ability.rb

@@ -1,19 +1,18 @@
 module Magic
   module Actions
     class ActivateAbility < Action
-      attr_reader :permanent, :ability, :costs, :requirements, :targets
+      attr_reader :ability, :costs, :requirements, :targets
 
-      def initialize(permanent:, ability:, **args)
-        @permanent = permanent
-        @ability = ability.new(source: permanent)
+      def initialize(ability:, **args)
+        @ability = ability
         @costs = @ability.costs
         @requirements = @ability.requirements
         @targets = []
         super(**args)
       end
 
       def inspect
-        "#<Actions::Actions::ActivateAbility permanent: #{permanent.name}, ability: #{ability.class}>"
+        "#<Actions::Actions::ActivateAbility source: #{ability.source.name}, ability: #{ability.class}>"
       end
 
       def can_be_activated?(player)
@@ -39,16 +38,20 @@ def targeting(*targets)
       end
 
       def pay_mana(payment)
-        pay(player, :mana, payment)
+        pay(:mana, payment)
         self
       end
 
       def pay_tap
-        pay(player, :tap)
+        pay(:tap)
       end
 
       def pay_multi_tap(targets)
-        pay(player, :multi_tap, targets)
+        pay(:multi_tap, targets)
+      end
+
+      def pay_sacrifice(targets)
+        pay(:sacrifice, targets)
       end
 
       def perform
@@ -63,7 +66,7 @@ def perform
         end
       end
 
-      def pay(player, cost_type, payment = nil)
+      def pay(cost_type, payment = nil)
         cost_type = case cost_type
         when :mana
           Costs::Mana
@@ -85,6 +88,10 @@ def pay(player, cost_type, payment = nil)
         self
       end
 
+      def has_cost?(cost_type)
+        costs.any? { |cost| cost.is_a?(cost_type) }
+      end
+
       def finalize_costs!(player)
         costs.each { |cost| cost.finalize!(player) }
       end

lib/magic/actions/activate_loyalty_ability.rb

@@ -3,9 +3,9 @@ module Actions
     class ActivateLoyaltyAbility < Action
       attr_reader :ability, :planeswalker, :targets, :x_value
 
-      def initialize(planeswalker:, ability:, **args)
-        @planeswalker = planeswalker
-        @ability = ability.new(planeswalker: planeswalker)
+      def initialize(ability:, **args)
+        @planeswalker = ability.planeswalker
+        @ability = ability
         @targets = []
         super(**args)
       end

lib/magic/actions/cast.rb

@@ -3,6 +3,8 @@ module Actions
     class Cast < Action
       extend Forwardable
 
+      class InvalidTarget < StandardError; end
+
       def_delegators :@card, :enchantment?, :artifact?
       attr_reader :card, :targets
       def initialize(card:, **args)
@@ -47,6 +49,10 @@ def mana_cost
         end
       end
 
+      def auto_pay
+        mana_cost.auto_pay(player)
+      end
+
       def kicker_cost
         card.kicker_cost
       end
@@ -69,7 +75,7 @@ def can_target?(target)
 
       def targeting(*targets)
         targets.each do |target|
-          raise "Invalid target for #{card.name}: #{target}" unless can_target?(target)
+          raise InvalidTarget, "Invalid target for #{card.name}: #{target}" unless can_target?(target)
         end
         @targets = targets
         self

lib/magic/actions/play_land.rb

@@ -13,8 +13,7 @@ def inspect
       end
 
       def can_perform?
-        return false if player.can_play_lands?
-        true
+        player.can_play_lands?
       end
 
       def perform

lib/magic/cards/animal_sanctuary.rb

@@ -12,14 +12,14 @@ def costs
         end
 
         def resolve!
-          controller.add_mana(colorless: 1)
+          controller.add_mana(generic: 1)
         end
       end
 
       class ActivatedAbility < Magic::ActivatedAbility
         def costs
           [
-            Costs::Mana.new(colorless: 2),
+            Costs::Mana.new(generic: 2),
             Costs::Tap.new(source),
           ]
         end

lib/magic/cards/celestial_enforcer.rb

@@ -36,6 +36,8 @@ def resolve!(target:)
           target.tap!
         end
       end
+
+      def activated_abilities = [ActivatedAbility]
     end
   end
 end

lib/magic/cards/fabled_passage.rb

@@ -2,7 +2,6 @@ module Magic
   module Cards
     class FabledPassage < Land
       NAME = "Fabled Passage"
-      TYPE_LINE = "Land"
 
       def target_choices(receiver)
         receiver.controller.library.basic_lands
@@ -30,9 +29,7 @@ def resolve!
         end
       end
 
-      def activated_abilities
-        [ActivatedAbility]
-      end
+      def activated_abilities = [ActivatedAbility]
     end
   end
 end

lib/magic/cards/faiths_fetters.rb

@@ -23,7 +23,7 @@ def can_block?
       end
 
       def can_activate_ability?(ability)
-        ability < ManaAbility
+        ability.is_a?(ManaAbility)
       end
     end
   end

lib/magic/cards/idol_of_endurance.rb

@@ -40,9 +40,9 @@ def target_choices
 
         def resolve!(target:)
           source.remove_from_exile(target)
-          cast_action = Magic::Actions::Cast.new(card: target, player: source.controller)
-          cast_action.mana_cost = 0
-          game.take_action(cast_action)
+          source.controller.cast(card: target) do
+            _1.mana_cost = 0
+          end
         end
       end
 

lib/magic/cards/land.rb

@@ -1,6 +1,8 @@
 module Magic
   module Cards
     class Land < Card
+      type "Land"
+
       def play!
         move_zone!(game.battlefield)
       end

lib/magic/cards/shock.rb

@@ -12,10 +12,8 @@ def single_target?
       end
 
       def resolve!(_controller, target:)
-          game.add_effect(Effects::DealDamage.new(source: self, targets: [target], damage: 2)) 
+        game.add_effect(Effects::DealDamage.new(source: self, targets: [target], damage: 2))
       end
     end
-
-
   end
 end

lib/magic/costs/mana.rb

@@ -54,13 +54,19 @@ def can_pay?(player)
       end
 
       def pay(player, payment)
-
         raise CannotPay unless can_pay?(player)
 
         pay_generic(payment[:generic]) if payment[:generic]
         pay_colors(payment.slice(*Magic::Mana::COLORS))
       end
 
+      def auto_pay(player)
+        raise CannotPay unless can_pay?(player)
+
+        pay_colors(color_costs)
+        pay_generic(generic: cost[:generic]) if cost[:generic]
+      end
+
       def finalize!(player)
         raise OutstandingBalance if outstanding_balance?
         raise Overpayment if overpaid?

lib/magic/effects/single_target.rb

@@ -0,0 +1,27 @@
+module Magic
+  module Effects
+    class SingleTarget < Effect
+      class InvalidTarget < StandardError; end;
+
+      attr_reader :source, :target, :choices
+
+      def initialize(source:, target:, choices: source.target_choices)
+        @target = target
+        @source = source
+        @choices = [*choices]
+      end
+
+      def requires_choices?
+        true
+      end
+
+      def single_choice?
+        choices.count == 1
+      end
+
+      def no_choice?
+        choices.count.zero?
+      end
+    end
+  end
+end

lib/magic/effects/targeted_effect.rb

@@ -21,10 +21,6 @@ def choices
         end
       end
 
-      def requires_targets?
-        true
-      end
-
       def requires_choices?
         true
       end

lib/magic/game.rb

@@ -40,7 +40,7 @@ def initialize(
     def add_players(*players)
       players.each(&method(:add_player))
     end
-
+\
     def add_player(player)
       @player_count += 1
       @players << player

lib/magic/permanent.rb

@@ -4,7 +4,7 @@ class Permanent
     include Types
 
     extend Forwardable
-    attr_reader :game, :owner, :controller, :card,:types, :delayed_responses, :attachments, :protections, :modifiers, :counters, :keywords, :keyword_grants, :activated_abilities, :exiled_cards, :cannot_untap_next_turn
+    attr_reader :game, :owner, :controller, :card, :types, :delayed_responses, :attachments, :protections, :modifiers, :counters, :keywords, :keyword_grants, :activated_abilities, :exiled_cards, :cannot_untap_next_turn
 
     def_delegators :@card, :name, :cmc, :mana_value, :colors, :colorless?
     def_delegators :@game, :logger
@@ -49,7 +49,6 @@ def initialize(game:, owner:, card:, token: false, cast: true, kicked: false)
       @keywords = card.keywords
       @keyword_grants = []
       @counters = Counters::Collection.new([])
-      @activated_abilities = card.activated_abilities
       @damage = 0
       @protections = Protections.new(card.protections.dup)
       @exiled_cards = Magic::CardList.new([])
@@ -67,6 +66,10 @@ def inspect
       "#<Magic::Permanent name:#{card.name} controller:#{controller.name}>"
     end
 
+    def activated_abilities
+      @activated_abilities ||= card.activated_abilities.map { |ability| ability.new(source: self) }
+    end
+
     alias_method :to_s, :inspect
 
     def controller?(other_controller)

lib/magic/permanents/planeswalker.rb

@@ -12,7 +12,7 @@ def change_loyalty!(change)
         @loyalty += change
         destroy! if loyalty <= 0
       end
-      
+
       def take_damage(source:, damage:)
         game.notify!(
           Events::DamageDealt.new(
@@ -24,9 +24,8 @@ def take_damage(source:, damage:)
         change_loyalty!(- damage)
       end
 
-
       def loyalty_abilities
-        card.loyalty_abilities
+        card.loyalty_abilities.map { |ability| ability.new(planeswalker: self) }
       end
     end
   end