Support for new heroes, closes #62

Also, add a verification if hero is found, so HSTracker will not crash if it does not find the hero
HearthSim · Jun 16, 2015 · cd7c806 · cd7c806
1 parent 5936acb
commit cd7c806
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 21 deletions.
diff --git a/app/controllers/huds/timer_hud.rb b/app/controllers/huds/timer_hud.rb
@@ -49,10 +49,10 @@ def restart(player)
 
   private
   def fire(_)
-    return if !@player_mulligan and !@opponent_mulligan
-
     @seconds -= 1 if @seconds > 0
 
+    return if !@player_mulligan and !@opponent_mulligan
+
     seconds = 90 - @seconds
     if @seconds < 10
       @label.flash

diff --git a/app/hearthstone/game.rb b/app/hearthstone/game.rb
@@ -72,7 +72,7 @@ def handle_end_game
                  :duration        => (@end_date.timeIntervalSince1970 - @start_date.timeIntervalSince1970).to_i,
                  :deck_id         => @current_deck.hearthstats_id,
                  :deck_version_id => @current_deck.hearthstats_version_id,
-                 :oppclass        => @current_opponent.player_class,
+                 :oppclass        => @current_opponent ? @current_opponent.player_class : nil,
                  :oppname         => @opponent_name || nil,
                  :notes           => nil,
                  :ranklvl         => @current_rank,
@@ -233,8 +233,11 @@ def player_get_to_deck(card_id, turn)
   end
 
   def player_hero(hero_id)
-    log(:player, "hero is #{hero_id} (#{Card.hero(hero_id).name})")
-    player_tracker.set_hero(hero_id)
+    hero = Card.hero(hero_id)
+    if hero
+      log(:player, "hero is #{hero_id} (#{hero.name})")
+      player_tracker.set_hero(hero_id)
+    end
   end
 
   def player_draw(card_id, turn)

diff --git a/app/utilities/database_generator.rb b/app/utilities/database_generator.rb
@@ -2,7 +2,7 @@ class DatabaseGenerator
   include CDQ
 
   # usefull if we need to force reloading of database
-  DATABASE_VERSION = 4
+  DATABASE_VERSION = 5
 
   Log = Motion::Log
 
@@ -46,7 +46,9 @@ def load(splash, &block)
         'Promotion',
         'Curse of Naxxramas',
         'Goblins vs Gnomes',
-        'Blackrock Mountain'
+        'Blackrock Mountain',
+        'Hero Skins',
+        'Tavern Brawl'
     ]
     splash.max(langs.size) if splash
 

diff --git a/resources/cards/cardsDB.deDE.json b/resources/cards/cardsDB.deDE.json
diff --git a/resources/cards/cardsDB.enGB.json b/resources/cards/cardsDB.enGB.json
diff --git a/resources/cards/cardsDB.enUS.json b/resources/cards/cardsDB.enUS.json
diff --git a/resources/cards/cardsDB.esES.json b/resources/cards/cardsDB.esES.json
diff --git a/resources/cards/cardsDB.esMX.json b/resources/cards/cardsDB.esMX.json
diff --git a/resources/cards/cardsDB.frFR.json b/resources/cards/cardsDB.frFR.json
diff --git a/resources/cards/cardsDB.itIT.json b/resources/cards/cardsDB.itIT.json
diff --git a/resources/cards/cardsDB.koKR.json b/resources/cards/cardsDB.koKR.json
diff --git a/resources/cards/cardsDB.plPL.json b/resources/cards/cardsDB.plPL.json
diff --git a/resources/cards/cardsDB.ptBR.json b/resources/cards/cardsDB.ptBR.json
diff --git a/resources/cards/cardsDB.ptPT.json b/resources/cards/cardsDB.ptPT.json
diff --git a/resources/cards/cardsDB.ruRU.json b/resources/cards/cardsDB.ruRU.json
diff --git a/resources/cards/cardsDB.zhCN.json b/resources/cards/cardsDB.zhCN.json
diff --git a/resources/cards/cardsDB.zhTW.json b/resources/cards/cardsDB.zhTW.json
diff --git a/versions.markdown b/versions.markdown
@@ -1,3 +1,7 @@
+#### 0.11.2
+- Correct a bug where HSTracker will crash when canceling a modal dialog in the deck manager
+- Support for new heroes
+
 #### 0.11.1
 - Correct a bug where the last deck was deleted on right-click instead of the selected one
 - Add a verification for the config.log file