manasimu 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c73ee6bfefc5a1611b3170d86b8dc27dbf75c58f2dc3f2be7d570679cedfab3
-  data.tar.gz: f771ef43cafe46bcc75eed2c0964c42e39f32d7c1ab92a0e09e1a5b6ad6b4845
+  metadata.gz: edeb30bfc6e2c9a608856f5806fd5b34b8ab9cd6930462cd0dae8e219de08194
+  data.tar.gz: dc7eaa4a60ea42b6a842ccc13df0a4831ba4d805c0f12b2ecfa5d7969aed5304
 SHA512:
-  metadata.gz: c1e61d71e665d98b74a8cfa52d877e2131be56484fdee9d78d85b1e072d5ffa5172444b7c0683c30c94e113f9876048b31d4bbb4af528fac08296d2650bb6ce1
-  data.tar.gz: 5a6ea06c33e3227a1f4f74be5a6d4266069090ecda660e29ad7c9b717891367d4764943726f2a0cd32632fafd6e58e505526c6809ed0da87e67b3b133382dd7d
+  metadata.gz: 1647c593a3f49a13ecf430ff9aaf8df1d7286c74e73b179fc04b2badd05b72c2be9ee5ac44d8c2e1cb32d8ae8b7e6458c54e26b57f5b11f2fcf9e8b33f5486cf
+  data.tar.gz: a2398b09125d7b7fa8538e4068a48f3dceb3d0262b4b9e1a9ebdc174ff2f1cb4f236965f66329f55d6f2b23cc85abbb5f707529daa1b68097c1ed07094d9c8ec

data/lib/manasimu/card.rb

@@ -7,12 +7,12 @@ class Card
   end
 
   def step_in_hands(turn)
-    @card_type.step_in_hands(turn - 1, self)
+    @card_type.step_in_hands(turn, self)
     @can_play = false
   end
 
   def step_in_plays(turn)
-    @card_type.step_in_plays(turn - 1, self)
+    @card_type.step_in_plays(turn, self)
   end
 
   def drawed(turn)
@@ -140,14 +140,14 @@ class CardType
   end
 
   def step_in_hands(turn, card)
-    if turn >= 0 and card.can_play?
+    if card.can_play?
       @can_plays[turn] ||= 0
       @can_plays[turn] += 1
     end
   end
 
   def step_in_plays(turn, card)
-    if turn >= 0 and card.mana_source? and not card.tapped?
+    if card.mana_source? and not card.tapped?
       @mana_sources[turn] ||= {}
       size = card.color_identity.length
       card.color_identity.each do |c|
@@ -328,14 +328,14 @@ class CardType
 
   def count(turn = nil)
     turn ||= converted_mana_cost
-    played = @played [turn] || 0
-    drawed = 0
+    played_count = @played[turn] || 0
+    drawed_count = 0
     (turn+1).times do |i|
-      drawed += @drawed[i] || 0
+      drawed_count += @drawed[i] || 0
     end
-    can_played = @can_plays[turn] || 0
-    mana_sources = @mana_sources[turn] || {}
-    [played, drawed, can_played, mana_sources]
+    can_played_count = @can_plays[turn] || 0
+    mana_sources_count = @mana_sources[turn] || {}
+    [played_count, drawed_count, can_played_count, mana_sources_count]
   end
 
   def to_s

data/lib/manasimu/game.rb

@@ -1,8 +1,12 @@
 class Game
   attr_accessor :hands, :plays, :deck
 
-  def initialize(deck)
-    @deck = deck.shuffle(random: Random.new)
+  def initialize(deck, shuffle = true)
+    if shuffle 
+      @deck = deck.shuffle(random: Random.new)
+    else
+      @deck = deck
+    end
     @deck.each { |card| card.reset }
     @hands = []
     @plays = []
@@ -17,15 +21,12 @@ class Game
     # puts "hands"
     # @hands.each do |card| puts " #{card}" end
 
-    upkeep(turn)
     draw(turn)
+    play_cards = plan;
+    @hands.each { |card| card.step_in_hands(turn) }
     plan.each do |card| 
       play(card, turn)
     end
-  end
-
-  def upkeep(turn)
-    @hands.each { |card| card.step_in_hands(turn) }
     @plays.each { |card| card.step_in_plays(turn) }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manasimu
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - so1itaryrove