steam-condenser 1.3.5 → 1.3.6

data/lib/steam/community/css/css_map.rb

@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2010-2011, Sebastian Staudt
+# Copyright (c) 2010-2013, Sebastian Staudt
 
 # Represents the stats for a Counter-Strike: Source map for a specific user
 #
@@ -34,7 +34,7 @@ class CSSMap
   # @param [String] map_name The name of the map
   # @param [Hash<String, Object>] maps_data The XML data of all maps
   def initialize(map_name, maps_data)
-    @name          = map_name
+    @name = map_name
 
     @favorite      = (maps_data['favorite'] == @name)
     @rounds_played = maps_data["#{@name}_rounds"].to_i

data/lib/steam/community/css/css_stats.rb

@@ -13,16 +13,14 @@ require 'steam/community/css/css_weapon'
 class CSSStats < GameStats
 
   # The names of the maps in Counter-Strike: Source
-  MAPS = [ 'cs_assault', 'cs_compound', 'cs_havana', 'cs_italy', 'cs_militia',
-           'cs_office', 'de_aztec', 'de_cbble', 'de_chateau', 'de_dust',
-           'de_dust2', 'de_inferno', 'de_nuke', 'de_piranesi', 'de_port',
-           'de_prodigy', 'de_tides', 'de_train' ]
+  MAPS = %w(cs_assault cs_compound cs_havana cs_italy cs_militia cs_office
+            de_aztec de_cbble de_chateau de_dust de_dust2 de_inferno de_nuke
+            de_piranesi de_port de_prodigy de_tides de_train)
 
   # The names of the weapons in Counter-Strike: Source
-  WEAPONS = [ 'deagle', 'usp', 'glock', 'p228', 'elite', 'fiveseven', 'awp',
-              'ak47', 'm4a1', 'aug', 'sg552', 'sg550', 'galil', 'famas',
-              'scout', 'g3sg1', 'p90', 'mp5navy', 'tmp', 'mac10', 'ump45',
-              'm3', 'xm1014', 'm249', 'knife', 'grenade' ]
+  WEAPONS = %w(deagle usp glock p228 elite fiveseven awp ak47 m4a1 aug sg552
+               sg550 galil famas scout g3sg1 p90 mp5navy tmp mac10 ump45 m3
+               xm1014 m249 knife grenade)
 
   # Returns statistics about the last match the player played
   #
@@ -48,54 +46,54 @@ class CSSStats < GameStats
       lifetime_data = @xml_data['stats']['lifetime']
       summary_data = @xml_data['stats']['summary']
 
