kag-gather 1.1.1 → 1.2.0

data/lib/kag/gather.rb

@@ -2,6 +2,7 @@ require 'cinch'
 require 'kag/bot'
 require 'kag/config'
 require 'kag/server'
+require 'kag/match'
 
 module KAG
   class Gather
@@ -11,12 +12,21 @@ module KAG
       KAG::Config.instance
     end
 
-    attr_accessor :queue
+    attr_accessor :queue,:servers
 
     def initialize(*args)
       super
       @queue = {}
       @matches = {}
+      _load_servers
+    end
+
+    def _load_servers
+      @servers = {}
+      KAG::Config.instance[:servers].each do |k,s|
+        s[:key] = k
+        @servers[k] = KAG::Server.new(s)
+      end
     end
 
     #listen_to :channel, method: :channel_listen
@@ -24,29 +34,23 @@ module KAG
     #end
 
     listen_to :leaving, method: :on_leaving
-    def on_leaving(m,user)
-      remove_user_from_queue(user) if @queue.key?(user)
-      remove_user_from_match(user) if in_match(user)
+    def on_leaving(m,nick)
+      match = get_match_in(nick)
+      if match
+        match.remove_player(nick)
+      elsif @queue.key?(nick)
+        remove_user_from_queue(nick)
+      end
     end
 
     listen_to :nick, method: :on_nick
     def on_nick(m)
-      if @queue.key?(m.user.last_nick)
+      match = get_match_in(m.user.last_nick)
+      if match
+        match.rename_player(m.user.last_nick,m.user.nick)
+      elsif @queue.key?(m.user.last_nick)
         @queue[m.user.nick] = @queue[m.user.last_nick]
         @queue.delete(m.user.last_nick)
-      elsif in_match(m.user.last_nick)
-        @matches.each do |m|
-          i = m[:team1].index(m.user.last_nick)
-          if i != nil
-            m[:team1].delete_at(i)
-            m[:team1] << m.user.nick
-          end
-          i = m[:team2].index(m.user.last_nick)
-          if i != nil
-            m[:team2].delete_at(i)
-            m[:team2] << m.user.nick
-          end
-        end
       end
     end
 
@@ -57,8 +61,13 @@ module KAG
 
     match "rem", method: :evt_rem
     def evt_rem(m)
-      remove_user_from_match(m.user.nick)
-      remove_user_from_queue(m.user.nick)
+      match = get_match_in(m.user.nick)
+      if match
+        match.remove_player(m.user.nick)
+        send_channels_msg "#{nick} has left the match at #{match.server[:key]}! Find a sub!"
+      elsif @queue.key?(user)
+        remove_user_from_queue(m.user.nick)
+      end
     end
 
     match "list", method: :evt_list
@@ -67,7 +76,7 @@ module KAG
       @queue.each do |n,u|
         users << n
       end
-      m.user.send "Queue (#{get_match_type_as_string}) [#{@queue.length}] #{users.join(", ")}"
+      m.user.send "Queue (#{KAG::Match.type_as_string}) [#{@queue.length}] #{users.join(", ")}"
     end
 
     match "status", method: :evt_status
@@ -77,16 +86,15 @@ module KAG
 
     match "end", method: :evt_end
     def evt_end(m)
-      match_in = get_match_in(m.user.nick)
-      if match_in
-        match_in[:end_votes] = match_in[:end_votes] + 1
-        evt = KAG::Config.instance[:end_vote_threshold].to_i
-        evt = 3 if evt < 1
-        if match_in[:end_votes] >= evt
-          end_match(match_in)
+      match = get_match_in(m.user.nick)
+      if match
+        match.add_end_vote
+        if match.voted_to_end?
+          match.cease
+          @matches.delete(match.server[:key])
+          send_channels_msg("Match at #{match.server[:key]} finished!")
         else
-          needed = evt - match_in[:end_votes]
-          reply m,"End vote started, #{needed} more votes to end match at #{match_in[:server][:key]}"
+          reply m,"End vote started, #{match.get_needed_end_votes_left} more votes to end match at #{match.server[:key]}"
         end
       else
         reply m,"You're not in a match, silly! Stop trying to hack me."
@@ -94,14 +102,14 @@ module KAG
     end
 
     def add_user_to_queue(m,nick)
-      unless @queue.key?(nick) or in_match(nick)
+      unless @queue.key?(nick) or get_match_in(nick)
         @queue[nick] = SymbolTable.new({
             :user => User(nick),
             :channel => m.channel,
             :message => m.message,
             :joined_at => Time.now
         })
-        send_channels_msg "Added #{nick} to queue (#{get_match_type_as_string}) [#{@queue.length}]"
+        send_channels_msg "Added #{nick} to queue (#{KAG::Match.type_as_string}) [#{@queue.length}]"
         check_for_new_match
       end
     end
