steam-condenser 0.9.0 → 0.10.0

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

@@ -3,69 +3,17 @@
 #
 # Copyright (c) 2009, Sebastian Staudt
 
-require 'steam/community/game_stats'
+require 'steam/community/l4d/abstract_l4d_stats'
 require 'steam/community/l4d/l4d_explosive'
 require 'steam/community/l4d/l4d_map'
 require 'steam/community/l4d/l4d_weapon'
 
-class L4DStats < GameStats
-
-  attr_reader :xml_data
+class L4DStats < AbstractL4DStats
 
   # Creates a L4DStats object by calling the super constructor with the game
-  # name "l4d"
+  # name "l4d".
   def initialize(steam_id)
     super steam_id, 'l4d'
-
-    if public?
-      @most_recent_game = {}
-      @most_recent_game['difficulty']  = @xml_data.elements['stats/mostrecentgame/difficulty'].text
-      @most_recent_game['escaped']     = (@xml_data.elements['stats/mostrecentgame/bEscaped'].text == 1)
-      @most_recent_game['movie']       = @xml_data.elements['stats/mostrecentgame/movie'].text
-      @most_recent_game['time_played'] = @xml_data.elements['stats/mostrecentgame/time'].text
-    end
-  end
-
-  # Returns a Hash of favorites for this user like weapons and character.
-  # If the favorites haven't been parsed already, parsing is done now.
-  def favorites
-    return unless public?
-
-    if @favorites.nil?
-      @favorites = {}
-      @favorites['campaign']                 = @xml_data.elements['stats/favorites/campaign'].text
-      @favorites['campaign_percentage']      = @xml_data.elements['stats/favorites/campaignpct'].text.to_i
-      @favorites['character']                = @xml_data.elements['stats/favorites/character'].text
-      @favorites['character_percentage']     = @xml_data.elements['stats/favorites/characterpct'].text.to_i
-      @favorites['level1_weapon']            = @xml_data.elements['stats/favorites/weapon1'].text
-      @favorites['level1_weapon_percentage'] = @xml_data.elements['stats/favorites/weapon1pct'].text.to_i
-      @favorites['level2_weapon']            = @xml_data.elements['stats/favorites/weapon2'].text
-      @favorites['level2_weapon_percentage'] = @xml_data.elements['stats/favorites/weapon2pct'].text.to_i
-    end
-
-    @favorites
-  end
-
-  # Returns a Hash of lifetime statistics for this user like the time played.
-  # If the lifetime statistics haven't been parsed already, parsing is done now.
-  def lifetime_stats
-    return unless public?
-
-    if @lifetime_stats.nil?
-      @lifetime_stats = {}
-      @lifetime_stats['finales_survived'] = @xml_data.elements['stats/lifetime/finales'].text.to_i
-      @lifetime_stats['games_played']     = @xml_data.elements['stats/lifetime/gamesplayed'].text.to_i
-      @lifetime_stats['finales_survived_percentage'] = @lifetime_stats['finales_survived'].to_f / @lifetime_stats['games_played']
-      @lifetime_stats['infected_killed']  = @xml_data.elements['stats/lifetime/infectedkilled'].text.to_i
-      @lifetime_stats['kills_per_hour']   = @xml_data.elements['stats/lifetime/killsperhour'].text.to_f
-      @lifetime_stats['avg_kits_shared']  = @xml_data.elements['stats/lifetime/kitsshared'].text.to_f
-      @lifetime_stats['avg_kits_used']    = @xml_data.elements['stats/lifetime/kitsused'].text.to_f
-      @lifetime_stats['avg_pills_shared'] = @xml_data.elements['stats/lifetime/pillsshared'].text.to_f
-      @lifetime_stats['avg_pills_used']   = @xml_data.elements['stats/lifetime/pillsused'].text.to_f
-      @lifetime_stats['time_played']      = @xml_data.elements['stats/lifetime/timeplayed'].text
-    end
-
-    @lifetime_stats
   end
 
   # Returns a Hash of Survival statistics for this user like revived teammates.