-      @last_match_stats = {}
-      @total_stats      = {}
-
-      @last_match_stats[:cost_per_kill]      = last_match_data['costkill'].to_f
-      @last_match_stats[:ct_wins]            = last_match_data['ct_wins'].to_i
-      @last_match_stats[:damage]             = last_match_data['dmg'].to_i
-      @last_match_stats[:deaths]             = last_match_data['deaths'].to_i
-      @last_match_stats[:dominations]        = last_match_data['dominations'].to_i
-      @last_match_stats[:favorite_weapon_id] = last_match_data['favwpnid'].to_i
-      @last_match_stats[:kills]              = last_match_data['kills'].to_i
-      @last_match_stats[:max_players]        = last_match_data['max_players'].to_i
-      @last_match_stats[:money]              = last_match_data['money'].to_i
-      @last_match_stats[:revenges]           = last_match_data['revenges'].to_i
-      @last_match_stats[:stars]              = last_match_data['stars'].to_i
-      @last_match_stats[:t_wins]             = last_match_data['t_wins'].to_i
-      @last_match_stats[:wins]               = last_match_data['wins'].to_i
-
-      @total_stats[:blind_kills]             = lifetime_data['blindkills'].to_i
-      @total_stats[:bombs_defused]           = lifetime_data['bombsdefused'].to_i
-      @total_stats[:bombs_planted]           = lifetime_data['bombsplanted'].to_i
-      @total_stats[:damage]                  = lifetime_data['dmg'].to_i
-      @total_stats[:deaths]                  = summary_data['deaths'].to_i
-      @total_stats[:domination_overkills]    = lifetime_data['dominationoverkills'].to_i
-      @total_stats[:dominations]             = lifetime_data['dominations'].to_i
-      @total_stats[:earned_money]            = lifetime_data['money'].to_i
-      @total_stats[:enemy_weapon_kills]      = lifetime_data['enemywpnkills'].to_i
-      @total_stats[:headshots]               = lifetime_data['headshots'].to_i
-      @total_stats[:hits]                    = summary_data['shotshit'].to_i
-      @total_stats[:hostages_rescued]        = lifetime_data['hostagesrescued'].to_i
-      @total_stats[:kills]                   = summary_data['kills'].to_i
-      @total_stats[:knife_kills]             = lifetime_data['knifekills'].to_i
-      @total_stats[:logos_sprayed]           = lifetime_data['decals'].to_i
-      @total_stats[:nightvision_damage]      = lifetime_data['nvgdmg'].to_i
-      @total_stats[:pistol_rounds_won]       = lifetime_data['pistolrounds'].to_i
-      @total_stats[:revenges]                = lifetime_data['revenges'].to_i
-      @total_stats[:rounds_played]           = summary_data['rounds'].to_i
-      @total_stats[:rounds_won]              = summary_data['wins'].to_i
-      @total_stats[:seconds_played]          = summary_data['timeplayed'].to_i
-      @total_stats[:shots]                   = summary_data['shots'].to_i
-      @total_stats[:stars]                   = summary_data['stars'].to_i
-      @total_stats[:weapons_donated]         = lifetime_data['wpndonated'].to_i
-      @total_stats[:windows_broken]          = lifetime_data['winbroken'].to_i
-      @total_stats[:zoomed_sniper_kills]     = lifetime_data['zsniperkills'].to_i
-
-      @last_match_stats[:kdratio] = (@total_stats[:deaths] > 0) ? @last_match_stats[:kills].to_f / @last_match_stats[:deaths] : 0
-      @total_stats[:accuracy]     = (@total_stats[:shots] > 0) ? @total_stats[:hits].to_f / @total_stats[:shots] : 0
-      @total_stats[:kdratio]      = (@total_stats[:deaths] > 0) ? @total_stats[:kills].to_f / @total_stats[:deaths] : 0
-      @total_stats[:rounds_lost]  = @total_stats[:rounds_played] - @total_stats[:rounds_won]
+      @last_match_stats = {
+        :cost_per_kill      => last_match_data['costkill'].to_f,
+        :ct_wins            => last_match_data['ct_wins'].to_i,
+        :damage             => last_match_data['dmg'].to_i,
+        :deaths             => last_match_data['deaths'].to_i,
+        :dominations        => last_match_data['dominations'].to_i,
+        :favorite_weapon_id => last_match_data['favwpnid'].to_i,
+        :kills              => last_match_data['kills'].to_i,
+        :max_players        => last_match_data['max_players'].to_i,
+        :money              => last_match_data['money'].to_i,
+        :revenges           => last_match_data['revenges'].to_i,
+        :stars              => last_match_data['stars'].to_i,
+        :t_wins             => last_match_data['t_wins'].to_i,
+        :wins               => last_match_data['wins'].to_i,
+      }
+
+      @total_stats = {
+        :blind_kills          => lifetime_data['blindkills'].to_i,
+        :bombs_defused        => lifetime_data['bombsdefused'].to_i,
+        :bombs_planted        => lifetime_data['bombsplanted'].to_i,
+        :damage               => lifetime_data['dmg'].to_i,
+        :deaths               => summary_data['deaths'].to_i,
+        :domination_overkills => lifetime_data['dominationoverkills'].to_i,
+        :dominations          => lifetime_data['dominations'].to_i,
+        :earned_money         => lifetime_data['money'].to_i,
+        :enemy_weapon_kills   => lifetime_data['enemywpnkills'].to_i,
+        :headshots            => lifetime_data['headshots'].to_i,
+        :hits                 => summary_data['shotshit'].to_i,
+        :hostages_rescued     => lifetime_data['hostagesrescued'].to_i,
+        :kills                => summary_data['kills'].to_i,
+        :knife_kills          => lifetime_data['knifekills'].to_i,
+        :logos_sprayed        => lifetime_data['decals'].to_i,
+        :nightvision_damage   => lifetime_data['nvgdmg'].to_i,
+        :pistol_rounds_won    => lifetime_data['pistolrounds'].to_i,
+        :revenges             => lifetime_data['revenges'].to_i,
+        :rounds_played        => summary_data['rounds'].to_i,
+        :rounds_won           => summary_data['wins'].to_i,
+        :seconds_played       => summary_data['timeplayed'].to_i,
+        :shots                => summary_data['shots'].to_i,
+        :stars                => summary_data['stars'].to_i,
+        :weapons_donated      => lifetime_data['wpndonated'].to_i,
+        :windows_broken       => lifetime_data['winbroken'].to_i,
+        :zoomed_sniper_kills  => lifetime_data['zsniperkills'].to_i,
+        :kdratio              => (@total_stats[:deaths] > 0) ? @last_match_stats[:kills].to_f / @last_match_stats[:deaths] : 0,
+        :accuracy             => (@total_stats[:shots] > 0) ? @total_stats[:hits].to_f / @total_stats[:shots] : 0,
+        :kdratio              => (@total_stats[:deaths] > 0) ? @total_stats[:kills].to_f / @total_stats[:deaths] : 0,
+        :rounds_lost          => @total_stats[:rounds_played] - @total_stats[:rounds_won]
+      }
     end
   end
 