@@ -109,66 +117,25 @@ module KAG
     def remove_user_from_queue(nick)
       if @queue.key?(nick)
         @queue.delete(nick)
-        send_channels_msg "Removed #{nick} from queue (#{get_match_type_as_string}) [#{@queue.length}]"
+        send_channels_msg "Removed #{nick} from queue (#{KAG::Match.type_as_string}) [#{@queue.length}]"
       end
     end
 
-    def end_match(match)
-      if match[:server].has_rcon?
-        begin
-          match[:team1].each do |p|
-            match[:server].kick(p)
-          end
-          match[:team2].each do |p|
-            match[:server].kick(p)
-          end
-        rescue Exception => e
-          debug e.message
-          debug e.backtrace.join("\n")
-        end
-      else
-        debug "NO RCON, so could not kick!"
-      end
-      match[:server].disconnect
-      @matches.delete(match[:server][:key])
-      send_channels_msg("Match at #{match[:server][:key]} finished!")
-    end
-
-    def remove_user_from_match(nick,send_msg = true)
-      match = get_match_in(nick)
-      if match and send_msg
-        send_channels_msg "#{nick} has left the match at #{match[:server][:key]}! Find a sub!"
-      end
-    end
-
-    def in_match(nick)
-      get_match_in(nick)
-    end
-
     def get_match_in(nick)
       m = false
       @matches.each do |k,match|
-        puts match.inspect
-        if match[:team1] and match[:team1].include?(nick)
-          m = match
-        elsif match[:team2] and match[:team2].include?(nick)
+        if match.has_player?(nick)
           m = match
         end
       end
       m
     end
 
-    def get_match_type_as_string
-      ms = KAG::Config.instance[:match_size]
-      ts = (ms / 2).ceil
-      "#{ts.to_s}v#{ts.to_s} #{KAG::Config.instance[:match_type]}"
-    end
-
     def check_for_new_match
       if @queue.length >= KAG::Config.instance[:match_size]
-        playing = []
+        players = []
         @queue.each do |n,i|
-          playing << n
+          players << n
         end
 
         server = get_unused_server
@@ -178,68 +145,20 @@ module KAG
           return false
         end
 
-        @queue = {}
-        playing.shuffle!
-        match_size = KAG::Config.instance[:match_size].to_i
-        match_size = 2 if match_size < 2
-
-        lb = (match_size / 2).ceil.to_i
-        lb = 1 if lb < 1
-
-        debug "MATCH SIZE #{match_size.to_s}"
-        debug "LOWER BOUND: #{lb.to_s}"
-        debug "PLAYERS: #{playing.join(",")}"
-
-        team1 = playing.slice(0,lb)
-        team2 = playing.slice(lb,match_size)
-
-        send_channels_msg("MATCH: #{get_match_type_as_string} - \x0312#{team1.join(", ")} (Blue) \x0310vs \x0304#{team2.join(", ")} (Red) \x0301(!end when done)",false)
-        msg = "Join \x0305#{server[:key]} - #{server[:ip]}:#{server[:port]} \x0306password #{server[:password]}\x0301 | Visit kag://#{server[:ip]}/#{server[:password]} | "
-
-        msg = msg + " \x0303Class: " if KAG::Config.instance[:pick_classes]
-        classes_t1 = get_team_classes(1)
-        classes_t2 = get_team_classes(2)
-
-        team1.each do |p|
-          player_msg = msg.clone
-          if KAG::Config.instance[:pick_classes]
-            cls = classes_t1.shift
-            player_msg = player_msg+cls if cls and !cls.empty?
-          end
-          player_msg = player_msg+" \x0312Blue Team with: #{team1.join(", ")}"
-          User(p).send(player_msg) unless p.include?("player")
-          debug "Sent to #{p.to_s}: "+player_msg
-          sleep(1)
-        end
-        team2.each do |p|
-          player_msg = msg.clone
-          if KAG::Config.instance[:pick_classes]
-            cls = classes_t2.shift
-            player_msg = player_msg+cls if cls and !cls.empty?
-          end
-          player_msg = player_msg+" \x0304Red Team with: #{team2.join(", ")}"
-          User(p).send(player_msg) unless p.include?("player")
-          debug "Sent to #{p.to_s}: "+player_msg
-          sleep(1)
-        end
-
-        begin
-          if server.has_rcon?
-            server.restart_map
-          else
-            debug "Cannot restart map, no RCON!"
-          end
-        rescue Exception => e
-          debug e.message
-          debug e.backtrace.join("\n")
+        match = KAG::Match.new(SymbolTable.new({
+          :server => server,
+          :players => players
+        }))
+        match.start
+        messages = match.notify_teams_of_match_start
+        messages.each do |nick,msg|
+          User(nick.to_s).send(msg) unless nick.to_s.include?("player")
+          sleep(2)
         end