@@ -74,13 +22,7 @@ class L4DStats < GameStats
     return unless public?
 
     if @survival_stats.nil?
-      @survival_stats = {}
-      @survival_stats['gold_medals']   = @xml_data.elements['stats/survival/goldmedals'].text.to_i
-      @survival_stats['silver_medals'] = @xml_data.elements['stats/survival/silvermedals'].text.to_i
-      @survival_stats['bronze_medals'] = @xml_data.elements['stats/survival/bronzemedals'].text.to_i
-      @survival_stats['rounds_played'] = @xml_data.elements['stats/survival/roundsplayed'].text.to_i
-      @survival_stats['best_time']     = @xml_data.elements['stats/survival/besttime'].text.to_f
-
+      super
       @survival_stats['maps'] = {}
       @xml_data.elements.each('stats/survival/maps/*') do |map_data|
         @survival_stats['maps'][map_data.name] = L4DMap.new(map_data)
@@ -90,58 +32,6 @@ class L4DStats < GameStats
     @survival_stats
   end
 
-  # Returns a Hash of teamplay statistics for this user like revived teammates.
-  # If the teamplay statistics haven't been parsed already, parsing is done now.
-  def teamplay_stats
-    return unless public?
-
-    if @teamplay_stats.nil?
-      @teamplay_stats = {}
-      @teamplay_stats['revived']                       = @xml_data.elements['stats/teamplay/revived'].text.to_i
-      @teamplay_stats['most_revived_difficulty']       = @xml_data.elements['stats/teamplay/reviveddiff'].text
-      @teamplay_stats['avg_revived']                   = @xml_data.elements['stats/teamplay/revivedavg'].text.to_f
-      @teamplay_stats['avg_was_revived']               = @xml_data.elements['stats/teamplay/wasrevivedavg'].text.to_f
-      @teamplay_stats['protected']                     = @xml_data.elements['stats/teamplay/protected'].text.to_i
-      @teamplay_stats['most_protected_difficulty']     = @xml_data.elements['stats/teamplay/protecteddiff'].text
-      @teamplay_stats['avg_protected']                 = @xml_data.elements['stats/teamplay/protectedavg'].text.to_f
-      @teamplay_stats['avg_was_protected']             = @xml_data.elements['stats/teamplay/wasprotectedavg'].text.to_f
-      @teamplay_stats['friendly_fire_damage']          = @xml_data.elements['stats/teamplay/ffdamage'].text.to_i
-      @teamplay_stats['most_friendly_fire_difficulty'] = @xml_data.elements['stats/teamplay/ffdamagediff'].text
-      @teamplay_stats['avg_friendly_fire_damage']      = @xml_data.elements['stats/teamplay/ffdamageavg'].text.to_f
-    end
-
-    @teamplay_stats
-  end
-
-  # Returns a Hash of Versus statistics for this user like percentage of rounds
-  # won.
-  # If the Versus statistics haven't been parsed already, parsing is done now.
-  def versus_stats
-    return unless public?
-
-    if @versus_stats.nil?
-      @versus_stats = {}
-      @versus_stats['games_played']                = @xml_data.elements['stats/versus/gamesplayed'].text.to_i
-      @versus_stats['games_completed']             = @xml_data.elements['stats/versus/gamescompleted'].text.to_i
-      @versus_stats['finales_survived']            = @xml_data.elements['stats/versus/finales'].text.to_i
-      @versus_stats['finales_survived_percentage'] = @versus_stats['finales_survived'].to_f / @versus_stats['games_played']
-      @versus_stats['points']                      = @xml_data.elements['stats/versus/points'].text.to_i
-      @versus_stats['most_points_infected']        = @xml_data.elements['stats/versus/pointsas'].text
-      @versus_stats['games_won']                   = @xml_data.elements['stats/versus/gameswon'].text.to_i
-      @versus_stats['games_lost']                  = @xml_data.elements['stats/versus/gameslost'].text.to_i
-      @versus_stats['highest_survivor_score']      = @xml_data.elements['stats/versus/survivorscore'].text.to_i
-
-      %w(boomer hunter smoker tank).each do |infected|
-        @versus_stats[infected] = {}
-        @versus_stats[infected]['special']      = @xml_data.elements["stats/versus/#{infected}special"].text.to_i
-        @versus_stats[infected]['most_damage']  = @xml_data.elements["stats/versus/#{infected}dmg"].text.to_i
-        @versus_stats[infected]['avg_lifespan'] = @xml_data.elements["stats/versus/#{infected}lifespan"].text.to_i
-      end
-    end
-
-    @versus_stats
-  end
-
   # Returns a Hash of L4DWeapon for this user containing all Left4Dead weapons.
   # If the weapons haven't been parsed already, parsing is done now.
   def weapon_stats
