TGT corrections

HearthSim · Aug 19, 2015 · 9b86814 · 9b86814
1 parent e6cd0f5
commit 9b86814
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/controllers/preferences/general_preferences_layout.rb b/app/controllers/preferences/general_preferences_layout.rb
@@ -11,7 +11,6 @@ class GeneralPreferencesLayout < PreferencesLayout
       'koKR' => 'ko_KR',
       'plPL' => 'pl_PL',
       'ptBR' => 'pt_BR',
-      'ptPT' => 'pt_PT',
       'ruRU' => 'ru_RU',
       'zhCN' => 'zh_CN',
       'zhTW' => 'zh_TW'

diff --git a/app/log/log_observer.rb b/app/log/log_observer.rb
@@ -145,7 +145,7 @@ def find_last_game_start(file_handle)
         found_spectator_start = true
       elsif line.include?('End Spectator')
         offset = temp_offset
-      elsif line.include?('CREATE_GAME')
+      elsif line.include?('CREATE_GAME') && line.include?('GameState.')
         if found_spectator_start
           found_spectator_start = false
           next
@@ -190,7 +190,7 @@ def analyze(line)
     #return
 
     ## [POWER]
-    if line =~ /^\[Power\]/
+    if line =~ /^\[Power\] GameState\./
       # game start
       if line =~ /CREATE_GAME/
         start_game
@@ -314,7 +314,7 @@ def analyze(line)
         @spectating = true
         #game_end
 
-      elsif (match = /.*ACTION_START.*id=(\w*).*cardId=(\w*).*SubType=POWER.*Target=(.+)/i.match(line))
+      elsif (match = /.*ACTION_START.*id=(\w*).*cardId=(\w*).*BlockType=POWER.*Target=(.+)/i.match(line))
         id = match[1]
         local_id = match[2]
         target = match[3]

diff --git a/app/utilities/image_cache.rb b/app/utilities/image_cache.rb
@@ -1,6 +1,6 @@
 class ImageCache
   # usefull if we need to force reloading of images
-  IMAGES_VERSION = 1
+  IMAGES_VERSION = 2
 
   class << self