+        send_channels_msg(match.text_for_match_start,false)
 
-        @matches[server[:key]] = {
-            :team1 => team1,
-            :team2 => team2,
-            :server => server,
-            :end_votes => 0
-        }
+        @queue = {}
+        @matches[server[:key]] = match
       end
     end
 
@@ -256,18 +175,11 @@ module KAG
     end
 
     def get_unused_server
-      used_servers = []
-      @matches.each do |k,m|
-        used_servers << k
+      server = false
+      @servers.each do |k,s|
+        server = s unless s.in_use?
       end
-      available_servers = KAG::Config.instance[:servers]
-      available_servers.each do |k,s|
-        unless used_servers.include?(k)
-          s[:key] = k
-          return KAG::Server.new(s)
-        end
-      end
-      false
+      server
     end
 
     match "help", method: :evt_help
@@ -356,8 +268,8 @@ module KAG
     def evt_restart_map(m)
       if is_admin(m.user)
         match = get_match_in(m.user.nick)
-        if match
-          match[:server].restart_map
+        if match and match.server
+          match.server.restart_map
         end
       end
     end
@@ -365,9 +277,8 @@ module KAG
     match /restart_map (.+)/, method: :evt_restart_map_specify
     def evt_restart_map_specify(m,arg)
       if is_admin(m.user)
-        server = get_server(arg)
-        if server
-          server.next_map
+        if @servers[key]
+          @servers[key].restart_map
         else
           m.reply "No server found with key #{arg}"
         end
@@ -378,8 +289,8 @@ module KAG
     def evt_next_map(m)
       if is_admin(m.user)
         match = get_match_in(m.user.nick)
-        if match
-          match[:server].restart_map
+        if match and match.server
+          match.server.next_map
         end
       end
     end
@@ -387,9 +298,8 @@ module KAG
     match /next_map (.+)/, method: :evt_next_map_specify
     def evt_next_map_specify(m,arg)
       if is_admin(m.user)
-        server = get_server(arg)
-        if server
-          server.next_map
+        if @servers[key]
+          @servers[key].next_map
         else
           m.reply "No server found with key #{arg}"
         end
@@ -400,9 +310,8 @@ module KAG
     def evt_kick_from_match(m,nick)
       if is_admin(m.user)
         match = get_match_in(nick)
-        if match[:server]
-          match[:server].kick(nick)
-          remove_user_from_match(nick,false)
+        if match
+          match.remove_player(nick)
           m.reply "#{nick} has been kicked from the match"
         else
           m.reply "#{nick} is not in a match!"
@@ -410,13 +319,6 @@ module KAG
       end
     end
 
-    def get_server(key)
-      @matches.each do |k,m|
-        return m[:server] if k.to_s == key
-      end
-      false
-    end
-
     match "reload_config", method: :evt_reload_config
     def evt_reload_config(m)
       if is_admin(m.user)
@@ -424,11 +326,5 @@ module KAG
         m.reply "Configuration reloaded."
       end
     end
-    
-    def get_team_classes(team)
-      classes = KAG::Config.instance[:classes]
-      classes.shuffle!
-      classes.clone
-    end
   end
 end

data/lib/kag/match.rb