data/lib/steam/community/css/css_weapon.rb

@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2010-2011, Sebastian Staudt
+# Copyright (c) 2010-2013, Sebastian Staudt
 
 # Represents the stats for a Counter-Strike: Source weapon for a specific user
 #
@@ -34,14 +34,14 @@ class CSSWeapon
   # @param [String] weapon_name The name of the weapon
   # @param [Hash<String, Object>] weapons_data The XML data of all weapons
   def initialize(weapon_name, weapons_data)
-    @name     = weapon_name
+    @name = weapon_name
 
     @favorite = (weapons_data['favorite'] == @name)
     @kills    = weapons_data["#{@name}_kills"].to_i
 
     if @name != 'grenade' && @name != 'knife'
-      @hits     = weapons_data["#{@name}_hits"].to_i
-      @shots    = weapons_data["#{@name}_shots"].to_i
+      @hits  = weapons_data["#{@name}_hits"].to_i
+      @shots = weapons_data["#{@name}_shots"].to_i
     end
   end
 

data/lib/steam/community/game_item.rb

@@ -23,7 +23,7 @@ module GameItem
 
   # Returns the number of items the player owns of this item
   #
-  # @return [Fixnum] The quanitity of this item
+  # @return [Fixnum] The quantity of this item
   attr_reader :count
 
   # Returns the index where the item is defined in the schema
@@ -112,8 +112,7 @@ module GameItem
 
     @attributes = []
     attributes_data.each do |attribute_data|
-      attribute_key = attribute_data[:defindex]
-      attribute_key = attribute_data[:name] if attribute_key.nil?
+      attribute_key = attribute_data[:defindex] || attribute_data[:name]
 
       unless attribute_key.nil?
         schema_attribute_data = inventory.item_schema.attributes[attribute_key]

data/lib/steam/community/game_leaderboard.rb

@@ -16,14 +16,14 @@ class GameLeaderboard
 
   include XMLData
 
-  LEADERBOARD_DISPLAY_TYPE_NONE         = 0
-  LEADERBOARD_DISPLAY_TYPE_NUMERIC      = 1
-  LEADERBOARD_DISPLAY_TYPE_SECONDS      = 2
-  LEADERBOARD_DISPLAY_TYPE_MILLISECONDS = 3
+  DISPLAY_TYPE_NONE         = 0
+  DISPLAY_TYPE_NUMERIC      = 1
+  DISPLAY_TYPE_SECONDS      = 2
+  DISPLAY_TYPE_MILLISECONDS = 3
 
