View difference between Paste ID: CQG63xYC and kYy9bM75

-# Free for all script written by Yourself
+"""
-# With scripts from: Jail.py and arena.py
+Jail script by PXYC
-# And btw I doubt this works; Ninja Pig
+Edited by Ninja Pig
 """
 
-from random import randint
+
 from commands import add, admin, get_player, join_arguments, name, alias
 from pyspades.constants import *
 
 jail_location = 0, 0, 0 # Location of game1
-jail_location = 0, 0, 0 # x, y, z of the spectator room
+jail_coords = [] # e.g. ["B4", "B5"]
-jail_coords   = [ ] # e.g. ["B4", "B5"]
+
 jail_list = []
-# If ALWAYS_ENABLED is False, free for all can still be enabled in the map
+
-# metadata by setting the key 'free_for_all' to True in the extensions dictionary
+@name('game')
-ALWAYS_ENABLED = True
+@alias('g')
 @admin
-# If WATER_SPANS is True, then players can spawn in water
+def game1_player(connection, value = None, *args):
-WATER_SPAWNS = False
+    protocol = connection.protocol # Meh
     player = get_player(protocol, value) # Get player
-HIDE_POS = (0, 0, 63)
+    if player not in protocol.players:
         raise ValueError() # If player doesn't exist, raise error
-def apply_script(protocol, connection, config):
+    else:
-    class FreeForAllProtocol(protocol):
+        if player.jailed:
-        free_for_all = False
+            return 'Player ' + player.name + ' Already ingame!' # Player is already jailed!
-        old_friendly_fire = None
+        elif not player.jailed:
-        def on_map_change(self, map):
+            player.jailed = True # Set player to jailed
-            extensions = self.map_info.extensions
+            player.reason = reason
-            if ALWAYS_ENABLED:
+            player.squad = None
-                self.free_for_all = True
+            player.squad_pref = None
             player.set_location(jail_location) # Move player to jail
-                if extensions.has_key('free_for_all'):
+            connection.protocol.send_chat("%s has joined game 1!" % (player.name, connection.name, reason)) # Message
-                    self.free_for_all = extensions['free_for_all']
+            connection.protocol.irc_say("* %s joined game 1" % (connection.name, player.name, reason)) # Message
-                else:
+            jail_list.append(player.name)
-                    self.free_for_all = False
+add(join_game1) # Add command
-            if self.free_for_all:
+
-                self.old_friendly_fire = self.friendly_fire
+@name('game1')
-                self.friendly_fire = True
+def is_jailed(connection, value = None):
     if value is None:
-                if self.old_friendly_fire is not None:
+        if not jail_list:
-                    self.friendly_fire = self.old_friendly_fire
+            return 'No players.'
-                    self.old_friendly_fire = None
+        else:
-            return protocol.on_map_change(self, map)
+            return " players: " + ", ".join(jail_list)
     elif value is not None:
-        def on_base_spawn(self, x, y, z, base, entity_id):
+        protocol = connection.protocol
-            if self.free_for_all:
+        player = get_player(protocol, value)
-                return HIDE_POS
+        if player not in protocol.players:
-            return protocol.on_base_spawn(self, x, y, z, base, entity_id)
+            raise ValueError()
         else:
-        def on_flag_spawn(self, x, y, z, flag, entity_id):
+            if player.jailed:
-            if self.free_for_all:
+                return 'Player %s is playing game 1' % (player.name, player.reason)
-                return HIDE_POS
+
-            return protocol.on_flag_spawn(self, x, y, z, flag, entity_id)
+                return 'Player %s is not playing.' % (player.name)
 @name('quit')
-    class FreeForAllConnection(connection):
+@admin
-        score_hack = False
+def quit_from_game(connection, value):
-        def on_spawn_location(self, pos):
+    protocol = connection.protocol # Meh
-            if not self.score_hack and self.protocol.free_for_all:
+
-                while True:
+    if player not in protocol.players:
-                    x = randint(0, 511)
+        raise ValueError() # Errors again
-                    y = randint(0, 511)
+    else:
-                    z = self.protocol.map.get_z(x, y)
+        if not player.jailed: # If player isn't jailed
-                    if z != 63 or WATER_SPAWNS:
+            return 'Player ' + player.name + ' is not ingame!' # Message
-                        break
+        elif player.jailed: # If player is jailed
-                # Magic numbers taken from server.py spawn function
+            player.jailed = False # Player is not jailed anymore
-                z -= 2.4
+            player.kill() # Kill the player
-                x += 0.5
+            connection.protocol.send_chat("%s quit the game 1" % (player.name, connection.name)) # Message
-                y += 0.5
+            connection.protocol.irc_say('* %s has left game 1' % (player.name, connection.name)) # Message
-                return (x, y, z)
+            jail_list.remove(player.name)
-            return connection.on_spawn_location(self, pos)
+
 @name('quit')
-        def on_refill(self):
+@admin
-            if self.protocol.free_for_all:
+        def on_disconnect(self):
-                return False
+            if self.jailed:
-            return connection.on_refill(self)
+                jail_list.remove(self.name)
                 self.jailed = False
-        def on_flag_take(self):
+            return connection.on_disconnect(self)
-            if self.protocol.free_for_all:
+    return protocol, JailConnection