@@ -0,0 +1,138 @@
+require 'cinch'
+require 'symboltable'
+require 'kag/config'
+require 'kag/team'
+
+module KAG
+  class Match < SymbolTable
+
+    def self.type_as_string
+      ms = KAG::Config.instance[:match_size].to_i
+      ts = (ms / 2).ceil
+      "#{ts.to_s}v#{ts.to_s} #{KAG::Config.instance[:match_type]}"
+    end
+
+    def setup_teams
+      self[:players].shuffle!
+      match_size = KAG::Config.instance[:match_size].to_i
+      match_size = 2 if match_size < 2
+
+      lb = (match_size / 2).ceil.to_i
+      lb = 1 if lb < 1
+
+      debug "MATCH SIZE #{match_size.to_s}"
+      debug "LOWER BOUND: #{lb.to_s}"
+      debug "PLAYERS: #{self[:players].join(",")}"
+
+      self[:teams] = []
+      self[:teams] << KAG::Team.new({
+        :players => self[:players].slice(0,lb),
+        :match => self,
+        :color => "\x0312",
+        :name => "Blue"
+      }).setup
+      self[:teams] << KAG::Team.new({
+        :players => self[:players].slice(lb,match_size),
+        :match => self,
+        :color => "\x0304",
+        :name => "Red"
+      }).setup
+      self[:teams]
+    end
+
+    def start
+      self[:end_votes] = 0 unless self[:end_votes]
+      setup_teams
+      restart_map
+    end
+
+    def text_for_match_start
+      msg = "MATCH: #{KAG::Match.type_as_string} - "
+      self[:teams].each do |team|
+        msg = msg+" "+team.text_for_match_start
+      end
+      msg+" \x0301(!end when done)"
+    end
+
+    def notify_teams_of_match_start
+      messages = {}
+      self[:teams].each do |t|
+        ms = t.notify_of_match_start
+        ms.each do |nick,msg|
+          messages[nick] = msg
+        end
+      end
+      messages
+    end
+
+    def add_end_vote
+      self[:end_votes] = 0 unless self[:end_votes] > 0
+      self[:end_votes] = self[:end_votes] + 1
+    end
+
+    def voted_to_end?
+      evt = KAG::Config.instance[:end_vote_threshold].to_i
+      evt = 3 if evt < 1
+      self[:end_votes] >= evt
+    end
+
+    def get_needed_end_votes_left
+      evt = KAG::Config.instance[:end_vote_threshold].to_i
+      evt - self[:end_votes]
+    end
+
+    def has_player?(nick)
+      playing = false
+      self[:teams].each do |team|
+        playing = true if team.has_player?(nick)
+      end
+      playing
+    end
+
+    def cease
+      if self.server
+        if self.server.has_rcon?
+          self[:teams].each do |team|
+            team.kick_all
+          end
+        else
+          debug "NO RCON, so could not kick!"
+        end
+        self.server.disconnect
+        self.server.delete(:match)
+        true
+      else
+        debug "No server for match defined!"
+        false
+      end
+    end
+
+    def restart_map
+      if self.server.has_rcon?
+        self.server.restart_map
+      else
+        debug "Cannot restart map, no RCON defined"
+      end
+    end
+
+    def remove_player
+      if match.server
+        match.server.kick(nick)
+      end
+    end
+
+    def rename_player(last_nick,new_nick)
+      self[:teams].each do |team|
+        if team.has_player?(last_nick)
+          team.rename_player(last_nick,new_nick)
+        end
+      end
+    end
+
+    def debug(msg)
+      if KAG::Config.instance[:debug]
+        puts msg
+      end
+    end
+  end
+end

data/lib/kag/server.rb

@@ -11,6 +11,10 @@ module KAG
       Kagerator.server(self[:ip],self[:port])
     end
 
+    def in_use?
+      self.key?(:match)
+    end
+
     def has_rcon?
       self[:rcon_password] and !self[:rcon_password].empty?
     end

data/lib/kag/team.rb

@@ -0,0 +1,62 @@
+require 'cinch'
+require 'cinch/user'
+require 'symboltable'
+require 'kag/config'
+
+module KAG
+  class Team < SymbolTable
+
+    def setup
+      setup_classes
+      puts self[:players].inspect
+      self
+    end
+
+    def setup_classes
+      classes = KAG::Config.instance[:classes].clone
+      classes.shuffle!
+      players = self[:players].clone
+      self[:players] = {}
+      players.each do |p|
+        self[:players][p.to_sym] = classes.shift
+      end
+    end
+
+    def notify_of_match_start
+      server = self.match.server
+      msg = "Join \x0305#{server[:key]} - #{server[:ip]}:#{server[:port]} \x0306password #{server[:password]}\x0301 | Visit kag://#{server[:ip]}/#{server[:password]} | "
+      msg = msg + " \x0303Class: " if KAG::Config.instance[:pick_classes]
+
+      messages = {}
+      self[:players].each do |nick,cls|
+        player_msg = msg.clone
+        player_msg = player_msg+cls if KAG::Config.instance[:pick_classes] and cls and !cls.empty?
+        player_msg = player_msg+" \x0312Blue Team with: #{self[:players].keys.join(", ")}"
+        messages[nick] = player_msg
+      end
+      messages
+    end
+
+    def text_for_match_start
+      "#{self[:color]}#{self[:players].keys.join(", ")} (#{self[:name]})"
+    end
+
+    def has_player?(nick)
+      self[:players].keys.include?(nick.to_sym)
+    end
+
+    def rename_player(last_nick,new_nick)
+      if has_player?(nick)
+        cls = self[:players][last_nick.to_sym]
+        self[:players].delete(last_nick.to_sym)
+        self[:players][new_nick.to_sym] = cls
+      end
+    end
+
+    def kick_all
+      self[:players].each do |nick,cls|
+        self.match.server.kick(nick.to_s)
+      end
+    end
+  end
+end

data/lib/kag/version.rb

@@ -1,5 +1,5 @@
 module KAG
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
   def self.version
     VERSION
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -135,7 +135,9 @@ files:
 - lib/kag/bot.rb
 - lib/kag/config.rb
 - lib/kag/gather.rb
+- lib/kag/match.rb
 - lib/kag/server.rb
+- lib/kag/team.rb
 - lib/kag/version.rb
 - config/config.sample.json
 homepage: https://github.com/splittingred/kag-gather