-  LEADERBOARD_SORT_METHOD_NONE = 0
-  LEADERBOARD_SORT_METHOD_ASC  = 1
-  LEADERBOARD_SORT_METHOD_DESC = 2
+  SORT_METHOD_NONE = 0
+  SORT_METHOD_ASC  = 1
+  SORT_METHOD_DESC = 2
 
   @@leaderboards = {}
 
@@ -120,13 +120,7 @@ class GameLeaderboard
     error = @xml_data['error']
     raise SteamCondenserError, error unless error.nil?
 
-    entries = []
-    @xml_data['entries']['entry'].each do |entry_data|
-      rank = entry_data['rank'].to_i
-      entries[rank] = GameLeaderboardEntry.new entry_data, self
-    end
-
-    entries
+    parse_entries
   end
 
   # Returns the entries on this leaderboard for a given rank range
@@ -162,7 +156,7 @@ class GameLeaderboard
       entries[rank] = GameLeaderboardEntry.new entry_data, self
     end
 
-    entries
+    parse_entries
   end
 
   private
@@ -179,6 +173,19 @@ class GameLeaderboard
     @display_type = board_data['displaytype'].to_i
   end
 
+  # Parses all entries available in the XML data
+  #
+  # @return [Array<GameLeaderboardEntry>] All available entries
+  def parse_entries
+    entries = []
+    @xml_data['entries']['entry'].each do |entry_data|
+      entries[entry_data['rank'].to_i] =
+        GameLeaderboardEntry.new entry_data, self
+    end
+
+    entries
+  end
+
   # Loads the leaderboards of the specified games into the cache
   #
   # @param [String] game_name The short name of the game

data/lib/steam/community/l4d/abstract_l4d_stats.rb

@@ -31,13 +31,12 @@ module AbstractL4DStats
     if public?
       most_recent_game_data = @xml_data['stats']['mostrecentgame']
 
-      @most_recent_game = {}
-      unless most_recent_game_data.nil?
-        @most_recent_game[:difficulty]  = most_recent_game_data['difficulty']
-        @most_recent_game[:escaped]     = (most_recent_game_data['bEscaped'] == 1)
-        @most_recent_game[:movie]       = most_recent_game_data['movie']
-        @most_recent_game[:time_played] = most_recent_game_data['time']
-      end
+      @most_recent_game = most_recent_game_data.nil? ? {} : {
+        :difficulty  => most_recent_game_data['difficulty'],
+        :escaped     => (most_recent_game_data['bEscaped'] == 1),
+        :movie       => most_recent_game_data['movie'],
+        :time_played => most_recent_game_data['time']
+      }
     end
   end
 
@@ -52,15 +51,16 @@ module AbstractL4DStats
     if @favorites.nil?
       favorites_data = @xml_data['stats']['favorites']
 
-      @favorites = {}
-      @favorites[:campaign]                 = favorites_data['campaign']
-      @favorites[:campaign_percentage]      = favorites_data['campaignpct'].to_i
-      @favorites[:character]                = favorites_data['character']
-      @favorites[:character_percentage]     = favorites_data['characterpct'].to_i
-      @favorites[:level1_weapon]            = favorites_data['weapon1']
-      @favorites[:level1_weapon_percentage] = favorites_data['weapon1pct'].to_i
-      @favorites[:level2_weapon]            = favorites_data['weapon2']
-      @favorites[:level2_weapon_percentage] = favorites_data['weapon2pct'].to_i
+      @favorites = {
+        :campaign                 => favorites_data['campaign'],
+        :campaign_percentage      => favorites_data['campaignpct'].to_i,
+        :character                => favorites_data['character'],
+        :character_percentage     => favorites_data['characterpct'].to_i,
+        :level1_weapon            => favorites_data['weapon1'],
+        :level1_weapon_percentage => favorites_data['weapon1pct'].to_i,
+        :level2_weapon            => favorites_data['weapon2'],
+        :level2_weapon_percentage => favorites_data['weapon2pct'].to_i
+      }
     end
 
     @favorites