@@ -150,7 +40,7 @@ class L4DStats < GameStats
     if @weapon_stats.nil?
       @weapon_stats = {}
       @xml_data.elements.each('stats/weapons/*') do |weapon_data|
-        unless weapon_data.name == 'molotov' or weapon_data.name == 'pipes'
+        unless %w{molotov pipes}.include? weapon_data.name
           weapon = L4DWeapon.new(weapon_data)
         else
           weapon = L4DExplosive.new(weapon_data)

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

@@ -3,9 +3,9 @@
 #
 # Copyright (c) 2009, Sebastian Staudt
 
-require 'steam/community/game_weapon'
+require 'steam/community/l4d/abstract_l4d_weapon'
 
-class L4DWeapon < GameWeapon
+class L4DWeapon < AbstractL4DWeapon
 
   attr_reader :accuracy, :headshots_percentage, :kill_percentage
 
@@ -13,11 +13,7 @@ class L4DWeapon < GameWeapon
   def initialize(weapon_data)
     super weapon_data
 
-    @accuracy             = weapon_data.elements['accuracy'].text
-    @headshots_percentage = weapon_data.elements['headshots'].text
-    @id                   = weapon_data.name
-    @kill_percentage      = weapon_data.elements['killpct'].text
-    @shots                = weapon_data.elements['shots'].text.to_i
+    @kill_percentage = weapon_data.elements['killpct'].text
   end
 
 end

data/lib/steam/community/steam_id.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) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
 require 'open-uri'
 require 'rexml/document'
@@ -23,6 +23,21 @@ class SteamId
               :real_name, :state_message, :steam_id64, :steam_rating,
               :steam_rating_text, :summary, :vac_banned, :visibility_state
 
+  # Converts the 64bit SteamID +community_id+ as used and reported by the Steam
+  # Community to a SteamID reported by game servers
+  def self.convert_community_id_to_steam_id(community_id)
+    steam_id1 = community_id % 2
+    steam_id2 = community_id - 76561197960265728
+
+    unless steam_id2 > 0
+      raise SteamCondenserException.new("SteamID #{community_id} is too small.")
+    end
+
+    steam_id2 = (steam_id2 - steam_id1) / 2
+
+    "STEAM_0:#{steam_id1}:#{steam_id2}"
+  end
+
   # Converts the SteamID +steam_id+ as reported by game servers to a 64bit
   # SteamID
   def self.convert_steam_id_to_community_id(steam_id)
@@ -79,6 +94,10 @@ class SteamId
       raise SteamCondenserException.new(profile.elements['error'].text)
     end
 
+    unless REXML::XPath.first(profile, 'privacyMessage').nil?
+      raise SteamCondenserException.new(profile.elements['privacyMessage'].text)
+    end
+
     @image_url        = profile.elements['avatarIcon'].text[0..-5]
     @online_state     = profile.elements['onlineState'].text
     @privacy_state    = profile.elements['privacyState'].text
@@ -91,6 +110,7 @@ class SteamId
     # Only public profiles can be scanned for further information
     if @privacy_state == 'public'
       @custom_url                       = profile.elements['customURL'].text.downcase
