Imply activated abilities during continuous effects

lib/magic/cards/basic_land.rb

@@ -7,7 +7,8 @@ def self.card_name(name)
       end
 
       def self.color(color)
-        mana_ability = Class.new(Magic::TapManaAbility) do
+        mana_ability = Class.new(Magic::ManaAbility) do
+          costs "{T}"
           choices color
         end
 

lib/magic/cards/crown_of_skemfar.rb

@@ -42,7 +42,7 @@ def can_activate_ability?(ability)
       end
 
       def activated_abilities
-        [ReturnFromGraveyard.new(source: self)]
+        [ReturnFromGraveyard]
       end
     end
   end

lib/magic/permanent.rb

@@ -14,6 +14,9 @@ class Permanent
       :controller,
       :card,
       :types,
+      :power,
+      :toughness,
+      :keywords,
       :delayed_responses,
       :attachments,
       :protections,
@@ -68,6 +71,7 @@ def initialize(game:, owner:, card:, token: false, cast: true, kicked: false, co
       @tapped = false
       @types = card.types
       @keyword_grants = card.keyword_grants
+      @activated_abilities = card.activated_abilities
       @counters = Counters::Collection.new([])
       @damage = 0
       @protections = Protections.new(card.protections.dup)
@@ -88,30 +92,22 @@ def types=(types)
       @types = types
     end
 
-    def power
-      @power
-    end
-
     def power=(power)
       @power = power
     end
 
-    def toughness
-      @toughness
-    end
-
     def toughness=(toughness)
       @toughness = toughness
     end
 
-    def keywords
-      @keywords
-    end
-
     def keywords=(keywords)
       @keywords = keywords
     end
 
+    def activated_abilities=(abilities)
+      @activated_abilities = abilities
+    end
+
     def keyword_grant_modifiers
       modifiers.select { |modifier| modifier.is_a?(Permanents::Modifications::KeywordGrant) }
     end
@@ -120,10 +116,6 @@ 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
-
     def state_triggered_abilities
       @state_triggered_abilities ||= card.state_triggered_abilities.map { |ability| ability.new(source: self) }
     end

lib/magic/permanents/continuous_effects.rb

@@ -19,6 +19,7 @@ def apply!
         permanent.types = types
         game.logger.debug "Types: #{types}"
         # Layer 6
+        permanent.activated_abilities = calculate_activated_abililities
         permanent.keywords = calculate_keywords
         game.logger.debug "Keywords: #{permanent.keywords}"
         # Layer 7
@@ -100,6 +101,14 @@ def keyword_grant_static_abilities
       def static_abilities_for(permanent)
         static_abilities.applies_to(permanent)
       end
+
+      def calculate_activated_abililities
+        [
+          *card.activated_abilities,
+        ].map do |ability|
+          ability.new(source: permanent)
+        end
+      end
     end
   end
 end

lib/magic/token.rb

@@ -81,6 +81,10 @@ def static_abilities
       []
     end
 
+    def activated_abilities
+      []
+    end
+
     def replacement_effects
       {}
     end

lib/magic/zones/graveyard.rb

@@ -6,6 +6,11 @@ def add(card, _index = 0)
 
         super
       end
+
+      def by_name(name)
+        super.map { |card| GraveyardCard.new(card: card) }
+      end
+
       def graveyard?
         true
       end

spec/cards/crown_of_skemfar_spec.rb

@@ -26,22 +26,21 @@
   end
 
   context "return from graveyard to hand" do
-    let(:crown_of_skemfar) { Card("Crown Of Skemfar") }
-
     before do
-      p1.graveyard.add(crown_of_skemfar)
+      p1.graveyard.add(Card("Crown Of Skemfar"))
     end
 
     it "returns to hand" do
-      ability = crown_of_skemfar.activated_abilities.first
+      graveyard_card = p1.graveyard.by_name("Crown of Skemfar").first
+      ability = graveyard_card.activated_abilities.first
       p1.add_mana(green: 3)
       p1.activate_ability(ability: ability) do
         _1.pay_mana(generic: { green: 2 }, green: 1)
       end
 
       game.stack.resolve!
 
-      expect(p1.hand).to include(crown_of_skemfar)
+      expect(p1.hand.by_name("Crown of Skemfar").count).to eq(1)
     end
   end
 end