@@ -78,18 +78,18 @@ module AbstractL4DStats
     if @lifetime_stats.nil?
       lifetime_data = @xml_data['stats']['lifetime']
 
-      @lifetime_stats = {}
-      @lifetime_stats[:finales_survived] = lifetime_data['finales'].to_i
-      @lifetime_stats[:games_played]     = lifetime_data['gamesplayed'].to_i
-      @lifetime_stats[:infected_killed]  = lifetime_data['infectedkilled'].to_i
-      @lifetime_stats[:kills_per_hour]   = lifetime_data['killsperhour'].to_f
-      @lifetime_stats[:avg_kits_shared]  = lifetime_data['kitsshared'].to_f
-      @lifetime_stats[:avg_kits_used]    = lifetime_data['kitsused'].to_f
-      @lifetime_stats[:avg_pills_shared] = lifetime_data['pillsshared'].to_f
-      @lifetime_stats[:avg_pills_used]   = lifetime_data['pillsused'].to_f
-      @lifetime_stats[:time_played]      = lifetime_data['timeplayed']
-
-      @lifetime_stats[:finales_survived_percentage] = @lifetime_stats[:finales_survived].to_f / @lifetime_stats[:games_played]
+      @lifetime_stats = {
+        :finales_survived            => lifetime_data['finales'].to_i,
+        :games_played                => lifetime_data['gamesplayed'].to_i,
+        :infected_killed             => lifetime_data['infectedkilled'].to_i,
+        :kills_per_hour              => lifetime_data['killsperhour'].to_f,
+        :avg_kits_shared             => lifetime_data['kitsshared'].to_f,
+        :avg_kits_used               => lifetime_data['kitsused'].to_f,
+        :avg_pills_shared            => lifetime_data['pillsshared'].to_f,
+        :avg_pills_used              => lifetime_data['pillsused'].to_f,
+        :time_played                 => lifetime_data['timeplayed'],
+        :finales_survived_percentage => @lifetime_stats[:finales_survived].to_f / @lifetime_stats[:games_played]
+      }
     end
 
     @lifetime_stats
@@ -107,12 +107,13 @@ module AbstractL4DStats
     if @survival_stats.nil?
       survival_data = @xml_data['stats']['survival']
 
-      @survival_stats = {}
-      @survival_stats[:gold_medals]   = survival_data['goldmedals'].to_i
-      @survival_stats[:silver_medals] = survival_data['silvermedals'].to_i
-      @survival_stats[:bronze_medals] = survival_data['bronzemedals'].to_i
-      @survival_stats[:rounds_played] = survival_data['roundsplayed'].to_i
-      @survival_stats[:best_time]     = survival_data['besttime'].to_f
+      @survival_stats = {
+        :gold_medals   => survival_data['goldmedals'].to_i,
+        :silver_medals => survival_data['silvermedals'].to_i,
+        :bronze_medals => survival_data['bronzemedals'].to_i,
+        :rounds_played => survival_data['roundsplayed'].to_i,
+        :best_time     => survival_data['besttime'].to_f
+      }
     end
 
     @survival_stats
@@ -130,18 +131,19 @@ module AbstractL4DStats
     if @teamplay_stats.nil?
       teamplay_data = @xml_data['stats']['teamplay']
 