+      @custom_url                       = nil if @custom_url.empty?
 
       # The favorite game cannot be set since 10/10/2008, but old profiles
       # still have this. May be removed in a future version.
@@ -147,28 +167,17 @@ class SteamId
 
   # Fetches the games this user owns
   def fetch_games
-    require 'rubygems'
-    require 'hpricot'
-
-    url = "#{base_url}/games"
+    url = "#{base_url}/games?xml=1"
 
     @games = {}
-    games_data = Hpricot(open(url, {:proxy => true}).read).at('div#mainContents')
-
-    games_data.traverse_some_element('h4') do |game|
-      game_name = game.inner_html
-      stats = game.next_sibling
-      if stats.name == 'br'
+    games_data = REXML::Document.new(open(url, {:proxy => true}).read).root
+    games_data.elements.each('games/game') do |game|
+      game_name = game.elements['name'].text
+      if game.elements['globalStatsLink'].nil?
         @games[game_name] = false
       else
-        stats = stats.next_sibling if stats.name == 'h5'
-        if stats.name == 'br'
-          @games[game_name] = false
-        else
-          stats = stats.siblings_at(2)[0]
-          friendly_name = stats['href'].match(/http:\/\/steamcommunity.com\/stats\/([0-9a-zA-Z:]+)\/achievements\//)[1]
-          @games[game_name] = friendly_name.downcase
-        end
+        friendly_name = game.elements['globalStatsLink'].text.match(/http:\/\/steamcommunity.com\/stats\/([0-9a-zA-Z:]+)\/achievements\//)[1]
+        @games[game_name] = friendly_name.downcase
       end
     end
 

data/lib/steam/community/tf2/tf2_class_factory.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "abstract_class"
 require "steam/community/tf2/tf2_class"

data/lib/steam/community/tf2/tf2_engineer.rb

@@ -1,16 +1,14 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/community/tf2/tf2_class"
 
 # Represents the stats for the Team Fortress 2 engineer class for a specific
 # user
 class TF2Engineer < TF2Class
-  
+
   attr_reader :max_buildings_built, :max_teleports, :max_sentry_kills
   
   # Creates a new instance of TF2Engineer based on the assigned XML data

data/lib/steam/community/tf2/tf2_medic.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/community/tf2/tf2_class"
 

data/lib/steam/community/tf2/tf2_sniper.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/community/tf2/tf2_class"
 

data/lib/steam/community/tf2/tf2_spy.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/community/tf2/tf2_class"
 

data/lib/steam/packets/a2a_ack_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/a2a_ping_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/a2m_get_servers_batch2_packet.rb

@@ -2,8 +2,6 @@
 # terms of the new BSD License.
 #
 # Copyright (c) 2008-2009, Sebastian Staudt
-#
-# $Id$
 
 require "steam/packets/steam_packet"
 require "steam/servers/master_server"

data/lib/steam/packets/a2s_info_packet.rb

@@ -2,8 +2,6 @@
 # terms of the new BSD License.
 #
 # Copyright (c) 2008-2009, Sebastian Staudt
-#
-# $Id$
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/a2s_player_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/request_with_challenge"
 require "steam/packets/steam_packet"

data/lib/steam/packets/a2s_rules_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/request_with_challenge"
 require "steam/packets/steam_packet"

data/lib/steam/packets/a2s_serverquery_getchallenge_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/m2a_server_batch_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/rcon/rcon_auth_request.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/rcon/rcon_packet"
 

data/lib/steam/packets/rcon/rcon_auth_response.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/rcon/rcon_packet"
 

data/lib/steam/packets/rcon/rcon_exec_request.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/rcon/rcon_packet"
 

data/lib/steam/packets/rcon/rcon_goldsrc_request.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/rcon/rcon_goldsrc_response.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/rcon/rcon_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "abstract_class"
 require "steam/packets/steam_packet"

data/lib/steam/packets/rcon/rcon_packet_factory.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "abstract_class"
 require "byte_buffer"

data/lib/steam/packets/request_with_challenge.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 # This module implements a to_s method for request packets which send a challenge number
 module RequestWithChallenge

data/lib/steam/packets/s2a_info2_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/s2a_info_base_packet"
 

data/lib/steam/packets/s2a_info_base_packet.rb

@@ -1,5 +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) 2008-2009, Sebastian Staudt
 
 require "abstract_class"
 require "steam/packets/steam_packet"

data/lib/steam/packets/s2a_rules_packet.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) 2008, Sebastian Staudt
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/s2c_challenge_packet.rb

