tclog 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/tclog.rb

@@ -231,9 +231,11 @@ module TCLog
     renames = {}
     orders = log.map do |x|
       next unless /^(\[skipnotify\])(\^.)?(.+renamed|Timelimit hit)/ =~ x ||
+                  /^(\[skipnotify\])(.+ entered the game)$/          =~ x ||
                   /^(\[skipnotify\])?(\^.)?(Specops|Terrorists)/     =~ x ||
                   /^(\[skipnotify\])?(\^.)?(Planted|Defused)/        =~ x ||
                   /^The .+ have completed the objective!/            =~ x ||
+                  /^The .+ have completed the objective!/            =~ x ||
                   /^(\[skipnotify\])(\^.)(Overall stats for: |)/     =~ x ||
                   /^(LOADING\.\.\. maps|Match starting)/             =~ x
       x.gsub!(/\[skipnotify\]/,"") 
@@ -244,7 +246,7 @@ module TCLog
         when /^LOADING\.\.\. maps\/(.+?)\.bsp$/ # Map Changing?
           m = $~.captures
           ["Map",m[0]]
-        when /^Match starting/ # Match starting
+        when /^Match starting/, /^(.+ entered the game)$/ # Match starting
           ["Match"]
         when /^(Planted) at (.+?) \[(.)\]/, /^The Terrorists have completed the objective!/ # TeroWin
           m = $~.captures
@@ -326,18 +328,9 @@ module TCLog
     flag2 = false
     include_match = orders.include?("Match")
     vm = Proc.new do |o|
-      if !match_flag && /Win$/ =~ o[0]
-        match_flag = true
-      end
-      if /Win$/ =~ o[0] && flag2 && specops_total && match_wins
-        game.add_round specops_total, terrorists_total, match_wins
-        match_wins = nil
-        terrorists_total = nil
-        specops_total = nil
-        flag2 = false
-      end
       case o[0]
       when "Match"
+        next if match[-1][0] == "Match"
         if match_flag
           if specops_total && match_wins
             game.add_round specops_total, terrorists_total, match_wins

data/tclog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tclog}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shota Fukumori"]
-  s.date = %q{2010-12-30}
+  s.date = %q{2010-12-31}
   s.description = %q{Parser for etconsole.log of TrueCombat:Elite (TC:E)}
   s.email = %q{sorah@tubusu.net}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Shota Fukumori
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +09:00
+date: 2010-12-31 00:00:00 +09:00
 default_executable: 
 dependencies: []