-      @teamplay_stats = {}
-      @teamplay_stats[:revived]                       = teamplay_data['revived'].to_i
-      @teamplay_stats[:most_revived_difficulty]       = teamplay_data['reviveddiff']
-      @teamplay_stats[:avg_revived]                   = teamplay_data['revivedavg'].to_f
-      @teamplay_stats[:avg_was_revived]               = teamplay_data['wasrevivedavg'].to_f
-      @teamplay_stats[:protected]                     = teamplay_data['protected'].to_i
-      @teamplay_stats[:most_protected_difficulty]     = teamplay_data['protecteddiff']
-      @teamplay_stats[:avg_protected]                 = teamplay_data['protectedavg'].to_f
-      @teamplay_stats[:avg_was_protected]             = teamplay_data['wasprotectedavg'].to_f
-      @teamplay_stats[:friendly_fire_damage]          = teamplay_data['ffdamage'].to_i
-      @teamplay_stats[:most_friendly_fire_difficulty] = teamplay_data['ffdamagediff']
-      @teamplay_stats[:avg_friendly_fire_damage]      = teamplay_data['ffdamageavg'].to_f
+      @teamplay_stats = {
+        :revived                       => teamplay_data['revived'].to_i,
+        :most_revived_difficulty       => teamplay_data['reviveddiff'],
+        :avg_revived                   => teamplay_data['revivedavg'].to_f,
+        :avg_was_revived               => teamplay_data['wasrevivedavg'].to_f,
+        :protected                     => teamplay_data['protected'].to_i,
+        :most_protected_difficulty     => teamplay_data['protecteddiff'],
+        :avg_protected                 => teamplay_data['protectedavg'].to_f,
+        :avg_was_protected             => teamplay_data['wasprotectedavg'].to_f,
+        :friendly_fire_damage          => teamplay_data['ffdamage'].to_i,
+        :most_friendly_fire_difficulty => teamplay_data['ffdamagediff'],
+        :avg_friendly_fire_damage      => teamplay_data['ffdamageavg'].to_f
+      }
     end
 
     @teamplay_stats
@@ -159,23 +161,24 @@ module AbstractL4DStats
     if @versus_stats.nil?
       versus_data = @xml_data['stats']['versus']
 
-      @versus_stats = {}
-      @versus_stats[:games_played]                = versus_data['gamesplayed'].to_i
-      @versus_stats[:games_completed]             = versus_data['gamescompleted'].to_i
-      @versus_stats[:finales_survived]            = versus_data['finales'].to_i
-      @versus_stats[:points]                      = versus_data['points'].to_i
-      @versus_stats[:most_points_infected]        = versus_data['pointsas']
-      @versus_stats[:games_won]                   = versus_data['gameswon'].to_i
-      @versus_stats[:games_lost]                  = versus_data['gameslost'].to_i
-      @versus_stats[:highest_survivor_score]      = versus_data['survivorscore'].to_i
-
-      @versus_stats[:finales_survived_percentage] = @versus_stats[:finales_survived].to_f / @versus_stats[:games_played]
+      @versus_stats = {
+        :games_played                => versus_data['gamesplayed'].to_i,
+        :games_completed             => versus_data['gamescompleted'].to_i,
+        :finales_survived            => versus_data['finales'].to_i,
+        :points                      => versus_data['points'].to_i,
+        :most_points_infected        => versus_data['pointsas'],
+        :games_won                   => versus_data['gameswon'].to_i,
+        :games_lost                  => versus_data['gameslost'].to_i,
+        :highest_survivor_score      => versus_data['survivorscore'].to_i,
+        :finales_survived_percentage => @versus_stats[:finales_survived].to_f / @versus_stats[:games_played]
+      }
 
       self.class.const_get(:SPECIAL_INFECTED).each do |infected|
-        @versus_stats[infected] = {}
-        @versus_stats[infected][:special_attacks] = versus_data["#{infected}special"].to_i
-        @versus_stats[infected][:most_damage]     = versus_data["#{infected}dmg"].to_i
-        @versus_stats[infected]['avg_lifespan']    = versus_data["#{infected}lifespan"].to_i
+        @versus_stats[infected] = {
+          :special_attacks => versus_data["#{infected}special"].to_i,
+          :most_damage     => versus_data["#{infected}dmg"].to_i,
+          :avg_lifespan    => versus_data["#{infected}lifespan"].to_i
+        }
       end
     end
 