@@ -1,9 +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) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/steam_packet"
 

data/lib/steam/packets/steam_packet.rb

@@ -1,48 +1,47 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2010, Sebastian Staudt
 
 # This class represents a packet used by the Source query protocol
 class SteamPacket
-  S2A_INFO_DETAILED_HEADER = 0x6D
-  A2S_INFO_HEADER = 0x54
-  S2A_INFO2_HEADER = 0x49
-  A2A_PING_HEADER = 0x69
+
   A2A_ACK_HEADER = 0x6A
+  A2A_PING_HEADER = 0x69
+  A2M_GET_SERVERS_BATCH2_HEADER = 0x31
+  A2S_INFO_HEADER = 0x54
   A2S_PLAYER_HEADER = 0x55
-  S2A_PLAYER_HEADER = 0x44
   A2S_RULES_HEADER = 0x56
-  S2A_RULES_HEADER = 0x45
   A2S_SERVERQUERY_GETCHALLENGE_HEADER = 0x57
-  S2C_CHALLENGE_HEADER = 0x41
-  A2M_GET_SERVERS_BATCH2_HEADER = 0x31
   M2A_SERVER_BATCH_HEADER = 0x66
-  S2C_CONNREJECT_HEADER = 0x39
   RCON_GOLDSRC_CHALLENGE_HEADER = 0x63
   RCON_GOLDSRC_NO_CHALLENGE_HEADER = 0x39
   RCON_GOLDSRC_RESPONSE_HEADER = 0x6c
+  S2A_INFO_DETAILED_HEADER = 0x6D
+  S2A_INFO2_HEADER = 0x49
+  S2A_PLAYER_HEADER = 0x44
+  S2A_RULES_HEADER = 0x45
+  S2C_CONNREJECT_HEADER = 0x39
+  S2C_CHALLENGE_HEADER = 0x41
 
   # Creates a new SteamPacket object with given header and content data
   def initialize(header_data, content_data = "")
     @content_data = ByteBuffer.new content_data
     @header_data = header_data
   end
-  
+
   # Returns a packed string representing the packet's data
   #
   # TODO Has to automatically split packets greater than 1400 bytes
   def to_s
     packet_data = [0xFF, 0xFF, 0xFF].pack("ccc")
-    
+
     unless @split_packet
       packet_data << [0xFF].pack("c")
     else
       packet_data << [0xFE].pack("c")
     end
-    
+
     return packet_data << [@header_data, @content_data.array].pack("ca*")
-  end    
+  end
 end

data/lib/steam/servers/master_server.rb

@@ -2,8 +2,6 @@
 # terms of the new BSD License.
 #
 # Copyright (c) 2008-2009, Sebastian Staudt
-#
-# $Id$
 
 require "steam/packets/a2m_get_servers_batch2_packet"
 require "steam/sockets/master_server_socket"

data/lib/steam/servers/source_server.rb

@@ -17,7 +17,9 @@ class SourceServer < GameServer
   def self.split_player_status(player_status)
     player_data = player_status.match(/# *(\d+) +"(.*)" +(.*)/).to_a[1..-1]
     player_data[2] = player_data[2].split
-    player_data.flatten
+    player_data.flatten!
+    player_data.delete_at(3)
+    player_data
   end
 
   def initialize(ip_address, port_number = 27015)

data/lib/steam-condenser.rb

@@ -3,6 +3,8 @@
 #
 # Copyright (c) 2009, Sebastian Staudt
 
+require 'yaml'
+
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)