Fix role message for alien kills.

[irc/quakenet/lua-labspace.git] / labspace.lua

diff --git a/labspace.lua b/labspace.lua
index b999b2fdd95397323f44877284c4c335699824e6..ff0b89c202ca37880e5a5c235098e3de65ddb8aa 100644 (file)
--- a/labspace.lua
+++ b/labspace.lua
@@ -17,7 +17,7 @@
 
 -- TODO
 -- logging
--- make idle notifications independent from game delay
+-- vote info in !status
 
 -- Ideas:
 -- scientists vote on kills
@@ -461,6 +461,11 @@ function ls_cmd_hl(channel, numeric)
     return
   end
 
+  if string.lower(channel) ~= "#labspace" then
+    ls_notice(numeric, "Sorry, you can't use this command here.")
+    return
+  end
+
   ls_set_lasthl(channel, os.time())
 
   local numerics = {}
@@ -491,7 +496,7 @@ function ls_cmd_enable(channel, numeric)
     return
   end
 
-  ls_set_enabled(channel, false)
+  ls_set_enabled(channel, true)
   ls_notice(numeric, "Game has been enabled.")
 end
 
@@ -572,10 +577,10 @@ function ls_cmd_kill(numeric, victim)
     ls_devoice_player(channel, numeric)
     ls_devoice_player(channel, victimnumeric)
     
+    ls_chanmsg(channel, "An alien bursts out of " .. ls_format_player(channel, victimnumeric, true) .. "'s chest just as " .. ls_format_player(channel, numeric, true) .. " was about to murder them, killing them both.")
+
     ls_remove_player(channel, numeric, true)
     ls_remove_player(channel, victimnumeric, true)
-
-    ls_chanmsg(channel, "An alien bursts out of " .. ls_format_player(channel, victimnumeric) .. "'s chest just as " .. ls_format_player(channel, numeric) .. " was about to murder them, killing them both.")
   else
     ls_devoice_player(channel, victimnumeric)
 
@@ -938,7 +943,7 @@ function ls_add_player(channel, numeric, forced)
     end
 
     if chanuser.opped then
-      ls_notice(channel, "You must not be opped to use this command.")
+      ls_notice(numeric, "You must not be opped to use this command.")
       return
     end
 
@@ -1248,7 +1253,6 @@ function ls_start_game(channel)
     local infested_player = players[math.random(table.getn(players))]
     ls_set_trait(channel, infested_player, "infested", true)
     ls_notice(infested_player, "You're infested with an \002alien parasite\002.")
-    ls_chanmsg(channel, "It's " .. ls_format_player(channel, infested_player) .. ".")
   end
   
   ls_chanmsg(channel, "Roles have been assigned: " ..