data/lib/steam/community/l4d/l4d2_stats.rb

@@ -62,9 +62,11 @@ class L4D2Stats < GameStats
       super
 
       lifetime_data = @xml_data['stats']['lifetime']
-      @lifetime_stats[:avg_adrenaline_shared]   = lifetime_data['adrenalineshared'].to_f
-      @lifetime_stats[:avg_adrenaline_used]     = lifetime_data['adrenalineused'].to_f
-      @lifetime_stats[:avg_defibrillators_used] = lifetime_data['defibrillatorsused'].to_f
+      @lifetime_stats.merge!({
+        :avg_adrenaline_shared   => lifetime_data['adrenalineshared'].to_f,
+        :avg_adrenaline_used     => lifetime_data['adrenalineused'].to_f,
+        :avg_defibrillators_used => lifetime_data['defibrillatorsused'].to_f
+      })
     end
 
     @lifetime_stats
@@ -83,33 +85,36 @@ class L4D2Stats < GameStats
     if @scavenge_stats.nil?
       scavange_data = @xml_data['stats']['scavenge']
 
-      @scavenge_stats = {}
-      @scavenge_stats[:avg_cans_per_round] = scavange_data['avgcansperround'].to_f
-      @scavenge_stats[:perfect_rounds]     = scavange_data['perfect16canrounds'].to_i
-      @scavenge_stats[:rounds_lost]        = scavange_data['roundslost'].to_i
-      @scavenge_stats[:rounds_played]      = scavange_data['roundsplayed'].to_i
-      @scavenge_stats[:rounds_won]         = scavange_data['roundswon'].to_i
-      @scavenge_stats[:total_cans]         = scavange_data['totalcans'].to_i
+      @scavenge_stats = {
+        :avg_cans_per_round => scavange_data['avgcansperround'].to_f,
+        :perfect_rounds     => scavange_data['perfect16canrounds'].to_i,
+        :rounds_lost        => scavange_data['roundslost'].to_i,
+        :rounds_played      => scavange_data['roundsplayed'].to_i,
+        :rounds_won         => scavange_data['roundswon'].to_i,
+        :total_cans         => scavange_data['totalcans'].to_i
+      }
 
       @scavenge_stats[:maps] = {}
       scavange_data['mapstats']['map'].each do |map_data|
-        map_stats = {}
-        map_stats['avg_round_score']     = map_data['avgscoreperround'].to_i
-        map_stats['highest_game_score']  = map_data['highgamescore'].to_i
-        map_stats['highest_round_score'] = map_data['highroundscore'].to_i
-        map_stats['name']                = map_data['fullname']
-        map_stats['rounds_played']       = map_data['roundsplayed'].to_i
-        map_stats['rounds_won']          = map_data['roundswon'].to_i
+        map_stats = {
+          :avg_round_score     => map_data['avgscoreperround'].to_i,
+          :highest_game_score  => map_data['highgamescore'].to_i,
+          :highest_round_score => map_data['highroundscore'].to_i,
+          :name                => map_data['fullname'],
+          :rounds_played       => map_data['roundsplayed'].to_i,
+          :rounds_won          => map_data['roundswon'].to_i
+        }
         @scavenge_stats[:maps][map_data['name']] = map_stats
 
       end
 
       @scavenge_stats[:infected] = {}
       scavange_data['infectedstats']['special'].each do |infected_data|
-        infected_stats = {}
-        infected_stats['max_damage_per_life']   = infected_data['maxdmg1life'].to_i
-        infected_stats['max_pours_interrupted'] = infected_data['maxpoursinterrupted'].to_i
-        infected_stats['special_attacks']       = infected_data['specialattacks'].to_i
+        infected_stats = {
+          :max_damage_per_life   => infected_data['maxdmg1life'].to_i,
+          :max_pours_interrupted => infected_data['maxpoursinterrupted'].to_i,
+          :special_attacks       => infected_data['specialattacks'].to_i
+        }
         @scavenge_stats[:infected][infected_data['name']] = infected_stats
       end
     end