gloomhaven 1.0.7.1 → 1.0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7c9d63eeb3b3dde93092d25c7b45b93a041d1ebf87275335edd4589ccece20e
-  data.tar.gz: fcf5579457b18f484a3dd5175d54caa2672b8b68ca07f7d1b0460d51814ee3e2
+  metadata.gz: b9a9c6115b2132fd750f361c54257be7fb60eeeaec8c8a2e8c03f17f12d58a0f
+  data.tar.gz: dd2fd656988020b324b62276c29080d0c1fc06e14f32eeb0f811c6e1729d0f2b
 SHA512:
-  metadata.gz: '0089b3a4c9676c26b7b6d20c058cb8fbcc1f687b3e3f3471bde5a6754ed5f4cc7ce6043464b4b3fa6c9a59d2b351150956f2bbd27e2308e834571a5c4939897b'
-  data.tar.gz: a50b06b4e550a457dc635ddf602678545542f546dac56e96eec84b5c4da45d2a14ea5fec875bef82a4f14d88cf52ab4e7c544ccdc8401767caa643345df2c209
+  metadata.gz: 881c7920a31728ba1a9aeb43a0ff6558bb1f03696af946a3486e310cf5e8508fe0f342f884b1afe8d172196e43c02550879c225c39157be89657fc9ea3a80392
+  data.tar.gz: 2ee41842565711ddbea09bcf82ead6de444a9a7dfc25ceca5a50e648f4f078448716a37c99048b26580a810588d0e0cbce8edddbcd8f64d49109df4c08b5ffb8

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    gloomhaven (1.0.7.1)
+    gloomhaven (1.0.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.2)
+    method_source (0.9.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -33,6 +38,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   gloomhaven!
+  pry
   rake (~> 13.0)
   rspec (~> 3.0)
   simplecov (~> 0.18.4)

data/changelog.md

@@ -1,3 +1,7 @@
+# 1.0.8
+- Allow gold, xp
+- Update characters yaml to return name, spoiler_name, number. Sort by number
+
 # 1.0.7.1
 - Fixed loading issue with pry gem
 

data/config/characters.yml

@@ -1,5 +1,8 @@
 ---
-beast_tyrant:
+-
+  name: Beast Tyrant
+  spoiler_name: Two Mini
+  number: 17
   perks:
     remove_two_minus_one_cards: 1
     replace_one_minus_one_card_with_one_plus_one_card: 3
@@ -9,7 +12,10 @@ beast_tyrant:
     add_two_rolling_heal_plus_one_cards: 3
     add_two_rolling_nature_cards: 1
     ignore_negative_scenario_effects: 1
-berserker:
+-
+  name: Berserker
+  spoiler_name: Lightning Bolt
+  number: 12
   perks:
     remove_two_minus_one_cards: 1
     remove_four_plus_zero_cards: 1
@@ -21,7 +27,9 @@ berserker:
     add_two_rolling_heal_plus_one_cards: 1
     add_one_plus_two_fire_card: 2
     ignore_negative_item_effects: 1
-brute:
+-
+  name: Brute
+  number: 1
   perks:
     remove_two_minus_one_cards: 1
     replace_one_minus_one_card_with_one_plus_one_card: 1
@@ -34,7 +42,9 @@ brute:
     add_one_rolling_add_target_card: 2
     add_one_plus_one_shield_one_self_card: 1
     ignore_negative_item_effects_and_add_one_plus_one_card: 1
-cragheart:
+-
+  name: Cragheart
+  number: 5
   perks:
     remove_four_plus_zero_cards: 1
     replace_one_minus_one_card_with_one_plus_one_card: 3
@@ -46,7 +56,10 @@ cragheart:
     add_two_rolling_air_cards: 1
     ignore_negative_item_effects: 1
     ignore_negative_scenario_effects: 1
-doomstalker:
+-
+  name: Doomstalker
+  spoiler_name: Angry Face
+  number: 14
   perks:
     remove_two_minus_one_cards: 2
     replace_two_plus_zero_cards_with_two_plus_one_cards: 3
@@ -58,7 +71,10 @@ doomstalker:
     add_one_plus_zero_stun_card: 1
     add_one_rolling_add_target_card: 2
     ignore_negative_scenario_effects: 1
-elementalist:
+-
+  name: Elementalist
+  spoiler_name: Triforce
+  number: 16
   perks:
     remove_two_minus_one_cards: 2
     replace_one_minus_one_card_with_one_plus_one_card: 1
@@ -73,7 +89,9 @@ elementalist:
     add_one_plus_one_wound_card: 1
     add_one_plus_zero_stun_card: 1
     add_one_plus_zero_add_target_card: 1
-mindthief:
+-
+  name: Mindthief
+  number: 6
   perks:
     remove_two_minus_one_cards: 2
     remove_four_plus_zero_cards: 1
@@ -87,7 +105,10 @@ mindthief:
     add_one_rolling_stun_card: 1
     add_one_rolling_disarm_card_and_one_rolling_muddle_card: 1
     ignore_negative_scenario_effects: 1
-nightshroud:
+-
+  name: Nightshroud
+  spoiler_name: Eclipse/Moon
+  number: 10
   perks:
     remove_two_minus_one_cards: 2
     remove_four_plus_zero_cards: 1
@@ -99,7 +120,10 @@ nightshroud:
     add_two_rolling_curse_cards: 2
     add_one_rolling_add_target_card: 1
     ignore_negative_scenario_effects_and_add_two_plus_one_cards: 1
-plagueherald:
+-
+  name: Plagueherald
+  spoiler_name: Cthulu
+  number: 11
   perks:
     replace_one_minus_two_card_with_one_plus_zero_card: 1
     replace_one_minus_one_card_with_one_plus_one_card: 2
@@ -111,7 +135,10 @@ plagueherald:
     add_two_rolling_immobilize_cards: 1
     add_one_rolling_stun_card: 2
     ignore_negative_scenario_effects_and_add_one_plus_one_card: 1
-quartermaster:
+-
+  name: Quartermaster
+  spoiler_name: Three Spears
+  number: 8
   perks:
     remove_two_minus_one_cards: 2
     remove_four_plus_zero_cards: 1
@@ -123,7 +150,10 @@ quartermaster:
     add_one_rolling_add_target_card: 1
     add_one_plus_zero_refresh_an_item_card: 3
     ignore_negative_item_effects_and_add_two_plus_one_cards: 1
-sawbones:
+-
+  name: Sawbones
+  spoiler_name: Saw
+  number: 15
   perks:
     remove_two_minus_one_cards: 2
     remove_four_plus_zero_cards: 1
@@ -134,7 +164,9 @@ sawbones:
     add_one_rolling_stun_card: 1
     add_one_rolling_heal_plus_three_card: 2
     add_one_plus_zero_refresh_an_item_card: 1
-scoundrel:
+-
+  name: Scoundrel
+  number: 4
   perks:
     remove_two_minus_one_cards: 2
     remove_four_plus_zero_cards: 1
@@ -147,7 +179,10 @@ scoundrel:
     add_two_rolling_muddle_cards: 1
     add_one_rolling_invisible_card: 1
     ignore_negative_scenario_effects: 1
-soothsinger:
+-
+  name: Soothsinger
+  spoiler_name: Music Note
+  number: 13
   perks:
     remove_two_minus_one_cards: 2
     remove_one_minus_two_card: 1
@@ -161,7 +196,9 @@ soothsinger:
     replace_one_minus_one_card_with_one_plus_zero_stun_card: 1
     add_three_rolling_plus_one_cards: 1
     add_two_rolling_curse_cards: 2
-spellweaver:
+-
+  name: Spellweaver
+  number: 3
   perks:
     remove_four_plus_zero_cards: 1
     replace_one_minus_one_card_with_one_plus_one_card: 2
@@ -174,7 +211,10 @@ spellweaver:
     add_one_plus_two_ice_card: 2
     add_one_rolling_nature_and_one_rolling_air_card: 1
     add_one_rolling_light_and_one_rolling_dark_card: 1
-summoner:
+-
+  name: Summoner
+  spoiler_name: Concentric Circles
+  number: 9
   perks:
     remove_two_minus_one_cards: 1
     replace_one_minus_two_card_with_one_plus_zero_card: 1
@@ -186,7 +226,10 @@ summoner:
     add_one_rolling_fire_and_one_rolling_air_card: 1
     add_one_rolling_dark_and_one_rolling_nature_card: 1
     ignore_negative_scenario_effects_and_add_two_plus_one_cards: 1
-sunkeeper:
+-
+  name: Sunkeeper
+  spoiler_name: Sun
+  number: 7
   perks:
     remove_two_minus_one_cards: 2
     remove_four_plus_zero_cards: 1
@@ -199,7 +242,9 @@ sunkeeper:
     add_two_rolling_shield_1_self_cards: 1
     ignore_negative_item_effects_and_add_two_plus_one_cards: 1
     ignore_negative_scenario_effects: 1
-tinkerer:
+-
+  name: Tinkerer
+  number: 2
   perks:
     remove_two_minus_one_cards: 2
     replace_one_minus_two_card_with_one_plus_zero_card: 1

data/gloomhaven.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'simplecov', "~> 0.18.4"
+  spec.add_development_dependency 'pry'
 end

data/lib/gloomhaven/deck.rb

@@ -41,11 +41,14 @@ module Gloomhaven
     end
 
     ##
+    # Shuffles the deck if trying to draw without any cards left in pile.
     # Removes the top card from the deck, adds it to the @drawn_cards array (unless it's a bless/curse)
     # Returns the drawn card.
     # Ex: Deck.new.draw
     # => #<Card >
     def draw
+      shuffle! if @cards.empty?
+
       card = @cards.shift
       @drawn_cards << card unless card.bless? || card.curse?
       card

data/lib/gloomhaven/player.rb

@@ -4,16 +4,16 @@ module Gloomhaven
     attr_reader :character_class, :name, :deck
     attr_accessor :gold, :items, :perks, :xp
 
-    def initialize(options = { character_class: nil, name: nil } )
+    def initialize(options = {})
       validate!(options)
 
       @character_class = options[:character_class].downcase
       @deck = Deck.new
       @name = options[:name]
-      @gold = 0
+      @gold = options[:gold] || 0
+      @xp = options[:xp] || 0
       @items = []
       @perks = []
-      @xp = 0
     end
 
     def add_perk!(perk)
@@ -26,8 +26,12 @@ module Gloomhaven
 
     private
 
+    def character
+      CHARACTERS.detect { |character| character['name'].downcase == character_class.downcase }
+    end
+
     def character_class_perks
-      CHARACTERS[character_class]['perks'].keys
+      character['perks'].keys
     end
 
     def existing_perk_count(perk)
@@ -35,7 +39,7 @@ module Gloomhaven
     end
 
     def character_perk_limit(perk)
-      CHARACTERS[character_class]['perks'][perk.key]
+      character['perks'][perk.key]
     end
 
     def update_attack_modifier_deck_from!(perk)
@@ -46,19 +50,31 @@ module Gloomhaven
     def validate!(options)
       validate_character_class!(options[:character_class])
       validate_name!(options[:name])
+      validate_gold!(options[:gold])
+      validate_xp!(options[:xp])
     end
 
     def validate_character_class!(character_class)
       raise ArgumentError.new("options[:character_class] cannot be blank") if character_class.nil?
 
-      unless Gloomhaven::CHARACTERS.keys.include?(character_class.downcase)
-        raise TypeError.new("Invalid character_class: #{character_class} is not supported. Must be one of the following: #{Gloomhaven::CHARACTERS.keys}")
+      unless Gloomhaven::CHARACTER_NAMES.map(&:downcase).include?(character_class.downcase)
+        raise TypeError.new("Invalid character_class: #{character_class} is not supported. Must be one of the following: #{Gloomhaven::CHARACTER_NAMES}")
       end
     end
 
+    def validate_gold!(gold)
+      return unless gold
+      raise ArgumentError.new("options[:gold] must be an Integer") unless gold.is_a?(Integer)
+    end
+
     def validate_name!(name)
       raise ArgumentError.new("options[:name] cannot be blank") if name.nil?
       raise ArgumentError.new("options[:name] must be a String") unless name.is_a?(String)
     end
+
+    def validate_xp!(xp)
+      return unless xp
+      raise ArgumentError.new("options[:xp] must be an Integer") unless xp.is_a?(Integer)
+    end
   end
 end

data/lib/gloomhaven/version.rb

@@ -1,3 +1,3 @@
 module Gloomhaven
-  VERSION = '1.0.7.1'
+  VERSION = '1.0.8.0'
 end

data/lib/gloomhaven.rb

@@ -9,9 +9,11 @@ module Gloomhaven
   class CardNotFoundError < StandardError; end
 
   CARDS = YAML.load(File.read(File.join(File.dirname(__FILE__), '../config/cards.yml')))
-  CHARACTERS = YAML.load(File.read(File.join(File.dirname(__FILE__), '../config/characters.yml')))
+  CHARACTERS = YAML.load(File.read(File.join(File.dirname(__FILE__), '../config/characters.yml'))).sort_by { |c| c['number'] }
   PERKS = YAML.load(File.read(File.join(File.dirname(__FILE__), '../config/perks.yml')))
 
+  CHARACTER_NAMES = CHARACTERS.map { |character| character['name'] }.map(&:downcase)
+  
   def self.version
     VERSION
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloomhaven
 version: !ruby/object:Gem::Version
-  version: 1.0.7.1
+  version: 1.0.8.0
 platform: ruby
 authors:
 - Teo Dell'Amico
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.4
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - teo.dellamico@gmail.com