kag-gather 1.2.3 → 1.3.0

data/lib/kag/gather.rb

@@ -34,7 +34,10 @@ module KAG
       nick = nick.to_s
       match = get_match_in(nick)
       if match
-        match.remove_player(nick)
+        sub = match.remove_player(nick)
+        if sub
+          m.channel.msg sub[:msg]
+        end
       elsif @queue.key?(nick)
         remove_user_from_queue(nick)
       end
@@ -51,6 +54,19 @@ module KAG
       end
     end
 
+    match "sub", :method => :evt_sub
+    def evt_sub(m)
+      @matches.each do |k,match|
+        if match.needs_sub?
+          placement = match.sub_in(m.user.nick)
+          if placement
+            reply m,placement[:channel_msg]
+            User(m.user.nick).send placement[:private_msg]
+          end
+        end
+      end
+    end
+
     match "add", :method => :evt_add
     def evt_add(m)
       add_user_to_queue(m,m.user.nick)
@@ -61,7 +77,7 @@ module KAG
       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!"
+        send_channels_msg "#{m.user.nick} has left the match at #{match.server[:key]}! You can sub in by typing !sub"
       elsif @queue.key?(m.user.nick)
         unless remove_user_from_queue(m.user.nick)
           debug "#{nick} is not in the queue."
@@ -279,7 +295,7 @@ module KAG
     def evt_restart(m)
       if is_admin(m.user)
         cmd = (KAG::Config.instance[:restart_method] or "nohup sh gather.sh &")
-        puts cmd
+        debug cmd
         pid = spawn cmd
         debug "Restarting bot, new process ID is #{pid.to_s} ..."
         exit

data/lib/kag/match.rb

@@ -42,6 +42,7 @@ module KAG
 
     def start
       self[:end_votes] = 0 unless self[:end_votes]
+      self[:subs_needed] = []
       setup_teams
       restart_map
     end
@@ -115,10 +116,29 @@ module KAG
       end
     end
 
-    def remove_player
-      if match.server
-        match.server.kick(nick)
+    def remove_player(nick)
+      sub = false
+      self[:teams].each do |team|
+        if team.has_player?(nick)
+          sub = team.remove_player(nick)
+        end
+      end
+      if sub
+        self[:subs_needed] << sub
+      end
+      sub
+    end
+
+    def needs_sub?
+      self[:subs_needed].length > 0
+    end
+
+    def sub_in(nick)
+      placement = false
+      if needs_sub?
+        placement = self[:subs_needed].shift
       end
+      placement
     end
 
     def rename_player(last_nick,new_nick)

data/lib/kag/server.rb

@@ -27,6 +27,10 @@ module KAG
       self[:_socket]
     end
 
+    def text_join
+      "Join \x0305#{self[:key]} - #{self[:ip]}:#{self[:port]} \x0306password #{self[:password]}\x0301 | Visit kag://#{self[:ip]}/#{self[:password]}"
+    end
+
     def connect
       return true if self.connected?
       puts "[RCON] Attempting to get socket"

data/lib/kag/team.rb

@@ -53,6 +53,26 @@ module KAG
       end
     end
 
+    def remove_player(nick)
+      if has_player?(nick)
+        sub = {}
+        sub[:cls] = self[:players][nick]
+        sub[:team] = self.clone
+        sub[:msg] = "Sub needed at #{self.match.server[:ip]} for #{sub[:team]}, #{sub[:cls]} Class! Type !sub to claim it!"
+        sub[:channel_msg] = "#{nick} is now subbing in for #{self[:name]} at #{self.match.server[:key]}. Subs still needed: #{self.match[:subs_needed].length}"
+        sub[:private_msg] = "Please #{self.match.server.text_join} | #{sub[:cls]} on the #{self[:name]} Team"
+        self[:players].delete(nick)
+
+        if self.match and self.match.server
+          self.match.server.kick(nick)
+        end
+
+        sub
+      else
+        false
+      end
+    end
+
     def kick_all
       self[:players].each do |nick,cls|
         self.match.server.kick(nick.to_s)

data/lib/kag/version.rb

@@ -1,5 +1,5 @@
 module KAG
-  VERSION = '1.2.3'
+  VERSION = '1.3.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.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors: