[nexuiz-commits] r6763 - in branches/nexuiz-2.0: . data data/gfx/keys data/maps data/qcsrc/client data/qcsrc/common data/qcsrc/menu data/qcsrc/server data/scripts misc/netradiant-NexuizPack/nexuiz.game/data

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun May 24 05:22:54 EDT 2009


Author: div0
Date: 2009-05-24 05:22:51 -0400 (Sun, 24 May 2009)
New Revision: 6763

Added:
   branches/nexuiz-2.0/data/gfx/keys/key_backward_inv.tga
   branches/nexuiz-2.0/data/gfx/keys/key_crouch_inv.tga
   branches/nexuiz-2.0/data/gfx/keys/key_forward_inv.tga
   branches/nexuiz-2.0/data/gfx/keys/key_jump_inv.tga
   branches/nexuiz-2.0/data/gfx/keys/key_left_inv.tga
   branches/nexuiz-2.0/data/gfx/keys/key_right_inv.tga
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/build-compat-pack.sh
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/maps/aggressor.bsp
   branches/nexuiz-2.0/data/maps/aggressor.map
   branches/nexuiz-2.0/data/maps/aneurysm.bsp
   branches/nexuiz-2.0/data/maps/aneurysm.map
   branches/nexuiz-2.0/data/maps/darkzone.bsp
   branches/nexuiz-2.0/data/maps/darkzone.map
   branches/nexuiz-2.0/data/maps/dieselpower.bsp
   branches/nexuiz-2.0/data/maps/dieselpower.map
   branches/nexuiz-2.0/data/maps/downer.bsp
   branches/nexuiz-2.0/data/maps/downer.map
   branches/nexuiz-2.0/data/maps/final_rage.bsp
   branches/nexuiz-2.0/data/maps/final_rage.map
   branches/nexuiz-2.0/data/maps/runningman.bsp
   branches/nexuiz-2.0/data/maps/runningman.map
   branches/nexuiz-2.0/data/maps/runningman_1on1remix.bsp
   branches/nexuiz-2.0/data/maps/runningman_1on1remix.map
   branches/nexuiz-2.0/data/maps/runningmanctf.bsp
   branches/nexuiz-2.0/data/maps/runningmanctf.map
   branches/nexuiz-2.0/data/maps/runningmanctf.mapinfo
   branches/nexuiz-2.0/data/maps/skyway.bsp
   branches/nexuiz-2.0/data/maps/skyway.map
   branches/nexuiz-2.0/data/maps/slimepit.bsp
   branches/nexuiz-2.0/data/maps/slimepit.map
   branches/nexuiz-2.0/data/maps/soylent.bsp
   branches/nexuiz-2.0/data/maps/soylent.map
   branches/nexuiz-2.0/data/maps/starship.bsp
   branches/nexuiz-2.0/data/maps/starship.map
   branches/nexuiz-2.0/data/maps/stormkeep.bsp
   branches/nexuiz-2.0/data/maps/stormkeep.map
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
   branches/nexuiz-2.0/data/qcsrc/common/util.qc
   branches/nexuiz-2.0/data/qcsrc/common/util.qh
   branches/nexuiz-2.0/data/qcsrc/menu/menu.qh
   branches/nexuiz-2.0/data/qcsrc/server/bots.qc
   branches/nexuiz-2.0/data/qcsrc/server/bots_scripting.qc
   branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
   branches/nexuiz-2.0/data/scripts/entities.def
   branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
r6749 | m0rfar | 2009-05-21 20:03:52 +0200 (Thu, 21 May 2009) | 2 lines
Dom point tweaks. Removed a lot and moved some.
Onslaught for runningmanctf :D (no dom anymore)
r6751 | div0 | 2009-05-22 08:23:00 +0200 (Fri, 22 May 2009) | 2 lines
add a g_tdm_teams_override cvar similar to g_keyhunt_teams_override
r6752 | div0 | 2009-05-22 14:54:04 +0200 (Fri, 22 May 2009) | 2 lines
clarify welcome message handling in campaign
r6753 | div0 | 2009-05-22 21:27:13 +0200 (Fri, 22 May 2009) | 2 lines
add sound/weapons/weaponpickup.ogg and particles/particlefont.tga to compat pack
r6754 | mand1nga | 2009-05-23 00:22:24 +0200 (Sat, 23 May 2009) | 1 line
Fix compiler warnings
r6755 | mand1nga | 2009-05-23 04:07:33 +0200 (Sat, 23 May 2009) | 1 line
Patch for more visible pressed keys (cl_showpressedkeys) by FruitieX
r6756 | mrbougo | 2009-05-23 15:18:50 +0200 (Sat, 23 May 2009) | 1 line
entities.def: func_button accepts multiple targets too
r6757 | div0 | 2009-05-23 17:52:37 +0200 (Sat, 23 May 2009) | 2 lines
mapinfo: do an explicit heapsort for the mapinfo list, to fix problems with "-" in map names
r6758 | div0 | 2009-05-23 21:31:06 +0200 (Sat, 23 May 2009) | 2 lines
sorry for breaking strength and basement. Reverted.


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/.patchsets	2009-05-24 09:22:51 UTC (rev 6763)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6721,6723-6746
+revisions_applied = 1-6721,6723-6746,6749-6749,6751-6758

Modified: branches/nexuiz-2.0/data/build-compat-pack.sh
===================================================================
--- branches/nexuiz-2.0/data/build-compat-pack.sh	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/build-compat-pack.sh	2009-05-24 09:22:51 UTC (rev 6763)
@@ -22,6 +22,8 @@
 	models/sprites/item-speed_frame1.tga
 	models/sprites/item-strength_frame0.tga
 	models/sprites/item-strength_frame1.tga
+	sound/weapons/weaponpickup.ogg
+	particles/particlefont.tga
 "
 
 rm -rf pack

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-05-24 09:22:51 UTC (rev 6763)
@@ -505,7 +505,8 @@
 seta g_balance_teams 0	"automatically balance out players entering instead of asking them for their preferred team"
 seta g_balance_teams_force 0	"automatically balance out teams when players move or disconnect"
 seta g_balance_teams_prevent_imbalance	0	"prevent players from changing to larger teams"
-seta g_tdm_teams 2	"how many teams are in team deathmatch"
+set g_tdm_teams 2 "how many teams are in team deathmatch (set by mapinfo)"
+seta g_tdm_teams_override 0	"how many teams are in team deathmatch"
 set g_changeteam_banned 0	"not allowed to change team"
 set g_changeteam_fragtransfer 0	"% of frags you get to keep when you change teams (rounded down)"
 

Copied: branches/nexuiz-2.0/data/gfx/keys/key_backward_inv.tga (from rev 6758, trunk/data/gfx/keys/key_backward_inv.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/keys/key_crouch_inv.tga (from rev 6758, trunk/data/gfx/keys/key_crouch_inv.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/keys/key_forward_inv.tga (from rev 6758, trunk/data/gfx/keys/key_forward_inv.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/keys/key_jump_inv.tga (from rev 6758, trunk/data/gfx/keys/key_jump_inv.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/keys/key_left_inv.tga (from rev 6758, trunk/data/gfx/keys/key_left_inv.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/keys/key_right_inv.tga (from rev 6758, trunk/data/gfx/keys/key_right_inv.tga)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/aggressor.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/aggressor.map
===================================================================
--- branches/nexuiz-2.0/data/maps/aggressor.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/aggressor.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -7910,6 +7910,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 0.000000 -64.000000"
 }
 // entity 83
 {
@@ -7920,6 +7921,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 -96.000000"
 }
 // entity 84
 {
@@ -7930,6 +7932,7 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 -32.000000"
 }
 // entity 85
 {
@@ -7957,63 +7960,55 @@
 }
 // entity 88
 {
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^1Corner"
-"origin" "-624.000000 320.000000 168.000000"
-"wait" "5"
-}
-// entity 89
-{
 "classname" "item_bullets"
 "origin" "-96.000000 208.000000 -240.000000"
 }
-// entity 90
+// entity 89
 {
 "classname" "item_bullets"
 "origin" "-192.000000 400.000000 144.000000"
 }
-// entity 91
+// entity 90
 {
 "classname" "item_armor_small"
 "origin" "-112.000000 1008.000000 -48.000000"
 }
-// entity 92
+// entity 91
 {
 "classname" "item_armor_small"
 "origin" "-80.000000 1008.000000 -48.000000"
 }
-// entity 93
+// entity 92
 {
 "classname" "item_armor_small"
 "origin" "-80.000000 976.000000 -48.000000"
 }
-// entity 94
+// entity 93
 {
 "classname" "item_armor_small"
 "origin" "-112.000000 976.000000 -48.000000"
 }
-// entity 95
+// entity 94
 {
 "classname" "item_health_small"
 "origin" "-704.000000 352.000000 144.000000"
 }
-// entity 96
+// entity 95
 {
 "classname" "item_health_small"
 "origin" "-704.000000 320.000000 144.000000"
 }
-// entity 97
+// entity 96
 {
 "classname" "item_health_small"
 "origin" "-672.000000 320.000000 144.000000"
 }
-// entity 98
+// entity 97
 {
 "classname" "item_health_small"
 "origin" "-672.000000 352.000000 144.000000"
 }
-// entity 99
+// entity 98
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8021,7 +8016,7 @@
 "origin" "-96 -212 420"
 "target" "t128"
 }
-// entity 100
+// entity 99
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8029,14 +8024,14 @@
 "origin" "-28 -128 -72"
 "wait" "1.2"
 }
-// entity 101
+// entity 100
 {
 "classname" "light"
 "_color" "0.85 0.85 0.9"
 "light" "220"
 "origin" "-184 888 84"
 }
-// entity 102
+// entity 101
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8044,7 +8039,7 @@
 "origin" "216 -8 244"
 "target" "t115"
 }
-// entity 103
+// entity 102
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8052,7 +8047,7 @@
 "origin" "12 320 244"
 "target" "t114"
 }
-// entity 104
+// entity 103
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8060,7 +8055,7 @@
 "origin" "148 256 244"
 "target" "t113"
 }
-// entity 105
+// entity 104
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8068,7 +8063,7 @@
 "origin" "-384 140 244"
 "target" "t109"
 }
-// entity 106
+// entity 105
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8076,7 +8071,7 @@
 "origin" "-512 140 244"
 "target" "t108"
 }
-// entity 107
+// entity 106
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8084,7 +8079,7 @@
 "origin" "-512 500 244"
 "target" "t107"
 }
-// entity 108
+// entity 107
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8092,7 +8087,7 @@
 "origin" "-724 320 244"
 "target" "t106"
 }
-// entity 109
+// entity 108
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8100,7 +8095,7 @@
 "origin" "-664 200 244"
 "target" "t105"
 }
-// entity 110
+// entity 109
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8108,42 +8103,42 @@
 "origin" "-664 440 244"
 "target" "t104"
 }
-// entity 111
+// entity 110
 {
 "classname" "light"
 "_color" "1.000000 0.858015 0.775509"
 "light" "80"
 "origin" "-96 -320 -212"
 }
-// entity 112
+// entity 111
 {
 "classname" "light"
 "_color" "1.000000 0.858015 0.775509"
 "light" "50"
 "origin" "-96 640 -20"
 }
-// entity 113
+// entity 112
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "200"
 "origin" "-296 664 96"
 }
-// entity 114
+// entity 113
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "90"
 "origin" "-120 136 48"
 }
-// entity 115
+// entity 114
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "35"
 "origin" "-248 464 8"
 }
-// entity 116
+// entity 115
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8151,7 +8146,7 @@
 "origin" "-192 396 68"
 "target" "t44"
 }
-// entity 117
+// entity 116
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8159,7 +8154,7 @@
 "origin" "-308 -320 84"
 "target" "t29"
 }
-// entity 118
+// entity 117
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8167,7 +8162,7 @@
 "origin" "-224 -388 84"
 "target" "t28"
 }
-// entity 119
+// entity 118
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8175,7 +8170,7 @@
 "origin" "568 -116 244"
 "target" "t27"
 }
-// entity 120
+// entity 119
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8183,7 +8178,7 @@
 "origin" "148 128 244"
 "target" "t25"
 }
-// entity 121
+// entity 120
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8191,7 +8186,7 @@
 "origin" "224 -180 244"
 "target" "t24"
 }
-// entity 122
+// entity 121
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8199,7 +8194,7 @@
 "origin" "96 -180 244"
 "target" "t23"
 }
-// entity 123
+// entity 122
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8207,14 +8202,14 @@
 "origin" "352 -180 244"
 "target" "t22"
 }
-// entity 124
+// entity 123
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "25"
 "origin" "200 408 24"
 }
-// entity 125
+// entity 124
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8222,7 +8217,7 @@
 "origin" "200 488 52"
 "target" "t21"
 }
-// entity 126
+// entity 125
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8230,7 +8225,7 @@
 "origin" "200 328 52"
 "target" "t20"
 }
-// entity 127
+// entity 126
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8238,7 +8233,7 @@
 "origin" "64 500 52"
 "target" "t19"
 }
-// entity 128
+// entity 127
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8246,7 +8241,7 @@
 "origin" "8 448 24"
 "wait" "1.2"
 }
-// entity 129
+// entity 128
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8254,7 +8249,7 @@
 "origin" "64 396 52"
 "target" "t18"
 }
-// entity 130
+// entity 129
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8262,7 +8257,7 @@
 "origin" "-384 -96 68"
 "target" "t17"
 }
-// entity 131
+// entity 130
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8270,7 +8265,7 @@
 "origin" "-384 -180 68"
 "target" "t16"
 }
-// entity 132
+// entity 131
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8278,7 +8273,7 @@
 "origin" "-384 -12 68"
 "target" "t15"
 }
-// entity 133
+// entity 132
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8286,7 +8281,7 @@
 "origin" "-436 -48 68"
 "target" "t14"
 }
-// entity 134
+// entity 133
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8294,14 +8289,14 @@
 "origin" "-436 -144 68"
 "target" "t13"
 }
-// entity 135
+// entity 134
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "35"
 "origin" "-120 464 8"
 }
-// entity 136
+// entity 135
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8309,28 +8304,28 @@
 "origin" "-64 396 68"
 "target" "t12"
 }
-// entity 137
+// entity 136
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "100"
 "origin" "384 -40 -8"
 }
-// entity 138
+// entity 137
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "100"
 "origin" "160 -40 360"
 }
-// entity 139
+// entity 138
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "90"
 "origin" "-304 128 -200"
 }
-// entity 140
+// entity 139
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8338,7 +8333,7 @@
 "origin" "500 192 84"
 "target" "t30"
 }
-// entity 141
+// entity 140
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8346,7 +8341,7 @@
 "origin" "500 64 84"
 "target" "t31"
 }
-// entity 142
+// entity 141
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8354,7 +8349,7 @@
 "origin" "268 192 52"
 "target" "t32"
 }
-// entity 143
+// entity 142
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8362,7 +8357,7 @@
 "origin" "268 64 52"
 "target" "t33"
 }
-// entity 144
+// entity 143
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8370,7 +8365,7 @@
 "origin" "-180 -192 -108"
 "target" "t36"
 }
-// entity 145
+// entity 144
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8378,7 +8373,7 @@
 "origin" "-180 -64 -108"
 "target" "t37"
 }
-// entity 146
+// entity 145
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8386,7 +8381,7 @@
 "origin" "128 244 420"
 "target" "t111"
 }
-// entity 147
+// entity 146
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8394,7 +8389,7 @@
 "origin" "256 244 420"
 "target" "t112"
 }
-// entity 148
+// entity 147
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8402,14 +8397,14 @@
 "origin" "-492 320 68"
 "target" "t117"
 }
-// entity 149
+// entity 148
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "35"
 "origin" "-376 456 8"
 }
-// entity 150
+// entity 149
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8417,7 +8412,7 @@
 "origin" "-320 396 68"
 "target" "t123"
 }
-// entity 151
+// entity 150
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8425,7 +8420,7 @@
 "origin" "-384 244 68"
 "target" "t125"
 }
-// entity 152
+// entity 151
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8433,7 +8428,7 @@
 "origin" "352 -76 244"
 "target" "t126"
 }
-// entity 153
+// entity 152
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8441,7 +8436,7 @@
 "origin" "244 480 244"
 "target" "t127"
 }
-// entity 154
+// entity 153
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8449,7 +8444,7 @@
 "origin" "300 64 260"
 "target" "t129"
 }
-// entity 155
+// entity 154
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8457,7 +8452,7 @@
 "origin" "300 192 260"
 "target" "t130"
 }
-// entity 156
+// entity 155
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8465,7 +8460,7 @@
 "origin" "-224 244 420"
 "target" "t131"
 }
-// entity 157
+// entity 156
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8473,7 +8468,7 @@
 "origin" "-96 244 420"
 "target" "t132"
 }
-// entity 158
+// entity 157
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8481,7 +8476,7 @@
 "origin" "-220 192 -116"
 "target" "t136"
 }
-// entity 159
+// entity 158
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8489,28 +8484,28 @@
 "origin" "-220 64 -116"
 "target" "t137"
 }
-// entity 160
+// entity 159
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "100"
 "origin" "128 508 192"
 }
-// entity 161
+// entity 160
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "40"
 "origin" "-568 320 8"
 }
-// entity 162
+// entity 161
 {
 "classname" "light"
 "_color" "0.85 0.85 0.9"
 "light" "80"
 "origin" "28 -296 -72"
 }
-// entity 163
+// entity 162
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
@@ -8518,105 +8513,105 @@
 "origin" "-36 24 -56"
 "wait" "1.2"
 }
-// entity 164
+// entity 163
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "50"
 "origin" "88 192 200"
 }
-// entity 165
+// entity 164
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "50"
 "origin" "152 -104 200"
 }
-// entity 166
+// entity 165
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "35"
 "origin" "296 -128 200"
 }
-// entity 167
+// entity 166
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "35"
 "origin" "472 -112 200"
 }
-// entity 168
+// entity 167
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "40"
 "origin" "-448 192 200"
 }
-// entity 169
+// entity 168
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "40"
 "origin" "-584 224 200"
 }
-// entity 170
+// entity 169
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "40"
 "origin" "-584 424 200"
 }
-// entity 171
+// entity 170
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "30"
 "origin" "-248 472 200"
 }
-// entity 172
+// entity 171
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "30"
 "origin" "-120 472 200"
 }
-// entity 173
+// entity 172
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "30"
 "origin" "-376 464 200"
 }
-// entity 174
+// entity 173
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "60"
 "origin" "-160 184 360"
 }
-// entity 175
+// entity 174
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "110"
 "origin" "176 136 376"
 }
-// entity 176
+// entity 175
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "100"
 "origin" "-160 -16 376"
 }
-// entity 177
+// entity 176
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "100"
 "origin" "384 160 64"
 }
-// entity 178
+// entity 177
 {
 "classname" "light"
 "_color" "1.000000 0.858015 0.775509"
@@ -8624,28 +8619,28 @@
 "origin" "-96 992 -12"
 "wait" "1.2"
 }
-// entity 179
+// entity 178
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "130"
 "origin" "-144 -8 216"
 }
-// entity 180
+// entity 179
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "35"
 "origin" "568 -8 200"
 }
-// entity 181
+// entity 180
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"
 "light" "35"
 "origin" "360 312 192"
 }
-// entity 182
+// entity 181
 {
 "classname" "light"
 "_color" "0.7098 0.6431 0.6039"

Modified: branches/nexuiz-2.0/data/maps/aneurysm.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/aneurysm.map
===================================================================
--- branches/nexuiz-2.0/data/maps/aneurysm.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/aneurysm.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -30598,6 +30598,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "352.000000 -16.000000 -208.000000"
 }
 // entity 148
 {
@@ -30608,6 +30609,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "352.000000 -16.000000 -176.000000"
 }
 // entity 149
 {
@@ -30618,6 +30620,7 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "352.000000 -16.000000 -144.000000"
 }
 // entity 150
 {
@@ -30628,6 +30631,7 @@
 "netname" "^6Pink Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "352.000000 -16.000000 -112.000000"
 }
 // entity 151
 {
@@ -30639,36 +30643,24 @@
 // entity 152
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Upper Main Room"
-"origin" "580.000000 712.000000 32.000000"
+"message" "^3 has captured the ^1Strength Room"
+"origin" "-512.000000 416.000000 96.000000"
 }
 // entity 153
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Strength Room"
-"origin" "-322.000000 126.000000 16.000000"
-}
-// entity 154
-{
-"classname" "dom_controlpoint"
 "angle" "90"
 "message" "^3 has captured the ^1Lower Main Room"
-"origin" "350.000000 -206.000000 -200.000000"
+"origin" "352.000000 -208.000000 -200.000000"
 }
-// entity 155
+// entity 154
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Nex"
-"origin" "1040.000000 1326.000000 -200.000000"
-}
-// entity 156
-{
-"classname" "dom_controlpoint"
-"angle" "-45"
+"angle" "-45.000000"
 "message" "^3 has captured the ^1Bridge"
-"origin" "-890.000000 1700.000000 80.000000"
+"origin" "-744.000000 1656.000000 80.000000"
 }
-// entity 157
+// entity 155
 {
 "classname" "func_group"
 // brush 0
@@ -30812,7 +30804,7 @@
 ( -57 1512 300 ) ( -57 1568 244 ) ( -47 1512 300 ) common/caulk -16 -24 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 158
+// entity 156
 {
 "classname" "func_group"
 // brush 0
@@ -30956,7 +30948,7 @@
 ( -381 1514 288 ) ( -375 1514 288 ) ( -375 1514 278 ) evil_metals/mtldrk0 62 -40 0 0.5 -0.5 134217728 0 0
 }
 }
-// entity 159
+// entity 157
 {
 "classname" "func_group"
 "a_lightmapscale" "0.125"
@@ -30970,28 +30962,28 @@
 ( 1116 662 14 ) ( 1116 668 14 ) ( 1116 668 26 ) evil_metals/mtldrk0 -176 47 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 160
+// entity 158
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "736 -44 -128"
 }
-// entity 161
+// entity 159
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "50"
 "origin" "-104 -96 -262"
 }
-// entity 162
+// entity 160
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "50"
 "origin" "856 1320 -262"
 }
-// entity 163
+// entity 161
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -31026,7 +31018,7 @@
 }
 }
 }
-// entity 164
+// entity 162
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -31061,7 +31053,7 @@
 }
 }
 }
-// entity 165
+// entity 163
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -31096,7 +31088,7 @@
 }
 }
 }
-// entity 166
+// entity 164
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -31131,14 +31123,14 @@
 }
 }
 }
-// entity 167
+// entity 165
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "348 1028 68"
 }
-// entity 168
+// entity 166
 {
 "classname" "func_group"
 // brush 0
@@ -31223,7 +31215,7 @@
 ( 550 1952 216 ) ( 538 1952 216 ) ( 538 1952 232 ) evil_metals/mtldrk0 -132 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 169
+// entity 167
 {
 "classname" "func_group"
 // brush 0
@@ -31308,7 +31300,7 @@
 ( 760 1962 226 ) ( 760 1956 226 ) ( 776 1962 226 ) evil_metals/mtldrk0 -195 52 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 170
+// entity 168
 {
 "classname" "func_group"
 // brush 0
@@ -31393,7 +31385,7 @@
 ( 1030 1952 216 ) ( 1018 1952 216 ) ( 1018 1952 232 ) evil_metals/mtldrk0 -196 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 171
+// entity 169
 {
 "classname" "func_group"
 // brush 0
@@ -31478,7 +31470,7 @@
 ( 1214 1656 226 ) ( 1220 1656 226 ) ( 1214 1672 226 ) evil_metals/mtldrk0 60 -156 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 172
+// entity 170
 {
 "classname" "func_group"
 // brush 0
@@ -31563,7 +31555,7 @@
 ( 1226 1496 216 ) ( 1226 1484 216 ) ( 1226 1484 232 ) evil_metals/mtldrk0 224 -1 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 173
+// entity 171
 {
 "classname" "func_group"
 // brush 0
@@ -31648,7 +31640,7 @@
 ( 1216 974 234 ) ( 1222 974 234 ) ( 1216 990 234 ) evil_metals/mtldrk0 232 -160 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 174
+// entity 172
 {
 "classname" "func_group"
 // brush 0
@@ -31733,14 +31725,14 @@
 ( 1226 1220 224 ) ( 1226 1208 224 ) ( 1226 1208 240 ) evil_metals/mtldrk0 184 15 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 175
+// entity 173
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1408 832 16"
 }
-// entity 176
+// entity 174
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -31748,7 +31740,7 @@
 "origin" "1416 832 24"
 "target" "t94"
 }
-// entity 177
+// entity 175
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -31768,7 +31760,7 @@
 }
 }
 }
-// entity 178
+// entity 176
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -31788,7 +31780,7 @@
 }
 }
 }
-// entity 179
+// entity 177
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -31808,21 +31800,21 @@
 }
 }
 }
-// entity 180
+// entity 178
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "50"
 "origin" "164 1904 222"
 }
-// entity 181
+// entity 179
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "50"
 "origin" "304 2044 -30"
 }
-// entity 182
+// entity 180
 {
 "classname" "func_group"
 // brush 0
@@ -31907,7 +31899,7 @@
 ( 188 890 -40 ) ( 200 890 -40 ) ( 200 890 -24 ) evil_metals/mtldrk0 -72 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 183
+// entity 181
 {
 "classname" "func_group"
 // brush 0
@@ -31992,7 +31984,7 @@
 ( 554 880 -30 ) ( 554 886 -30 ) ( 538 880 -30 ) evil_metals/mtldrk0 -8 0 0 0.5 -0.5 134217728 0 0
 }
 }
-// entity 184
+// entity 182
 {
 "classname" "func_group"
 // brush 0
@@ -32077,7 +32069,7 @@
 ( 772 890 -40 ) ( 784 890 -40 ) ( 784 890 -24 ) evil_metals/mtldrk0 40 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 185
+// entity 183
 {
 "classname" "func_group"
 // brush 0
@@ -32162,7 +32154,7 @@
 ( 1040 722 -30 ) ( 1034 722 -30 ) ( 1040 706 -30 ) evil_metals/mtldrk0 -88 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 186
+// entity 184
 {
 "classname" "func_group"
 // brush 0
@@ -32247,7 +32239,7 @@
 ( 508 6 -40 ) ( 496 6 -40 ) ( 496 6 -24 ) evil_metals/mtldrk0 -216 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 187
+// entity 185
 {
 "classname" "func_group"
 // brush 0
@@ -32332,7 +32324,7 @@
 ( 1030 180 -40 ) ( 1030 192 -40 ) ( 1030 192 -24 ) evil_metals/mtldrk0 -56 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 188
+// entity 186
 {
 "classname" "func_group"
 // brush 0
@@ -32417,329 +32409,329 @@
 ( 766 16 -30 ) ( 766 10 -30 ) ( 782 16 -30 ) evil_metals/mtldrk0 -184 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 189
+// entity 187
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-880 736 152"
 }
-// entity 190
+// entity 188
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "65"
 "origin" "1648 1352 102"
 }
-// entity 191
+// entity 189
 {
 "classname" "light"
 "_color" "1 1 0.6"
 "light" "200"
 "origin" "820 984 104"
 }
-// entity 192
+// entity 190
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "620 900 132"
 }
-// entity 193
+// entity 191
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "620 1036 132"
 }
-// entity 194
+// entity 192
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "50"
 "origin" "688 1160 -46"
 }
-// entity 195
+// entity 193
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "50"
 "origin" "624 1160 -46"
 }
-// entity 196
+// entity 194
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "65"
 "origin" "356 724 150"
 }
-// entity 197
+// entity 195
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "65"
 "origin" "440 136 174"
 }
-// entity 198
+// entity 196
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "65"
 "origin" "200 136 174"
 }
-// entity 199
+// entity 197
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "464 472 204"
 }
-// entity 200
+// entity 198
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "368 472 204"
 }
-// entity 201
+// entity 199
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "368 552 204"
 }
-// entity 202
+// entity 200
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "464 552 204"
 }
-// entity 203
+// entity 201
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "272 552 204"
 }
-// entity 204
+// entity 202
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "176 552 204"
 }
-// entity 205
+// entity 203
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "176 472 204"
 }
-// entity 206
+// entity 204
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "272 472 204"
 }
-// entity 207
+// entity 205
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "272 312 204"
 }
-// entity 208
+// entity 206
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "176 312 204"
 }
-// entity 209
+// entity 207
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "176 392 204"
 }
-// entity 210
+// entity 208
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "272 392 204"
 }
-// entity 211
+// entity 209
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "464 392 204"
 }
-// entity 212
+// entity 210
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "368 392 204"
 }
-// entity 213
+// entity 211
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "368 312 204"
 }
-// entity 214
+// entity 212
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "464 312 204"
 }
-// entity 215
+// entity 213
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "744 208 132"
 }
-// entity 216
+// entity 214
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "744 104 132"
 }
-// entity 217
+// entity 215
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "848 -16 528"
 }
-// entity 218
+// entity 216
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "952 -16 360"
 }
-// entity 219
+// entity 217
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "848 -16 304"
 }
-// entity 220
+// entity 218
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "848 -16 416"
 }
-// entity 221
+// entity 219
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "952 -16 472"
 }
-// entity 222
+// entity 220
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "952 -16 248"
 }
-// entity 223
+// entity 221
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "848 -16 192"
 }
-// entity 224
+// entity 222
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "848 -16 80"
 }
-// entity 225
+// entity 223
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "960 -16 16"
 }
-// entity 226
+// entity 224
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "952 -16 136"
 }
-// entity 227
+// entity 225
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1000 4 80"
 }
-// entity 228
+// entity 226
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1000 4 124"
 }
-// entity 229
+// entity 227
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1032 4 124"
 }
-// entity 230
+// entity 228
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1032 4 80"
 }
-// entity 231
+// entity 229
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1072 4 80"
 }
-// entity 232
+// entity 230
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1072 4 124"
 }
-// entity 233
+// entity 231
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1120 4 124"
 }
-// entity 234
+// entity 232
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1120 4 80"
 }
-// entity 235
+// entity 233
 {
 "classname" "func_group"
 "a_lightmapscale" "0.125"
@@ -32996,14 +32988,14 @@
 ( 992 156 232 ) ( 992 148 232 ) ( 992 148 224 ) evil6_trims/e6boltstrip 17 14 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 236
+// entity 234
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1160 484 468"
 }
-// entity 237
+// entity 235
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -33016,11 +33008,11 @@
 (
 ( ( 1040.0762939453 480 484.0450744629 0 0.25 ) ( 1053.6303710938 480 492.5472412109 0 0.125 ) ( 1067.1844482422 480 501.0494384766 0 0 ) )
 ( ( 1048.2357177734 383.8932495117 484.012512207 0.7535349727 0.25 ) ( 1061.2709960938 385.1230773926 493.2085571289 0.7535349727 0.125 ) ( 1074.3063964844 386.3529052734 502.4046325684 0.7535349727 0 ) )
-( ( 1120.2537841797 380.0020141602 392.0090637207 1.6668419838 0.25 ) ( 1133.0161132813 380.3712463379 401.6519165039 1.6668419838 0.125 ) ( 1145.7785644531 380.7404785156 411.2947692871 1.6668419838 0 ) )
-( ( 1163.7478027344 383.8852539063 331.9785766602 2.2467839718 0.25 ) ( 1177.0810546875 383.6931152344 340.8210449219 2.2467839718 0.125 ) ( 1190.4141845703 383.5009460449 349.663482666 2.2467839718 0 ) )
+( ( 1120.2537841797 380.0020141602 392.0090637207 1.6668419838 0.25 ) ( 1133.0161132812 380.3712463379 401.6519165039 1.6668419838 0.125 ) ( 1145.7785644531 380.7404785156 411.2947692871 1.6668419838 0 ) )
+( ( 1163.7478027344 383.8852539062 331.9785766602 2.2467839718 0.25 ) ( 1177.0810546875 383.6931152344 340.8210449219 2.2467839718 0.125 ) ( 1190.4141845703 383.5009460449 349.663482666 2.2467839718 0 ) )
 ( ( 1167.6062011719 480 323.7553405762 3.0010259151 0.25 ) ( 1181.3212890625 480 331.9952392578 3.0010259151 0.125 ) ( 1195.0363769531 480 340.2351074219 3.0010259151 0 ) )
 ( ( 1163.7478027344 576.1147460938 331.9785766602 3.7552680969 0.25 ) ( 1177.0810546875 576.3068847656 340.8210449219 3.7552680969 0.125 ) ( 1190.4141845703 576.4990844727 349.663482666 3.7552680969 0 ) )
-( ( 1120.2537841797 579.9979858398 392.0090637207 4.3352098465 0.25 ) ( 1133.0161132813 579.6287841797 401.6519165039 4.3352098465 0.125 ) ( 1145.7785644531 579.2595214844 411.2947387695 4.3352098465 0 ) )
+( ( 1120.2537841797 579.9979858398 392.0090637207 4.3352098465 0.25 ) ( 1133.0161132812 579.6287841797 401.6519165039 4.3352098465 0.125 ) ( 1145.7785644531 579.2595214844 411.2947387695 4.3352098465 0 ) )
 ( ( 1048.2357177734 576.1067504883 484.012512207 5.2485170364 0.25 ) ( 1061.2709960938 574.876953125 493.2085571289 5.2485170364 0.125 ) ( 1074.3063964844 573.6470947266 502.4046325684 5.2485170364 0 ) )
 ( ( 1040.0762939453 480 484.0450744629 6.0020518303 0.25 ) ( 1053.6303710938 480 492.5472412109 6.0020518303 0.125 ) ( 1067.1844482422 480 501.0494384766 6.0020518303 0 ) )
 )
@@ -33036,9 +33028,9 @@
 ( ( 1048.1772460938 480 470.2474365234 0 0.125 ) ( 1044.1267089844 480 477.1462402344 0 0.0625 ) ( 1040.0762939453 480 484.0450744629 0 0 ) )
 ( ( 1053.7821044922 395.3137207031 474.2754516602 0.6638050079 0.125 ) ( 1051.0089111328 389.6034851074 479.1439819336 0.6638050079 0.0625 ) ( 1048.2357177734 383.8932495117 484.012512207 0.6638050079 0 ) )
 ( ( 1120 396 392 1.4889229536 0.125 ) ( 1120.126953125 388.0010070801 392.0045166016 1.4889229536 0.0625 ) ( 1120.2537841797 380.0020141602 392.0090637207 1.4889229536 0 ) )
-( ( 1157.8911132813 395.3137207031 341.5226745605 1.982049942 0.125 ) ( 1160.8194580078 389.5994873047 336.7506103516 1.982049942 0.0625 ) ( 1163.7478027344 383.8852539063 331.9785766602 1.982049942 0 ) )
+( ( 1157.8911132812 395.3137207031 341.5226745605 1.982049942 0.125 ) ( 1160.8194580078 389.5994873047 336.7506103516 1.982049942 0.0625 ) ( 1163.7478027344 383.8852539062 331.9785766602 1.982049942 0 ) )
 ( ( 1159.3607177734 480 337.4671020508 2.6445190907 0.125 ) ( 1163.4833984375 480 330.6112060547 2.6445190907 0.0625 ) ( 1167.6062011719 480 323.7553405762 2.6445190907 0 ) )
-( ( 1157.8911132813 564.6862792969 341.5226745605 3.3069880009 0.125 ) ( 1160.8194580078 570.4005126953 336.7506103516 3.3069880009 0.0625 ) ( 1163.7478027344 576.1147460938 331.9785766602 3.3069880009 0 ) )
+( ( 1157.8911132812 564.6862792969 341.5226745605 3.3069880009 0.125 ) ( 1160.8194580078 570.4005126953 336.7506103516 3.3069880009 0.0625 ) ( 1163.7478027344 576.1147460938 331.9785766602 3.3069880009 0 ) )
 ( ( 1120 564 392 3.8001160622 0.125 ) ( 1120.126953125 571.9990234375 392.0045166016 3.8001160622 0.0625 ) ( 1120.2537841797 579.9979858398 392.0090637207 3.8001160622 0 ) )
 ( ( 1053.7821044922 564.6862792969 474.2754516602 4.6252331734 0.125 ) ( 1051.0089111328 570.396484375 479.1439819336 4.6252331734 0.0625 ) ( 1048.2357177734 576.1067504883 484.012512207 4.6252331734 0 ) )
 ( ( 1048.1772460938 480 470.2474365234 5.2890381813 0.125 ) ( 1044.1267089844 480 477.1462402344 5.2890381813 0.0625 ) ( 1040.0762939453 480 484.0450744629 5.2890381813 0 ) )
@@ -33046,7 +33038,7 @@
 }
 }
 }
-// entity 238
+// entity 236
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -33059,11 +33051,11 @@
 (
 ( ( 1203.9996337891 492 1344.0457763672 0 0 ) ( 1211.9993896484 492 1344.1066894531 0 0.0625 ) ( 1219.9991455078 492 1344.1674804688 0 0.125 ) )
 ( ( 1204.0377197266 395.9623413086 1344.0059814453 0.6626240015 0 ) ( 1209.6754150391 401.6380310059 1344.0622558594 0.6626240015 0.0625 ) ( 1215.3131103516 407.3137207031 1344.1184082031 0.6626240015 0.125 ) )
-( ( 1324.1489257813 396.0007019043 1343.9807128906 1.5125290155 0 ) ( 1324.0744628906 404.0003662109 1343.9903564453 1.5125290155 0.0625 ) ( 1324 412 1344 1.5125290155 0.125 ) )
+( ( 1324.1489257812 396.0007019043 1343.9807128906 1.5125290155 0 ) ( 1324.0744628906 404.0003662109 1343.9903564453 1.5125290155 0.0625 ) ( 1324 412 1344 1.5125290155 0.125 ) )
 ( ( 1416.0662841797 396.0663146973 1344.0430908203 2.1439580917 0 ) ( 1410.3764648438 401.6900024414 1344.0737304688 2.1439580917 0.0625 ) ( 1404.6867675781 407.3137207031 1344.1042480469 2.1439580917 0.125 ) )
-( ( 1416.0003662109 492 1344.0369873047 2.8065810204 0 ) ( 1408.0004882813 492 1344.0922851563 2.8065810204 0.0625 ) ( 1400.0007324219 492 1344.1474609375 2.8065810204 0.125 ) )
+( ( 1416.0003662109 492 1344.0369873047 2.8065810204 0 ) ( 1408.0004882812 492 1344.0922851562 2.8065810204 0.0625 ) ( 1400.0007324219 492 1344.1474609375 2.8065810204 0.125 ) )
 ( ( 1416.0662841797 587.9337158203 1344.0430908203 3.4692049026 0 ) ( 1410.3764648438 582.3099975586 1344.0737304688 3.4692049026 0.0625 ) ( 1404.6867675781 576.6862792969 1344.1042480469 3.4692049026 0.125 ) )
-( ( 1324.1489257813 587.9992675781 1343.9807128906 4.1006331444 0 ) ( 1324.0744628906 579.9996337891 1343.9903564453 4.1006331444 0.0625 ) ( 1324 572 1344 4.1006331444 0.125 ) )
+( ( 1324.1489257812 587.9992675781 1343.9807128906 4.1006331444 0 ) ( 1324.0744628906 579.9996337891 1343.9903564453 4.1006331444 0.0625 ) ( 1324 572 1344 4.1006331444 0.125 ) )
 ( ( 1204.0377197266 588.0376586914 1344.0059814453 4.9505391121 0 ) ( 1209.6754150391 582.3619384766 1344.0622558594 4.9505391121 0.0625 ) ( 1215.3131103516 576.6862792969 1344.1184082031 4.9505391121 0.125 ) )
 ( ( 1203.9996337891 492 1344.0457763672 5.6131629944 0 ) ( 1211.9993896484 492 1344.1066894531 5.6131629944 0.0625 ) ( 1219.9991455078 492 1344.1674804688 5.6131629944 0.125 ) )
 )
@@ -33079,304 +33071,304 @@
 ( ( 1219.9991455078 480 1344.1674804688 0 7.4391450882 ) ( 1225.9487304688 480 572.1620483398 0 1.4076730013 ) ( 1048.1772460938 480 470.2474365234 0 0 ) )
 ( ( 1215.3131103516 395.3137207031 1344.1184082031 0.6626240015 7.4391450882 ) ( 1221.1351318359 396.0913391113 574.8668212891 0.6626240015 1.4076730013 ) ( 1053.7821044922 395.3137207031 474.2754516602 0.6626240015 0 ) )
 ( ( 1324 400 1344 1.5125290155 7.4391450882 ) ( 1268 400 560 1.5125290155 1.4076730013 ) ( 1120 396 392 1.5125290155 0 ) )
-( ( 1404.6867675781 395.3137207031 1344.1042480469 2.1439580917 7.4391450882 ) ( 1398.7502441406 396.0133056641 481.111114502 2.1439580917 1.4076730013 ) ( 1157.8911132813 395.3137207031 341.5226745605 2.1439580917 0 ) )
+( ( 1404.6867675781 395.3137207031 1344.1042480469 2.1439580917 7.4391450882 ) ( 1398.7502441406 396.0133056641 481.111114502 2.1439580917 1.4076730013 ) ( 1157.8911132812 395.3137207031 341.5226745605 2.1439580917 0 ) )
 ( ( 1400.0007324219 480 1344.1474609375 2.8065810204 7.4391450882 ) ( 1393.9957275391 480 483.7383117676 2.8065810204 1.4076730013 ) ( 1159.3607177734 480 337.4671020508 2.8065810204 0 ) )
-( ( 1404.6867675781 564.6862792969 1344.1042480469 3.4692049026 7.4391450882 ) ( 1398.7502441406 563.9866943359 481.111114502 3.4692049026 1.4076730013 ) ( 1157.8911132813 564.6862792969 341.5226745605 3.4692049026 0 ) )
+( ( 1404.6867675781 564.6862792969 1344.1042480469 3.4692049026 7.4391450882 ) ( 1398.7502441406 563.9866943359 481.111114502 3.4692049026 1.4076730013 ) ( 1157.8911132812 564.6862792969 341.5226745605 3.4692049026 0 ) )
 ( ( 1324 560 1344 4.1006331444 7.4391450882 ) ( 1268 560 560 4.1006331444 1.4076730013 ) ( 1120 564 392 4.1006331444 0 ) )
-( ( 1215.3131103516 564.6862792969 1344.1184082031 4.9505391121 7.4391450882 ) ( 1221.1351318359 563.9086914063 574.8668212891 4.9505391121 1.4076730013 ) ( 1053.7821044922 564.6862792969 474.2754516602 4.9505391121 0 ) )
+( ( 1215.3131103516 564.6862792969 1344.1184082031 4.9505391121 7.4391450882 ) ( 1221.1351318359 563.9086914062 574.8668212891 4.9505391121 1.4076730013 ) ( 1053.7821044922 564.6862792969 474.2754516602 4.9505391121 0 ) )
 ( ( 1219.9991455078 480 1344.1674804688 5.6131629944 7.4391450882 ) ( 1225.9487304688 480 572.1620483398 5.6131629944 1.4076730013 ) ( 1048.1772460938 480 470.2474365234 5.6131629944 0 ) )
 )
 }
 }
 }
-// entity 239
+// entity 237
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1108 1140 152"
 }
-// entity 240
+// entity 238
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "936 420 380"
 }
-// entity 241
+// entity 239
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "65"
 "origin" "956 276 106"
 }
-// entity 242
+// entity 240
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "936 512 146"
 }
-// entity 243
+// entity 241
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "940 736 146"
 }
-// entity 244
+// entity 242
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "1076 892 102"
 }
-// entity 245
+// entity 243
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1152 36 80"
 }
-// entity 246
+// entity 244
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "70"
 "origin" "1152 36 124"
 }
-// entity 247
+// entity 245
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "80"
 "origin" "1152 72 124"
 }
-// entity 248
+// entity 246
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "80"
 "origin" "1152 72 80"
 }
-// entity 249
+// entity 247
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "90"
 "origin" "1152 100 80"
 }
-// entity 250
+// entity 248
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "90"
 "origin" "1152 100 124"
 }
-// entity 251
+// entity 249
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "100"
 "origin" "1152 132 124"
 }
-// entity 252
+// entity 250
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "100"
 "origin" "1152 132 80"
 }
-// entity 253
+// entity 251
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "110"
 "origin" "1152 164 80"
 }
-// entity 254
+// entity 252
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "110"
 "origin" "1152 164 124"
 }
-// entity 255
+// entity 253
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "130"
 "origin" "1152 196 124"
 }
-// entity 256
+// entity 254
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "130"
 "origin" "1152 196 80"
 }
-// entity 257
+// entity 255
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "150"
 "origin" "1152 228 80"
 }
-// entity 258
+// entity 256
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "150"
 "origin" "1152 228 124"
 }
-// entity 259
+// entity 257
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "180"
 "origin" "1152 260 124"
 }
-// entity 260
+// entity 258
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "180"
 "origin" "1152 260 80"
 }
-// entity 261
+// entity 259
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1152 420 80"
 }
-// entity 262
+// entity 260
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1152 388 80"
 }
-// entity 263
+// entity 261
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1152 356 80"
 }
-// entity 264
+// entity 262
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1152 328 80"
 }
-// entity 265
+// entity 263
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1152 292 80"
 }
-// entity 266
+// entity 264
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1152 292 124"
 }
-// entity 267
+// entity 265
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1144 528 124"
 }
-// entity 268
+// entity 266
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1148 584 124"
 }
-// entity 269
+// entity 267
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1148 632 80"
 }
-// entity 270
+// entity 268
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1148 632 124"
 }
-// entity 271
+// entity 269
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1192 636 124"
 }
-// entity 272
+// entity 270
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1192 636 80"
 }
-// entity 273
+// entity 271
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1256 672 80"
 }
-// entity 274
+// entity 272
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1256 672 124"
 }
-// entity 275
+// entity 273
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1324 700 124"
 }
-// entity 276
+// entity 274
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1324 700 80"
 }
-// entity 277
+// entity 275
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1364 728 80"
 }
-// entity 278
+// entity 276
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1364 728 124"
 }
-// entity 279
+// entity 277
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "1264 928 102"
 }
-// entity 280
+// entity 278
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -33384,21 +33376,21 @@
 "origin" "1416 940 24"
 "target" "t91"
 }
-// entity 281
+// entity 279
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1408 940 16"
 }
-// entity 282
+// entity 280
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1408 1008 16"
 }
-// entity 283
+// entity 281
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -33406,14 +33398,14 @@
 "origin" "1416 1008 24"
 "target" "t90"
 }
-// entity 284
+// entity 282
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1009 1015 16"
 }
-// entity 285
+// entity 283
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -33421,7 +33413,7 @@
 "origin" "1007 1022 24"
 "target" "t89"
 }
-// entity 286
+// entity 284
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -33429,21 +33421,21 @@
 "origin" "896 983 24"
 "target" "t88"
 }
-// entity 287
+// entity 285
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "900 977 16"
 }
-// entity 288
+// entity 286
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "855 901 16"
 }
-// entity 289
+// entity 287
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -33451,7 +33443,7 @@
 "origin" "848 904 24"
 "target" "t87"
 }
-// entity 290
+// entity 288
 {
 "classname" "func_group"
 "a_lightmapscale" "0.125"
@@ -35098,7 +35090,7 @@
 ( 1000 612 48 ) ( 1000 612 56 ) ( 1006 604 56 ) common/caulk 8 48 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 291
+// entity 289
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -35110,9 +35102,9 @@
 ( 9 3 0 0 0 )
 (
 ( ( 1056 1088 124 0 0 ) ( 776 1088 124 0 4.375 ) ( 776 824 120 0 8.5 ) )
-( ( 1055.6352539063 1067.3078613281 124.6862945557 0.25 0 ) ( 801.2933959961 1054.4937744141 123.0056915283 0.25 4.375 ) ( 796.6862792969 824 124.6862945557 0.25 8.5 ) )
+( ( 1055.6352539062 1067.3078613281 124.6862945557 0.25 0 ) ( 801.2933959961 1054.4937744141 123.0056915283 0.25 4.375 ) ( 796.6862792969 824 124.6862945557 0.25 8.5 ) )
 ( ( 1055.4841308594 1067.9916992188 104 0.5 0 ) ( 796.5053710938 1059.1298828125 104 0.5 4.375 ) ( 792 824 104 0.5 8.5 ) )
-( ( 1055.6352539063 1067.3078613281 83.3137054443 0.75 0 ) ( 801.2933959961 1054.4937744141 84.9943084717 0.75 4.375 ) ( 796.6862792969 824 83.3137054443 0.75 8.5 ) )
+( ( 1055.6352539062 1067.3078613281 83.3137054443 0.75 0 ) ( 801.2933959961 1054.4937744141 84.9943084717 0.75 4.375 ) ( 796.6862792969 824 83.3137054443 0.75 8.5 ) )
 ( ( 1056 1088 84 1 0 ) ( 776 1088 84 1 4.375 ) ( 776 824 88 1 8.5 ) )
 ( ( 1056 1108.6862792969 83.3137054443 1.25 0 ) ( 750.5319824219 1113.4680175781 85.063949585 1.25 4.375 ) ( 755.3137207031 824 83.3137054443 1.25 8.5 ) )
 ( ( 1056 1108 104 1.5 0 ) ( 755.3137207031 1108.6862792969 104 1.5 4.375 ) ( 760 824 104 1.5 8.5 ) )
@@ -35148,9 +35140,9 @@
 ( 9 3 0 0 0 )
 (
 ( ( 1056 1088 136 0 0.5 ) ( 1064 1088 128 0 0.25 ) ( 1056 1088 124 0 0 ) )
-( ( 1056 1056 136 1 0.5 ) ( 1063.8176269531 1061.6539306641 130.3431396484 1 0.25 ) ( 1055.6352539063 1067.3078613281 124.6862945557 1 0 ) )
+( ( 1056 1056 136 1 0.5 ) ( 1063.8176269531 1061.6539306641 130.3431396484 1 0.25 ) ( 1055.6352539062 1067.3078613281 124.6862945557 1 0 ) )
 ( ( 1056 1056 104 2 0.5 ) ( 1063.7420654297 1063.9958496094 104 2 0.25 ) ( 1055.4841308594 1067.9916992188 104 2 0 ) )
-( ( 1056 1056 72 3 0.5 ) ( 1063.8176269531 1061.6539306641 77.6568527222 3 0.25 ) ( 1055.6352539063 1067.3078613281 83.3137054443 3 0 ) )
+( ( 1056 1056 72 3 0.5 ) ( 1063.8176269531 1061.6539306641 77.6568527222 3 0.25 ) ( 1055.6352539062 1067.3078613281 83.3137054443 3 0 ) )
 ( ( 1056 1088 72 4 0.5 ) ( 1064 1088 80 4 0.25 ) ( 1056 1088 84 4 0 ) )
 ( ( 1056 1120 72 5 0.5 ) ( 1064 1114.3431396484 77.6568527222 5 0.25 ) ( 1056 1108.6862792969 83.3137054443 5 0 ) )
 ( ( 1056 1120 104 6 0.5 ) ( 1064 1112 104 6 0.25 ) ( 1056 1108 104 6 0 ) )
@@ -35160,7 +35152,7 @@
 }
 }
 }
-// entity 292
+// entity 290
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35168,7 +35160,7 @@
 "origin" "840 792 24"
 "target" "t80"
 }
-// entity 293
+// entity 291
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35176,7 +35168,7 @@
 "origin" "840 736 24"
 "target" "t79"
 }
-// entity 294
+// entity 292
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35184,28 +35176,28 @@
 "origin" "840 680 24"
 "target" "t78"
 }
-// entity 295
+// entity 293
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 792 16"
 }
-// entity 296
+// entity 294
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 736 16"
 }
-// entity 297
+// entity 295
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 680 16"
 }
-// entity 298
+// entity 296
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35213,21 +35205,21 @@
 "origin" "1112 1144 24"
 "target" "t76"
 }
-// entity 299
+// entity 297
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1120 1144 16"
 }
-// entity 300
+// entity 298
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1120 1088 16"
 }
-// entity 301
+// entity 299
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35235,7 +35227,7 @@
 "origin" "1112 1088 24"
 "target" "t75"
 }
-// entity 302
+// entity 300
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35243,21 +35235,21 @@
 "origin" "1416 1088 24"
 "target" "t74"
 }
-// entity 303
+// entity 301
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1408 1088 16"
 }
-// entity 304
+// entity 302
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1408 1144 16"
 }
-// entity 305
+// entity 303
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35265,7 +35257,7 @@
 "origin" "1416 1144 24"
 "target" "t73"
 }
-// entity 306
+// entity 304
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35273,14 +35265,14 @@
 "origin" "1104 1747 24"
 "target" "t72"
 }
-// entity 307
+// entity 305
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1110 1752 16"
 }
-// entity 308
+// entity 306
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35288,21 +35280,21 @@
 "origin" "1402 1801 24"
 "target" "t71"
 }
-// entity 309
+// entity 307
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1394 1799 16"
 }
-// entity 310
+// entity 308
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1322 1932 16"
 }
-// entity 311
+// entity 309
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35310,7 +35302,7 @@
 "origin" "1328 1937 24"
 "target" "t70"
 }
-// entity 312
+// entity 310
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35318,28 +35310,28 @@
 "origin" "1180 2032 24"
 "target" "t69"
 }
-// entity 313
+// entity 311
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1178 2024 16"
 }
-// entity 314
+// entity 312
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "1152 1328 128"
 }
-// entity 315
+// entity 313
 {
 "classname" "light"
 "_color" "1 0.35 0"
 "light" "10"
 "origin" "1408 1296 16"
 }
-// entity 316
+// entity 314
 {
 "classname" "light"
 "_color" "1 0.35 0"
@@ -35347,7 +35339,7 @@
 "origin" "1416 1296 24"
 "target" "t68"
 }
-// entity 317
+// entity 315
 {
 "classname" "light"
 "_color" "1 0.35 0"
@@ -35355,21 +35347,21 @@
 "origin" "1416 1352 24"
 "target" "t67"
 }
-// entity 318
+// entity 316
 {
 "classname" "light"
 "_color" "1 0.35 0"
 "light" "10"
 "origin" "1408 1352 16"
 }
-// entity 319
+// entity 317
 {
 "classname" "light"
 "_color" "1 0.35 0"
 "light" "10"
 "origin" "1408 1408 16"
 }
-// entity 320
+// entity 318
 {
 "classname" "light"
 "_color" "1 0.35 0"
@@ -35377,7 +35369,7 @@
 "origin" "1416 1408 24"
 "target" "t66"
 }
-// entity 321
+// entity 319
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35385,21 +35377,21 @@
 "origin" "1112 1536 24"
 "target" "t63"
 }
-// entity 322
+// entity 320
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1120 1536 16"
 }
-// entity 323
+// entity 321
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1120 1592 16"
 }
-// entity 324
+// entity 322
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35407,7 +35399,7 @@
 "origin" "1112 1592 24"
 "target" "t62"
 }
-// entity 325
+// entity 323
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35415,7 +35407,7 @@
 "origin" "952 1752 24"
 "target" "t61"
 }
-// entity 326
+// entity 324
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35423,7 +35415,7 @@
 "origin" "896 1752 24"
 "target" "t60"
 }
-// entity 327
+// entity 325
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35431,35 +35423,35 @@
 "origin" "840 1752 24"
 "target" "t59"
 }
-// entity 328
+// entity 326
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "952 1760 16"
 }
-// entity 329
+// entity 327
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "896 1760 16"
 }
-// entity 330
+// entity 328
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "840 1760 16"
 }
-// entity 331
+// entity 329
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "472 1760 16"
 }
-// entity 332
+// entity 330
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35467,7 +35459,7 @@
 "origin" "472 1752 24"
 "target" "t58"
 }
-// entity 333
+// entity 331
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35475,21 +35467,21 @@
 "origin" "416 1752 24"
 "target" "t57"
 }
-// entity 334
+// entity 332
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "416 1760 16"
 }
-// entity 335
+// entity 333
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "416 2048 16"
 }
-// entity 336
+// entity 334
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35497,7 +35489,7 @@
 "origin" "416 2056 24"
 "target" "t56"
 }
-// entity 337
+// entity 335
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35505,21 +35497,21 @@
 "origin" "472 2056 24"
 "target" "t55"
 }
-// entity 338
+// entity 336
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "472 2048 16"
 }
-// entity 339
+// entity 337
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "616 2048 16"
 }
-// entity 340
+// entity 338
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35527,7 +35519,7 @@
 "origin" "616 2056 24"
 "target" "t54"
 }
-// entity 341
+// entity 339
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35535,35 +35527,35 @@
 "origin" "696 2056 24"
 "target" "t53"
 }
-// entity 342
+// entity 340
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "696 2048 16"
 }
-// entity 343
+// entity 341
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "840 2048 16"
 }
-// entity 344
+// entity 342
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "896 2048 16"
 }
-// entity 345
+// entity 343
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "952 2048 16"
 }
-// entity 346
+// entity 344
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35571,7 +35563,7 @@
 "origin" "840 2056 24"
 "target" "t52"
 }
-// entity 347
+// entity 345
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35579,7 +35571,7 @@
 "origin" "896 2056 24"
 "target" "t51"
 }
-// entity 348
+// entity 346
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35587,77 +35579,77 @@
 "origin" "952 2056 24"
 "target" "t50"
 }
-// entity 349
+// entity 347
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "1264 1208 102"
 }
-// entity 350
+// entity 348
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "1264 1496 102"
 }
-// entity 351
+// entity 349
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "1264 1656 102"
 }
-// entity 352
+// entity 350
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "1024 1912 102"
 }
-// entity 353
+// entity 351
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "768 1912 102"
 }
-// entity 354
+// entity 352
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "428 1916 86"
 }
-// entity 355
+// entity 353
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "536 1912 102"
 }
-// entity 356
+// entity 354
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "704 1328 102"
 }
-// entity 357
+// entity 355
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "648 1688 102"
 }
-// entity 358
+// entity 356
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "544 1472 102"
 }
-// entity 359
+// entity 357
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35665,7 +35657,7 @@
 "origin" "352 1320 32"
 "target" "t49"
 }
-// entity 360
+// entity 358
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35673,7 +35665,7 @@
 "origin" "416 1320 32"
 "target" "t48"
 }
-// entity 361
+// entity 359
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35681,7 +35673,7 @@
 "origin" "480 1320 32"
 "target" "t47"
 }
-// entity 362
+// entity 360
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35689,7 +35681,7 @@
 "origin" "480 1624 32"
 "target" "t46"
 }
-// entity 363
+// entity 361
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35697,7 +35689,7 @@
 "origin" "416 1624 32"
 "target" "t45"
 }
-// entity 364
+// entity 362
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -35705,105 +35697,105 @@
 "origin" "352 1624 32"
 "target" "t44"
 }
-// entity 365
+// entity 363
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "100"
 "origin" "296 1472 102"
 }
-// entity 366
+// entity 364
 {
 "classname" "light"
 "_color" "1 1 0.75"
 "light" "2"
 "origin" "352 1328 24"
 }
-// entity 367
+// entity 365
 {
 "classname" "light"
 "_color" "1 1 0.75"
 "light" "2"
 "origin" "416 1328 24"
 }
-// entity 368
+// entity 366
 {
 "classname" "light"
 "_color" "1 1 0.75"
 "light" "2"
 "origin" "480 1328 24"
 }
-// entity 369
+// entity 367
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "264 1312 24"
 }
-// entity 370
+// entity 368
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "264 1632 24"
 }
-// entity 371
+// entity 369
 {
 "classname" "light"
 "_color" "1 1 0.75"
 "light" "2"
 "origin" "480 1616 24"
 }
-// entity 372
+// entity 370
 {
 "classname" "light"
 "_color" "1 1 0.75"
 "light" "2"
 "origin" "416 1616 24"
 }
-// entity 373
+// entity 371
 {
 "classname" "light"
 "_color" "1 1 0.75"
 "light" "2"
 "origin" "352 1616 24"
 }
-// entity 374
+// entity 372
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-305 364 268"
 }
-// entity 375
+// entity 373
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-434 784 172"
 }
-// entity 376
+// entity 374
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "90"
 "origin" "-76 416 192"
 }
-// entity 377
+// entity 375
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "150"
 "origin" "96 1832 112"
 }
-// entity 378
+// entity 376
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-434 126 172"
 }
-// entity 379
+// entity 377
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -35821,7 +35813,7 @@
 }
 }
 }
-// entity 380
+// entity 378
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -35852,7 +35844,7 @@
 }
 }
 }
-// entity 381
+// entity 379
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -35870,7 +35862,7 @@
 }
 }
 }
-// entity 382
+// entity 380
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -35888,7 +35880,7 @@
 }
 }
 }
-// entity 383
+// entity 381
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -35919,28 +35911,28 @@
 }
 }
 }
-// entity 384
+// entity 382
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-664 1288 222"
 }
-// entity 385
+// entity 383
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-584 1288 222"
 }
-// entity 386
+// entity 384
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-416 1288 222"
 }
-// entity 387
+// entity 385
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -35954,8 +35946,8 @@
 ( ( -536 1295.9993896484 8 0 0.125 ) ( -537.940246582 1303.7604980469 8 0 0.0625009984 ) ( -535.8804931641 1311.5217285156 8.0000009537 0 0 ) )
 ( ( -600.0012207031 1279.9993896484 8 0.5153970122 0.125 ) ( -595.0778808594 1286.3049316406 8 0.5153970122 0.0625009984 ) ( -590.1546020508 1292.6105957031 8 0.5153970122 0 ) )
 ( ( -600.0012207031 1343.9997558594 8 1.0154000521 0.125 ) ( -592.0012207031 1343.9997558594 8 1.0154000521 0.0625009984 ) ( -584.0012207031 1343.9997558594 8 1.0154000521 0 ) )
-( ( -600.0012207031 1392 8 1.3904019594 0.125 ) ( -593.6955566406 1387.0766601563 8 1.3904019594 0.0625009984 ) ( -587.3899536133 1382.1533203125 8 1.3904019594 0 ) )
-( ( -536 1408 8 1.9057999849 0.125 ) ( -536.059753418 1400.2387695313 8 1.9057999849 0.0625009984 ) ( -536.1195068359 1392.4776611328 8 1.9057999849 0 ) )
+( ( -600.0012207031 1392 8 1.3904019594 0.125 ) ( -593.6955566406 1387.0766601562 8 1.3904019594 0.0625009984 ) ( -587.3899536133 1382.1533203125 8 1.3904019594 0 ) )
+( ( -536 1408 8 1.9057999849 0.125 ) ( -536.059753418 1400.2387695312 8 1.9057999849 0.0625009984 ) ( -536.1195068359 1392.4776611328 8 1.9057999849 0 ) )
 )
 }
 }
@@ -35969,8 +35961,8 @@
 ( ( -535.8804931641 1311.5217285156 40 0 -0.0623219982 ) ( -535.940246582 1303.7604980469 40 0 -0.122957997 ) ( -536 1295.9993896484 40 0 -0.1835940033 ) )
 ( ( -590.1546020508 1292.6105957031 40 0.4490190148 -0.0623219982 ) ( -595.0778808594 1286.3049316406 40 0.4490190148 -0.122957997 ) ( -600.0012207031 1279.9993896484 40 0.4490190148 -0.1835940033 ) )
 ( ( -584.0012207031 1343.9997558594 40 0.8533650041 -0.0623219982 ) ( -592.0012207031 1343.9997558594 40 0.8533650041 -0.122957997 ) ( -600.0012207031 1343.9997558594 40 0.8533650041 -0.1835940033 ) )
-( ( -587.3899536133 1382.1533203125 40 1.1526130438 -0.0623219982 ) ( -593.6955566406 1387.0766601563 40 1.1526130438 -0.122957997 ) ( -600.0012207031 1392 40 1.1526130438 -0.1835940033 ) )
-( ( -536.1195068359 1392.4776611328 40 1.5612039566 -0.0623219982 ) ( -536.059753418 1400.2387695313 40 1.5612039566 -0.122957997 ) ( -536 1408 40 1.5612039566 -0.1835940033 ) )
+( ( -587.3899536133 1382.1533203125 40 1.1526130438 -0.0623219982 ) ( -593.6955566406 1387.0766601562 40 1.1526130438 -0.122957997 ) ( -600.0012207031 1392 40 1.1526130438 -0.1835940033 ) )
+( ( -536.1195068359 1392.4776611328 40 1.5612039566 -0.0623219982 ) ( -536.059753418 1400.2387695312 40 1.5612039566 -0.122957997 ) ( -536 1408 40 1.5612039566 -0.1835940033 ) )
 )
 }
 }
@@ -35990,7 +35982,7 @@
 }
 }
 }
-// entity 388
+// entity 386
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36021,7 +36013,7 @@
 }
 }
 }
-// entity 389
+// entity 387
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36039,7 +36031,7 @@
 }
 }
 }
-// entity 390
+// entity 388
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -36074,7 +36066,7 @@
 }
 }
 }
-// entity 391
+// entity 389
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36092,7 +36084,7 @@
 }
 }
 }
-// entity 392
+// entity 390
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -36106,13 +36098,13 @@
 ( ( -536 1487.9993896484 8 0 0.125 ) ( -535.940246582 1495.7604980469 8 0 0.0625009984 ) ( -535.8804931641 1503.5217285156 8 0 0 ) )
 ( ( -600.0012207031 1471.9993896484 8 0.5153970122 0.125 ) ( -595.0778808594 1478.3049316406 8 0.5153970122 0.0625009984 ) ( -590.1546020508 1484.6105957031 8 0.5153970122 0 ) )
 ( ( -600.0012207031 1535.9997558594 8 1.0154000521 0.125 ) ( -592.0012207031 1535.9997558594 8 1.0154000521 0.0625009984 ) ( -584.0012207031 1535.9997558594 8 1.0154000521 0 ) )
-( ( -600.0012207031 1584 8 1.3904019594 0.125 ) ( -593.6955566406 1579.0766601563 8 1.3904019594 0.0625009984 ) ( -587.3899536133 1574.1533203125 8 1.3904019594 0 ) )
-( ( -536 1600 8 1.9057999849 0.125 ) ( -536.059753418 1592.2387695313 8 1.9057999849 0.0625009984 ) ( -536.1195068359 1584.4776611328 8 1.9057999849 0 ) )
+( ( -600.0012207031 1584 8 1.3904019594 0.125 ) ( -593.6955566406 1579.0766601562 8 1.3904019594 0.0625009984 ) ( -587.3899536133 1574.1533203125 8 1.3904019594 0 ) )
+( ( -536 1600 8 1.9057999849 0.125 ) ( -536.059753418 1592.2387695312 8 1.9057999849 0.0625009984 ) ( -536.1195068359 1584.4776611328 8 1.9057999849 0 ) )
 )
 }
 }
 }
-// entity 393
+// entity 391
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36130,7 +36122,7 @@
 }
 }
 }
-// entity 394
+// entity 392
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36148,7 +36140,7 @@
 }
 }
 }
-// entity 395
+// entity 393
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -36162,8 +36154,8 @@
 ( ( -535.8804931641 1503.5217285156 40 0 -0.0623219982 ) ( -535.940246582 1495.7604980469 40 0 -0.122957997 ) ( -536 1487.9993896484 40 0 -0.1835940033 ) )
 ( ( -590.1546020508 1484.6105957031 40 0.4490190148 -0.0623219982 ) ( -595.0778808594 1478.3049316406 40 0.4490190148 -0.122957997 ) ( -600.0012207031 1471.9993896484 40 0.4490190148 -0.1835940033 ) )
 ( ( -584.0012207031 1535.9997558594 40 0.8533650041 -0.0623219982 ) ( -592.0012207031 1535.9997558594 40 0.8533650041 -0.122957997 ) ( -600.0012207031 1535.9997558594 40 0.8533650041 -0.1835940033 ) )
-( ( -587.3899536133 1574.1533203125 40 1.1526130438 -0.0623219982 ) ( -593.6955566406 1579.0766601563 40 1.1526130438 -0.122957997 ) ( -600.0012207031 1584 40 1.1526130438 -0.1835940033 ) )
-( ( -536.1195068359 1584.4776611328 40 1.5612039566 -0.0623219982 ) ( -536.059753418 1592.2387695313 40 1.5612039566 -0.122957997 ) ( -536 1600 40 1.5612039566 -0.1835940033 ) )
+( ( -587.3899536133 1574.1533203125 40 1.1526130438 -0.0623219982 ) ( -593.6955566406 1579.0766601562 40 1.1526130438 -0.122957997 ) ( -600.0012207031 1584 40 1.1526130438 -0.1835940033 ) )
+( ( -536.1195068359 1584.4776611328 40 1.5612039566 -0.0623219982 ) ( -536.059753418 1592.2387695312 40 1.5612039566 -0.122957997 ) ( -536 1600 40 1.5612039566 -0.1835940033 ) )
 )
 }
 }
@@ -36183,7 +36175,7 @@
 }
 }
 }
-// entity 396
+// entity 394
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36191,7 +36183,7 @@
 "origin" "-680 888 20"
 "target" "t42"
 }
-// entity 397
+// entity 395
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36199,7 +36191,7 @@
 "origin" "-680 968 20"
 "target" "t41"
 }
-// entity 398
+// entity 396
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36207,7 +36199,7 @@
 "origin" "-604 928 16"
 "target" "t40"
 }
-// entity 399
+// entity 397
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36215,7 +36207,7 @@
 "origin" "-740 928 16"
 "target" "t39"
 }
-// entity 400
+// entity 398
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36223,7 +36215,7 @@
 "origin" "-740 736 16"
 "target" "t38"
 }
-// entity 401
+// entity 399
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36231,7 +36223,7 @@
 "origin" "-604 736 16"
 "target" "t37"
 }
-// entity 402
+// entity 400
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36239,7 +36231,7 @@
 "origin" "-680 776 20"
 "target" "t36"
 }
-// entity 403
+// entity 401
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36247,7 +36239,7 @@
 "origin" "-680 696 20"
 "target" "t35"
 }
-// entity 404
+// entity 402
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36255,7 +36247,7 @@
 "origin" "-680 552 20"
 "target" "t33"
 }
-// entity 405
+// entity 403
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36263,7 +36255,7 @@
 "origin" "-604 512 16"
 "target" "t32"
 }
-// entity 406
+// entity 404
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36271,7 +36263,7 @@
 "origin" "-740 512 16"
 "target" "t31"
 }
-// entity 407
+// entity 405
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36279,7 +36271,7 @@
 "origin" "-740 320 16"
 "target" "t30"
 }
-// entity 408
+// entity 406
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36287,7 +36279,7 @@
 "origin" "-604 320 16"
 "target" "t29"
 }
-// entity 409
+// entity 407
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36295,7 +36287,7 @@
 "origin" "-680 280 20"
 "target" "t27"
 }
-// entity 410
+// entity 408
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36303,7 +36295,7 @@
 "origin" "-680 56 20"
 "target" "t26"
 }
-// entity 411
+// entity 409
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36311,7 +36303,7 @@
 "origin" "-680 136 20"
 "target" "t25"
 }
-// entity 412
+// entity 410
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36319,7 +36311,7 @@
 "origin" "-604 96 16"
 "target" "t24"
 }
-// entity 413
+// entity 411
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36327,7 +36319,7 @@
 "origin" "-740 96 16"
 "target" "t23"
 }
-// entity 414
+// entity 412
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36335,7 +36327,7 @@
 "origin" "-740 -96 16"
 "target" "t22"
 }
-// entity 415
+// entity 413
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36343,7 +36335,7 @@
 "origin" "-604 -96 16"
 "target" "t21"
 }
-// entity 416
+// entity 414
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36351,7 +36343,7 @@
 "origin" "-680 -56 20"
 "target" "t20"
 }
-// entity 417
+// entity 415
 {
 "classname" "light"
 "_color" "1 0.5 0"
@@ -36359,28 +36351,28 @@
 "origin" "-680 -136 20"
 "target" "t19"
 }
-// entity 418
+// entity 416
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "-408 -96 84"
 }
-// entity 419
+// entity 417
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "55"
 "origin" "-212 -92 84"
 }
-// entity 420
+// entity 418
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "-132 -92 -52"
 }
-// entity 421
+// entity 419
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36400,7 +36392,7 @@
 }
 }
 }
-// entity 422
+// entity 420
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36420,7 +36412,7 @@
 }
 }
 }
-// entity 423
+// entity 421
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36440,7 +36432,7 @@
 }
 }
 }
-// entity 424
+// entity 422
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -36460,7 +36452,7 @@
 }
 }
 }
-// entity 425
+// entity 423
 {
 "classname" "func_group"
 "a_lightmapscale" "0.125"
@@ -37605,21 +37597,21 @@
 ( -696 -64 16 ) ( -712 -64 16 ) ( -712 -80 16 ) common/caulk -16 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 426
+// entity 424
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "1152 1436 -36"
 }
-// entity 427
+// entity 425
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "1152 1436 -136"
 }
-// entity 428
+// entity 426
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37627,35 +37619,35 @@
 "origin" "1152 1412 -136"
 "target" "t17"
 }
-// entity 429
+// entity 427
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1132 1408 -88"
 }
-// entity 430
+// entity 428
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1172 1408 -88"
 }
-// entity 431
+// entity 429
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1132 396 -88"
 }
-// entity 432
+// entity 430
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1132 436 -88"
 }
-// entity 433
+// entity 431
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37663,35 +37655,35 @@
 "origin" "1136 416 -136"
 "target" "t16"
 }
-// entity 434
+// entity 432
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "1160 416 -136"
 }
-// entity 435
+// entity 433
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "1160 416 -36"
 }
-// entity 436
+// entity 434
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "1352 1120 -36"
 }
-// entity 437
+// entity 435
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "1352 1120 -136"
 }
-// entity 438
+// entity 436
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37699,35 +37691,35 @@
 "origin" "1328 1120 -136"
 "target" "t15"
 }
-// entity 439
+// entity 437
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1324 1140 -88"
 }
-// entity 440
+// entity 438
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1324 1100 -88"
 }
-// entity 441
+// entity 439
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "84 1004 -88"
 }
-// entity 442
+// entity 440
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "44 1004 -88"
 }
-// entity 443
+// entity 441
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37735,35 +37727,35 @@
 "origin" "64 1008 -136"
 "target" "t14"
 }
-// entity 444
+// entity 442
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "64 1032 -136"
 }
-// entity 445
+// entity 443
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "64 1032 -36"
 }
-// entity 446
+// entity 444
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "608 1032 -36"
 }
-// entity 447
+// entity 445
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "8"
 "origin" "608 1032 -136"
 }
-// entity 448
+// entity 446
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37771,84 +37763,84 @@
 "origin" "608 1008 -136"
 "target" "t13"
 }
-// entity 449
+// entity 447
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "588 1004 -88"
 }
-// entity 450
+// entity 448
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "628 1004 -88"
 }
-// entity 451
+// entity 449
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "788 620 -104"
 }
-// entity 452
+// entity 450
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "648 240 -52"
 }
-// entity 453
+// entity 451
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "672 240 -80"
 }
-// entity 454
+// entity 452
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "732 240 -80"
 }
-// entity 455
+// entity 453
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "760 240 -60"
 }
-// entity 456
+// entity 454
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "760 620 -60"
 }
-// entity 457
+// entity 455
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "648 620 -52"
 }
-// entity 458
+// entity 456
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "672 620 -80"
 }
-// entity 459
+// entity 457
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "732 620 -80"
 }
-// entity 460
+// entity 458
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37856,7 +37848,7 @@
 "origin" "760 240 -60"
 "target" "t12"
 }
-// entity 461
+// entity 459
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37864,7 +37856,7 @@
 "origin" "732 240 -80"
 "target" "t11"
 }
-// entity 462
+// entity 460
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37872,7 +37864,7 @@
 "origin" "648 240 -52"
 "target" "t10"
 }
-// entity 463
+// entity 461
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37880,7 +37872,7 @@
 "origin" "672 240 -80"
 "target" "t9"
 }
-// entity 464
+// entity 462
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37888,7 +37880,7 @@
 "origin" "672 620 -80"
 "target" "t8"
 }
-// entity 465
+// entity 463
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37896,7 +37888,7 @@
 "origin" "648 620 -52"
 "target" "t7"
 }
-// entity 466
+// entity 464
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37904,7 +37896,7 @@
 "origin" "732 620 -80"
 "target" "t6"
 }
-// entity 467
+// entity 465
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37912,7 +37904,7 @@
 "origin" "760 620 -60"
 "target" "t5"
 }
-// entity 468
+// entity 466
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37920,7 +37912,7 @@
 "origin" "-36 416 -44"
 "target" "t4"
 }
-// entity 469
+// entity 467
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37928,7 +37920,7 @@
 "origin" "-52 416 -76"
 "target" "t3"
 }
-// entity 470
+// entity 468
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -37936,7 +37928,7 @@
 "origin" "-88 416 -100"
 "target" "t2"
 }
-// entity 471
+// entity 469
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -37967,7 +37959,7 @@
 }
 }
 }
-// entity 472
+// entity 470
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -37998,7 +37990,7 @@
 }
 }
 }
-// entity 473
+// entity 471
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38033,7 +38025,7 @@
 }
 }
 }
-// entity 474
+// entity 472
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38068,7 +38060,7 @@
 }
 }
 }
-// entity 475
+// entity 473
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38088,7 +38080,7 @@
 }
 }
 }
-// entity 476
+// entity 474
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -38132,7 +38124,7 @@
 }
 }
 }
-// entity 477
+// entity 475
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -38182,7 +38174,7 @@
 }
 }
 }
-// entity 478
+// entity 476
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -38232,28 +38224,28 @@
 }
 }
 }
-// entity 479
+// entity 477
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-434 952 172"
 }
-// entity 480
+// entity 478
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-434 872 172"
 }
-// entity 481
+// entity 479
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-434 704 172"
 }
-// entity 482
+// entity 480
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
@@ -38261,294 +38253,294 @@
 "origin" "-128 416 -112"
 "target" "t1"
 }
-// entity 483
+// entity 481
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "80 920 -128"
 }
-// entity 484
+// entity 482
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "-152 920 -128"
 }
-// entity 485
+// entity 483
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "272 920 -128"
 }
-// entity 486
+// entity 484
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "504 920 -128"
 }
-// entity 487
+// entity 485
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "952 848 -128"
 }
-// entity 488
+// entity 486
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "720 848 -128"
 }
-// entity 489
+// entity 487
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "704 704 -128"
 }
-// entity 490
+// entity 488
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "936 704 -128"
 }
-// entity 491
+// entity 489
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "920 520 -128"
 }
-// entity 492
+// entity 490
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "688 520 -128"
 }
-// entity 493
+// entity 491
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "696 336 -128"
 }
-// entity 494
+// entity 492
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "928 336 -128"
 }
-// entity 495
+// entity 493
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "872 104 -128"
 }
-// entity 496
+// entity 494
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "640 104 -128"
 }
-// entity 497
+// entity 495
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "536 24 -128"
 }
-// entity 498
+// entity 496
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "400 -80 -128"
 }
-// entity 499
+// entity 497
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "296 -88 -128"
 }
-// entity 500
+// entity 498
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "352 -296 -128"
 }
-// entity 501
+// entity 499
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "152 -8 -128"
 }
-// entity 502
+// entity 500
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "-32 -88 -128"
 }
-// entity 503
+// entity 501
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "56 144 -128"
 }
-// entity 504
+// entity 502
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "0 304 -128"
 }
-// entity 505
+// entity 503
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "24 528 -128"
 }
-// entity 506
+// entity 504
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "80 672 -128"
 }
-// entity 507
+// entity 505
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "352 -296 -48"
 }
-// entity 508
+// entity 506
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "352 -296 64"
 }
-// entity 509
+// entity 507
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "352 -296 168"
 }
-// entity 510
+// entity 508
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "40 416 -88"
 }
-// entity 511
+// entity 509
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "184 416 -16"
 }
-// entity 512
+// entity 510
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "512 416 -16"
 }
-// entity 513
+// entity 511
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "344 416 0"
 }
-// entity 514
+// entity 512
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "352 584 200"
 }
-// entity 515
+// entity 513
 {
 "classname" "light"
 "_color" "0.9 0.7 0.2"
 "light" "80"
 "origin" "352 424 112"
 }
-// entity 516
+// entity 514
 {
 "classname" "light"
 "_color" "0.9 0.7 0.2"
 "light" "80"
 "origin" "520 576 112"
 }
-// entity 517
+// entity 515
 {
 "classname" "light"
 "_color" "0.9 0.7 0.2"
 "light" "80"
 "origin" "224 560 112"
 }
-// entity 518
+// entity 516
 {
 "classname" "light"
 "_color" "0.9 0.7 0.2"
 "light" "80"
 "origin" "240 296 112"
 }
-// entity 519
+// entity 517
 {
 "classname" "light"
 "_color" "0.9 0.7 0.2"
 "light" "80"
 "origin" "512 280 112"
 }
-// entity 520
+// entity 518
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "608 128 64"
 }
-// entity 521
+// entity 519
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "48 128 64"
 }
-// entity 522
+// entity 520
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "48 728 64"
 }
-// entity 523
+// entity 521
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "564 708 48"
 }
-// entity 524
+// entity 522
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38566,7 +38558,7 @@
 }
 }
 }
-// entity 525
+// entity 523
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38584,7 +38576,7 @@
 }
 }
 }
-// entity 526
+// entity 524
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38602,7 +38594,7 @@
 }
 }
 }
-// entity 527
+// entity 525
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38620,7 +38612,7 @@
 }
 }
 }
-// entity 528
+// entity 526
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38651,7 +38643,7 @@
 }
 }
 }
-// entity 529
+// entity 527
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38682,7 +38674,7 @@
 }
 }
 }
-// entity 530
+// entity 528
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38713,7 +38705,7 @@
 }
 }
 }
-// entity 531
+// entity 529
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -38744,266 +38736,266 @@
 }
 }
 }
-// entity 532
+// entity 530
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-305 292 268"
 }
-// entity 533
+// entity 531
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-305 460 268"
 }
-// entity 534
+// entity 532
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-305 540 268"
 }
-// entity 535
+// entity 533
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-434 66 172"
 }
-// entity 536
+// entity 534
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-306 -62 268"
 }
-// entity 537
+// entity 535
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-984 -96 116"
 }
-// entity 538
+// entity 536
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-886 -96 146"
 }
-// entity 539
+// entity 537
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "55"
 "origin" "-1084 836 324"
 }
-// entity 540
+// entity 538
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "55"
 "origin" "-1084 604 324"
 }
-// entity 541
+// entity 539
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "55"
 "origin" "-1084 412 324"
 }
-// entity 542
+// entity 540
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "55"
 "origin" "-1084 220 324"
 }
-// entity 543
+// entity 541
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "55"
 "origin" "-1084 4 324"
 }
-// entity 544
+// entity 542
 {
 "classname" "light"
 "_color" "1 0.5 0.2"
 "light" "55"
 "origin" "-36 -92 84"
 }
-// entity 545
+// entity 543
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "90"
 "origin" "-160 208 192"
 }
-// entity 546
+// entity 544
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-886 96 146"
 }
-// entity 547
+// entity 545
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-984 96 116"
 }
-// entity 548
+// entity 546
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-984 320 116"
 }
-// entity 549
+// entity 547
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-886 320 146"
 }
-// entity 550
+// entity 548
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-886 512 146"
 }
-// entity 551
+// entity 549
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-984 512 116"
 }
-// entity 552
+// entity 550
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-984 736 116"
 }
-// entity 553
+// entity 551
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-886 736 146"
 }
-// entity 554
+// entity 552
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-886 928 146"
 }
-// entity 555
+// entity 553
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-984 928 116"
 }
-// entity 556
+// entity 554
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "90"
 "origin" "-76 288 192"
 }
-// entity 557
+// entity 555
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "90"
 "origin" "-76 544 192"
 }
-// entity 558
+// entity 556
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "90"
 "origin" "-160 624 192"
 }
-// entity 559
+// entity 557
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "1096 912 -128"
 }
-// entity 560
+// entity 558
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "1152 1120 -128"
 }
-// entity 561
+// entity 559
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "1152 1152 -128"
 }
-// entity 562
+// entity 560
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "1152 1280 -128"
 }
-// entity 563
+// entity 561
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "992 1312 -128"
 }
-// entity 564
+// entity 562
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "55"
 "origin" "848 1320 -128"
 }
-// entity 565
+// entity 563
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "-36 416 -44"
 }
-// entity 566
+// entity 564
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "-52 416 -76"
 }
-// entity 567
+// entity 565
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "-88 416 -100"
 }
-// entity 568
+// entity 566
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "-128 416 -112"
 }
-// entity 569
+// entity 567
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39034,7 +39026,7 @@
 }
 }
 }
-// entity 570
+// entity 568
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -39052,7 +39044,7 @@
 }
 }
 }
-// entity 571
+// entity 569
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39070,7 +39062,7 @@
 }
 }
 }
-// entity 572
+// entity 570
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -39090,392 +39082,392 @@
 }
 }
 }
-// entity 573
+// entity 571
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-936 1120 108"
 }
-// entity 574
+// entity 572
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-862 1120 146"
 }
-// entity 575
+// entity 573
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-862 1248 146"
 }
-// entity 576
+// entity 574
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-936 1248 108"
 }
-// entity 577
+// entity 575
 {
 "classname" "light"
 "_color" "1 0.5 0"
 "light" "100"
 "origin" "-936 1440 108"
 }
-// entity 578
+// entity 576
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "90"
 "origin" "-862 1440 146"
 }
-// entity 579
+// entity 577
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-56 1688 222"
 }
-// entity 580
+// entity 578
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-136 1688 222"
 }
-// entity 581
+// entity 579
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-304 1688 222"
 }
-// entity 582
+// entity 580
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "150"
 "origin" "-256 1992 126"
 }
-// entity 583
+// entity 581
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "150"
 "origin" "-672 1832 128"
 }
-// entity 584
+// entity 582
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "150"
 "origin" "-224 1200 112"
 }
-// entity 585
+// entity 583
 {
 "classname" "light"
 "_color" "0.2 0.1 0"
 "light" "180"
 "origin" "-292 1660 -124"
 }
-// entity 586
+// entity 584
 {
 "classname" "light"
 "_color" "0.2 0.1 0"
 "light" "180"
 "origin" "-300 1332 -124"
 }
-// entity 587
+// entity 585
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-306 -142 268"
 }
-// entity 588
+// entity 586
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "150"
 "origin" "-416 1888 174"
 }
-// entity 589
+// entity 587
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-752 1384 336"
 }
-// entity 590
+// entity 588
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-712 1384 328"
 }
-// entity 591
+// entity 589
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-672 1384 320"
 }
-// entity 592
+// entity 590
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-552 1384 296"
 }
-// entity 593
+// entity 591
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-592 1384 304"
 }
-// entity 594
+// entity 592
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-632 1384 312"
 }
-// entity 595
+// entity 593
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-512 1384 288"
 }
-// entity 596
+// entity 594
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-472 1384 280"
 }
-// entity 597
+// entity 595
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-432 1384 272"
 }
-// entity 598
+// entity 596
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-328 1384 272"
 }
-// entity 599
+// entity 597
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-280 1384 272"
 }
-// entity 600
+// entity 598
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-184 1384 272"
 }
-// entity 601
+// entity 599
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-232 1384 272"
 }
-// entity 602
+// entity 600
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "8 1384 272"
 }
-// entity 603
+// entity 601
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-88 1384 272"
 }
-// entity 604
+// entity 602
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-136 1384 272"
 }
-// entity 605
+// entity 603
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "64 1384 272"
 }
-// entity 606
+// entity 604
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "112 1384 272"
 }
-// entity 607
+// entity 605
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "112 1568 272"
 }
-// entity 608
+// entity 606
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "64 1568 272"
 }
-// entity 609
+// entity 607
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-136 1568 272"
 }
-// entity 610
+// entity 608
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-88 1568 272"
 }
-// entity 611
+// entity 609
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "8 1568 272"
 }
-// entity 612
+// entity 610
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-232 1568 272"
 }
-// entity 613
+// entity 611
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-184 1568 272"
 }
-// entity 614
+// entity 612
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-280 1568 272"
 }
-// entity 615
+// entity 613
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-328 1568 272"
 }
-// entity 616
+// entity 614
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-432 1568 272"
 }
-// entity 617
+// entity 615
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-472 1568 280"
 }
-// entity 618
+// entity 616
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-512 1568 288"
 }
-// entity 619
+// entity 617
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-632 1568 312"
 }
-// entity 620
+// entity 618
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-592 1568 304"
 }
-// entity 621
+// entity 619
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-552 1568 296"
 }
-// entity 622
+// entity 620
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-672 1568 320"
 }
-// entity 623
+// entity 621
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-712 1568 328"
 }
-// entity 624
+// entity 622
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "-752 1568 336"
 }
-// entity 625
+// entity 623
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "150"
 "origin" "-920 1688 198"
 }
-// entity 626
+// entity 624
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-504 1288 222"
 }
-// entity 627
+// entity 625
 {
 "classname" "light"
 "_color" "0.8 0.4 0"
 "light" "180"
 "origin" "-224 1680 222"
 }
-// entity 628
+// entity 626
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39493,7 +39485,7 @@
 }
 }
 }
-// entity 629
+// entity 627
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39511,7 +39503,7 @@
 }
 }
 }
-// entity 630
+// entity 628
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39529,7 +39521,7 @@
 }
 }
 }
-// entity 631
+// entity 629
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39547,7 +39539,7 @@
 }
 }
 }
-// entity 632
+// entity 630
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39565,7 +39557,7 @@
 }
 }
 }
-// entity 633
+// entity 631
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39583,7 +39575,7 @@
 }
 }
 }
-// entity 634
+// entity 632
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39601,7 +39593,7 @@
 }
 }
 }
-// entity 635
+// entity 633
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39619,7 +39611,7 @@
 }
 }
 }
-// entity 636
+// entity 634
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39637,7 +39629,7 @@
 }
 }
 }
-// entity 637
+// entity 635
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39655,7 +39647,7 @@
 }
 }
 }
-// entity 638
+// entity 636
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39673,7 +39665,7 @@
 }
 }
 }
-// entity 639
+// entity 637
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39691,7 +39683,7 @@
 }
 }
 }
-// entity 640
+// entity 638
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39709,7 +39701,7 @@
 }
 }
 }
-// entity 641
+// entity 639
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39727,7 +39719,7 @@
 }
 }
 }
-// entity 642
+// entity 640
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39745,7 +39737,7 @@
 }
 }
 }
-// entity 643
+// entity 641
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39763,7 +39755,7 @@
 }
 }
 }
-// entity 644
+// entity 642
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39781,7 +39773,7 @@
 }
 }
 }
-// entity 645
+// entity 643
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39799,7 +39791,7 @@
 }
 }
 }
-// entity 646
+// entity 644
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39817,7 +39809,7 @@
 }
 }
 }
-// entity 647
+// entity 645
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39835,21 +39827,21 @@
 }
 }
 }
-// entity 648
+// entity 646
 {
 "classname" "light"
 "_color" "0.9 0.5 0.1"
 "light" "150"
 "origin" "1227 1852 102"
 }
-// entity 649
+// entity 647
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1112 1026 16"
 }
-// entity 650
+// entity 648
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -39857,7 +39849,7 @@
 "origin" "1107 1032 24"
 "target" "t77"
 }
-// entity 651
+// entity 649
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -39890,28 +39882,28 @@
 }
 }
 }
-// entity 652
+// entity 650
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 488 16"
 }
-// entity 653
+// entity 651
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 544 16"
 }
-// entity 654
+// entity 652
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 600 16"
 }
-// entity 655
+// entity 653
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -39919,7 +39911,7 @@
 "origin" "840 488 24"
 "target" "t81"
 }
-// entity 656
+// entity 654
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -39927,7 +39919,7 @@
 "origin" "840 544 24"
 "target" "t82"
 }
-// entity 657
+// entity 655
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -39935,7 +39927,7 @@
 "origin" "840 600 24"
 "target" "t83"
 }
-// entity 658
+// entity 656
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -39943,7 +39935,7 @@
 "origin" "840 408 24"
 "target" "t84"
 }
-// entity 659
+// entity 657
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -39951,7 +39943,7 @@
 "origin" "840 352 24"
 "target" "t85"
 }
-// entity 660
+// entity 658
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -39959,28 +39951,28 @@
 "origin" "840 296 24"
 "target" "t86"
 }
-// entity 661
+// entity 659
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 408 16"
 }
-// entity 662
+// entity 660
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 352 16"
 }
-// entity 663
+// entity 661
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "848 296 16"
 }
-// entity 664
+// entity 662
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40000,7 +39992,7 @@
 }
 }
 }
-// entity 665
+// entity 663
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40020,7 +40012,7 @@
 }
 }
 }
-// entity 666
+// entity 664
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40040,7 +40032,7 @@
 }
 }
 }
-// entity 667
+// entity 665
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40060,7 +40052,7 @@
 }
 }
 }
-// entity 668
+// entity 666
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40080,7 +40072,7 @@
 }
 }
 }
-// entity 669
+// entity 667
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40100,7 +40092,7 @@
 }
 }
 }
-// entity 670
+// entity 668
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40120,7 +40112,7 @@
 }
 }
 }
-// entity 671
+// entity 669
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40140,7 +40132,7 @@
 }
 }
 }
-// entity 672
+// entity 670
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40175,7 +40167,7 @@
 }
 }
 }
-// entity 673
+// entity 671
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40210,7 +40202,7 @@
 }
 }
 }
-// entity 674
+// entity 672
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40245,7 +40237,7 @@
 }
 }
 }
-// entity 675
+// entity 673
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40280,175 +40272,175 @@
 }
 }
 }
-// entity 676
+// entity 674
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1108 1032 152"
 }
-// entity 677
+// entity 675
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1052 1032 152"
 }
-// entity 678
+// entity 676
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "1052 1032 48"
 }
-// entity 679
+// entity 677
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "40"
 "origin" "1183 102 270"
 }
-// entity 680
+// entity 678
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "300"
 "origin" "1248 484 676"
 }
-// entity 681
+// entity 679
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-160 640 192"
 }
-// entity 682
+// entity 680
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-64 544 192"
 }
-// entity 683
+// entity 681
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-64 288 192"
 }
-// entity 684
+// entity 682
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-160 192 192"
 }
-// entity 685
+// entity 683
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-64 416 192"
 }
-// entity 686
+// entity 684
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-920 1688 198"
 }
-// entity 687
+// entity 685
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-416 1888 174"
 }
-// entity 688
+// entity 686
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-224 1200 112"
 }
-// entity 689
+// entity 687
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-672 1832 128"
 }
-// entity 690
+// entity 688
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-256 1992 126"
 }
-// entity 691
+// entity 689
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-856 1440 152"
 }
-// entity 692
+// entity 690
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-856 1248 152"
 }
-// entity 693
+// entity 691
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-856 1120 152"
 }
-// entity 694
+// entity 692
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-880 928 152"
 }
-// entity 695
+// entity 693
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-880 512 152"
 }
-// entity 696
+// entity 694
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-880 320 152"
 }
-// entity 697
+// entity 695
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-880 96 152"
 }
-// entity 698
+// entity 696
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "-880 -96 152"
 }
-// entity 699
+// entity 697
 {
 "classname" "light"
 "_color" "1 1 1"
 "light" "5"
 "origin" "96 1832 112"
 }
-// entity 700
+// entity 698
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -40456,21 +40448,21 @@
 "origin" "1416 1592 24"
 "target" "t92"
 }
-// entity 701
+// entity 699
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1408 1592 16"
 }
-// entity 702
+// entity 700
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
 "light" "10"
 "origin" "1408 1536 16"
 }
-// entity 703
+// entity 701
 {
 "classname" "light"
 "_color" "0.99 0.81 0.12"
@@ -40478,7 +40470,7 @@
 "origin" "1416 1536 24"
 "target" "t93"
 }
-// entity 704
+// entity 702
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -40535,49 +40527,49 @@
 }
 }
 }
-// entity 705
+// entity 703
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "340 860 68"
 }
-// entity 706
+// entity 704
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "492 1020 68"
 }
-// entity 707
+// entity 705
 {
 "classname" "light"
 "_color" "0.99 0.61 0.12"
 "light" "80"
 "origin" "652 1156 68"
 }
-// entity 708
+// entity 706
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "636 1316 220"
 }
-// entity 709
+// entity 707
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "636 1476 220"
 }
-// entity 710
+// entity 708
 {
 "classname" "light"
 "_color" "0.8 0.65 0.1"
 "light" "60"
 "origin" "404 1476 228"
 }
-// entity 711
+// entity 709
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -40597,7 +40589,7 @@
 }
 }
 }
-// entity 712
+// entity 710
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -40615,7 +40607,7 @@
 }
 }
 }
-// entity 713
+// entity 711
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -40650,7 +40642,7 @@
 }
 }
 }
-// entity 714
+// entity 712
 {
 "classname" "func_group"
 "type" "patchCapped"

Modified: branches/nexuiz-2.0/data/maps/darkzone.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/darkzone.map
===================================================================
--- branches/nexuiz-2.0/data/maps/darkzone.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/darkzone.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -6583,140 +6583,135 @@
 }
 // entity 58
 {
-"classname" "item_spikes"
-"angle" "180"
-"origin" "-648.000000 -1136.000000 168.000000"
-}
-// entity 59
-{
 "classname" "info_player_deathmatch"
 "angle" "180"
 "origin" "-768.000000 -448.000000 64.000000"
 }
-// entity 60
+// entity 59
 {
 "classname" "info_null"
 "origin" "462.000000 1140.000000 384.000000"
 "targetname" "t342"
 }
-// entity 61
+// entity 60
 {
 "classname" "info_null"
 "origin" "1138.000000 1140.000000 384.000000"
 "targetname" "t343"
 }
-// entity 62
+// entity 61
 {
 "classname" "item_health_mega"
 "angle" "90"
 "origin" "-1016.000000 -216.000000 352.000000"
 "spawnflags" "2"
 }
-// entity 63
+// entity 62
 {
 "classname" "item_health_medium"
 "origin" "416.000000 784.000000 240.000000"
 }
-// entity 64
+// entity 63
 {
 "classname" "item_health_medium"
 "origin" "416.000000 656.000000 240.000000"
 }
-// entity 65
+// entity 64
 {
 "classname" "item_cells"
 "origin" "496.000000 -80.000000 64.000000"
 }
-// entity 66
+// entity 65
 {
 "classname" "item_health_medium"
 "angle" "90"
 "origin" "64.000000 -424.000000 272.000000"
 }
-// entity 67
+// entity 66
 {
 "classname" "item_spikes"
 "origin" "712.000000 -80.000000 64.000000"
 }
-// entity 68
+// entity 67
 {
 "classname" "item_health_medium"
 "angle" "270"
 "origin" "792.000000 1168.000000 48.000000"
 }
-// entity 69
+// entity 68
 {
 "classname" "item_spikes"
 "origin" "-144.000000 -752.000000 48.000000"
 }
-// entity 70
+// entity 69
 {
 "classname" "item_spikes"
 "origin" "48.000000 784.000000 64.000000"
 }
-// entity 71
+// entity 70
 {
 "classname" "item_spikes"
 "origin" "-560.000000 -432.000000 280.000000"
 }
-// entity 72
+// entity 71
 {
 "classname" "info_null"
 "origin" "-428.000000 84.000000 -224.000000"
 "targetname" "t345"
 }
-// entity 73
+// entity 72
 {
 "classname" "info_null"
 "origin" "-428.000000 -212.000000 -224.000000"
 "targetname" "t346"
 }
-// entity 74
+// entity 73
 {
 "classname" "item_armor_large"
 "origin" "-1048.000000 -1112.000000 144.000000"
 }
-// entity 75
+// entity 74
 {
 "classname" "info_null"
 "origin" "-960.000000 -1200.000000 296.000000"
 "targetname" "t347"
 }
-// entity 76
+// entity 75
 {
 "classname" "info_null"
 "origin" "-1136.000000 -1024.000000 296.000000"
 "targetname" "t348"
 }
-// entity 77
+// entity 76
 {
 "classname" "info_null"
 "origin" "-1136.000000 -768.000000 296.000000"
 "targetname" "t349"
 }
-// entity 78
+// entity 77
 {
 "classname" "info_null"
 "origin" "-960.000000 -592.000000 296.000000"
 "targetname" "t350"
 }
-// entity 79
+// entity 78
 {
 "classname" "item_health_medium"
 "angle" "90"
 "origin" "-544.000000 -1152.000000 40.000000"
 }
-// entity 80
+// entity 79
 {
 "classname" "weapon_grenadelauncher"
 "origin" "431.000000 -72.000000 315.000000"
 }
-// entity 81
+// entity 80
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "64.000000 -128.000000 40.000000"
 }
-// entity 82
+// entity 81
 {
 "classname" "dom_team"
 "cnt" "13"
@@ -6725,8 +6720,9 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "64.000000 -128.000000 72.000000"
 }
-// entity 83
+// entity 82
 {
 "classname" "dom_team"
 "cnt" "4"
@@ -6735,45 +6731,30 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "64.000000 -128.000000 104.000000"
 }
+// entity 83
+{
+"classname" "dom_controlpoint"
+"origin" "-1056.000000 -672.000000 48.000000"
+}
 // entity 84
 {
 "classname" "dom_controlpoint"
-"origin" "-770.000000 -448.000000 56.000000"
+"origin" "272.000000 -272.000000 -48.000000"
 }
 // entity 85
 {
 "classname" "dom_controlpoint"
-"origin" "-190.000000 130.000000 -40.000000"
+"origin" "848.000000 832.000000 40.000000"
 }
 // entity 86
 {
-"classname" "dom_controlpoint"
-"origin" "900.000000 832.000000 56.000000"
-}
-// entity 87
-{
-"classname" "dom_controlpoint"
-"origin" "1346.000000 1340.000000 248.000000"
-}
-// entity 88
-{
-"classname" "dom_controlpoint"
-"origin" "1125.000000 -100.000000 248.000000"
-}
-// entity 89
-{
-"classname" "dom_controlpoint"
-"angle" "90"
-"origin" "-550.000000 -250.000000 280.000000"
-}
-// entity 90
-{
 "classname" "light"
 "light" "50"
 "origin" "896 1344 288"
 }
-// entity 91
+// entity 87
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -6781,7 +6762,7 @@
 "origin" "368 240 -40"
 "target" "t1"
 }
-// entity 92
+// entity 88
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -6789,7 +6770,7 @@
 "origin" "368 -368 -40"
 "target" "t2"
 }
-// entity 93
+// entity 89
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -6797,7 +6778,7 @@
 "origin" "-240 -368 -40"
 "target" "t3"
 }
-// entity 94
+// entity 90
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -6805,7 +6786,7 @@
 "origin" "-240 240 -40"
 "target" "t4"
 }
-// entity 95
+// entity 91
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6813,7 +6794,7 @@
 "origin" "800 -176 96"
 "target" "t322"
 }
-// entity 96
+// entity 92
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6821,7 +6802,7 @@
 "origin" "1200 160 96"
 "target" "t323"
 }
-// entity 97
+// entity 93
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6829,7 +6810,7 @@
 "origin" "1200 352 96"
 "target" "t324"
 }
-// entity 98
+// entity 94
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6837,7 +6818,7 @@
 "origin" "896 1200 96"
 "target" "t325"
 }
-// entity 99
+// entity 95
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6845,70 +6826,70 @@
 "origin" "704 1200 96"
 "target" "t326"
 }
-// entity 100
+// entity 96
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "800 -80 96"
 }
-// entity 101
+// entity 97
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "1104 160 96"
 }
-// entity 102
+// entity 98
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "1104 352 96"
 }
-// entity 103
+// entity 99
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "896 1104 96"
 }
-// entity 104
+// entity 100
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "704 1104 96"
 }
-// entity 105
+// entity 101
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "125"
 "origin" "1088 -64 280"
 }
-// entity 106
+// entity 102
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "125"
 "origin" "1088 192 280"
 }
-// entity 107
+// entity 103
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "125"
 "origin" "832 -64 280"
 }
-// entity 108
+// entity 104
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "200"
 "origin" "576 -64 288"
 }
-// entity 109
+// entity 105
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -6916,7 +6897,7 @@
 "origin" "-176 -432 280"
 "target" "t327"
 }
-// entity 110
+// entity 106
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -6924,21 +6905,21 @@
 "origin" "-176 304 280"
 "target" "t330"
 }
-// entity 111
+// entity 107
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
 "light" "100"
 "origin" "-176 -376 360"
 }
-// entity 112
+// entity 108
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
 "light" "100"
 "origin" "-176 248 360"
 }
-// entity 113
+// entity 109
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6946,14 +6927,14 @@
 "origin" "608 -176 96"
 "target" "t331"
 }
-// entity 114
+// entity 110
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "608 -80 96"
 }
-// entity 115
+// entity 111
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6961,7 +6942,7 @@
 "origin" "1200 672 96"
 "target" "t332"
 }
-// entity 116
+// entity 112
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
@@ -6969,49 +6950,49 @@
 "origin" "1200 864 96"
 "target" "t333"
 }
-// entity 117
+// entity 113
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "1104 672 96"
 }
-// entity 118
+// entity 114
 {
 "classname" "light"
 "_color" "1.000000 0.996598 0.787972"
 "light" "100"
 "origin" "1104 864 96"
 }
-// entity 119
+// entity 115
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "75"
 "origin" "-384 -64 280"
 }
-// entity 120
+// entity 116
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "75"
 "origin" "-544 -64 280"
 }
-// entity 121
+// entity 117
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "75"
 "origin" "-544 -224 280"
 }
-// entity 122
+// entity 118
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "75"
 "origin" "-544 -416 280"
 }
-// entity 123
+// entity 119
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -7019,70 +7000,70 @@
 "origin" "1200 -176 56"
 "target" "t334"
 }
-// entity 124
+// entity 120
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "64 416 88"
 }
-// entity 125
+// entity 121
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "64 608 88"
 }
-// entity 126
+// entity 122
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "64 800 88"
 }
-// entity 127
+// entity 123
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "288 800 88"
 }
-// entity 128
+// entity 124
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "64 -736 88"
 }
-// entity 129
+// entity 125
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "-128 -736 88"
 }
-// entity 130
+// entity 126
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "-352 -736 88"
 }
-// entity 131
+// entity 127
 {
 "classname" "light"
 "_color" "0.830897 0.912109 1.000000"
 "light" "100"
 "origin" "64 -544 88"
 }
-// entity 132
+// entity 128
 {
 "classname" "light"
 "_color" "1.000000 0.994522 0.822583"
 "light" "1000"
 "origin" "64 -64 304"
 }
-// entity 133
+// entity 129
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -7090,14 +7071,14 @@
 "origin" "304 -432 280"
 "target" "t335"
 }
-// entity 134
+// entity 130
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
 "light" "100"
 "origin" "304 -376 360"
 }
-// entity 135
+// entity 131
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -7105,14 +7086,14 @@
 "origin" "304 304 280"
 "target" "t336"
 }
-// entity 136
+// entity 132
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
 "light" "100"
 "origin" "304 248 360"
 }
-// entity 137
+// entity 133
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7156,7 +7137,7 @@
 }
 }
 }
-// entity 138
+// entity 134
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7200,7 +7181,7 @@
 }
 }
 }
-// entity 139
+// entity 135
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7244,7 +7225,7 @@
 }
 }
 }
-// entity 140
+// entity 136
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7288,7 +7269,7 @@
 }
 }
 }
-// entity 141
+// entity 137
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7332,7 +7313,7 @@
 }
 }
 }
-// entity 142
+// entity 138
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7376,19 +7357,19 @@
 }
 }
 }
-// entity 143
+// entity 139
 {
 "classname" "light"
 "light" "25"
 "origin" "-576 -64 128"
 }
-// entity 144
+// entity 140
 {
 "classname" "light"
 "light" "25"
 "origin" "-776 -64 240"
 }
-// entity 145
+// entity 141
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -7469,7 +7450,7 @@
 }
 }
 }
-// entity 146
+// entity 142
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -7550,19 +7531,19 @@
 }
 }
 }
-// entity 147
+// entity 143
 {
 "classname" "light"
 "light" "250"
 "origin" "-1000 -248 512"
 }
-// entity 148
+// entity 144
 {
 "classname" "light"
 "light" "25"
 "origin" "-704 -64 144"
 }
-// entity 149
+// entity 145
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
@@ -7570,14 +7551,14 @@
 "origin" "-464 -1024 424"
 "target" "t340"
 }
-// entity 150
+// entity 146
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
 "light" "75"
 "origin" "-512 -1024 312"
 }
-// entity 151
+// entity 147
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
@@ -7585,68 +7566,68 @@
 "origin" "-640 -1200 424"
 "target" "t341"
 }
-// entity 152
+// entity 148
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
 "light" "75"
 "origin" "-640 -1152 312"
 }
-// entity 153
+// entity 149
 {
 "classname" "light"
 "light" "250"
 "origin" "832 456 328"
 }
-// entity 154
+// entity 150
 {
 "classname" "light"
 "light" "50"
 "origin" "-1000 -168 416"
 }
-// entity 155
+// entity 151
 {
 "classname" "light"
 "light" "25"
 "origin" "-1240 -64 512"
 }
-// entity 156
+// entity 152
 {
 "classname" "light"
 "light" "50"
 "origin" "-800 -448 104"
 }
-// entity 157
+// entity 153
 {
 "classname" "light"
 "light" "50"
 "origin" "-928 -456 104"
 }
-// entity 158
+// entity 154
 {
 "classname" "light"
 "light" "50"
 "origin" "1120 1344 288"
 }
-// entity 159
+// entity 155
 {
 "classname" "light"
 "light" "50"
 "origin" "1344 1344 288"
 }
-// entity 160
+// entity 156
 {
 "classname" "light"
 "light" "50"
 "origin" "1344 1120 288"
 }
-// entity 161
+// entity 157
 {
 "classname" "light"
 "light" "50"
 "origin" "1344 896 288"
 }
-// entity 162
+// entity 158
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -7654,7 +7635,7 @@
 "origin" "462 1140 248"
 "target" "t342"
 }
-// entity 163
+// entity 159
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -7662,13 +7643,13 @@
 "origin" "1138 1140 248"
 "target" "t343"
 }
-// entity 164
+// entity 160
 {
 "classname" "light"
 "light" "50"
 "origin" "-776 -64 384"
 }
-// entity 165
+// entity 161
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -7676,7 +7657,7 @@
 "origin" "-428 84 -360"
 "target" "t345"
 }
-// entity 166
+// entity 162
 {
 "classname" "light"
 "_color" "0.747723 0.868879 1.000000"
@@ -7684,7 +7665,7 @@
 "origin" "-428 -212 -360"
 "target" "t346"
 }
-// entity 167
+// entity 163
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
@@ -7692,14 +7673,14 @@
 "origin" "-960 -1200 424"
 "target" "t347"
 }
-// entity 168
+// entity 164
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
 "light" "75"
 "origin" "-960 -1152 312"
 }
-// entity 169
+// entity 165
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
@@ -7707,14 +7688,14 @@
 "origin" "-1136 -1024 424"
 "target" "t348"
 }
-// entity 170
+// entity 166
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
 "light" "75"
 "origin" "-1088 -1024 312"
 }
-// entity 171
+// entity 167
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
@@ -7722,14 +7703,14 @@
 "origin" "-1136 -768 424"
 "target" "t349"
 }
-// entity 172
+// entity 168
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
 "light" "75"
 "origin" "-1088 -768 312"
 }
-// entity 173
+// entity 169
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
@@ -7737,28 +7718,39 @@
 "origin" "-960 -592 424"
 "target" "t350"
 }
-// entity 174
+// entity 170
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
 "light" "75"
 "origin" "-960 -640 312"
 }
-// entity 175
+// entity 171
 {
 "classname" "light"
 "light" "1500"
 "origin" "808 832 352"
 }
-// entity 176
+// entity 172
 {
 "classname" "light"
 "light" "20"
 "origin" "-528 -1136 96"
 }
-// entity 177
+// entity 173
 {
 "classname" "light"
 "light" "20"
 "origin" "672 536 64"
 }
+// entity 174
+{
+"classname" "item_bullets"
+"angle" "180.000000"
+"origin" "-640.000000 -1120.000000 168.000000"
+}
+// entity 175
+{
+"classname" "dom_controlpoint"
+"origin" "-1016.000000 8.000000 336.000000"
+}

Modified: branches/nexuiz-2.0/data/maps/dieselpower.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/dieselpower.map
===================================================================
--- branches/nexuiz-2.0/data/maps/dieselpower.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/dieselpower.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -27491,6 +27491,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 0.000000 112.000000"
 }
 // entity 270
 {
@@ -27501,6 +27502,7 @@
 "netname" "^4Blue Team^3"
 "noise1" "domination/claim.wav"
 "message" "Blue team has captured a control point"
+"origin" "0.000000 0.000000 80.000000"
 }
 // entity 271
 {
@@ -27511,82 +27513,52 @@
 "netname" "^1Red Team^3"
 "noise1" "domination/claim.wav"
 "message" "Red team has captured a control point"
+"origin" "0.000000 0.000000 48.000000"
 }
 // entity 272
 {
 "classname" "dom_team"
-"cnt" "9"
-"model" "models/domination/dom_pink.md3"
+"cnt" "12"
+"model" "models/domination/dom_yellow.md3"
 "noise" "domination/claim.wav"
-"netname" "^6Pink Team^3"
+"netname" "^3Yellow Team^3"
 "noise1" "domination/claim.wav"
 "message" "Pink team has captured a control point"
+"origin" "0.000000 0.000000 144.000000"
 }
 // entity 273
 {
 "classname" "dom_controlpoint"
-"origin" "-20 -600 24"
-"angle" "-45"
+"origin" "24.000000 -424.000000 16.000000"
+"angle" "-45.000000"
 "message" "^3 has captured the ^1Main Arena"
 }
 // entity 274
 {
 "classname" "dom_controlpoint"
-"origin" "-700 880 -232"
-"message" "^3 has captured the ^1Electro"
+"origin" "1072.000000 64.000000 -432.000000"
+"message" "^3 has captured the ^1Rocket Launcher"
 }
 // entity 275
 {
 "classname" "dom_controlpoint"
-"origin" "-70 860 216"
-"angle" "90"
-"message" "^3 has captured the ^1Nex"
+"origin" "648.000000 1304.000000 464.000000"
+"message" "^3 has captured the ^1Mortar"
 }
 // entity 276
 {
 "classname" "dom_controlpoint"
-"origin" "1680 -1360 -473"
-"message" "^3 has captured the ^1Lower Lifts"
+"origin" "2440.000000 -616.000000 -296.000000"
+"message" "^3 has captured the ^1East"
 }
 // entity 277
 {
 "classname" "dom_controlpoint"
-"origin" "1000 -550 -744"
-"message" "^3 has captured the ^1Lower Arena"
+"origin" "1920.000000 -64.000000 -1008.000000"
+"message" "^3 has captured the ^1Bottom"
 }
 // entity 278
 {
-"classname" "dom_controlpoint"
-"origin" "1290 690 -424"
-"message" "^3 has captured the ^1Lower Rocket Launcher"
-}
-// entity 279
-{
-"classname" "dom_controlpoint"
-"origin" "700 460 -104"
-"message" "^3 has captured the ^1Rocket Launcher"
-}
-// entity 280
-{
-"classname" "dom_controlpoint"
-"origin" "1800 -1720 -200"
-"angle" "90"
-"message" "^3 has captured the ^1Jump"
-}
-// entity 281
-{
-"classname" "dom_controlpoint"
-"origin" "2440 -100 -296"
-"message" "^3 has captured the ^1Hole"
-}
-// entity 282
-{
-"classname" "dom_controlpoint"
-"origin" "1380 -60 -1000"
-"message" "^3 has captured the ^1Bottom"
-}
-// entity 283
-{
 "classname" "func_group"
 "type" "patchThick"
 // brush 0
@@ -27629,7 +27601,7 @@
 }
 }
 }
-// entity 284
+// entity 279
 {
 "classname" "func_group"
 // brush 0
@@ -27761,7 +27733,7 @@
 ( -256 1064 -80 ) ( -256 1064 -72 ) ( -192 1064 -72 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 285
+// entity 280
 {
 "classname" "func_group"
 // brush 0
@@ -27893,7 +27865,7 @@
 ( -576 1064 -96 ) ( -576 1048 -96 ) ( -512 1048 -96 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 286
+// entity 281
 {
 "classname" "func_group"
 // brush 0
@@ -28021,7 +27993,7 @@
 ( -840 1032 -232 ) ( -848 1040 -232 ) ( -840 1032 -224 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 287
+// entity 282
 {
 "classname" "func_group"
 // brush 0
@@ -28149,7 +28121,7 @@
 ( -896 1088 -232 ) ( -888 1080 -232 ) ( -896 1088 -224 ) evil1_trims/trm_rivetmtlpipes -128 7 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 288
+// entity 283
 {
 "classname" "func_group"
 // brush 0
@@ -28172,7 +28144,7 @@
 ( 1312 -512 448 ) ( 1440 -512 704 ) ( 1312 -512 704 ) common/caulk -32 0 -180 0.5 -0.5 134217728 4 0
 }
 }
-// entity 289
+// entity 284
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28190,7 +28162,7 @@
 }
 }
 }
-// entity 290
+// entity 285
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28208,7 +28180,7 @@
 }
 }
 }
-// entity 291
+// entity 286
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28226,7 +28198,7 @@
 }
 }
 }
-// entity 292
+// entity 287
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28244,7 +28216,7 @@
 }
 }
 }
-// entity 293
+// entity 288
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28262,7 +28234,7 @@
 }
 }
 }
-// entity 294
+// entity 289
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28280,7 +28252,7 @@
 }
 }
 }
-// entity 295
+// entity 290
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28298,7 +28270,7 @@
 }
 }
 }
-// entity 296
+// entity 291
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28316,7 +28288,7 @@
 }
 }
 }
-// entity 297
+// entity 292
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28334,7 +28306,7 @@
 }
 }
 }
-// entity 298
+// entity 293
 {
 "classname" "func_group"
 // brush 0
@@ -28347,7 +28319,7 @@
 ( 2272 -112 -576 ) ( 2272 -80 -592 ) ( 2208 -80 -592 ) evil2_trims/trim_odd 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 299
+// entity 294
 {
 "classname" "func_group"
 // brush 0
@@ -28360,7 +28332,7 @@
 ( 1824 256 -592 ) ( 1824 128 -592 ) ( 1952 128 -592 ) stralenex1/stralenex_roundlight 0 -34 90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 300
+// entity 295
 {
 "classname" "func_group"
 // brush 0
@@ -28373,7 +28345,7 @@
 ( 1872 -416 -576 ) ( 1904 -416 -592 ) ( 1904 -352 -592 ) evil2_trims/trim_odd 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 301
+// entity 296
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -28404,7 +28376,7 @@
 }
 }
 }
-// entity 302
+// entity 297
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28422,7 +28394,7 @@
 }
 }
 }
-// entity 303
+// entity 298
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -28453,7 +28425,7 @@
 }
 }
 }
-// entity 304
+// entity 299
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28471,7 +28443,7 @@
 }
 }
 }
-// entity 305
+// entity 300
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -28489,7 +28461,7 @@
 }
 }
 }
-// entity 306
+// entity 301
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -28520,7 +28492,7 @@
 }
 }
 }
-// entity 307
+// entity 302
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28564,7 +28536,7 @@
 }
 }
 }
-// entity 308
+// entity 303
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -28595,7 +28567,7 @@
 }
 }
 }
-// entity 309
+// entity 304
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -28639,7 +28611,7 @@
 }
 }
 }
-// entity 310
+// entity 305
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -28670,7 +28642,7 @@
 }
 }
 }
-// entity 311
+// entity 306
 {
 "classname" "func_group"
 // brush 0
@@ -28683,7 +28655,7 @@
 ( 448 -80 -640 ) ( 448 -48 -656 ) ( 384 -48 -656 ) evil2_trims/trim_odd 64 -64 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 312
+// entity 307
 {
 "classname" "func_group"
 // brush 0
@@ -28696,7 +28668,7 @@
 ( 448 48 -640 ) ( 448 80 -656 ) ( 384 80 -656 ) evil2_trims/trim_odd 64 -64 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 313
+// entity 308
 {
 "classname" "func_group"
 // brush 0
@@ -28709,7 +28681,7 @@
 ( 336 -160 -656 ) ( 336 -288 -656 ) ( 464 -288 -656 ) stralenex1/stralenex_roundlight 63 63 -180 0.5000349879 -0.5 134217728 0 0
 }
 }
-// entity 314
+// entity 309
 {
 "classname" "func_group"
 // brush 0
@@ -28722,7 +28694,7 @@
 ( 272 160 -640 ) ( 304 160 -656 ) ( 304 224 -656 ) evil2_trims/trim_odd 128 -64 180 0.5 0.5 134217728 0 0
 }
 }
-// entity 315
+// entity 310
 {
 "classname" "func_group"
 // brush 0
@@ -28735,7 +28707,7 @@
 ( 448 560 -576 ) ( 448 592 -592 ) ( 384 592 -592 ) evil2_trims/trim_odd 64 -128 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 316
+// entity 311
 {
 "classname" "func_group"
 // brush 0
@@ -28748,7 +28720,7 @@
 ( 384 640 -592 ) ( 512 640 -592 ) ( 512 768 -592 ) stralenex1/stralenex_roundlight 4 31 -180 0.5 -0.5000420213 134217728 0 0
 }
 }
-// entity 317
+// entity 312
 {
 "classname" "func_group"
 // brush 0
@@ -28763,7 +28735,7 @@
 ( 480 -896 432 ) ( 480 -768 432 ) ( 352 -768 432 ) stralenex1/stralenex_roundlight 0 -32 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 318
+// entity 313
 {
 "classname" "func_group"
 // brush 0
@@ -28778,7 +28750,7 @@
 ( 304 -832 448 ) ( 272 -832 432 ) ( 272 -896 432 ) evil2_trims/trim_odd 0 1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 319
+// entity 314
 {
 "classname" "func_group"
 // brush 0
@@ -28792,7 +28764,7 @@
 ( 224 -896 432 ) ( 224 -768 432 ) ( 96 -768 432 ) stralenex1/stralenex_roundlight 0 -32 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 320
+// entity 315
 {
 "classname" "func_group"
 // brush 0
@@ -28805,7 +28777,7 @@
 ( -192 -592 448 ) ( -192 -560 432 ) ( -256 -560 432 ) evil2_trims/trim_odd 192 -63 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 321
+// entity 316
 {
 "classname" "func_group"
 // brush 0
@@ -28819,7 +28791,7 @@
 ( -224 -448 432 ) ( -224 -320 432 ) ( -352 -320 432 ) stralenex1/stralenex_roundlight 0 -34 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 322
+// entity 317
 {
 "classname" "func_group"
 // brush 0
@@ -28834,7 +28806,7 @@
 ( -400 -384 448 ) ( -432 -384 432 ) ( -432 -448 432 ) evil2_trims/trim_odd 128 1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 323
+// entity 318
 {
 "classname" "func_group"
 // brush 0
@@ -28849,7 +28821,7 @@
 ( -528 -384 448 ) ( -560 -384 432 ) ( -560 -448 432 ) evil2_trims/trim_odd 128 -63 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 324
+// entity 319
 {
 "classname" "func_group"
 // brush 0
@@ -28864,7 +28836,7 @@
 ( -608 -448 432 ) ( -608 -320 432 ) ( -736 -320 432 ) stralenex1/stralenex_roundlight 0 -34 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 325
+// entity 320
 {
 "classname" "func_group"
 // brush 0
@@ -28878,7 +28850,7 @@
 ( -784 -384 448 ) ( -816 -384 432 ) ( -816 -448 432 ) evil2_trims/trim_odd 128 1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 326
+// entity 321
 {
 "classname" "func_group"
 // brush 0
@@ -28892,7 +28864,7 @@
 ( -896 -416 432 ) ( -768 -416 432 ) ( -768 -288 432 ) stralenex1/stralenex_roundlight 32 0 -90 -0.4999989867 0.5 134217728 0 0
 }
 }
-// entity 327
+// entity 322
 {
 "classname" "func_group"
 // brush 0
@@ -28907,7 +28879,7 @@
 ( -832 -240 448 ) ( -832 -208 432 ) ( -896 -208 432 ) evil2_trims/trim_odd 128 -63 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 328
+// entity 323
 {
 "classname" "func_group"
 // brush 0
@@ -28922,7 +28894,7 @@
 ( -832 -112 448 ) ( -832 -80 432 ) ( -896 -80 432 ) evil2_trims/trim_odd 128 -62 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 329
+// entity 324
 {
 "classname" "func_group"
 // brush 0
@@ -28936,7 +28908,7 @@
 ( -832 912 448 ) ( -832 944 432 ) ( -896 944 432 ) evil2_trims/trim_odd 128 -61 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 330
+// entity 325
 {
 "classname" "func_group"
 // brush 0
@@ -28950,7 +28922,7 @@
 ( -928 1088 432 ) ( -928 960 432 ) ( -800 960 432 ) stralenex1/stralenex_roundlight 32 0 -180 0.5000100136 -0.5 134217728 0 0
 }
 }
-// entity 331
+// entity 326
 {
 "classname" "func_group"
 // brush 0
@@ -28964,7 +28936,7 @@
 ( -368 1024 448 ) ( -336 1024 432 ) ( -336 1088 432 ) evil2_trims/trim_odd 128 -60 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 332
+// entity 327
 {
 "classname" "func_group"
 // brush 0
@@ -28978,7 +28950,7 @@
 ( -256 1088 432 ) ( -128 1088 432 ) ( -128 1216 432 ) stralenex1/stralenex_roundlight 0 32 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 333
+// entity 328
 {
 "classname" "func_group"
 // brush 0
@@ -28992,7 +28964,7 @@
 ( -256 1344 432 ) ( -128 1344 432 ) ( -128 1472 432 ) stralenex1/stralenex_roundlight 0 32 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 334
+// entity 329
 {
 "classname" "func_group"
 // brush 0
@@ -29006,7 +28978,7 @@
 ( -208 1472 448 ) ( -176 1472 432 ) ( -176 1536 432 ) evil2_trims/trim_odd -64 -60 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 335
+// entity 330
 {
 "classname" "func_group"
 // brush 0
@@ -29020,7 +28992,7 @@
 ( 176 1472 448 ) ( 208 1472 432 ) ( 208 1536 432 ) evil2_trims/trim_odd 192 -59 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 336
+// entity 331
 {
 "classname" "func_group"
 // brush 0
@@ -29033,7 +29005,7 @@
 ( 320 1088 432 ) ( 320 1216 432 ) ( 192 1216 432 ) stralenex1/stralenex_roundlight 0 -32 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 337
+// entity 332
 {
 "classname" "func_group"
 // brush 0
@@ -29047,7 +29019,7 @@
 ( 64 1040 448 ) ( 64 1008 432 ) ( 128 1008 432 ) evil2_trims/trim_odd -191 -63 90 0.5001220107 0.5 134217728 0 0
 }
 }
-// entity 338
+// entity 333
 {
 "classname" "func_group"
 // brush 0
@@ -29061,7 +29033,7 @@
 ( 64 400 448 ) ( 64 368 432 ) ( 128 368 432 ) evil2_trims/trim_odd 63 0 90 0.5001220107 0.5 134217728 0 0
 }
 }
-// entity 339
+// entity 334
 {
 "classname" "func_group"
 // brush 0
@@ -29075,7 +29047,7 @@
 ( -368 -128 448 ) ( -336 -128 432 ) ( -336 -64 432 ) evil2_trims/trim_odd 127 -63 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 340
+// entity 335
 {
 "classname" "func_group"
 // brush 0
@@ -29089,7 +29061,7 @@
 ( -544 -64 432 ) ( -544 -192 432 ) ( -416 -192 432 ) stralenex1/stralenex_roundlight 31 0 -180 0.4999899864 -0.5 134217728 0 0
 }
 }
-// entity 341
+// entity 336
 {
 "classname" "func_group"
 // brush 0
@@ -29103,7 +29075,7 @@
 ( -576 48 448 ) ( -576 16 432 ) ( -512 16 432 ) evil2_trims/trim_odd -1 -63 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 342
+// entity 337
 {
 "classname" "func_group"
 // brush 0
@@ -29117,7 +29089,7 @@
 ( -512 736 432 ) ( -640 736 432 ) ( -640 608 432 ) stralenex1/stralenex_roundlight 0 31 -180 0.5 -0.5000039935 134217728 0 0
 }
 }
-// entity 343
+// entity 338
 {
 "classname" "func_group"
 // brush 0
@@ -29130,7 +29102,7 @@
 ( 128 256 432 ) ( 128 128 432 ) ( 256 128 432 ) stralenex1/stralenex_roundlight 31 0 -180 0.5000370145 -0.5 134217728 0 0
 }
 }
-// entity 344
+// entity 339
 {
 "classname" "func_group"
 // brush 0
@@ -29144,7 +29116,7 @@
 ( 384 304 448 ) ( 384 336 432 ) ( 320 336 432 ) evil2_trims/trim_odd 189 0 -90 0.5001220107 0.5 134217728 0 0
 }
 }
-// entity 345
+// entity 340
 {
 "classname" "func_group"
 // brush 0
@@ -29158,7 +29130,7 @@
 ( 384 816 448 ) ( 384 848 432 ) ( 320 848 432 ) evil2_trims/trim_odd 187 -62 -90 0.5001220107 0.5 134217728 0 0
 }
 }
-// entity 346
+// entity 341
 {
 "classname" "func_group"
 // brush 0
@@ -29171,7 +29143,7 @@
 ( 320 896 432 ) ( 448 896 432 ) ( 448 1024 432 ) stralenex1/stralenex_roundlight 0 31 -180 0.5 -0.5000140071 134217728 0 0
 }
 }
-// entity 347
+// entity 342
 {
 "classname" "func_group"
 // brush 0
@@ -29184,7 +29156,7 @@
 ( 320 1632 432 ) ( 448 1632 432 ) ( 448 1760 432 ) stralenex1/stralenex_roundlight 0 31 -180 0.5 -0.5000510216 134217728 0 0
 }
 }
-// entity 348
+// entity 343
 {
 "classname" "func_group"
 // brush 0
@@ -29197,7 +29169,7 @@
 ( 400 1792 448 ) ( 432 1792 432 ) ( 432 1856 432 ) evil2_trims/trim_odd 128 -63 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 349
+// entity 344
 {
 "classname" "func_group"
 // brush 0
@@ -29210,7 +29182,7 @@
 ( 480 1856 432 ) ( 480 1728 432 ) ( 608 1728 432 ) stralenex1/stralenex_roundlight 31 0 -180 0.5000060201 -0.5 134217728 0 0
 }
 }
-// entity 350
+// entity 345
 {
 "classname" "func_group"
 // brush 0
@@ -29223,7 +29195,7 @@
 ( 608 1856 432 ) ( 608 1728 432 ) ( 736 1728 432 ) stralenex1/stralenex_roundlight 31 0 -180 0.5000060201 -0.5 134217728 0 0
 }
 }
-// entity 351
+// entity 346
 {
 "classname" "func_group"
 // brush 0
@@ -29237,7 +29209,7 @@
 ( 784 1792 448 ) ( 816 1792 432 ) ( 816 1856 432 ) evil2_trims/trim_odd 128 -61 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 352
+// entity 347
 {
 "classname" "func_group"
 // brush 0
@@ -29251,7 +29223,7 @@
 ( 1168 1792 448 ) ( 1200 1792 432 ) ( 1200 1856 432 ) evil2_trims/trim_odd 128 -61 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 353
+// entity 348
 {
 "classname" "func_group"
 // brush 0
@@ -29265,7 +29237,7 @@
 ( 1344 1824 432 ) ( 1216 1824 432 ) ( 1216 1696 432 ) stralenex1/stralenex_roundlight 0 32 -180 0.5 -0.499992013 134217728 0 0
 }
 }
-// entity 354
+// entity 349
 {
 "classname" "func_group"
 // brush 0
@@ -29279,7 +29251,7 @@
 ( 1344 1312 432 ) ( 1216 1312 432 ) ( 1216 1184 432 ) stralenex1/stralenex_roundlight 64 31 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 355
+// entity 350
 {
 "classname" "func_group"
 // brush 0
@@ -29292,7 +29264,7 @@
 ( 1536 976 448 ) ( 1536 944 432 ) ( 1600 944 432 ) evil2_trims/trim_odd 192 -62 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 356
+// entity 351
 {
 "classname" "func_group"
 // brush 0
@@ -29305,7 +29277,7 @@
 ( 1536 768 432 ) ( 1536 896 432 ) ( 1408 896 432 ) stralenex1/stralenex_roundlight 32 -63 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 357
+// entity 352
 {
 "classname" "func_group"
 // brush 0
@@ -29318,7 +29290,7 @@
 ( 1424 1024 448 ) ( 1456 1024 432 ) ( 1456 1088 432 ) evil2_trims/trim_odd 128 -62 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 358
+// entity 353
 {
 "classname" "func_group"
 // brush 0
@@ -29332,7 +29304,7 @@
 ( 1280 736 448 ) ( 1280 704 432 ) ( 1344 704 432 ) evil2_trims/trim_odd 160 -60 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 359
+// entity 354
 {
 "classname" "func_group"
 // brush 0
@@ -29346,7 +29318,7 @@
 ( 1344 -368 432 ) ( 1216 -368 432 ) ( 1216 -496 432 ) stralenex1/stralenex_roundlight 68 -1 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 360
+// entity 355
 {
 "classname" "func_group"
 // brush 0
@@ -29360,7 +29332,7 @@
 ( 640 256 432 ) ( 512 256 432 ) ( 512 128 432 ) stralenex1/stralenex_roundlight 0 31 0 -0.5 0.5000039935 134217728 0 0
 }
 }
-// entity 361
+// entity 356
 {
 "classname" "func_group"
 // brush 0
@@ -29374,7 +29346,7 @@
 ( 576 -304 448 ) ( 576 -336 432 ) ( 640 -336 432 ) evil2_trims/trim_odd 192 63 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 362
+// entity 357
 {
 "classname" "func_group"
 // brush 0
@@ -29388,7 +29360,7 @@
 ( 608 -448 432 ) ( 608 -576 432 ) ( 736 -576 432 ) stralenex1/stralenex_roundlight 32 0 0 -0.4999890029 0.5 134217728 0 0
 }
 }
-// entity 363
+// entity 358
 {
 "classname" "func_group"
 // brush 0
@@ -29402,602 +29374,602 @@
 ( 864 -448 432 ) ( 864 -576 432 ) ( 992 -576 432 ) stralenex1/stralenex_roundlight 32 0 0 -0.4999890029 0.5 134217728 0 0
 }
 }
-// entity 364
+// entity 359
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1168 1264 40"
 "light" "200"
 }
-// entity 365
+// entity 360
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1424 912 32"
 "light" "300"
 }
-// entity 366
+// entity 361
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "496 448 16"
 "light" "450"
 }
-// entity 367
+// entity 362
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "208 -208 336"
 "light" "1300"
 }
-// entity 368
+// entity 363
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-64 448 352"
 "light" "500"
 }
-// entity 369
+// entity 364
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-64 896 352"
 "light" "500"
 }
-// entity 370
+// entity 365
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-640 896 352"
 "light" "500"
 }
-// entity 371
+// entity 366
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-704 448 352"
 "light" "400"
 }
-// entity 372
+// entity 367
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-688 -224 352"
 "light" "800"
 }
-// entity 373
+// entity 368
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-704 496 -48"
 "light" "500"
 }
-// entity 374
+// entity 369
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "160 1328 352"
 "light" "500"
 }
-// entity 375
+// entity 370
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "576 1248 -80"
 "light" "550"
 }
-// entity 376
+// entity 371
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "448 672 -368"
 "light" "200"
 }
-// entity 377
+// entity 372
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "704 672 -368"
 "light" "200"
 }
-// entity 378
+// entity 373
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "960 672 -368"
 "light" "200"
 }
-// entity 379
+// entity 374
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1216 672 -368"
 "light" "200"
 }
-// entity 380
+// entity 375
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "576 224 -336"
 "light" "200"
 }
-// entity 381
+// entity 376
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "768 224 -336"
 "light" "200"
 }
-// entity 382
+// entity 377
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "960 224 -336"
 "light" "200"
 }
-// entity 383
+// entity 378
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1152 224 -336"
 "light" "200"
 }
-// entity 384
+// entity 379
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "384 224 -336"
 "light" "200"
 }
-// entity 385
+// entity 380
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "864 -592 -336"
 "light" "200"
 }
-// entity 386
+// entity 381
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1152 -640 -640"
 "light" "150"
 }
-// entity 387
+// entity 382
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1152 -928 -640"
 "light" "150"
 }
-// entity 388
+// entity 383
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1440 -640 -640"
 "light" "150"
 }
-// entity 389
+// entity 384
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "496 -48 -704"
 "light" "40"
 }
-// entity 390
+// entity 385
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "544 672 -656"
 "light" "150"
 }
-// entity 391
+// entity 386
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "736 672 -656"
 "light" "150"
 }
-// entity 392
+// entity 387
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "928 672 -656"
 "light" "150"
 }
-// entity 393
+// entity 388
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1120 672 -656"
 "light" "150"
 }
-// entity 394
+// entity 389
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1296 592 -656"
 "light" "150"
 }
-// entity 395
+// entity 390
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1296 400 -656"
 "light" "150"
 }
-// entity 396
+// entity 391
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1488 400 -656"
 "light" "150"
 }
-// entity 397
+// entity 392
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1296 208 -656"
 "light" "150"
 }
-// entity 398
+// entity 393
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1488 208 -656"
 "light" "150"
 }
-// entity 399
+// entity 394
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1296 16 -656"
 "light" "150"
 }
-// entity 400
+// entity 395
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1488 16 -656"
 "light" "150"
 }
-// entity 401
+// entity 396
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1488 -176 -656"
 "light" "150"
 }
-// entity 402
+// entity 397
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1488 -368 -656"
 "light" "150"
 }
-// entity 403
+// entity 398
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1920 -64 -896"
 "light" "750"
 }
-// entity 404
+// entity 399
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1392 -64 -928"
 "light" "200"
 }
-// entity 405
+// entity 400
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "816 -464 -928"
 "light" "250"
 }
-// entity 406
+// entity 401
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1216 -832 -928"
 "light" "250"
 }
-// entity 407
+// entity 402
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1248 -576 -912"
 "light" "250"
 }
-// entity 408
+// entity 403
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1168 576 -928"
 "light" "200"
 }
-// entity 409
+// entity 404
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "912 576 -928"
 "light" "200"
 }
-// entity 410
+// entity 405
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1104 1632 416"
 "light" "500"
 }
-// entity 411
+// entity 406
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1392 928 368"
 "light" "350"
 }
-// entity 412
+// entity 407
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "720 624 432"
 "light" "800"
 }
-// entity 413
+// entity 408
 {
 "classname" "light"
 "_color" "1.000000 0.988220 0.846721"
 "origin" "1184 112 240"
 "light" "200"
 }
-// entity 414
+// entity 409
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1184 -192 336"
 "light" "500"
 }
-// entity 415
+// entity 410
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "864 -688 336"
 "light" "500"
 }
-// entity 416
+// entity 411
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "504 144 -704"
 "light" "40"
 }
-// entity 417
+// entity 412
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "400 376 -648"
 "light" "100"
 }
-// entity 418
+// entity 413
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "864 -880 -336"
 "light" "200"
 }
-// entity 419
+// entity 414
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "576 -880 -336"
 "light" "200"
 }
-// entity 420
+// entity 415
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "576 -592 -336"
 "light" "200"
 }
-// entity 421
+// entity 416
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "744 -392 -448"
 "light" "800"
 }
-// entity 422
+// entity 417
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "728 -896 -496"
 "light" "500"
 }
-// entity 423
+// entity 418
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "448 -160 -400"
 "light" "250"
 }
-// entity 424
+// entity 419
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1248 -288 -400"
 "light" "400"
 }
-// entity 425
+// entity 420
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1040 -304 -656"
 "light" "200"
 }
-// entity 426
+// entity 421
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "752 -304 -656"
 "light" "200"
 }
-// entity 427
+// entity 422
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1040 368 -656"
 "light" "100"
 }
-// entity 428
+// entity 423
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "752 368 -656"
 "light" "100"
 }
-// entity 429
+// entity 424
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "672 912 -128"
 "light" "200"
 }
-// entity 430
+// entity 425
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "416 912 -128"
 "light" "200"
 }
-// entity 431
+// entity 426
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "200 952 -128"
 "light" "200"
 }
-// entity 432
+// entity 427
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-224 896 -160"
 "light" "200"
 }
-// entity 433
+// entity 428
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-544 896 -160"
 "light" "200"
 }
-// entity 434
+// entity 429
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "-704 768 -160"
 "light" "200"
 }
-// entity 435
+// entity 430
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "840 1088 -128"
 "light" "200"
 }
-// entity 436
+// entity 431
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "848 1280 -128"
 "light" "200"
 }
-// entity 437
+// entity 432
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "624 1312 232"
 "light" "200"
 }
-// entity 438
+// entity 433
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1168 1104 40"
 "light" "200"
 }
-// entity 439
+// entity 434
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1168 816 40"
 "light" "200"
 }
-// entity 440
+// entity 435
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1168 656 40"
 "light" "200"
 }
-// entity 441
+// entity 436
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "864 -688 24"
 "light" "500"
 }
-// entity 442
+// entity 437
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "504 -688 144"
 "light" "500"
 }
-// entity 443
+// entity 438
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1312 -864 128"
 "light" "450"
 }
-// entity 444
+// entity 439
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1136 1248 416"
 "light" "500"
 }
-// entity 445
+// entity 440
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1040 704 416"
 "light" "500"
 }
-// entity 446
+// entity 441
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "304 960 -368"
 "light" "200"
 }
-// entity 447
+// entity 442
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1376 312 -928"
 "light" "200"
 }
-// entity 448
+// entity 443
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1920 -64 -440"
 "light" "300"
 }
-// entity 449
+// entity 444
 {
 "classname" "func_group"
 // brush 0
@@ -30010,7 +29982,7 @@
 ( 1824 -544 384 ) ( 1696 -544 384 ) ( 1696 -672 384 ) stralenex1/stralenex_roundlight 0 31 0 -0.5 0.4999989867 134217728 0 0
 }
 }
-// entity 450
+// entity 445
 {
 "classname" "func_group"
 // brush 0
@@ -30023,7 +29995,7 @@
 ( 1760 -768 416 ) ( 1760 -800 400 ) ( 1824 -800 400 ) evil2_trims/trim_odd 96 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 451
+// entity 446
 {
 "classname" "func_group"
 // brush 0
@@ -30036,7 +30008,7 @@
 ( 1824 -848 400 ) ( 1696 -848 400 ) ( 1696 -976 400 ) stralenex1/stralenex_roundlight 0 0 0 -0.5 0.5000150204 134217728 0 0
 }
 }
-// entity 452
+// entity 447
 {
 "classname" "func_group"
 // brush 0
@@ -30049,7 +30021,7 @@
 ( 1760 -1024 416 ) ( 1760 -1056 400 ) ( 1824 -1056 400 ) evil2_trims/trim_odd 96 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 453
+// entity 448
 {
 "classname" "func_group"
 // brush 0
@@ -30062,7 +30034,7 @@
 ( 1824 -1104 400 ) ( 1696 -1104 400 ) ( 1696 -1232 400 ) stralenex1/stralenex_roundlight 0 0 0 -0.5 0.5000150204 134217728 0 0
 }
 }
-// entity 454
+// entity 449
 {
 "classname" "func_group"
 // brush 0
@@ -30075,7 +30047,7 @@
 ( 1760 -1312 400 ) ( 1760 -1344 384 ) ( 1824 -1344 384 ) evil2_trims/trim_odd 160 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 455
+// entity 450
 {
 "classname" "func_group"
 // brush 0
@@ -30089,7 +30061,7 @@
 ( 2528 -576 416 ) ( 2528 -608 400 ) ( 2592 -608 400 ) evil2_trims/trim_odd -32 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 456
+// entity 451
 {
 "classname" "func_group"
 // brush 0
@@ -30103,7 +30075,7 @@
 ( 2528 -704 416 ) ( 2528 -736 400 ) ( 2592 -736 400 ) evil2_trims/trim_odd -32 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 457
+// entity 452
 {
 "classname" "func_group"
 // brush 0
@@ -30117,7 +30089,7 @@
 ( 2592 -1016 400 ) ( 2464 -1016 400 ) ( 2464 -1144 400 ) stralenex1/stralenex_roundlight 15 0 -90 -0.5000290275 0.5 134217728 0 0
 }
 }
-// entity 458
+// entity 453
 {
 "classname" "func_group"
 // brush 0
@@ -30131,7 +30103,7 @@
 ( 2528 -1320 416 ) ( 2528 -1352 400 ) ( 2592 -1352 400 ) evil2_trims/trim_odd 176 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 459
+// entity 454
 {
 "classname" "func_group"
 // brush 0
@@ -30218,7 +30190,7 @@
 ( 1896 48 -640 ) ( 1896 64 -624 ) ( 1944 64 -624 ) e7/e7brnmetal 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 460
+// entity 455
 {
 "classname" "func_group"
 // brush 0
@@ -30305,7 +30277,7 @@
 ( 2048 -88 -640 ) ( 2048 -40 -640 ) ( 2024 -40 -640 ) common/caulk 0 0 -90 0.5 0.5 134217728 4 0
 }
 }
-// entity 461
+// entity 456
 {
 "classname" "func_group"
 // brush 0
@@ -30392,7 +30364,7 @@
 ( 1944 -176 -640 ) ( 1944 -192 -624 ) ( 1896 -192 -624 ) e7/e7brnmetal 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 462
+// entity 457
 {
 "classname" "func_group"
 // brush 0
@@ -30406,7 +30378,7 @@
 ( 1752 -1488 432 ) ( 1752 -1360 432 ) ( 1624 -1360 432 ) stralenex1/stralenex_roundlight 32 14 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 463
+// entity 458
 {
 "classname" "func_group"
 // brush 0
@@ -30420,7 +30392,7 @@
 ( 1368 -1488 432 ) ( 1368 -1360 432 ) ( 1240 -1360 432 ) stralenex1/stralenex_roundlight 32 14 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 464
+// entity 459
 {
 "classname" "func_group"
 // brush 0
@@ -30544,7 +30516,7 @@
 ( 1536 -1728 -320 ) ( 1536 -1728 -448 ) ( 1536 -1792 -512 ) common/caulk 32 0 -180 0.5 -0.5 134217728 4 0
 }
 }
-// entity 465
+// entity 460
 {
 "classname" "func_group"
 // brush 0
@@ -30668,7 +30640,7 @@
 ( 1376 -1784 -320 ) ( 1384 -1784 -320 ) ( 1384 -1784 -256 ) e7/e7brnmetal 128 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 466
+// entity 461
 {
 "classname" "func_group"
 // brush 0
@@ -30792,7 +30764,7 @@
 ( 1344 -1664 -320 ) ( 1344 -1664 -448 ) ( 1344 -1600 -512 ) common/caulk -32 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 467
+// entity 462
 {
 "classname" "func_group"
 // brush 0
@@ -30916,112 +30888,112 @@
 ( 1504 -1608 -320 ) ( 1496 -1608 -320 ) ( 1496 -1608 -256 ) e7/e7brnmetal 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 468
+// entity 463
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1376 -1344 128"
 "light" "350"
 }
-// entity 469
+// entity 464
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1912 -1240 128"
 "light" "700"
 }
-// entity 470
+// entity 465
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2392 -1272 -88"
 "light" "450"
 }
-// entity 471
+// entity 466
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1720 -1704 -160"
 "light" "150"
 }
-// entity 472
+// entity 467
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1736 -1352 -400"
 "light" "350"
 }
-// entity 473
+// entity 468
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2000 -1168 -576"
 "light" "400"
 }
-// entity 474
+// entity 469
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2416 -648 -152"
 "light" "500"
 }
-// entity 475
+// entity 470
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1920 -64 -176"
 "light" "350"
 }
-// entity 476
+// entity 471
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1472 -960 -640"
 "light" "200"
 }
-// entity 477
+// entity 472
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1688 -1008 -640"
 "light" "200"
 }
-// entity 478
+// entity 473
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1472 -1208 -640"
 "light" "200"
 }
-// entity 479
+// entity 474
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1464 -1472 -640"
 "light" "200"
 }
-// entity 480
+// entity 475
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1616 -1336 312"
 "light" "350"
 }
-// entity 481
+// entity 476
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1616 -1344 -48"
 "light" "350"
 }
-// entity 482
+// entity 477
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2440 -96 -216"
 "light" "200"
 }
-// entity 483
+// entity 478
 {
 "classname" "func_group"
 // brush 0
@@ -31108,28 +31080,28 @@
 ( 1792 -40 -640 ) ( 1792 -88 -640 ) ( 1816 -88 -640 ) common/caulk 0 -1 90 0.5 0.5 134217728 4 0
 }
 }
-// entity 484
+// entity 479
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2016 -680 -72"
 "light" "350"
 }
-// entity 485
+// entity 480
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1568 -688 72"
 "light" "350"
 }
-// entity 486
+// entity 481
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1200 -376 24"
 "light" "500"
 }
-// entity 487
+// entity 482
 {
 "classname" "light"
 "target" "t87"
@@ -31137,7 +31109,7 @@
 "origin" "1016 -288 -112"
 "light" "900"
 }
-// entity 488
+// entity 483
 {
 "classname" "light"
 "target" "t88"
@@ -31145,7 +31117,7 @@
 "origin" "1016 -160 -112"
 "light" "900"
 }
-// entity 489
+// entity 484
 {
 "classname" "light"
 "target" "t89"
@@ -31153,7 +31125,7 @@
 "origin" "1016 -32 -112"
 "light" "900"
 }
-// entity 490
+// entity 485
 {
 "classname" "light"
 "target" "t90"
@@ -31161,7 +31133,7 @@
 "origin" "1016 96 -112"
 "light" "900"
 }
-// entity 491
+// entity 486
 {
 "classname" "light"
 "target" "t91"
@@ -31169,7 +31141,7 @@
 "origin" "1352 96 -112"
 "light" "900"
 }
-// entity 492
+// entity 487
 {
 "classname" "light"
 "target" "t92"
@@ -31177,7 +31149,7 @@
 "origin" "1352 -32 -112"
 "light" "900"
 }
-// entity 493
+// entity 488
 {
 "classname" "light"
 "target" "t93"
@@ -31185,7 +31157,7 @@
 "origin" "1352 -160 -112"
 "light" "900"
 }
-// entity 494
+// entity 489
 {
 "classname" "light"
 "target" "t94"
@@ -31193,7 +31165,7 @@
 "origin" "1352 -288 -112"
 "light" "900"
 }
-// entity 495
+// entity 490
 {
 "classname" "light"
 "target" "t95"
@@ -31201,7 +31173,7 @@
 "origin" "1352 608 -112"
 "light" "900"
 }
-// entity 496
+// entity 491
 {
 "classname" "light"
 "target" "t96"
@@ -31209,7 +31181,7 @@
 "origin" "1352 480 -112"
 "light" "900"
 }
-// entity 497
+// entity 492
 {
 "classname" "light"
 "target" "t97"
@@ -31217,7 +31189,7 @@
 "origin" "1352 352 -112"
 "light" "900"
 }
-// entity 498
+// entity 493
 {
 "classname" "light"
 "target" "t98"
@@ -31225,7 +31197,7 @@
 "origin" "1352 224 -112"
 "light" "900"
 }
-// entity 499
+// entity 494
 {
 "classname" "light"
 "target" "t99"
@@ -31233,7 +31205,7 @@
 "origin" "896 248 -112"
 "light" "900"
 }
-// entity 500
+// entity 495
 {
 "classname" "light"
 "target" "t100"
@@ -31241,7 +31213,7 @@
 "origin" "768 248 -112"
 "light" "900"
 }
-// entity 501
+// entity 496
 {
 "classname" "light"
 "target" "t101"
@@ -31249,7 +31221,7 @@
 "origin" "640 248 -112"
 "light" "900"
 }
-// entity 502
+// entity 497
 {
 "classname" "light"
 "target" "t102"
@@ -31257,7 +31229,7 @@
 "origin" "512 248 -112"
 "light" "900"
 }
-// entity 503
+// entity 498
 {
 "classname" "light"
 "target" "t103"
@@ -31265,7 +31237,7 @@
 "origin" "512 648 -112"
 "light" "900"
 }
-// entity 504
+// entity 499
 {
 "classname" "light"
 "target" "t104"
@@ -31273,7 +31245,7 @@
 "origin" "640 648 -112"
 "light" "900"
 }
-// entity 505
+// entity 500
 {
 "classname" "light"
 "target" "t105"
@@ -31281,7 +31253,7 @@
 "origin" "768 648 -112"
 "light" "900"
 }
-// entity 506
+// entity 501
 {
 "classname" "light"
 "target" "t106"
@@ -31289,7 +31261,7 @@
 "origin" "896 648 -112"
 "light" "900"
 }
-// entity 507
+// entity 502
 {
 "classname" "light"
 "target" "t107"
@@ -31297,7 +31269,7 @@
 "origin" "384 648 -112"
 "light" "900"
 }
-// entity 508
+// entity 503
 {
 "classname" "light"
 "target" "t108"
@@ -31305,7 +31277,7 @@
 "origin" "384 248 -112"
 "light" "900"
 }
-// entity 509
+// entity 504
 {
 "classname" "light"
 "target" "t109"
@@ -31313,7 +31285,7 @@
 "origin" "312 320 -112"
 "light" "900"
 }
-// entity 510
+// entity 505
 {
 "classname" "light"
 "target" "t110"
@@ -31321,7 +31293,7 @@
 "origin" "312 448 -112"
 "light" "900"
 }
-// entity 511
+// entity 506
 {
 "classname" "light"
 "target" "t111"
@@ -31329,7 +31301,7 @@
 "origin" "312 576 -112"
 "light" "900"
 }
-// entity 512
+// entity 507
 {
 "classname" "light"
 "target" "t112"
@@ -31337,7 +31309,7 @@
 "origin" "1608 864 -112"
 "light" "900"
 }
-// entity 513
+// entity 508
 {
 "classname" "light"
 "target" "t113"
@@ -31345,7 +31317,7 @@
 "origin" "1608 992 -112"
 "light" "900"
 }
-// entity 514
+// entity 509
 {
 "classname" "light"
 "target" "t114"
@@ -31353,7 +31325,7 @@
 "origin" "1352 1216 -112"
 "light" "900"
 }
-// entity 515
+// entity 510
 {
 "classname" "light"
 "target" "t115"
@@ -31361,7 +31333,7 @@
 "origin" "1504 760 -112"
 "light" "900"
 }
-// entity 516
+// entity 511
 {
 "classname" "light"
 "target" "t116"
@@ -31369,7 +31341,7 @@
 "origin" "1504 1096 -112"
 "light" "900"
 }
-// entity 517
+// entity 512
 {
 "classname" "light"
 "target" "t117"
@@ -31377,7 +31349,7 @@
 "origin" "1016 1216 -112"
 "light" "900"
 }
-// entity 518
+// entity 513
 {
 "classname" "light"
 "target" "t118"
@@ -31385,7 +31357,7 @@
 "origin" "1136 1384 -112"
 "light" "900"
 }
-// entity 519
+// entity 514
 {
 "classname" "light"
 "target" "t119"
@@ -31393,7 +31365,7 @@
 "origin" "1232 1384 -112"
 "light" "900"
 }
-// entity 520
+// entity 515
 {
 "classname" "light"
 "target" "t120"
@@ -31401,7 +31373,7 @@
 "origin" "1016 1056 -112"
 "light" "900"
 }
-// entity 521
+// entity 516
 {
 "classname" "light"
 "target" "t121"
@@ -31409,7 +31381,7 @@
 "origin" "1016 928 -112"
 "light" "900"
 }
-// entity 522
+// entity 517
 {
 "classname" "light"
 "target" "t122"
@@ -31417,7 +31389,7 @@
 "origin" "1016 800 -112"
 "light" "900"
 }
-// entity 523
+// entity 518
 {
 "classname" "light"
 "target" "t123"
@@ -31425,7 +31397,7 @@
 "origin" "864 -440 -112"
 "light" "900"
 }
-// entity 524
+// entity 519
 {
 "classname" "light"
 "target" "t124"
@@ -31433,7 +31405,7 @@
 "origin" "736 -440 -112"
 "light" "900"
 }
-// entity 525
+// entity 520
 {
 "classname" "light"
 "target" "t125"
@@ -31441,7 +31413,7 @@
 "origin" "736 -904 -112"
 "light" "900"
 }
-// entity 526
+// entity 521
 {
 "classname" "light"
 "target" "t126"
@@ -31449,7 +31421,7 @@
 "origin" "864 -904 -112"
 "light" "900"
 }
-// entity 527
+// entity 522
 {
 "classname" "light"
 "target" "t127"
@@ -31457,7 +31429,7 @@
 "origin" "992 -904 -112"
 "light" "900"
 }
-// entity 528
+// entity 523
 {
 "classname" "light"
 "target" "t128"
@@ -31465,7 +31437,7 @@
 "origin" "1696 -504 -112"
 "light" "900"
 }
-// entity 529
+// entity 524
 {
 "classname" "light"
 "target" "t129"
@@ -31473,7 +31445,7 @@
 "origin" "1568 -504 -112"
 "light" "900"
 }
-// entity 530
+// entity 525
 {
 "classname" "light"
 "target" "t130"
@@ -31481,7 +31453,7 @@
 "origin" "2048 -504 -112"
 "light" "900"
 }
-// entity 531
+// entity 526
 {
 "classname" "light"
 "target" "t131"
@@ -31489,7 +31461,7 @@
 "origin" "1920 -504 -112"
 "light" "900"
 }
-// entity 532
+// entity 527
 {
 "classname" "light"
 "target" "t132"
@@ -31497,7 +31469,7 @@
 "origin" "2176 -504 -112"
 "light" "900"
 }
-// entity 533
+// entity 528
 {
 "classname" "light"
 "target" "t133"
@@ -31505,7 +31477,7 @@
 "origin" "1128 -1056 -112"
 "light" "900"
 }
-// entity 534
+// entity 529
 {
 "classname" "light"
 "target" "t134"
@@ -31513,7 +31485,7 @@
 "origin" "1128 -1184 -112"
 "light" "900"
 }
-// entity 535
+// entity 530
 {
 "classname" "light"
 "target" "t135"
@@ -31521,7 +31493,7 @@
 "origin" "1920 136 -1008"
 "light" "900"
 }
-// entity 536
+// entity 531
 {
 "classname" "light"
 "target" "t136"
@@ -31529,7 +31501,7 @@
 "origin" "2120 -64 -1008"
 "light" "900"
 }
-// entity 537
+// entity 532
 {
 "classname" "light"
 "target" "t137"
@@ -31537,7 +31509,7 @@
 "origin" "1920 -264 -1008"
 "light" "900"
 }
-// entity 538
+// entity 533
 {
 "classname" "light"
 "target" "t138"
@@ -31545,7 +31517,7 @@
 "origin" "1632 -136 -1008"
 "light" "900"
 }
-// entity 539
+// entity 534
 {
 "classname" "light"
 "target" "t139"
@@ -31553,7 +31525,7 @@
 "origin" "1632 8 -1008"
 "light" "900"
 }
-// entity 540
+// entity 535
 {
 "classname" "light"
 "target" "t140"
@@ -31561,7 +31533,7 @@
 "origin" "1272 -128 -1008"
 "light" "900"
 }
-// entity 541
+// entity 536
 {
 "classname" "light"
 "target" "t141"
@@ -31569,7 +31541,7 @@
 "origin" "1272 64 -1008"
 "light" "900"
 }
-// entity 542
+// entity 537
 {
 "classname" "light"
 "target" "t142"
@@ -31577,7 +31549,7 @@
 "origin" "1272 256 -1008"
 "light" "900"
 }
-// entity 543
+// entity 538
 {
 "classname" "light"
 "target" "t143"
@@ -31585,7 +31557,7 @@
 "origin" "1480 160 -1008"
 "light" "900"
 }
-// entity 544
+// entity 539
 {
 "classname" "light"
 "target" "t144"
@@ -31593,7 +31565,7 @@
 "origin" "1480 352 -1008"
 "light" "900"
 }
-// entity 545
+// entity 540
 {
 "classname" "light"
 "target" "t145"
@@ -31601,7 +31573,7 @@
 "origin" "1480 -288 -1008"
 "light" "900"
 }
-// entity 546
+// entity 541
 {
 "classname" "light"
 "target" "t146"
@@ -31609,7 +31581,7 @@
 "origin" "1480 -480 -1008"
 "light" "900"
 }
-// entity 547
+// entity 542
 {
 "classname" "light"
 "target" "t147"
@@ -31617,7 +31589,7 @@
 "origin" "1480 -672 -1008"
 "light" "900"
 }
-// entity 548
+// entity 543
 {
 "classname" "light"
 "target" "t148"
@@ -31625,7 +31597,7 @@
 "origin" "1184 -968 -1008"
 "light" "900"
 }
-// entity 549
+// entity 544
 {
 "classname" "light"
 "target" "t149"
@@ -31633,7 +31605,7 @@
 "origin" "1080 -864 -1008"
 "light" "900"
 }
-// entity 550
+// entity 545
 {
 "classname" "light"
 "target" "t150"
@@ -31641,7 +31613,7 @@
 "origin" "736 -312 -1008"
 "light" "900"
 }
-// entity 551
+// entity 546
 {
 "classname" "light"
 "target" "t151"
@@ -31649,7 +31621,7 @@
 "origin" "928 -312 -1008"
 "light" "900"
 }
-// entity 552
+// entity 547
 {
 "classname" "light"
 "target" "t152"
@@ -31657,7 +31629,7 @@
 "origin" "1120 -312 -1008"
 "light" "900"
 }
-// entity 553
+// entity 548
 {
 "classname" "light"
 "target" "t153"
@@ -31665,7 +31637,7 @@
 "origin" "1152 712 -1008"
 "light" "900"
 }
-// entity 554
+// entity 549
 {
 "classname" "light"
 "target" "t154"
@@ -31673,7 +31645,7 @@
 "origin" "960 712 -1008"
 "light" "900"
 }
-// entity 555
+// entity 550
 {
 "classname" "light"
 "target" "t155"
@@ -31681,7 +31653,7 @@
 "origin" "768 712 -1008"
 "light" "900"
 }
-// entity 556
+// entity 551
 {
 "classname" "light"
 "target" "t156"
@@ -31689,7 +31661,7 @@
 "origin" "768 440 -1008"
 "light" "900"
 }
-// entity 557
+// entity 552
 {
 "classname" "light"
 "target" "t157"
@@ -31697,7 +31669,7 @@
 "origin" "960 440 -1008"
 "light" "900"
 }
-// entity 558
+// entity 553
 {
 "classname" "light"
 "target" "t158"
@@ -31705,21 +31677,21 @@
 "origin" "1152 440 -1008"
 "light" "900"
 }
-// entity 559
+// entity 554
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2176 -1288 312"
 "light" "350"
 }
-// entity 560
+// entity 555
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2176 -1296 -48"
 "light" "350"
 }
-// entity 561
+// entity 556
 {
 "classname" "light"
 "target" "t159"
@@ -31727,7 +31699,7 @@
 "origin" "624 32 424"
 "light" "400"
 }
-// entity 562
+// entity 557
 {
 "classname" "light"
 "target" "t160"
@@ -31735,7 +31707,7 @@
 "origin" "624 -96 424"
 "light" "400"
 }
-// entity 563
+// entity 558
 {
 "classname" "light"
 "target" "t161"
@@ -31743,7 +31715,7 @@
 "origin" "624 -224 424"
 "light" "400"
 }
-// entity 564
+// entity 559
 {
 "classname" "light"
 "target" "t162"
@@ -31751,7 +31723,7 @@
 "origin" "624 -352 424"
 "light" "400"
 }
-// entity 565
+// entity 560
 {
 "classname" "light"
 "target" "t163"
@@ -31759,7 +31731,7 @@
 "origin" "624 160 424"
 "light" "400"
 }
-// entity 566
+// entity 561
 {
 "classname" "light"
 "target" "t164"
@@ -31767,7 +31739,7 @@
 "origin" "704 -464 424"
 "light" "400"
 }
-// entity 567
+// entity 562
 {
 "classname" "light"
 "target" "t165"
@@ -31775,7 +31747,7 @@
 "origin" "832 -464 424"
 "light" "400"
 }
-// entity 568
+// entity 563
 {
 "classname" "light"
 "target" "t166"
@@ -31783,7 +31755,7 @@
 "origin" "960 -464 424"
 "light" "400"
 }
-// entity 569
+// entity 564
 {
 "classname" "light"
 "target" "t167"
@@ -31791,7 +31763,7 @@
 "origin" "1040 -352 424"
 "light" "400"
 }
-// entity 570
+// entity 565
 {
 "classname" "light"
 "target" "t168"
@@ -31799,7 +31771,7 @@
 "origin" "1040 -224 424"
 "light" "400"
 }
-// entity 571
+// entity 566
 {
 "classname" "light"
 "target" "t169"
@@ -31807,7 +31779,7 @@
 "origin" "1040 -96 424"
 "light" "400"
 }
-// entity 572
+// entity 567
 {
 "classname" "light"
 "target" "t170"
@@ -31815,7 +31787,7 @@
 "origin" "1040 32 424"
 "light" "400"
 }
-// entity 573
+// entity 568
 {
 "classname" "light"
 "target" "t171"
@@ -31823,7 +31795,7 @@
 "origin" "1040 160 424"
 "light" "400"
 }
-// entity 574
+// entity 569
 {
 "classname" "light"
 "target" "t172"
@@ -31831,7 +31803,7 @@
 "origin" "960 272 424"
 "light" "400"
 }
-// entity 575
+// entity 570
 {
 "classname" "light"
 "target" "t173"
@@ -31839,7 +31811,7 @@
 "origin" "832 272 424"
 "light" "400"
 }
-// entity 576
+// entity 571
 {
 "classname" "light"
 "target" "t174"
@@ -31847,7 +31819,7 @@
 "origin" "704 272 424"
 "light" "400"
 }
-// entity 577
+// entity 572
 {
 "classname" "light"
 "target" "t175"
@@ -31855,7 +31827,7 @@
 "origin" "1024 -880 424"
 "light" "400"
 }
-// entity 578
+// entity 573
 {
 "classname" "light"
 "target" "t176"
@@ -31863,7 +31835,7 @@
 "origin" "896 -880 424"
 "light" "400"
 }
-// entity 579
+// entity 574
 {
 "classname" "light"
 "target" "t177"
@@ -31871,7 +31843,7 @@
 "origin" "768 -880 424"
 "light" "400"
 }
-// entity 580
+// entity 575
 {
 "classname" "light"
 "target" "t178"
@@ -31879,7 +31851,7 @@
 "origin" "640 -880 424"
 "light" "400"
 }
-// entity 581
+// entity 576
 {
 "classname" "light"
 "target" "t179"
@@ -31887,7 +31859,7 @@
 "origin" "512 -880 424"
 "light" "400"
 }
-// entity 582
+// entity 577
 {
 "classname" "light"
 "target" "t180"
@@ -31895,7 +31867,7 @@
 "origin" "384 -880 424"
 "light" "400"
 }
-// entity 583
+// entity 578
 {
 "classname" "light"
 "target" "t181"
@@ -31903,7 +31875,7 @@
 "origin" "256 -880 424"
 "light" "400"
 }
-// entity 584
+// entity 579
 {
 "classname" "light"
 "target" "t182"
@@ -31911,7 +31883,7 @@
 "origin" "128 -880 424"
 "light" "400"
 }
-// entity 585
+// entity 580
 {
 "classname" "light"
 "target" "t183"
@@ -31919,7 +31891,7 @@
 "origin" "-240 -544 424"
 "light" "400"
 }
-// entity 586
+// entity 581
 {
 "classname" "light"
 "target" "t184"
@@ -31927,7 +31899,7 @@
 "origin" "-320 -432 424"
 "light" "400"
 }
-// entity 587
+// entity 582
 {
 "classname" "light"
 "target" "t185"
@@ -31935,7 +31907,7 @@
 "origin" "-448 -432 424"
 "light" "400"
 }
-// entity 588
+// entity 583
 {
 "classname" "light"
 "target" "t186"
@@ -31943,7 +31915,7 @@
 "origin" "-576 -432 424"
 "light" "400"
 }
-// entity 589
+// entity 584
 {
 "classname" "light"
 "target" "t187"
@@ -31951,7 +31923,7 @@
 "origin" "-704 -432 424"
 "light" "400"
 }
-// entity 590
+// entity 585
 {
 "classname" "light"
 "target" "t188"
@@ -31959,7 +31931,7 @@
 "origin" "-832 -432 424"
 "light" "400"
 }
-// entity 591
+// entity 586
 {
 "classname" "light"
 "target" "t189"
@@ -31967,7 +31939,7 @@
 "origin" "-880 -320 424"
 "light" "400"
 }
-// entity 592
+// entity 587
 {
 "classname" "light"
 "target" "t190"
@@ -31975,7 +31947,7 @@
 "origin" "-880 -192 424"
 "light" "400"
 }
-// entity 593
+// entity 588
 {
 "classname" "light"
 "target" "t191"
@@ -31983,7 +31955,7 @@
 "origin" "-880 -64 424"
 "light" "400"
 }
-// entity 594
+// entity 589
 {
 "classname" "light"
 "target" "t192"
@@ -31991,7 +31963,7 @@
 "origin" "-880 64 424"
 "light" "400"
 }
-// entity 595
+// entity 590
 {
 "classname" "light"
 "target" "t193"
@@ -31999,7 +31971,7 @@
 "origin" "-880 192 424"
 "light" "400"
 }
-// entity 596
+// entity 591
 {
 "classname" "light"
 "target" "t194"
@@ -32007,7 +31979,7 @@
 "origin" "-880 320 424"
 "light" "400"
 }
-// entity 597
+// entity 592
 {
 "classname" "light"
 "target" "t195"
@@ -32015,7 +31987,7 @@
 "origin" "-880 448 424"
 "light" "400"
 }
-// entity 598
+// entity 593
 {
 "classname" "light"
 "target" "t196"
@@ -32023,7 +31995,7 @@
 "origin" "-880 576 424"
 "light" "400"
 }
-// entity 599
+// entity 594
 {
 "classname" "light"
 "target" "t197"
@@ -32031,7 +32003,7 @@
 "origin" "-880 704 424"
 "light" "400"
 }
-// entity 600
+// entity 595
 {
 "classname" "light"
 "target" "t198"
@@ -32039,7 +32011,7 @@
 "origin" "-880 832 424"
 "light" "400"
 }
-// entity 601
+// entity 596
 {
 "classname" "light"
 "target" "t199"
@@ -32047,7 +32019,7 @@
 "origin" "-880 960 424"
 "light" "400"
 }
-// entity 602
+// entity 597
 {
 "classname" "light"
 "target" "t200"
@@ -32055,7 +32027,7 @@
 "origin" "-832 1072 424"
 "light" "400"
 }
-// entity 603
+// entity 598
 {
 "classname" "light"
 "target" "t201"
@@ -32063,7 +32035,7 @@
 "origin" "-704 1072 424"
 "light" "400"
 }
-// entity 604
+// entity 599
 {
 "classname" "light"
 "target" "t202"
@@ -32071,7 +32043,7 @@
 "origin" "-576 1072 424"
 "light" "400"
 }
-// entity 605
+// entity 600
 {
 "classname" "light"
 "target" "t203"
@@ -32079,7 +32051,7 @@
 "origin" "-448 1072 424"
 "light" "400"
 }
-// entity 606
+// entity 601
 {
 "classname" "light"
 "target" "t204"
@@ -32087,7 +32059,7 @@
 "origin" "-320 1072 424"
 "light" "400"
 }
-// entity 607
+// entity 602
 {
 "classname" "light"
 "target" "t205"
@@ -32095,7 +32067,7 @@
 "origin" "-160 1520 424"
 "light" "400"
 }
-// entity 608
+// entity 603
 {
 "classname" "light"
 "target" "t206"
@@ -32103,7 +32075,7 @@
 "origin" "-32 1520 424"
 "light" "400"
 }
-// entity 609
+// entity 604
 {
 "classname" "light"
 "target" "t207"
@@ -32111,7 +32083,7 @@
 "origin" "96 1520 424"
 "light" "400"
 }
-// entity 610
+// entity 605
 {
 "classname" "light"
 "target" "t208"
@@ -32119,7 +32091,7 @@
 "origin" "224 1520 424"
 "light" "400"
 }
-// entity 611
+// entity 606
 {
 "classname" "light"
 "target" "t209"
@@ -32127,7 +32099,7 @@
 "origin" "-240 1184 424"
 "light" "400"
 }
-// entity 612
+// entity 607
 {
 "classname" "light"
 "target" "t210"
@@ -32135,7 +32107,7 @@
 "origin" "-240 1312 424"
 "light" "400"
 }
-// entity 613
+// entity 608
 {
 "classname" "light"
 "target" "t211"
@@ -32143,7 +32115,7 @@
 "origin" "-240 1440 424"
 "light" "400"
 }
-// entity 614
+// entity 609
 {
 "classname" "light"
 "target" "t212"
@@ -32151,7 +32123,7 @@
 "origin" "-320 720 424"
 "light" "400"
 }
-// entity 615
+// entity 610
 {
 "classname" "light"
 "target" "t213"
@@ -32159,7 +32131,7 @@
 "origin" "-448 720 424"
 "light" "400"
 }
-// entity 616
+// entity 611
 {
 "classname" "light"
 "target" "t214"
@@ -32167,7 +32139,7 @@
 "origin" "-528 640 424"
 "light" "400"
 }
-// entity 617
+// entity 612
 {
 "classname" "light"
 "target" "t215"
@@ -32175,7 +32147,7 @@
 "origin" "-528 512 424"
 "light" "400"
 }
-// entity 618
+// entity 613
 {
 "classname" "light"
 "target" "t216"
@@ -32183,7 +32155,7 @@
 "origin" "-528 384 424"
 "light" "400"
 }
-// entity 619
+// entity 614
 {
 "classname" "light"
 "target" "t217"
@@ -32191,7 +32163,7 @@
 "origin" "-528 256 424"
 "light" "400"
 }
-// entity 620
+// entity 615
 {
 "classname" "light"
 "target" "t218"
@@ -32199,7 +32171,7 @@
 "origin" "-528 128 424"
 "light" "400"
 }
-// entity 621
+// entity 616
 {
 "classname" "light"
 "target" "t219"
@@ -32207,7 +32179,7 @@
 "origin" "-528 0 424"
 "light" "400"
 }
-// entity 622
+// entity 617
 {
 "classname" "light"
 "target" "t220"
@@ -32215,7 +32187,7 @@
 "origin" "-448 -80 424"
 "light" "400"
 }
-// entity 623
+// entity 618
 {
 "classname" "light"
 "target" "t221"
@@ -32223,7 +32195,7 @@
 "origin" "-320 -80 424"
 "light" "400"
 }
-// entity 624
+// entity 619
 {
 "classname" "light"
 "target" "t222"
@@ -32231,7 +32203,7 @@
 "origin" "-240 0 424"
 "light" "400"
 }
-// entity 625
+// entity 620
 {
 "classname" "light"
 "target" "t223"
@@ -32239,7 +32211,7 @@
 "origin" "-240 128 424"
 "light" "400"
 }
-// entity 626
+// entity 621
 {
 "classname" "light"
 "target" "t224"
@@ -32247,7 +32219,7 @@
 "origin" "-240 256 424"
 "light" "400"
 }
-// entity 627
+// entity 622
 {
 "classname" "light"
 "target" "t225"
@@ -32255,7 +32227,7 @@
 "origin" "-240 384 424"
 "light" "400"
 }
-// entity 628
+// entity 623
 {
 "classname" "light"
 "target" "t226"
@@ -32263,7 +32235,7 @@
 "origin" "-240 512 424"
 "light" "400"
 }
-// entity 629
+// entity 624
 {
 "classname" "light"
 "target" "t227"
@@ -32271,7 +32243,7 @@
 "origin" "-240 640 424"
 "light" "400"
 }
-// entity 630
+// entity 625
 {
 "classname" "light"
 "target" "t228"
@@ -32279,7 +32251,7 @@
 "origin" "112 992 424"
 "light" "400"
 }
-// entity 631
+// entity 626
 {
 "classname" "light"
 "target" "t229"
@@ -32287,7 +32259,7 @@
 "origin" "112 864 424"
 "light" "400"
 }
-// entity 632
+// entity 627
 {
 "classname" "light"
 "target" "t230"
@@ -32295,7 +32267,7 @@
 "origin" "112 736 424"
 "light" "400"
 }
-// entity 633
+// entity 628
 {
 "classname" "light"
 "target" "t231"
@@ -32303,7 +32275,7 @@
 "origin" "112 608 424"
 "light" "400"
 }
-// entity 634
+// entity 629
 {
 "classname" "light"
 "target" "t232"
@@ -32311,7 +32283,7 @@
 "origin" "112 480 424"
 "light" "400"
 }
-// entity 635
+// entity 630
 {
 "classname" "light"
 "target" "t233"
@@ -32319,7 +32291,7 @@
 "origin" "112 352 424"
 "light" "400"
 }
-// entity 636
+// entity 631
 {
 "classname" "light"
 "target" "t234"
@@ -32327,7 +32299,7 @@
 "origin" "224 240 424"
 "light" "400"
 }
-// entity 637
+// entity 632
 {
 "classname" "light"
 "target" "t235"
@@ -32335,7 +32307,7 @@
 "origin" "224 240 104"
 "light" "400"
 }
-// entity 638
+// entity 633
 {
 "classname" "light"
 "target" "t236"
@@ -32343,7 +32315,7 @@
 "origin" "-168 -704 424"
 "light" "400"
 }
-// entity 639
+// entity 634
 {
 "classname" "light"
 "target" "t237"
@@ -32351,7 +32323,7 @@
 "origin" "-56 -816 424"
 "light" "400"
 }
-// entity 640
+// entity 635
 {
 "classname" "light"
 "target" "t238"
@@ -32359,7 +32331,7 @@
 "origin" "1328 32 424"
 "light" "400"
 }
-// entity 641
+// entity 636
 {
 "classname" "light"
 "target" "t239"
@@ -32367,7 +32339,7 @@
 "origin" "1328 -96 424"
 "light" "400"
 }
-// entity 642
+// entity 637
 {
 "classname" "light"
 "target" "t240"
@@ -32375,7 +32347,7 @@
 "origin" "1328 -224 424"
 "light" "400"
 }
-// entity 643
+// entity 638
 {
 "classname" "light"
 "target" "t241"
@@ -32383,7 +32355,7 @@
 "origin" "1328 -344 424"
 "light" "400"
 }
-// entity 644
+// entity 639
 {
 "classname" "light"
 "target" "t242"
@@ -32391,7 +32363,7 @@
 "origin" "1328 -464 424"
 "light" "400"
 }
-// entity 645
+// entity 640
 {
 "classname" "light"
 "target" "t243"
@@ -32399,7 +32371,7 @@
 "origin" "1328 688 424"
 "light" "400"
 }
-// entity 646
+// entity 641
 {
 "classname" "light"
 "target" "t244"
@@ -32407,7 +32379,7 @@
 "origin" "1328 560 424"
 "light" "400"
 }
-// entity 647
+// entity 642
 {
 "classname" "light"
 "target" "t245"
@@ -32415,7 +32387,7 @@
 "origin" "1328 432 424"
 "light" "400"
 }
-// entity 648
+// entity 643
 {
 "classname" "light"
 "target" "t246"
@@ -32423,7 +32395,7 @@
 "origin" "1328 304 424"
 "light" "400"
 }
-// entity 649
+// entity 644
 {
 "classname" "light"
 "target" "t247"
@@ -32431,7 +32403,7 @@
 "origin" "1328 176 424"
 "light" "400"
 }
-// entity 650
+// entity 645
 {
 "classname" "light"
 "target" "t248"
@@ -32439,7 +32411,7 @@
 "origin" "1328 1728 424"
 "light" "400"
 }
-// entity 651
+// entity 646
 {
 "classname" "light"
 "target" "t249"
@@ -32447,7 +32419,7 @@
 "origin" "1328 1600 424"
 "light" "400"
 }
-// entity 652
+// entity 647
 {
 "classname" "light"
 "target" "t250"
@@ -32455,7 +32427,7 @@
 "origin" "1328 1472 424"
 "light" "400"
 }
-// entity 653
+// entity 648
 {
 "classname" "light"
 "target" "t251"
@@ -32463,7 +32435,7 @@
 "origin" "1328 1344 424"
 "light" "400"
 }
-// entity 654
+// entity 649
 {
 "classname" "light"
 "target" "t252"
@@ -32471,7 +32443,7 @@
 "origin" "1328 1216 424"
 "light" "400"
 }
-// entity 655
+// entity 650
 {
 "classname" "light"
 "target" "t254"
@@ -32479,7 +32451,7 @@
 "origin" "832 1840 424"
 "light" "400"
 }
-// entity 656
+// entity 651
 {
 "classname" "light"
 "target" "t255"
@@ -32487,7 +32459,7 @@
 "origin" "960 1840 424"
 "light" "400"
 }
-// entity 657
+// entity 652
 {
 "classname" "light"
 "target" "t256"
@@ -32495,7 +32467,7 @@
 "origin" "1088 1840 424"
 "light" "400"
 }
-// entity 658
+// entity 653
 {
 "classname" "light"
 "target" "t257"
@@ -32503,7 +32475,7 @@
 "origin" "1216 1840 424"
 "light" "400"
 }
-// entity 659
+// entity 654
 {
 "classname" "light"
 "target" "t258"
@@ -32511,7 +32483,7 @@
 "origin" "336 480 424"
 "light" "400"
 }
-// entity 660
+// entity 655
 {
 "classname" "light"
 "target" "t259"
@@ -32519,7 +32491,7 @@
 "origin" "336 608 424"
 "light" "400"
 }
-// entity 661
+// entity 656
 {
 "classname" "light"
 "target" "t260"
@@ -32527,7 +32499,7 @@
 "origin" "336 736 424"
 "light" "400"
 }
-// entity 662
+// entity 657
 {
 "classname" "light"
 "target" "t261"
@@ -32535,7 +32507,7 @@
 "origin" "336 864 424"
 "light" "400"
 }
-// entity 663
+// entity 658
 {
 "classname" "light"
 "target" "t262"
@@ -32543,7 +32515,7 @@
 "origin" "336 352 424"
 "light" "400"
 }
-// entity 664
+// entity 659
 {
 "classname" "light"
 "target" "t263"
@@ -32551,7 +32523,7 @@
 "origin" "224 1104 424"
 "light" "400"
 }
-// entity 665
+// entity 660
 {
 "classname" "light"
 "target" "t264"
@@ -32559,7 +32531,7 @@
 "origin" "1424 -528 424"
 "light" "400"
 }
-// entity 666
+// entity 661
 {
 "classname" "light"
 "target" "t265"
@@ -32567,7 +32539,7 @@
 "origin" "1552 -528 424"
 "light" "400"
 }
-// entity 667
+// entity 662
 {
 "classname" "light"
 "target" "t266"
@@ -32575,7 +32547,7 @@
 "origin" "1680 -528 424"
 "light" "400"
 }
-// entity 668
+// entity 663
 {
 "classname" "light"
 "target" "t267"
@@ -32583,7 +32555,7 @@
 "origin" "1952 -528 392"
 "light" "400"
 }
-// entity 669
+// entity 664
 {
 "classname" "light"
 "target" "t268"
@@ -32591,7 +32563,7 @@
 "origin" "2080 -528 392"
 "light" "400"
 }
-// entity 670
+// entity 665
 {
 "classname" "light"
 "target" "t269"
@@ -32599,7 +32571,7 @@
 "origin" "2208 -528 392"
 "light" "400"
 }
-// entity 671
+// entity 666
 {
 "classname" "light"
 "target" "t270"
@@ -32607,7 +32579,7 @@
 "origin" "2336 -528 392"
 "light" "400"
 }
-// entity 672
+// entity 667
 {
 "classname" "light"
 "target" "t271"
@@ -32615,7 +32587,7 @@
 "origin" "2464 -528 392"
 "light" "400"
 }
-// entity 673
+// entity 668
 {
 "classname" "light"
 "target" "t272"
@@ -32623,7 +32595,7 @@
 "origin" "2576 -624 392"
 "light" "400"
 }
-// entity 674
+// entity 669
 {
 "classname" "light"
 "target" "t273"
@@ -32631,7 +32603,7 @@
 "origin" "2576 -752 392"
 "light" "400"
 }
-// entity 675
+// entity 670
 {
 "classname" "light"
 "target" "t274"
@@ -32639,7 +32611,7 @@
 "origin" "2576 -1112 392"
 "light" "400"
 }
-// entity 676
+// entity 671
 {
 "classname" "light"
 "target" "t275"
@@ -32647,7 +32619,7 @@
 "origin" "2576 -1240 392"
 "light" "400"
 }
-// entity 677
+// entity 672
 {
 "classname" "light"
 "target" "t276"
@@ -32655,7 +32627,7 @@
 "origin" "2576 -1368 392"
 "light" "400"
 }
-// entity 678
+// entity 673
 {
 "classname" "light"
 "target" "t277"
@@ -32663,7 +32635,7 @@
 "origin" "2472 -1472 392"
 "light" "400"
 }
-// entity 679
+// entity 674
 {
 "classname" "light"
 "target" "t278"
@@ -32671,7 +32643,7 @@
 "origin" "2344 -1472 392"
 "light" "400"
 }
-// entity 680
+// entity 675
 {
 "classname" "light"
 "target" "t279"
@@ -32679,7 +32651,7 @@
 "origin" "2216 -1472 392"
 "light" "400"
 }
-// entity 681
+// entity 676
 {
 "classname" "light"
 "target" "t280"
@@ -32687,7 +32659,7 @@
 "origin" "2088 -1472 392"
 "light" "400"
 }
-// entity 682
+// entity 677
 {
 "classname" "light"
 "target" "t281"
@@ -32695,7 +32667,7 @@
 "origin" "1960 -1472 392"
 "light" "400"
 }
-// entity 683
+// entity 678
 {
 "classname" "light"
 "target" "t282"
@@ -32703,7 +32675,7 @@
 "origin" "1656 -1472 424"
 "light" "400"
 }
-// entity 684
+// entity 679
 {
 "classname" "light"
 "target" "t283"
@@ -32711,7 +32683,7 @@
 "origin" "1528 -1472 424"
 "light" "400"
 }
-// entity 685
+// entity 680
 {
 "classname" "light"
 "target" "t284"
@@ -32719,7 +32691,7 @@
 "origin" "1400 -1472 424"
 "light" "400"
 }
-// entity 686
+// entity 681
 {
 "classname" "light"
 "target" "t285"
@@ -32727,7 +32699,7 @@
 "origin" "1272 -1472 424"
 "light" "400"
 }
-// entity 687
+// entity 682
 {
 "classname" "light"
 "target" "t286"
@@ -32735,7 +32707,7 @@
 "origin" "1152 -1368 424"
 "light" "400"
 }
-// entity 688
+// entity 683
 {
 "classname" "light"
 "target" "t287"
@@ -32743,7 +32715,7 @@
 "origin" "1152 -1240 424"
 "light" "400"
 }
-// entity 689
+// entity 684
 {
 "classname" "light"
 "target" "t288"
@@ -32751,7 +32723,7 @@
 "origin" "1152 -1112 424"
 "light" "400"
 }
-// entity 690
+// entity 685
 {
 "classname" "light"
 "target" "t289"
@@ -32759,7 +32731,7 @@
 "origin" "1152 -984 424"
 "light" "400"
 }
-// entity 691
+// entity 686
 {
 "classname" "light"
 "target" "t290"
@@ -32767,49 +32739,49 @@
 "origin" "2220 -1276 -600"
 "light" "400"
 }
-// entity 692
+// entity 687
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1808 -1360 348"
 "light" "80"
 }
-// entity 693
+// entity 688
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1808 -1200 348"
 "light" "80"
 }
-// entity 694
+// entity 689
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1808 -1072 348"
 "light" "80"
 }
-// entity 695
+// entity 690
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1808 -912 348"
 "light" "80"
 }
-// entity 696
+// entity 691
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1808 -816 348"
 "light" "80"
 }
-// entity 697
+// entity 692
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1808 -640 332"
 "light" "80"
 }
-// entity 698
+// entity 693
 {
 "classname" "func_group"
 // brush 0
@@ -32824,7 +32796,7 @@
 ( 800 -864 448 ) ( 800 -864 432 ) ( 800 -896 448 ) evil2_trims/trim_odd 0 1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 699
+// entity 694
 {
 "classname" "func_group"
 // brush 0
@@ -32839,7 +32811,7 @@
 ( 608 -864 440 ) ( 608 -864 448 ) ( 608 -896 448 ) stralenex1/stralenex_roundlight -31 -67 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 700
+// entity 695
 {
 "classname" "func_group"
 // brush 0
@@ -32854,7 +32826,7 @@
 ( 480 -888 432 ) ( 480 -872 432 ) ( 480 -872 448 ) evil2_trims/trim_odd 0 1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 701
+// entity 696
 {
 "classname" "func_group"
 // brush 0
@@ -32868,7 +32840,7 @@
 ( 1120 -896 432 ) ( 1120 -768 432 ) ( 992 -768 432 ) stralenex1/stralenex_roundlight 0 -32 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 702
+// entity 697
 {
 "classname" "func_group"
 // brush 0
@@ -32883,14 +32855,14 @@
 ( 944 -832 448 ) ( 912 -832 432 ) ( 912 -896 432 ) evil2_trims/trim_odd 0 1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 703
+// entity 698
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1808 -680 72"
 "light" "350"
 }
-// entity 704
+// entity 699
 {
 "classname" "func_group"
 // brush 0
@@ -32905,7 +32877,7 @@
 ( -912 96 432 ) ( -864 96 432 ) ( -864 96 448 ) evil2_trims/trim_odd 128 -13 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 705
+// entity 700
 {
 "classname" "func_group"
 // brush 0
@@ -32920,7 +32892,7 @@
 ( -912 224 432 ) ( -864 224 432 ) ( -864 224 448 ) evil2_trims/trim_odd 128 -13 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 706
+// entity 701
 {
 "classname" "func_group"
 // brush 0
@@ -32935,7 +32907,7 @@
 ( -912 352 432 ) ( -864 352 432 ) ( -864 352 448 ) evil2_trims/trim_odd 128 -13 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 707
+// entity 702
 {
 "classname" "func_group"
 // brush 0
@@ -32950,7 +32922,7 @@
 ( -912 480 432 ) ( -864 480 432 ) ( -864 480 448 ) evil2_trims/trim_odd 128 -13 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 708
+// entity 703
 {
 "classname" "func_group"
 // brush 0
@@ -32965,7 +32937,7 @@
 ( -832 528 448 ) ( -832 560 432 ) ( -896 560 432 ) evil2_trims/trim_odd 128 -61 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 709
+// entity 704
 {
 "classname" "func_group"
 // brush 0
@@ -32980,7 +32952,7 @@
 ( -832 656 448 ) ( -832 688 432 ) ( -896 688 432 ) evil2_trims/trim_odd 128 -60 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 710
+// entity 705
 {
 "classname" "func_group"
 // brush 0
@@ -32995,7 +32967,7 @@
 ( -912 864 432 ) ( -864 864 432 ) ( -864 864 448 ) evil2_trims/trim_odd 128 -13 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 711
+// entity 706
 {
 "classname" "func_group"
 // brush 0
@@ -33010,7 +32982,7 @@
 ( -672 1104 432 ) ( -672 1056 432 ) ( -672 1056 448 ) evil2_trims/trim_odd 0 -13 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 712
+// entity 707
 {
 "classname" "func_group"
 // brush 0
@@ -33025,7 +32997,7 @@
 ( -544 1104 432 ) ( -544 1056 432 ) ( -544 1056 448 ) evil2_trims/trim_odd 0 -13 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 713
+// entity 708
 {
 "classname" "func_group"
 // brush 0
@@ -33040,7 +33012,7 @@
 ( -496 1024 448 ) ( -464 1024 432 ) ( -464 1088 432 ) evil2_trims/trim_odd 128 3 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 714
+// entity 709
 {
 "classname" "func_group"
 // brush 0
@@ -33055,7 +33027,7 @@
 ( -576 560 448 ) ( -576 528 432 ) ( -512 528 432 ) evil2_trims/trim_odd 0 -62 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 715
+// entity 710
 {
 "classname" "func_group"
 // brush 0
@@ -33070,7 +33042,7 @@
 ( -576 432 448 ) ( -576 400 432 ) ( -512 400 432 ) evil2_trims/trim_odd 0 -61 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 716
+// entity 711
 {
 "classname" "func_group"
 // brush 0
@@ -33085,7 +33057,7 @@
 ( -576 304 448 ) ( -576 272 432 ) ( -512 272 432 ) evil2_trims/trim_odd 0 -62 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 717
+// entity 712
 {
 "classname" "func_group"
 // brush 0
@@ -33100,7 +33072,7 @@
 ( -576 176 448 ) ( -576 144 432 ) ( -512 144 432 ) evil2_trims/trim_odd 0 -61 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 718
+// entity 713
 {
 "classname" "func_group"
 // brush 0
@@ -33114,7 +33086,7 @@
 ( -416 736 432 ) ( -416 704 432 ) ( -416 704 448 ) evil2_trims/trim_odd -128 -13 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 719
+// entity 714
 {
 "classname" "func_group"
 // brush 0
@@ -33128,7 +33100,7 @@
 ( -352 704 432 ) ( -352 720 432 ) ( -352 704 448 ) evil2_trims/trim_odd -128 -11 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 720
+// entity 715
 {
 "classname" "func_group"
 // brush 0
@@ -33142,7 +33114,7 @@
 ( -224 608 432 ) ( -272 608 432 ) ( -272 608 448 ) evil2_trims/trim_odd 0 -11 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 721
+// entity 716
 {
 "classname" "func_group"
 // brush 0
@@ -33156,7 +33128,7 @@
 ( -272 32 432 ) ( -240 32 432 ) ( -272 32 448 ) evil2_trims/trim_odd 0 -11 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 722
+// entity 717
 {
 "classname" "func_group"
 // brush 0
@@ -33171,7 +33143,7 @@
 ( -272 160 432 ) ( -224 160 432 ) ( -224 160 448 ) evil2_trims/trim_odd -128 -12 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 723
+// entity 718
 {
 "classname" "func_group"
 // brush 0
@@ -33186,7 +33158,7 @@
 ( -272 288 432 ) ( -224 288 432 ) ( -224 288 448 ) evil2_trims/trim_odd -128 -12 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 724
+// entity 719
 {
 "classname" "func_group"
 // brush 0
@@ -33201,7 +33173,7 @@
 ( -272 416 432 ) ( -224 416 432 ) ( -224 416 448 ) evil2_trims/trim_odd -128 -12 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 725
+// entity 720
 {
 "classname" "func_group"
 // brush 0
@@ -33216,7 +33188,7 @@
 ( -272 544 432 ) ( -224 544 432 ) ( -224 544 448 ) evil2_trims/trim_odd -128 -12 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 726
+// entity 721
 {
 "classname" "func_group"
 // brush 0
@@ -33231,7 +33203,7 @@
 ( -192 1264 448 ) ( -192 1296 432 ) ( -256 1296 432 ) evil2_trims/trim_odd 64 -60 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 727
+// entity 722
 {
 "classname" "func_group"
 // brush 0
@@ -33246,7 +33218,7 @@
 ( -80 1472 448 ) ( -48 1472 432 ) ( -48 1536 432 ) evil2_trims/trim_odd 192 -61 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 728
+// entity 723
 {
 "classname" "func_group"
 // brush 0
@@ -33261,7 +33233,7 @@
 ( 128 1552 432 ) ( 128 1504 432 ) ( 128 1504 448 ) evil2_trims/trim_odd -128 -13 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 729
+// entity 724
 {
 "classname" "func_group"
 // brush 0
@@ -33276,7 +33248,7 @@
 ( 64 912 448 ) ( 64 880 432 ) ( 128 880 432 ) evil2_trims/trim_odd -192 -62 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 730
+// entity 725
 {
 "classname" "func_group"
 // brush 0
@@ -33291,7 +33263,7 @@
 ( 64 784 448 ) ( 64 752 432 ) ( 128 752 432 ) evil2_trims/trim_odd -192 -61 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 731
+// entity 726
 {
 "classname" "func_group"
 // brush 0
@@ -33306,7 +33278,7 @@
 ( 64 656 448 ) ( 64 624 432 ) ( 128 624 432 ) evil2_trims/trim_odd -192 -62 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 732
+// entity 727
 {
 "classname" "func_group"
 // brush 0
@@ -33321,7 +33293,7 @@
 ( 64 528 448 ) ( 64 496 432 ) ( 128 496 432 ) evil2_trims/trim_odd -192 -61 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 733
+// entity 728
 {
 "classname" "func_group"
 // brush 0
@@ -33336,7 +33308,7 @@
 ( 304 512 432 ) ( 352 512 432 ) ( 352 512 448 ) evil2_trims/trim_odd 0 -12 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 734
+// entity 729
 {
 "classname" "func_group"
 // brush 0
@@ -33351,7 +33323,7 @@
 ( 304 640 432 ) ( 352 640 432 ) ( 352 640 448 ) evil2_trims/trim_odd 0 -12 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 735
+// entity 730
 {
 "classname" "func_group"
 // brush 0
@@ -33366,7 +33338,7 @@
 ( 304 768 432 ) ( 352 768 432 ) ( 352 768 448 ) evil2_trims/trim_odd 0 -12 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 736
+// entity 731
 {
 "classname" "func_group"
 // brush 0
@@ -33381,7 +33353,7 @@
 ( 608 -192 448 ) ( 608 -192 432 ) ( 640 -192 448 ) evil2_trims/trim_odd 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 737
+// entity 732
 {
 "classname" "func_group"
 // brush 0
@@ -33396,7 +33368,7 @@
 ( 576 80 448 ) ( 576 48 432 ) ( 640 48 432 ) evil2_trims/trim_odd -64 -62 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 738
+// entity 733
 {
 "classname" "func_group"
 // brush 0
@@ -33411,7 +33383,7 @@
 ( 640 0 432 ) ( 512 0 432 ) ( 512 -128 432 ) stralenex1/stralenex_roundlight 0 31 0 -0.5 0.5000039935 134217728 0 0
 }
 }
-// entity 739
+// entity 734
 {
 "classname" "func_group"
 // brush 0
@@ -33426,7 +33398,7 @@
 ( 864 -456 432 ) ( 864 -472 432 ) ( 864 -472 448 ) evil2_trims/trim_odd -128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 740
+// entity 735
 {
 "classname" "func_group"
 // brush 0
@@ -33440,7 +33412,7 @@
 ( 1024 -320 432 ) ( 1072 -320 432 ) ( 1024 -320 448 ) evil2_trims/trim_odd 192 -16 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 741
+// entity 736
 {
 "classname" "func_group"
 // brush 0
@@ -33454,7 +33426,7 @@
 ( 1056 128 432 ) ( 1008 128 432 ) ( 1008 128 448 ) evil2_trims/trim_odd 192 -16 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 742
+// entity 737
 {
 "classname" "func_group"
 // brush 0
@@ -33468,7 +33440,7 @@
 ( 928 256 432 ) ( 928 304 432 ) ( 928 256 448 ) evil2_trims/trim_odd 0 -16 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 743
+// entity 738
 {
 "classname" "func_group"
 // brush 0
@@ -33482,7 +33454,7 @@
 ( 736 288 432 ) ( 736 256 432 ) ( 736 256 448 ) evil2_trims/trim_odd 0 -16 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 744
+// entity 739
 {
 "classname" "func_group"
 // brush 0
@@ -33497,7 +33469,7 @@
 ( 1024 -64 432 ) ( 1152 -64 432 ) ( 1152 64 432 ) stralenex1/stralenex_roundlight 64 -33 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 745
+// entity 740
 {
 "classname" "func_group"
 // brush 0
@@ -33512,7 +33484,7 @@
 ( 1056 -192 440 ) ( 1056 -192 448 ) ( 1024 -192 448 ) stralenex1/stralenex_roundlight -31 61 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 746
+// entity 741
 {
 "classname" "func_group"
 // brush 0
@@ -33527,7 +33499,7 @@
 ( 1032 -64 432 ) ( 1048 -64 432 ) ( 1048 -64 448 ) evil2_trims/trim_odd 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 747
+// entity 742
 {
 "classname" "func_group"
 // brush 0
@@ -33542,7 +33514,7 @@
 ( 928 256 432 ) ( 928 384 432 ) ( 800 384 432 ) stralenex1/stralenex_roundlight 32 -63 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 748
+// entity 743
 {
 "classname" "func_group"
 // brush 0
@@ -33557,7 +33529,7 @@
 ( 1312 -192 448 ) ( 1312 -192 432 ) ( 1344 -192 448 ) evil2_trims/trim_odd 128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 749
+// entity 744
 {
 "classname" "func_group"
 // brush 0
@@ -33572,7 +33544,7 @@
 ( 1288 -320 432 ) ( 1368 -320 432 ) ( 1368 -320 448 ) common/caulk -31 -67 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 750
+// entity 745
 {
 "classname" "func_group"
 // brush 0
@@ -33587,7 +33559,7 @@
 ( 1344 272 432 ) ( 1216 272 432 ) ( 1216 144 432 ) stralenex1/stralenex_roundlight 64 -1 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 751
+// entity 746
 {
 "classname" "func_group"
 // brush 0
@@ -33602,7 +33574,7 @@
 ( 1280 80 448 ) ( 1280 48 432 ) ( 1344 48 432 ) evil2_trims/trim_odd -64 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 752
+// entity 747
 {
 "classname" "func_group"
 // brush 0
@@ -33617,7 +33589,7 @@
 ( 1344 0 432 ) ( 1216 0 432 ) ( 1216 -128 432 ) stralenex1/stralenex_roundlight 64 -33 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 753
+// entity 748
 {
 "classname" "func_group"
 // brush 0
@@ -33632,7 +33604,7 @@
 ( 1312 272 440 ) ( 1312 272 448 ) ( 1344 272 448 ) stralenex1/stralenex_roundlight -31 -67 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 754
+// entity 749
 {
 "classname" "func_group"
 // brush 0
@@ -33647,7 +33619,7 @@
 ( 1312 464 448 ) ( 1312 464 432 ) ( 1344 464 448 ) evil2_trims/trim_odd 128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 755
+// entity 750
 {
 "classname" "func_group"
 // brush 0
@@ -33662,7 +33634,7 @@
 ( 1280 608 448 ) ( 1280 576 432 ) ( 1344 576 432 ) evil2_trims/trim_odd -96 1 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 756
+// entity 751
 {
 "classname" "light"
 "target" "t291"
@@ -33670,7 +33642,7 @@
 "origin" "1584 928 424"
 "light" "400"
 }
-// entity 757
+// entity 752
 {
 "classname" "light"
 "target" "t292"
@@ -33678,7 +33650,7 @@
 "origin" "1440 784 424"
 "light" "400"
 }
-// entity 758
+// entity 753
 {
 "classname" "light"
 "target" "t293"
@@ -33686,7 +33658,7 @@
 "origin" "1472 1072 424"
 "light" "400"
 }
-// entity 759
+// entity 754
 {
 "classname" "func_group"
 // brush 0
@@ -33701,7 +33673,7 @@
 ( 1280 1392 448 ) ( 1280 1360 432 ) ( 1344 1360 432 ) evil2_trims/trim_odd -128 -62 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 760
+// entity 755
 {
 "classname" "func_group"
 // brush 0
@@ -33716,7 +33688,7 @@
 ( 1344 1568 432 ) ( 1216 1568 432 ) ( 1216 1440 432 ) stralenex1/stralenex_roundlight 64 31 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 761
+// entity 756
 {
 "classname" "func_group"
 // brush 0
@@ -33731,7 +33703,7 @@
 ( 1312 1568 440 ) ( 1312 1568 448 ) ( 1344 1568 448 ) stralenex1/stralenex_roundlight -31 -67 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 762
+// entity 757
 {
 "classname" "func_group"
 // brush 0
@@ -33746,7 +33718,7 @@
 ( 1040 1792 448 ) ( 1072 1792 432 ) ( 1072 1856 432 ) evil2_trims/trim_odd -127 -62 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 763
+// entity 758
 {
 "classname" "func_group"
 // brush 0
@@ -33761,7 +33733,7 @@
 ( 992 1824 440 ) ( 992 1824 448 ) ( 992 1856 448 ) stralenex1/stralenex_roundlight -31 -67 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 764
+// entity 759
 {
 "classname" "func_group"
 // brush 0
@@ -33775,7 +33747,7 @@
 ( 1456 -512 432 ) ( 1456 -560 432 ) ( 1456 -512 448 ) evil2_trims/trim_odd 0 -15 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 765
+// entity 760
 {
 "classname" "func_group"
 // brush 0
@@ -33789,7 +33761,7 @@
 ( 1648 -544 432 ) ( 1648 -512 432 ) ( 1648 -512 448 ) evil2_trims/trim_odd 0 -15 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 766
+// entity 761
 {
 "classname" "func_group"
 // brush 0
@@ -33804,7 +33776,7 @@
 ( 1456 -512 432 ) ( 1456 -640 432 ) ( 1584 -640 432 ) stralenex1/stralenex_roundlight 0 0 90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 767
+// entity 762
 {
 "classname" "func_group"
 // brush 0
@@ -33818,7 +33790,7 @@
 ( 1856 -512 400 ) ( 1856 -640 400 ) ( 1984 -640 400 ) stralenex1/stralenex_roundlight 0 -32 90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 768
+// entity 763
 {
 "classname" "func_group"
 // brush 0
@@ -33832,7 +33804,7 @@
 ( 2416 -576 416 ) ( 2448 -576 400 ) ( 2448 -512 400 ) evil2_trims/trim_odd 64 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 769
+// entity 764
 {
 "classname" "func_group"
 // brush 0
@@ -33847,7 +33819,7 @@
 ( 2304 -544 416 ) ( 2304 -544 400 ) ( 2304 -512 416 ) evil2_trims/trim_odd 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 770
+// entity 765
 {
 "classname" "func_group"
 // brush 0
@@ -33862,7 +33834,7 @@
 ( 2032 -576 416 ) ( 2064 -576 400 ) ( 2064 -512 400 ) evil2_trims/trim_odd 64 2 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 771
+// entity 766
 {
 "classname" "func_group"
 // brush 0
@@ -33877,7 +33849,7 @@
 ( 2112 -512 400 ) ( 2112 -640 400 ) ( 2240 -640 400 ) stralenex1/stralenex_roundlight 0 -32 90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 772
+// entity 767
 {
 "classname" "func_group"
 // brush 0
@@ -33892,7 +33864,7 @@
 ( 2584 -1272 400 ) ( 2568 -1272 400 ) ( 2568 -1272 416 ) evil2_trims/trim_odd 64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 773
+// entity 768
 {
 "classname" "func_group"
 // brush 0
@@ -33906,7 +33878,7 @@
 ( 2440 -1488 400 ) ( 2440 -1440 400 ) ( 2440 -1488 416 ) evil2_trims/trim_odd -224 -16 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 774
+// entity 769
 {
 "classname" "func_group"
 // brush 0
@@ -33920,7 +33892,7 @@
 ( 1992 -1456 400 ) ( 1992 -1504 400 ) ( 1992 -1504 416 ) evil2_trims/trim_odd -224 -16 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 775
+// entity 770
 {
 "classname" "func_group"
 // brush 0
@@ -33935,7 +33907,7 @@
 ( 2184 -1488 400 ) ( 2184 -1360 400 ) ( 2056 -1360 400 ) stralenex1/stralenex_roundlight 32 -16 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 776
+// entity 771
 {
 "classname" "func_group"
 // brush 0
@@ -33950,7 +33922,7 @@
 ( 2312 -1456 408 ) ( 2312 -1456 416 ) ( 2312 -1488 416 ) evil2_trims/trim_odd -80 -15 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 777
+// entity 772
 {
 "classname" "func_group"
 // brush 0
@@ -33965,7 +33937,7 @@
 ( 2184 -1480 400 ) ( 2184 -1464 400 ) ( 2184 -1464 416 ) evil2_trims/trim_odd 160 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 778
+// entity 773
 {
 "classname" "func_group"
 // brush 0
@@ -33980,7 +33952,7 @@
 ( 1496 -1488 432 ) ( 1496 -1360 432 ) ( 1368 -1360 432 ) stralenex1/stralenex_roundlight 32 14 -90 -0.5 0.5 134217728 0 0
 }
 }
-// entity 779
+// entity 774
 {
 "classname" "func_group"
 // brush 0
@@ -33995,7 +33967,7 @@
 ( 1496 -1456 440 ) ( 1496 -1456 448 ) ( 1496 -1488 448 ) stralenex1/stralenex_roundlight -30 -99 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 780
+// entity 775
 {
 "classname" "func_group"
 // brush 0
@@ -34009,7 +33981,7 @@
 ( 1152 -1336 432 ) ( 1168 -1336 432 ) ( 1168 -1336 448 ) evil2_trims/trim_odd 144 49 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 781
+// entity 776
 {
 "classname" "func_group"
 // brush 0
@@ -34023,7 +33995,7 @@
 ( 1160 -1016 432 ) ( 1144 -1016 432 ) ( 1160 -1016 448 ) evil2_trims/trim_odd 144 49 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 782
+// entity 777
 {
 "classname" "func_group"
 // brush 0
@@ -34038,7 +34010,7 @@
 ( 1168 -1144 448 ) ( 1168 -1144 432 ) ( 1136 -1144 448 ) evil2_trims/trim_odd 32 1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 783
+// entity 778
 {
 "classname" "func_group"
 // brush 0
@@ -34053,28 +34025,28 @@
 ( 1200 -1288 448 ) ( 1200 -1256 432 ) ( 1136 -1256 432 ) evil2_trims/trim_odd 79 -31 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 784
+// entity 779
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "1920 -976 -640"
 "light" "200"
 }
-// entity 785
+// entity 780
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "768 -184 -696"
 "light" "80"
 }
-// entity 786
+// entity 781
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1024 -184 -696"
 "light" "80"
 }
-// entity 787
+// entity 782
 {
 "classname" "func_group"
 // brush 0
@@ -34593,49 +34565,49 @@
 ( 1088 -192 -768 ) ( 704 -192 -768 ) ( 704 -128 -576 ) evil1_metals/mtl_rst2 -128 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 788
+// entity 783
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1144 -64 -696"
 "light" "80"
 }
-// entity 789
+// entity 784
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1144 192 -696"
 "light" "80"
 }
-// entity 790
+// entity 785
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "648 192 -696"
 "light" "80"
 }
-// entity 791
+// entity 786
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "648 -64 -696"
 "light" "80"
 }
-// entity 792
+// entity 787
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "1024 312 -696"
 "light" "80"
 }
-// entity 793
+// entity 788
 {
 "classname" "light"
 "_color" "0.971603 0.996246 1.000000"
 "origin" "768 312 -696"
 "light" "80"
 }
-// entity 794
+// entity 789
 {
 "classname" "func_group"
 // brush 0
@@ -34756,7 +34728,7 @@
 ( 532 -392 -768 ) ( 516 -392 -768 ) ( 532 -408 -768 ) common/caulk 16 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 795
+// entity 790
 {
 "classname" "func_group"
 // brush 0
@@ -34877,7 +34849,7 @@
 ( 535 -558 -416 ) ( 565 -550 -416 ) ( 565 -550 -672 ) evil_metals/mtloverlaprwll -88 0 90 0.4806210101 0.5 134217728 0 0
 }
 }
-// entity 796
+// entity 791
 {
 "classname" "func_group"
 // brush 0
@@ -34998,7 +34970,7 @@
 ( 598 -654 -768 ) ( 585 -663 -768 ) ( 607 -667 -768 ) common/caulk 44 -16 123 0.5001080036 0.500056982 134217728 0 0
 }
 }
-// entity 797
+// entity 792
 {
 "classname" "func_group"
 // brush 0
@@ -35119,7 +35091,7 @@
 ( 680 -765 -512 ) ( 699 -739 -512 ) ( 699 -739 -768 ) evil_metals/mtloverlaprwll -181 0 90 0.4096679986 0.5 134217728 0 0
 }
 }
-// entity 798
+// entity 793
 {
 "classname" "func_group"
 // brush 0
@@ -35186,7 +35158,7 @@
 ( 788 -790 -768 ) ( 783 -805 -768 ) ( 802 -794 -768 ) common/caulk 45 58 165 0.4999450147 0.5001379848 134217728 0 0
 }
 }
-// entity 799
+// entity 794
 {
 "classname" "func_group"
 // brush 0
@@ -35199,7 +35171,7 @@
 ( 512 -412 -512 ) ( 544 -412 -512 ) ( 544 -412 -768 ) common/clip 0 0 0 0.5 0.5 0 13 0
 }
 }
-// entity 800
+// entity 795
 {
 "classname" "func_group"
 // brush 0
@@ -35212,7 +35184,7 @@
 ( 549 -538 -768 ) ( 534 -542 -768 ) ( 554 -553 -768 ) common/clip 0 0 0 0.5 0.5 0 13 0
 }
 }
-// entity 801
+// entity 796
 {
 "classname" "func_group"
 // brush 0
@@ -35225,7 +35197,7 @@
 ( 594 -682 -512 ) ( 620 -665 -512 ) ( 620 -665 -768 ) common/clip 0 0 0 0.5 0.5 0 13 0
 }
 }
-// entity 802
+// entity 797
 {
 "classname" "func_group"
 // brush 0
@@ -35238,7 +35210,7 @@
 ( 680 -739 -768 ) ( 670 -752 -768 ) ( 692 -748 -768 ) common/clip 0 0 0 0.5 0.5 0 13 0
 }
 }
-// entity 803
+// entity 798
 {
 "classname" "func_group"
 // brush 0
@@ -35251,14 +35223,14 @@
 ( 804 -814 -512 ) ( 813 -783 -512 ) ( 813 -783 -768 ) common/clip 0 0 0 0.5 0.5 0 13 0
 }
 }
-// entity 804
+// entity 799
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "2424 -952 -88"
 "light" "500"
 }
-// entity 805
+// entity 800
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -35276,7 +35248,7 @@
 }
 }
 }
-// entity 806
+// entity 801
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -35294,7 +35266,7 @@
 }
 }
 }
-// entity 807
+// entity 802
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -35312,7 +35284,7 @@
 }
 }
 }
-// entity 808
+// entity 803
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -35330,7 +35302,7 @@
 }
 }
 }
-// entity 809
+// entity 804
 {
 "classname" "func_group"
 // brush 0
@@ -35388,7 +35360,7 @@
 ( 782 -789 -564 ) ( 778 -804 -564 ) ( 805 -795 -564 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 810
+// entity 805
 {
 "classname" "func_group"
 // brush 0
@@ -35446,7 +35418,7 @@
 ( 774 -789 -428 ) ( 770 -804 -428 ) ( 797 -795 -428 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 811
+// entity 806
 {
 "classname" "func_group"
 // brush 0
@@ -35504,7 +35476,7 @@
 ( 801 -814 -232 ) ( 808 -783 -232 ) ( 808 -783 -488 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 812
+// entity 807
 {
 "classname" "func_group"
 // brush 0
@@ -35616,7 +35588,7 @@
 ( 675 -737 -284 ) ( 666 -749 -284 ) ( 695 -750 -284 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 813
+// entity 808
 {
 "classname" "func_group"
 // brush 0
@@ -35728,7 +35700,7 @@
 ( 593 -681 -234 ) ( 618 -663 -234 ) ( 618 -663 -490 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 814
+// entity 809
 {
 "classname" "func_group"
 // brush 0
@@ -35840,7 +35812,7 @@
 ( 548 -534 -284 ) ( 533 -538 -284 ) ( 555 -557 -284 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 815
+// entity 810
 {
 "classname" "func_group"
 // brush 0
@@ -35952,7 +35924,7 @@
 ( 512 -412 -232 ) ( 544 -412 -232 ) ( 544 -412 -488 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 816
+// entity 811
 {
 "classname" "func_group"
 // brush 0
@@ -36081,7 +36053,7 @@
 ( 176 -864 640 ) ( 176 -872 640 ) ( 176 -864 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 817
+// entity 812
 {
 "classname" "func_group"
 // brush 0
@@ -36210,7 +36182,7 @@
 ( 288 -832 704 ) ( 288 -736 704 ) ( 352 -736 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 818
+// entity 813
 {
 "classname" "func_group"
 // brush 0
@@ -36339,7 +36311,7 @@
 ( 432 -864 640 ) ( 432 -872 640 ) ( 432 -864 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 819
+// entity 814
 {
 "classname" "func_group"
 // brush 0
@@ -36468,7 +36440,7 @@
 ( 544 -832 704 ) ( 544 -736 704 ) ( 608 -736 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 820
+// entity 815
 {
 "classname" "func_group"
 // brush 0
@@ -36597,7 +36569,7 @@
 ( 688 -864 640 ) ( 688 -872 640 ) ( 688 -864 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 821
+// entity 816
 {
 "classname" "func_group"
 // brush 0
@@ -36726,7 +36698,7 @@
 ( 800 -832 704 ) ( 800 -736 704 ) ( 864 -736 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 822
+// entity 817
 {
 "classname" "func_group"
 // brush 0
@@ -36855,7 +36827,7 @@
 ( 944 -864 640 ) ( 944 -872 640 ) ( 944 -864 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 823
+// entity 818
 {
 "classname" "func_group"
 // brush 0
@@ -36984,7 +36956,7 @@
 ( 1072 -832 704 ) ( 1072 -736 704 ) ( 1136 -736 704 ) common/caulk 0 -32 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 824
+// entity 819
 {
 "classname" "func_group"
 // brush 0
@@ -37113,7 +37085,7 @@
 ( 1168 -1032 640 ) ( 1160 -1032 640 ) ( 1168 -1032 704 ) common/caulk 0 32 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 825
+// entity 820
 {
 "classname" "func_group"
 // brush 0
@@ -37242,7 +37214,7 @@
 ( 1200 -1144 704 ) ( 1296 -1144 704 ) ( 1296 -1208 704 ) common/caulk 32 -48 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 826
+// entity 821
 {
 "classname" "func_group"
 // brush 0
@@ -37371,7 +37343,7 @@
 ( 1168 -1288 640 ) ( 1160 -1288 640 ) ( 1168 -1288 704 ) common/caulk 0 32 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 827
+// entity 822
 {
 "classname" "func_group"
 // brush 0
@@ -37500,7 +37472,7 @@
 ( 1304 -1424 704 ) ( 1304 -1328 704 ) ( 1368 -1328 704 ) common/caulk 31 -48 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 828
+// entity 823
 {
 "classname" "func_group"
 // brush 0
@@ -37629,7 +37601,7 @@
 ( 1448 -1456 640 ) ( 1448 -1464 640 ) ( 1448 -1456 704 ) common/caulk 0 32 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 829
+// entity 824
 {
 "classname" "func_group"
 // brush 0
@@ -37758,7 +37730,7 @@
 ( 1560 -1424 704 ) ( 1560 -1328 704 ) ( 1624 -1328 704 ) common/caulk 31 -48 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 830
+// entity 825
 {
 "classname" "func_group"
 // brush 0
@@ -37887,7 +37859,7 @@
 ( 576 -320 704 ) ( 480 -320 704 ) ( 480 -256 704 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 831
+// entity 826
 {
 "classname" "func_group"
 // brush 0
@@ -38016,7 +37988,7 @@
 ( 608 -176 640 ) ( 616 -176 640 ) ( 608 -176 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 832
+// entity 827
 {
 "classname" "func_group"
 // brush 0
@@ -38145,7 +38117,7 @@
 ( 576 -64 704 ) ( 480 -64 704 ) ( 480 0 704 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 833
+// entity 828
 {
 "classname" "func_group"
 // brush 0
@@ -38274,7 +38246,7 @@
 ( 608 80 640 ) ( 616 80 640 ) ( 608 80 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 834
+// entity 829
 {
 "classname" "func_group"
 // brush 0
@@ -38403,7 +38375,7 @@
 ( 784 -480 640 ) ( 784 -472 640 ) ( 784 -480 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 835
+// entity 830
 {
 "classname" "func_group"
 // brush 0
@@ -38532,7 +38504,7 @@
 ( 928 -512 704 ) ( 928 -608 704 ) ( 864 -608 704 ) common/caulk 0 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 836
+// entity 831
 {
 "classname" "func_group"
 // brush 0
@@ -38696,7 +38668,7 @@
 ( 1216 -128 640 ) ( 1184 -128 640 ) ( 1216 -192 640 ) evil5_metal/drkrstmtl 128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 837
+// entity 832
 {
 "classname" "func_group"
 // brush 0
@@ -38842,7 +38814,7 @@
 ( 1088 0 448 ) ( 1080 0 440 ) ( 1088 -64 448 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 838
+// entity 833
 {
 "classname" "func_group"
 // brush 0
@@ -38997,7 +38969,7 @@
 ( 1280 -192 448 ) ( 1288 -192 440 ) ( 1280 -128 448 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 839
+// entity 834
 {
 "classname" "func_group"
 // brush 0
@@ -39019,7 +38991,7 @@
 ( 1240 -256 640 ) ( 1160 -256 640 ) ( 1240 -320 640 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 840
+// entity 835
 {
 "classname" "func_group"
 // brush 0
@@ -39032,7 +39004,7 @@
 ( 1280 -320 704 ) ( 1184 -320 704 ) ( 1184 -256 704 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 841
+// entity 836
 {
 "classname" "func_group"
 // brush 0
@@ -39178,7 +39150,7 @@
 ( 1280 64 448 ) ( 1288 64 440 ) ( 1280 128 448 ) common/caulk 0 -63 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 842
+// entity 837
 {
 "classname" "func_group"
 // brush 0
@@ -39200,7 +39172,7 @@
 ( 1088 0 704 ) ( 1184 0 704 ) ( 1184 -64 704 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 843
+// entity 838
 {
 "classname" "func_group"
 // brush 0
@@ -39213,7 +39185,7 @@
 ( 1280 -64 704 ) ( 1184 -64 704 ) ( 1184 0 704 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 844
+// entity 839
 {
 "classname" "func_group"
 // brush 0
@@ -39235,7 +39207,7 @@
 ( 1216 128 640 ) ( 1184 128 640 ) ( 1216 64 640 ) evil5_metal/drkrstmtl 128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 845
+// entity 840
 {
 "classname" "func_group"
 // brush 0
@@ -39248,7 +39220,7 @@
 ( 1320 64 640 ) ( 1312 64 640 ) ( 1312 64 704 ) evil5_metal/drkrstmtl 128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 846
+// entity 841
 {
 "classname" "func_group"
 // brush 0
@@ -39341,7 +39313,7 @@
 ( 736 320 704 ) ( 736 416 704 ) ( 800 416 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 847
+// entity 842
 {
 "classname" "func_group"
 // brush 0
@@ -39362,7 +39334,7 @@
 ( 736 416 512 ) ( 800 416 512 ) ( 800 384 512 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 848
+// entity 843
 {
 "classname" "func_group"
 // brush 0
@@ -39491,7 +39463,7 @@
 ( 1280 208 704 ) ( 1184 208 704 ) ( 1184 272 704 ) common/caulk 0 32 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 849
+// entity 844
 {
 "classname" "func_group"
 // brush 0
@@ -39619,7 +39591,7 @@
 ( 864 320 448 ) ( 864 312 440 ) ( 928 320 448 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 850
+// entity 845
 {
 "classname" "func_group"
 // brush 0
@@ -39748,7 +39720,7 @@
 ( 1312 352 640 ) ( 1320 352 640 ) ( 1312 352 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 851
+// entity 846
 {
 "classname" "func_group"
 // brush 0
@@ -39877,7 +39849,7 @@
 ( 1280 464 704 ) ( 1184 464 704 ) ( 1184 528 704 ) common/caulk 0 -32 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 852
+// entity 847
 {
 "classname" "func_group"
 // brush 0
@@ -40006,7 +39978,7 @@
 ( 1312 608 640 ) ( 1320 608 640 ) ( 1312 608 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 853
+// entity 848
 {
 "classname" "func_group"
 // brush 0
@@ -40135,7 +40107,7 @@
 ( 1280 1376 704 ) ( 1184 1376 704 ) ( 1184 1440 704 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 854
+// entity 849
 {
 "classname" "func_group"
 // brush 0
@@ -40264,7 +40236,7 @@
 ( 1312 1264 640 ) ( 1320 1264 640 ) ( 1312 1264 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 855
+// entity 850
 {
 "classname" "func_group"
 // brush 0
@@ -40393,7 +40365,7 @@
 ( 1280 1504 704 ) ( 1184 1504 704 ) ( 1184 1568 704 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 856
+// entity 851
 {
 "classname" "func_group"
 // brush 0
@@ -40522,7 +40494,7 @@
 ( 1312 1648 640 ) ( 1320 1648 640 ) ( 1312 1648 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 857
+// entity 852
 {
 "classname" "func_group"
 // brush 0
@@ -40651,7 +40623,7 @@
 ( 1184 1792 704 ) ( 1184 1696 704 ) ( 1120 1696 704 ) common/caulk 0 -63 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 858
+// entity 853
 {
 "classname" "func_group"
 // brush 0
@@ -40780,7 +40752,7 @@
 ( 1040 1824 640 ) ( 1040 1832 640 ) ( 1040 1824 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 859
+// entity 854
 {
 "classname" "func_group"
 // brush 0
@@ -40909,35 +40881,35 @@
 ( 1312 -416 640 ) ( 1320 -416 640 ) ( 1312 -416 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 860
+// entity 855
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "712 1840 376"
 "light" "70"
 }
-// entity 861
+// entity 856
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "576 1840 400"
 "light" "30"
 }
-// entity 862
+// entity 857
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "448 1840 400"
 "light" "30"
 }
-// entity 863
+// entity 858
 {
 "classname" "light"
 "_color" "1.000000 0.992294 0.828168"
 "origin" "336 1728 400"
 "light" "30"
 }
-// entity 864
+// entity 859
 {
 "classname" "func_group"
 // brush 0
@@ -41066,7 +41038,7 @@
 ( 384 832 704 ) ( 480 832 704 ) ( 480 768 704 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 865
+// entity 860
 {
 "classname" "func_group"
 // brush 0
@@ -41195,7 +41167,7 @@
 ( 352 688 640 ) ( 344 688 640 ) ( 352 688 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 866
+// entity 861
 {
 "classname" "func_group"
 // brush 0
@@ -41324,7 +41296,7 @@
 ( 384 576 704 ) ( 480 576 704 ) ( 480 512 704 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 867
+// entity 862
 {
 "classname" "func_group"
 // brush 0
@@ -41453,7 +41425,7 @@
 ( 352 432 640 ) ( 344 432 640 ) ( 352 432 704 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 868
+// entity 863
 {
 "classname" "func_group"
 // brush 0
@@ -41707,7 +41679,7 @@
 ( -544 -384 448 ) ( -544 -392 440 ) ( -480 -384 448 ) common/caulk 0 63 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 869
+// entity 864
 {
 "classname" "func_group"
 // brush 0
@@ -41836,7 +41808,7 @@
 ( -672 -448 392 ) ( -672 -432 392 ) ( -608 -432 392 ) common/caulk 0 -1 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 870
+// entity 865
 {
 "classname" "func_group"
 // brush 0
@@ -41965,7 +41937,7 @@
 ( -352 -128 448 ) ( -352 -120 440 ) ( -416 -128 448 ) common/caulk 0 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 871
+// entity 866
 {
 "classname" "func_group"
 // brush 0
@@ -42094,7 +42066,7 @@
 ( -880 -160 392 ) ( -880 -96 392 ) ( -896 -96 392 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 872
+// entity 867
 {
 "classname" "func_group"
 // brush 0
@@ -42223,7 +42195,7 @@
 ( -832 -224 448 ) ( -840 -224 440 ) ( -832 -288 448 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 873
+// entity 868
 {
 "classname" "func_group"
 // brush 0
@@ -42477,7 +42449,7 @@
 ( -880 96 392 ) ( -880 160 392 ) ( -896 160 392 ) common/caulk 0 -1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 874
+// entity 869
 {
 "classname" "func_group"
 // brush 0
@@ -42731,7 +42703,7 @@
 ( -832 416 448 ) ( -840 416 440 ) ( -832 352 448 ) common/caulk 0 -1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 875
+// entity 870
 {
 "classname" "func_group"
 // brush 0
@@ -42985,7 +42957,7 @@
 ( -880 608 392 ) ( -880 672 392 ) ( -896 672 392 ) common/caulk 0 63 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 876
+// entity 871
 {
 "classname" "func_group"
 // brush 0
@@ -43239,7 +43211,7 @@
 ( -832 928 448 ) ( -840 928 440 ) ( -832 864 448 ) common/caulk 0 -1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 877
+// entity 872
 {
 "classname" "func_group"
 // brush 0
@@ -43493,7 +43465,7 @@
 ( -528 96 392 ) ( -528 32 392 ) ( -512 32 392 ) common/caulk 0 -1 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 878
+// entity 873
 {
 "classname" "func_group"
 // brush 0
@@ -43747,7 +43719,7 @@
 ( -576 288 448 ) ( -568 288 440 ) ( -576 352 448 ) common/caulk 0 -1 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 879
+// entity 874
 {
 "classname" "func_group"
 // brush 0
@@ -43876,7 +43848,7 @@
 ( -528 608 392 ) ( -528 544 392 ) ( -512 544 392 ) common/caulk 0 63 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 880
+// entity 875
 {
 "classname" "func_group"
 // brush 0
@@ -44130,7 +44102,7 @@
 ( -480 1024 448 ) ( -480 1032 440 ) ( -544 1024 448 ) common/caulk 0 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 881
+// entity 876
 {
 "classname" "func_group"
 // brush 0
@@ -44259,7 +44231,7 @@
 ( -416 768 448 ) ( -416 760 440 ) ( -352 768 448 ) common/caulk -63 -1 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 882
+// entity 877
 {
 "classname" "func_group"
 // brush 0
@@ -44388,7 +44360,7 @@
 ( -416 1072 392 ) ( -352 1072 392 ) ( -352 1088 392 ) common/caulk 1 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 883
+// entity 878
 {
 "classname" "func_group"
 // brush 0
@@ -44517,7 +44489,7 @@
 ( -192 1280 448 ) ( -200 1280 440 ) ( -192 1216 448 ) common/caulk -63 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 884
+// entity 879
 {
 "classname" "func_group"
 // brush 0
@@ -44614,7 +44586,7 @@
 ( -96 1360 672 ) ( -88 1360 664 ) ( -96 1344 672 ) evil5_metal/drkrstmtl 64 1 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 885
+// entity 880
 {
 "classname" "func_group"
 // brush 0
@@ -44691,7 +44663,7 @@
 ( -96 1392 392 ) ( -112 1392 392 ) ( -112 1392 512 ) common/caulk 1 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 886
+// entity 881
 {
 "classname" "func_group"
 // brush 0
@@ -44715,7 +44687,7 @@
 ( -80 1360 656 ) ( -80 1376 672 ) ( -64 1376 672 ) evil5_metal/drkrstmtl -64 -255 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 887
+// entity 882
 {
 "classname" "func_group"
 // brush 0
@@ -44844,7 +44816,7 @@
 ( 0 1520 392 ) ( 64 1520 392 ) ( 64 1536 392 ) common/caulk 1 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 888
+// entity 883
 {
 "classname" "func_group"
 // brush 0
@@ -44973,7 +44945,7 @@
 ( 192 1472 448 ) ( 192 1480 440 ) ( 128 1472 448 ) common/caulk 0 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 889
+// entity 884
 {
 "classname" "func_group"
 // brush 0
@@ -45102,7 +45074,7 @@
 ( 112 960 392 ) ( 112 896 392 ) ( 128 896 392 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 890
+// entity 885
 {
 "classname" "func_group"
 // brush 0
@@ -45231,7 +45203,7 @@
 ( 64 768 448 ) ( 72 768 440 ) ( 64 832 448 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 891
+// entity 886
 {
 "classname" "func_group"
 // brush 0
@@ -45360,7 +45332,7 @@
 ( 112 704 392 ) ( 112 640 392 ) ( 128 640 392 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 892
+// entity 887
 {
 "classname" "func_group"
 // brush 0
@@ -45489,7 +45461,7 @@
 ( 64 512 448 ) ( 72 512 440 ) ( 64 576 448 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 893
+// entity 888
 {
 "classname" "func_group"
 // brush 0
@@ -45618,7 +45590,7 @@
 ( 112 448 392 ) ( 112 384 392 ) ( 128 384 392 ) common/caulk 0 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 894
+// entity 889
 {
 "classname" "func_group"
 // brush 0
@@ -45747,7 +45719,7 @@
 ( -192 480 448 ) ( -200 480 440 ) ( -192 416 448 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 895
+// entity 890
 {
 "classname" "func_group"
 // brush 0
@@ -45876,7 +45848,7 @@
 ( -240 544 392 ) ( -240 608 392 ) ( -256 608 392 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 896
+// entity 891
 {
 "classname" "func_group"
 // brush 0
@@ -46005,7 +45977,7 @@
 ( -192 352 448 ) ( -200 352 440 ) ( -192 288 448 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 897
+// entity 892
 {
 "classname" "func_group"
 // brush 0
@@ -46134,7 +46106,7 @@
 ( -240 160 392 ) ( -240 224 392 ) ( -256 224 392 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 898
+// entity 893
 {
 "classname" "func_group"
 // brush 0
@@ -46263,7 +46235,7 @@
 ( -192 96 448 ) ( -200 96 440 ) ( -192 32 448 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 899
+// entity 894
 {
 "classname" "func_group"
 // brush 0
@@ -46392,7 +46364,7 @@
 ( 1520 -576 704 ) ( 1520 -672 704 ) ( 1456 -672 704 ) common/caulk 0 -31 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 900
+// entity 895
 {
 "classname" "func_group"
 // brush 0
@@ -46521,7 +46493,7 @@
 ( 1632 -544 640 ) ( 1632 -536 640 ) ( 1632 -544 704 ) common/caulk 0 0 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 901
+// entity 896
 {
 "classname" "func_group"
 // brush 0
@@ -47040,7 +47012,7 @@
 ( 704 224 -656 ) ( 704 240 -672 ) ( 672 240 -672 ) evil5_metal/drkrstmtl -224 16 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 902
+// entity 897
 {
 "classname" "func_group"
 // brush 0
@@ -47559,7 +47531,7 @@
 ( 704 320 -768 ) ( 1088 320 -768 ) ( 1088 256 -576 ) evil1_metals/mtl_rst2 128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 903
+// entity 898
 {
 "classname" "func_group"
 // brush 0
@@ -48078,7 +48050,7 @@
 ( 1088 -96 -656 ) ( 1088 -112 -672 ) ( 1120 -112 -672 ) evil5_metal/drkrstmtl 32 16 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 904
+// entity 899
 {
 "classname" "func_group"
 // brush 0
@@ -48098,18 +48070,29 @@
 ( 1408 1280 128 ) ( 1024 1280 128 ) ( 1024 512 128 ) evil5_metal/drkrstmtl 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 905
+// entity 900
 {
 "classname" "item_armor_large"
 "origin" "1184 1280 -104"
 }
-// entity 906
+// entity 901
 {
 "classname" "item_armor_large"
 "origin" "1040 -528 -432"
 }
-// entity 907
+// entity 902
 {
 "classname" "item_armor_large"
 "origin" "2168 -1208 -752"
 }
+// entity 903
+{
+"classname" "dom_team"
+"cnt" "9"
+"model" "models/domination/dom_pink.md3"
+"noise" "domination/claim.wav"
+"netname" "^6Pink Team^3"
+"noise1" "domination/claim.wav"
+"message" "Pink team has captured a control point"
+"origin" "0.000000 0.000000 16.000000"
+}

Modified: branches/nexuiz-2.0/data/maps/downer.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/downer.map
===================================================================
--- branches/nexuiz-2.0/data/maps/downer.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/downer.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -8089,6 +8089,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "96.000000 832.000000 160.000000"
 }
 // entity 68
 {
@@ -8099,6 +8100,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "96.000000 832.000000 128.000000"
 }
 // entity 69
 {
@@ -8109,6 +8111,7 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "96.000000 832.000000 96.000000"
 }
 // entity 70
 {
@@ -8121,21 +8124,15 @@
 {
 "classname" "dom_controlpoint"
 "message" "^3 has captured the ^1Lower Floor"
-"origin" "336.000000 668.000000 -200.000000"
+"origin" "368.000000 560.000000 -208.000000"
 }
 // entity 72
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Upper Floor"
-"origin" "355.000000 1294.000000 216.000000"
-}
-// entity 73
-{
-"classname" "dom_controlpoint"
 "message" "^3 has captured the ^1Megahealth"
 "origin" "-800.000000 800.000000 216.000000"
 }
-// entity 74
+// entity 73
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -8218,7 +8215,7 @@
 }
 }
 }
-// entity 75
+// entity 74
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -8301,40 +8298,40 @@
 }
 }
 }
-// entity 76
+// entity 75
 {
 "classname" "light"
 "light" "120"
 "origin" "-408 1120 -64"
 }
-// entity 77
+// entity 76
 {
 "classname" "light"
 "light" "60"
 "origin" "512 480 -168"
 }
-// entity 78
+// entity 77
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "448 1024 -72"
 }
-// entity 79
+// entity 78
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "448 896 -72"
 }
-// entity 80
+// entity 79
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "448 960 -72"
 }
-// entity 81
+// entity 80
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -8342,7 +8339,7 @@
 "origin" "448 1024 -56"
 "target" "t22"
 }
-// entity 82
+// entity 81
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -8350,7 +8347,7 @@
 "origin" "448 896 -56"
 "target" "t21"
 }
-// entity 83
+// entity 82
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -8358,7 +8355,7 @@
 "origin" "224 480 -56"
 "target" "t20"
 }
-// entity 84
+// entity 83
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -8366,7 +8363,7 @@
 "origin" "224 608 -56"
 "target" "t19"
 }
-// entity 85
+// entity 84
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -8374,7 +8371,7 @@
 "origin" "224 736 -56"
 "target" "t18"
 }
-// entity 86
+// entity 85
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -8382,161 +8379,161 @@
 "origin" "168 800 -56"
 "target" "t17"
 }
-// entity 87
+// entity 86
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "224 480 -72"
 }
-// entity 88
+// entity 87
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "224 544 -72"
 }
-// entity 89
+// entity 88
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "224 672 -72"
 }
-// entity 90
+// entity 89
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "224 608 -72"
 }
-// entity 91
+// entity 90
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "224 736 -72"
 }
-// entity 92
+// entity 91
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "224 800 -72"
 }
-// entity 93
+// entity 92
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "168 800 -72"
 }
-// entity 94
+// entity 93
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "104 800 -72"
 }
-// entity 95
+// entity 94
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-608 800 -72"
 }
-// entity 96
+// entity 95
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-544 800 -72"
 }
-// entity 97
+// entity 96
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-480 800 -72"
 }
-// entity 98
+// entity 97
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-416 800 -72"
 }
-// entity 99
+// entity 98
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-352 800 -72"
 }
-// entity 100
+// entity 99
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-288 800 -72"
 }
-// entity 101
+// entity 100
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-224 800 -72"
 }
-// entity 102
+// entity 101
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-160 800 -72"
 }
-// entity 103
+// entity 102
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-96 800 -72"
 }
-// entity 104
+// entity 103
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-32 800 -72"
 }
-// entity 105
+// entity 104
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "32 800 -72"
 }
-// entity 106
+// entity 105
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
 "light" "120"
 "origin" "-168 1696 224"
 }
-// entity 107
+// entity 106
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
 "light" "120"
 "origin" "-416 536 -128"
 }
-// entity 108
+// entity 107
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
 "light" "120"
 "origin" "-96 344 64"
 }
-// entity 109
+// entity 108
 {
 "classname" "func_group"
 // brush 0
@@ -8569,7 +8566,7 @@
 ( -550 788 240 ) ( -550 788 236 ) ( -550 800 236 ) evil3_metals/mtldrk1 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 110
+// entity 109
 {
 "classname" "func_group"
 // brush 0
@@ -8602,7 +8599,7 @@
 ( -538 820 268 ) ( -554 820 268 ) ( -554 824 256 ) common/caulk -4 0 0 0.5 -0.5 134217728 4 0
 }
 }
-// entity 111
+// entity 110
 {
 "classname" "func_group"
 // brush 0
@@ -8635,7 +8632,7 @@
 ( -550 812 272 ) ( -550 812 276 ) ( -550 800 276 ) evil3_metals/mtldrk1 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 112
+// entity 111
 {
 "classname" "func_group"
 // brush 0
@@ -8668,7 +8665,7 @@
 ( -538 780 244 ) ( -554 780 244 ) ( -554 776 256 ) common/caulk -4 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 113
+// entity 112
 {
 "classname" "func_group"
 // brush 0
@@ -8699,7 +8696,7 @@
 ( -128 928 216 ) ( -128 912 216 ) ( -128 912 200 ) common/caulk 0 0 -90 0.5 0.5 134217728 4 0
 }
 }
-// entity 114
+// entity 113
 {
 "classname" "func_group"
 // brush 0
@@ -8730,7 +8727,7 @@
 ( -120 1008 200 ) ( -128 1008 200 ) ( -128 992 200 ) evil3_metals/mtldrk1 0 160 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 115
+// entity 114
 {
 "classname" "func_group"
 // brush 0
@@ -8761,7 +8758,7 @@
 ( -120 752 264 ) ( -128 752 264 ) ( -128 736 264 ) evil3_metals/mtldrk1 0 -96 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 116
+// entity 115
 {
 "classname" "func_group"
 // brush 0
@@ -8792,7 +8789,7 @@
 ( -128 608 280 ) ( -128 592 280 ) ( -128 592 264 ) common/caulk 0 0 -90 0.5 0.5 134217728 4 0
 }
 }
-// entity 117
+// entity 116
 {
 "classname" "func_group"
 // brush 0
@@ -8823,7 +8820,7 @@
 ( -48 520 264 ) ( -48 512 264 ) ( -32 512 264 ) evil3_metals/mtldrk1 0 32 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 118
+// entity 117
 {
 "classname" "func_group"
 // brush 0
@@ -8854,7 +8851,7 @@
 ( 160 512 280 ) ( 176 512 280 ) ( 176 512 264 ) common/caulk 0 0 -90 0.5 -0.5 134217728 4 0
 }
 }
-// entity 119
+// entity 118
 {
 "classname" "func_group"
 // brush 0
@@ -8903,7 +8900,7 @@
 ( -976 736 320 ) ( -976 728 320 ) ( -976 728 192 ) common/caulk -32 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 120
+// entity 119
 {
 "classname" "func_group"
 // brush 0
@@ -8952,7 +8949,7 @@
 ( -32 336 16 ) ( -32 304 16 ) ( -24 304 8 ) common/caulk -31 -32 90 0.5 0.5 134217728 4 0
 }
 }
-// entity 121
+// entity 120
 {
 "classname" "func_group"
 // brush 0
@@ -9001,7 +8998,7 @@
 ( -352 496 -64 ) ( -344 496 -64 ) ( -344 496 -192 ) common/caulk -32 -63 -180 0.5 -0.5 134217728 4 0
 }
 }
-// entity 122
+// entity 121
 {
 "classname" "func_group"
 // brush 0
@@ -9050,7 +9047,7 @@
 ( -176 1632 176 ) ( -208 1632 176 ) ( -208 1624 168 ) common/caulk 34 32 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 123
+// entity 122
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9059,14 +9056,14 @@
 "radius" "128"
 "target" "jumppad_light_4"
 }
-// entity 124
+// entity 123
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
 "light" "120"
 "origin" "-936 800 256"
 }
-// entity 125
+// entity 124
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9074,7 +9071,7 @@
 "origin" "32 800 -56"
 "target" "t7"
 }
-// entity 126
+// entity 125
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9082,7 +9079,7 @@
 "origin" "-224 800 -56"
 "target" "t8"
 }
-// entity 127
+// entity 126
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9090,7 +9087,7 @@
 "origin" "-96 800 -56"
 "target" "t9"
 }
-// entity 128
+// entity 127
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9098,7 +9095,7 @@
 "origin" "-608 800 -56"
 "target" "t10"
 }
-// entity 129
+// entity 128
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9106,7 +9103,7 @@
 "origin" "-352 800 -56"
 "target" "t11"
 }
-// entity 130
+// entity 129
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9114,49 +9111,49 @@
 "origin" "-480 800 -56"
 "target" "t12"
 }
-// entity 131
+// entity 130
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-608 864 -72"
 }
-// entity 132
+// entity 131
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-608 928 -64"
 }
-// entity 133
+// entity 132
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-608 992 -48"
 }
-// entity 134
+// entity 133
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-608 1064 -40"
 }
-// entity 135
+// entity 134
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-416 736 -72"
 }
-// entity 136
+// entity 135
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-416 672 -72"
 }
-// entity 137
+// entity 136
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9164,7 +9161,7 @@
 "origin" "-416 672 -56"
 "target" "t13"
 }
-// entity 138
+// entity 137
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9172,7 +9169,7 @@
 "origin" "-608 928 -48"
 "target" "t14"
 }
-// entity 139
+// entity 138
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9180,7 +9177,7 @@
 "origin" "-608 1064 -24"
 "target" "t15"
 }
-// entity 140
+// entity 139
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
@@ -9188,28 +9185,28 @@
 "origin" "-224 928 -48"
 "target" "t16"
 }
-// entity 141
+// entity 140
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-224 992 -48"
 }
-// entity 142
+// entity 141
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-224 928 -64"
 }
-// entity 143
+// entity 142
 {
 "classname" "light"
 "_color" "0.798818 1.000000 0.836165"
 "light" "15"
 "origin" "-224 864 -72"
 }
-// entity 144
+// entity 143
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9253,7 +9250,7 @@
 }
 }
 }
-// entity 145
+// entity 144
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9271,7 +9268,7 @@
 }
 }
 }
-// entity 146
+// entity 145
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9289,7 +9286,7 @@
 }
 }
 }
-// entity 147
+// entity 146
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9320,7 +9317,7 @@
 }
 }
 }
-// entity 148
+// entity 147
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9351,7 +9348,7 @@
 }
 }
 }
-// entity 149
+// entity 148
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -9442,7 +9439,7 @@
 }
 }
 }
-// entity 150
+// entity 149
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9492,7 +9489,7 @@
 }
 }
 }
-// entity 151
+// entity 150
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9542,7 +9539,7 @@
 }
 }
 }
-// entity 152
+// entity 151
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9586,248 +9583,248 @@
 }
 }
 }
-// entity 153
+// entity 152
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "-384 1856 48"
 }
-// entity 154
+// entity 153
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "512 1504 8"
 }
-// entity 155
+// entity 154
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "0 1856 216"
 }
-// entity 156
+// entity 155
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "448 896 248"
 }
-// entity 157
+// entity 156
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "704 896 80"
 }
-// entity 158
+// entity 157
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "704 1344 248"
 }
-// entity 159
+// entity 158
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "-704 320 248"
 }
-// entity 160
+// entity 159
 {
 "classname" "light"
 "_color" "0.998444 1.000000 0.821393"
 "light" "60"
 "origin" "-384 320 248"
 }
-// entity 161
+// entity 160
 {
 "classname" "light"
 "_color" "0.998444 1.000000 0.821393"
 "light" "60"
 "origin" "-384 1280 248"
 }
-// entity 162
+// entity 161
 {
 "classname" "light"
 "_color" "0.999298 1.000000 0.920150"
 "light" "60"
 "origin" "-704 1280 248"
 }
-// entity 163
+// entity 162
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "-544 1248 232"
 }
-// entity 164
+// entity 163
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "-288 1120 248"
 }
-// entity 165
+// entity 164
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "96 1400 232"
 }
-// entity 166
+// entity 165
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "416 1152 232"
 }
-// entity 167
+// entity 166
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "544 1312 232"
 }
-// entity 168
+// entity 167
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "480 928 48"
 }
-// entity 169
+// entity 168
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "416 640 -80"
 }
-// entity 170
+// entity 169
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "-96 440 48"
 }
-// entity 171
+// entity 170
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "-544 352 232"
 }
-// entity 172
+// entity 171
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "96 1664 200"
 }
-// entity 173
+// entity 172
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "-32 1696 32"
 }
-// entity 174
+// entity 173
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "-96 1440 -32"
 }
-// entity 175
+// entity 174
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "-352 1440 -32"
 }
-// entity 176
+// entity 175
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "312 1440 -32"
 }
-// entity 177
+// entity 176
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "96 1328 -8"
 }
-// entity 178
+// entity 177
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "75"
 "origin" "448 1304 -32"
 }
-// entity 179
+// entity 178
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "10"
 "origin" "-96 1440 96"
 }
-// entity 180
+// entity 179
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "10"
 "origin" "-352 1440 96"
 }
-// entity 181
+// entity 180
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "10"
 "origin" "312 1440 64"
 }
-// entity 182
+// entity 181
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "10"
 "origin" "416 632 120"
 }
-// entity 183
+// entity 182
 {
 "classname" "light"
 "_color" "0.821393 0.883192 1.000000"
 "light" "10"
 "origin" "448 1304 64"
 }
-// entity 184
+// entity 183
 {
 "classname" "light"
 "light" "200"
 "origin" "-352 800 512"
 }
-// entity 185
+// entity 184
 {
 "classname" "light"
 "light" "200"
 "origin" "-352 800 328"
 }
-// entity 186
+// entity 185
 {
 "classname" "light"
 "light" "200"
 "origin" "-672 808 512"
 }
-// entity 187
+// entity 186
 {
 "classname" "light"
 "light" "100"
 "origin" "-672 808 328"
 }
-// entity 188
+// entity 187
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9836,7 +9833,7 @@
 "radius" "64"
 "target" "jumppad_light_5"
 }
-// entity 189
+// entity 188
 {
 "classname" "func_group"
 "_lightmapscale" "0.25"
@@ -9868,7 +9865,7 @@
 ( 560 1040 160 ) ( 560 1040 0 ) ( 560 1216 0 ) common/caulk 16 16 0 0.5 0.5 0 4 0
 }
 }
-// entity 190
+// entity 189
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9877,7 +9874,7 @@
 "radius" "128"
 "target" "jumppad_light_1"
 }
-// entity 191
+// entity 190
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9886,7 +9883,7 @@
 "radius" "128"
 "target" "jumppad_light_2"
 }
-// entity 192
+// entity 191
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9895,7 +9892,7 @@
 "radius" "128"
 "target" "jumppad_light_3"
 }
-// entity 193
+// entity 192
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9904,7 +9901,7 @@
 "radius" "128"
 "target" "jumppad_light_14"
 }
-// entity 194
+// entity 193
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9913,7 +9910,7 @@
 "radius" "64"
 "target" "jumppad_light_15"
 }
-// entity 195
+// entity 194
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9922,7 +9919,7 @@
 "radius" "128"
 "target" "jumppad_light_11"
 }
-// entity 196
+// entity 195
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9931,7 +9928,7 @@
 "radius" "128"
 "target" "jumppad_light_12"
 }
-// entity 197
+// entity 196
 {
 "classname" "light"
 "_color" "0.574347 0.634320 1.000000"
@@ -9940,7 +9937,7 @@
 "radius" "128"
 "target" "jumppad_light_13"
 }
-// entity 198
+// entity 197
 {
 "classname" "func_group"
 "_lightmapscale" "0.25"

Modified: branches/nexuiz-2.0/data/maps/final_rage.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/final_rage.map
===================================================================
--- branches/nexuiz-2.0/data/maps/final_rage.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/final_rage.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -14914,20 +14914,20 @@
 // entity 340
 {
 "classname" "dom_controlpoint"
-"origin" "64 256 -48"
+"origin" "-16.000000 -304.000000 -48.000000"
 "message" " has captured the lava room"
 }
 // entity 341
 {
 "classname" "dom_controlpoint"
-"origin" "832 1160 144"
+"origin" "832.000000 1128.000000 144.000000"
 "message" " has captured the machinegun room"
 }
 // entity 342
 {
 "classname" "dom_controlpoint"
-"origin" "-288 560 304"
-"message" " has captured the nexgun balcony"
+"origin" "320.000000 512.000000 400.000000"
+"message" " has captured the catwalk"
 }
 // entity 343
 {

Modified: branches/nexuiz-2.0/data/maps/runningman.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/runningman.map
===================================================================
--- branches/nexuiz-2.0/data/maps/runningman.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/runningman.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -13282,6 +13282,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 0.000000 136.000000"
 }
 // entity 71
 {
@@ -13292,6 +13293,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 104.000000"
 }
 // entity 72
 {
@@ -13302,49 +13304,42 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 72.000000"
 }
 // entity 73
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured ^1Main Area"
-"origin" "768.000000 -256.000000 240.000000"
+"message" "^3 has captured the ^1Mortar Niche"
+"origin" "784.000000 832.000000 304.000000"
 "wait" "5"
 }
 // entity 74
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured the ^1Mortar Niche"
-"origin" "784.000000 816.000000 304.000000"
-"wait" "5"
-}
-// entity 75
-{
-"classname" "dom_controlpoint"
-"frags" "1"
 "message" "^3 has captured the ^1Rocket Launcher/Teleporter"
 "origin" "-1056.000000 -208.000000 208.000000"
 "wait" "5"
 }
-// entity 76
+// entity 75
 {
 "classname" "dom_controlpoint"
 "frags" "2"
 "message" "^3 has captured the ^1Nex-Tunnel"
 "origin" "256.000000 -176.000000 -376.000000"
-"scale" "1.3"
+"scale" "0.8"
 "wait" "5"
 }
-// entity 77
+// entity 76
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured the ^1lower Floor"
-"origin" "352.000000 -656.000000 -224.000000"
+"message" "^3 has captured the ^1hagar"
+"origin" "256.000000 -1048.000000 -144.000000"
 "wait" "5"
 }
-// entity 78
+// entity 77
 {
 "classname" "func_rotating"
 "origin" "-0.000000 0.000000 -0.000000"
@@ -13368,7 +13363,7 @@
 ( -952 -640 188 ) ( -1040 -640 188 ) ( -1040 -656 188 ) common/origin 48 16 0 0.5 0.5 0 14 0
 }
 }
-// entity 79
+// entity 78
 {
 "classname" "func_rotating"
 "origin" "-0.000000 -0.000000 -0.000000"
@@ -13392,7 +13387,7 @@
 ( -984 -640 204 ) ( -1000 -640 204 ) ( -1000 -640 188 ) common/origin 48 24 0 0.5 0.5 0 14 0
 }
 }
-// entity 80
+// entity 79
 {
 "classname" "func_group"
 // brush 0
@@ -13529,7 +13524,7 @@
 ( 136 48 -64 ) ( 160 48 -64 ) ( 160 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 81
+// entity 80
 {
 "classname" "func_group"
 // brush 0
@@ -13595,7 +13590,7 @@
 ( 64 -368 -96 ) ( 64 -336 -96 ) ( 64 -368 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 82
+// entity 81
 {
 "classname" "func_group"
 // brush 0
@@ -13696,7 +13691,7 @@
 ( 304 -288 -64 ) ( 256 -288 -64 ) ( 304 -464 -64 ) common/caulk 0 -16 0 0.5 0.5 0 0 0
 }
 }
-// entity 83
+// entity 82
 {
 "classname" "func_group"
 // brush 0
@@ -13775,7 +13770,7 @@
 ( 704 -128 256 ) ( 704 304 256 ) ( 704 304 192 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 84
+// entity 83
 {
 "classname" "func_group"
 // brush 0
@@ -13832,7 +13827,7 @@
 ( -624 -368 0 ) ( -768 -416 0 ) ( -624 -368 48 ) common/caulk 0 47 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 85
+// entity 84
 {
 "classname" "func_group"
 // brush 0
@@ -13872,7 +13867,7 @@
 ( -384 -544 0 ) ( -640 -544 32 ) ( -384 -512 0 ) evil8_base/e8_base1 -128 64 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 86
+// entity 85
 {
 "classname" "func_group"
 // brush 0
@@ -13893,7 +13888,7 @@
 ( 576 -832 -32 ) ( 528 -832 -32 ) ( 528 -848 -24 ) common/caulk -32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 87
+// entity 86
 {
 "classname" "func_group"
 // brush 0
@@ -13905,7 +13900,7 @@
 ( 432 -832 -32 ) ( 432 -832 -64 ) ( 528 -832 -64 ) common/caulk -32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 88
+// entity 87
 {
 "classname" "func_group"
 // brush 0
@@ -13926,7 +13921,7 @@
 ( 560 -16 -96 ) ( 576 0 -96 ) ( 576 0 -19 ) common/caulk 0 -64 0 0.5 0.5 0 0 0
 }
 }
-// entity 89
+// entity 88
 {
 "classname" "func_group"
 // brush 0
@@ -13974,7 +13969,7 @@
 ( 576 512 0 ) ( 576 544 0 ) ( 352 512 0 ) common/caulk 0 -16 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 90
+// entity 89
 {
 "classname" "func_group"
 // brush 0
@@ -13987,7 +13982,7 @@
 ( 576 672 0 ) ( 320 704 32 ) ( 576 704 0 ) evil8_base/e8_base1 0 -127 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 91
+// entity 90
 {
 "classname" "func_group"
 // brush 0
@@ -14000,7 +13995,7 @@
 ( 192 64 0 ) ( 192 32 0 ) ( 448 64 0 ) common/caulk 0 -16 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 92
+// entity 91
 {
 "classname" "func_group"
 // brush 0
@@ -14024,7 +14019,7 @@
 ( 416 64 0 ) ( 416 32 0 ) ( 576 64 0 ) common/caulk -32 47 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 93
+// entity 92
 {
 "classname" "func_group"
 // brush 0
@@ -14037,7 +14032,7 @@
 ( 576 -1176 -128 ) ( 576 -1144 -128 ) ( 560 -1144 -96 ) evil8_base/e8_base1 -224 -80 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 94
+// entity 93
 {
 "classname" "func_group"
 // brush 0
@@ -14050,7 +14045,7 @@
 ( 720 80 448 ) ( 736 80 448 ) ( 736 112 448 ) evil8_base/e8_base1 64 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 95
+// entity 94
 {
 "classname" "func_group"
 // brush 0
@@ -14129,7 +14124,7 @@
 ( 608 304 176 ) ( 640 320 176 ) ( 608 304 768 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 96
+// entity 95
 {
 "classname" "func_group"
 // brush 0
@@ -14142,7 +14137,7 @@
 ( 800 272 576 ) ( 800 304 576 ) ( 736 304 448 ) evil8_lights/e8tmtllight2b 0 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 97
+// entity 96
 {
 "classname" "func_group"
 // brush 0
@@ -14221,7 +14216,7 @@
 ( 608 -464 176 ) ( 640 -448 176 ) ( 608 -464 768 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 98
+// entity 97
 {
 "classname" "func_group"
 // brush 0
@@ -14243,7 +14238,7 @@
 ( 240 -528 768 ) ( 240 -544 768 ) ( 240 -544 160 ) evil8_base/e8_base1 128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 99
+// entity 98
 {
 "classname" "func_group"
 // brush 0
@@ -14256,7 +14251,7 @@
 ( -48 -1176 32 ) ( -48 -1144 32 ) ( -48 -1144 -96 ) evil8_lights/e8tmtllight2b 16 -63 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 100
+// entity 99
 {
 "classname" "func_group"
 // brush 0
@@ -14269,7 +14264,7 @@
 ( 128 -1216 -128 ) ( 160 -1216 -128 ) ( 160 -1200 -96 ) evil8_base/e8_base1 -16 -79 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 101
+// entity 100
 {
 "classname" "func_group"
 // brush 0
@@ -14282,7 +14277,7 @@
 ( 384 -1200 32 ) ( 352 -1200 32 ) ( 352 -1200 -96 ) evil8_lights/e8tmtllight2b 0 -63 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 102
+// entity 101
 {
 "classname" "func_group"
 // brush 0
@@ -14304,7 +14299,7 @@
 ( -112 -528 208 ) ( -112 -544 176 ) ( -80 -544 176 ) evil8_base/e8_base1 192 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 103
+// entity 102
 {
 "classname" "func_group"
 // brush 0
@@ -14326,7 +14321,7 @@
 ( -208 -192 896 ) ( -224 -192 896 ) ( -224 -192 288 ) evil8_base/e8_base1 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 104
+// entity 103
 {
 "classname" "func_group"
 // brush 0
@@ -14348,21 +14343,21 @@
 ( -272 272 768 ) ( -272 288 768 ) ( -272 288 160 ) evil8_base/e8_base1 -128 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 105
+// entity 104
 {
 "classname" "misc_model"
 "angle" "225"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "152 216 176"
 }
-// entity 106
+// entity 105
 {
 "classname" "misc_model"
 "angle" "153.5"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "0 224 176"
 }
-// entity 107
+// entity 106
 {
 "classname" "func_group"
 // brush 0
@@ -14384,7 +14379,7 @@
 ( 208 432 208 ) ( 192 432 176 ) ( 192 400 176 ) evil8_base/e8_base1 64 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 108
+// entity 107
 {
 "classname" "func_group"
 // brush 0
@@ -14406,7 +14401,7 @@
 ( 464 688 768 ) ( 464 704 768 ) ( 464 704 160 ) evil8_base/e8_base1 -192 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 109
+// entity 108
 {
 "classname" "func_group"
 // brush 0
@@ -14454,7 +14449,7 @@
 ( 1024 608 0 ) ( 1024 672 0 ) ( 1248 672 8 ) evil8_base/e8metal01 128 -127 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 110
+// entity 109
 {
 "classname" "func_group"
 // brush 0
@@ -14467,7 +14462,7 @@
 ( 1280 512 0 ) ( 1024 544 0 ) ( 1024 512 0 ) common/caulk 0 -15 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 111
+// entity 110
 {
 "classname" "func_group"
 // brush 0
@@ -14480,7 +14475,7 @@
 ( 768 208 576 ) ( 768 176 576 ) ( 832 176 448 ) evil8_lights/e8tmtllight2b 0 127 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 112
+// entity 111
 {
 "classname" "func_group"
 // brush 0
@@ -14546,7 +14541,7 @@
 ( 928 192 672 ) ( 928 208 672 ) ( 928 208 768 ) evil8_base/e8metal01 64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 113
+// entity 112
 {
 "classname" "func_group"
 // brush 0
@@ -14559,7 +14554,7 @@
 ( 848 208 632 ) ( 848 176 632 ) ( 848 176 192 ) evil8_base/e8_base1 64 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 114
+// entity 113
 {
 "classname" "func_group"
 // brush 0
@@ -14572,7 +14567,7 @@
 ( 952 120 656 ) ( 960 120 672 ) ( 960 88 672 ) evil8_base/e8_base1 64 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 115
+// entity 114
 {
 "classname" "func_group"
 // brush 0
@@ -14585,7 +14580,7 @@
 ( 960 72 192 ) ( 992 72 192 ) ( 992 504 192 ) common/caulk -32 32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 116
+// entity 115
 {
 "classname" "func_group"
 // brush 0
@@ -14598,7 +14593,7 @@
 ( 1120 288 192 ) ( 1072 288 192 ) ( 1120 256 192 ) evil8_base/e8_base1 -192 14 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 117
+// entity 116
 {
 "classname" "func_group"
 // brush 0
@@ -14611,14 +14606,14 @@
 ( 1104 96 584 ) ( 1104 128 584 ) ( 1104 128 144 ) evil8_base/e8_base1 144 30 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 118
+// entity 117
 {
 "classname" "misc_model"
 "angle" "135"
 "model" "models/mapobjects/strale5_lamp2.ase"
 "origin" "928 -224 384"
 }
-// entity 119
+// entity 118
 {
 "classname" "func_group"
 // brush 0
@@ -14640,7 +14635,7 @@
 ( 1136 688 208 ) ( 1136 704 176 ) ( 1104 704 176 ) evil8_base/e8_base1 -64 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 120
+// entity 119
 {
 "classname" "func_group"
 // brush 0
@@ -14662,7 +14657,7 @@
 ( 816 -432 416 ) ( 832 -432 384 ) ( 832 -400 384 ) evil8_base/e8_base1 64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 121
+// entity 120
 {
 "classname" "func_group"
 // brush 0
@@ -14684,7 +14679,7 @@
 ( 1232 -112 896 ) ( 1232 -128 896 ) ( 1232 -128 288 ) evil8_base/e8_base1 192 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 122
+// entity 121
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14692,14 +14687,14 @@
 "origin" "80 -524 172"
 "target" "t2"
 }
-// entity 123
+// entity 122
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "250"
 "origin" "80 -516 168"
 }
-// entity 124
+// entity 123
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14707,14 +14702,14 @@
 "origin" "-192 -868 -130"
 "target" "t5"
 }
-// entity 125
+// entity 124
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-192 -868 -126"
 }
-// entity 126
+// entity 125
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14722,14 +14717,14 @@
 "origin" "0 -508 -124"
 "target" "t6"
 }
-// entity 127
+// entity 126
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "0 -516 -128"
 }
-// entity 128
+// entity 127
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14737,56 +14732,56 @@
 "origin" "-424 -656 -128"
 "target" "t7"
 }
-// entity 129
+// entity 128
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-416 -656 -132"
 }
-// entity 130
+// entity 129
 {
 "classname" "light"
 "_color" "0.314264 0.528486 1.000000"
 "light" "400"
 "origin" "-120 -176 -360"
 }
-// entity 131
+// entity 130
 {
 "classname" "light"
 "_color" "0.314264 0.528486 1.000000"
 "light" "400"
 "origin" "16 -40 -360"
 }
-// entity 132
+// entity 131
 {
 "classname" "light"
 "_color" "0.314264 0.528486 1.000000"
 "light" "400"
 "origin" "208 -40 -360"
 }
-// entity 133
+// entity 132
 {
 "classname" "light"
 "_color" "0.314264 0.528486 1.000000"
 "light" "400"
 "origin" "192 -312 -360"
 }
-// entity 134
+// entity 133
 {
 "classname" "light"
 "_color" "0.314264 0.528486 1.000000"
 "light" "400"
 "origin" "384 -312 -360"
 }
-// entity 135
+// entity 134
 {
 "classname" "light"
 "_color" "0.314264 0.528486 1.000000"
 "light" "400"
 "origin" "552 -176 -360"
 }
-// entity 136
+// entity 135
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14794,14 +14789,14 @@
 "origin" "1108 -112 60"
 "target" "t11"
 }
-// entity 137
+// entity 136
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "175"
 "origin" "1116 -112 56"
 }
-// entity 138
+// entity 137
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14809,14 +14804,14 @@
 "origin" "879 -235 -4"
 "target" "t12"
 }
-// entity 139
+// entity 138
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "175"
 "origin" "885 -241 -8"
 }
-// entity 140
+// entity 139
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14824,14 +14819,14 @@
 "origin" "516 -240 -52"
 "target" "t13"
 }
-// entity 141
+// entity 140
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "175"
 "origin" "524 -240 -56"
 }
-// entity 142
+// entity 141
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14839,21 +14834,21 @@
 "origin" "172 -168 -124"
 "target" "t14"
 }
-// entity 143
+// entity 142
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "100"
 "origin" "180 -168 -128"
 }
-// entity 144
+// entity 143
 {
 "classname" "light"
 "_color" "0.314264 0.528486 1.000000"
 "light" "400"
 "origin" "552 -24 -360"
 }
-// entity 145
+// entity 144
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14861,14 +14856,14 @@
 "origin" "-424 112 -128"
 "target" "t15"
 }
-// entity 146
+// entity 145
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-418 112 -130"
 }
-// entity 147
+// entity 146
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14876,14 +14871,14 @@
 "origin" "-192 294 -128"
 "target" "t16"
 }
-// entity 148
+// entity 147
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-192 286 -130"
 }
-// entity 149
+// entity 148
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14891,14 +14886,14 @@
 "origin" "60 192 -124"
 "target" "t17"
 }
-// entity 150
+// entity 149
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "100"
 "origin" "60 192 -144"
 }
-// entity 151
+// entity 150
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14906,14 +14901,14 @@
 "origin" "620 192 -284"
 "target" "t18"
 }
-// entity 152
+// entity 151
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "150"
 "origin" "620 192 -296"
 }
-// entity 153
+// entity 152
 {
 "classname" "func_group"
 // brush 0
@@ -14935,7 +14930,7 @@
 ( 1392 464 768 ) ( 1408 464 768 ) ( 1408 464 160 ) evil8_base/e8_base1 -64 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 154
+// entity 153
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14943,14 +14938,14 @@
 "origin" "432 -524 172"
 "target" "t21"
 }
-// entity 155
+// entity 154
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "250"
 "origin" "432 -516 168"
 }
-// entity 156
+// entity 155
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14958,14 +14953,14 @@
 "origin" "-1044 180 292"
 "target" "t22"
 }
-// entity 157
+// entity 156
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "100"
 "origin" "-1038 174 288"
 }
-// entity 158
+// entity 157
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14973,14 +14968,14 @@
 "origin" "272 632 176"
 "target" "t23"
 }
-// entity 159
+// entity 158
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "278 630 172"
 }
-// entity 160
+// entity 159
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -14988,105 +14983,105 @@
 "origin" "1336 628 172"
 "target" "t24"
 }
-// entity 161
+// entity 160
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "1330 622 168"
 }
-// entity 162
+// entity 161
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "350"
 "origin" "384 192 256"
 }
-// entity 163
+// entity 162
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "275"
 "origin" "384 512 256"
 }
-// entity 164
+// entity 163
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "250"
 "origin" "1216 512 256"
 }
-// entity 165
+// entity 164
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "250"
 "origin" "1248 224 352"
 }
-// entity 166
+// entity 165
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "500"
 "origin" "544 -192 352"
 }
-// entity 167
+// entity 166
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "500"
 "origin" "0 -192 224"
 }
-// entity 168
+// entity 167
 {
 "classname" "light"
 "_color" "0.66 0.65 0.7"
 "light" "200"
 "origin" "-432 -208 -64"
 }
-// entity 169
+// entity 168
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "200"
 "origin" "-640 64 224"
 }
-// entity 170
+// entity 169
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "170"
 "origin" "-1072 -208 304"
 }
-// entity 171
+// entity 170
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "200"
 "origin" "256 -1024 -32"
 }
-// entity 172
+// entity 171
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "100"
 "origin" "784 512 96"
 }
-// entity 173
+// entity 172
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "784 240 96"
 }
-// entity 174
+// entity 173
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "25"
 "origin" "944 144 -320"
 }
-// entity 175
+// entity 174
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -15094,35 +15089,35 @@
 "origin" "327 -339 -124"
 "target" "t25"
 }
-// entity 176
+// entity 175
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "333 -345 -128"
 }
-// entity 177
+// entity 176
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-992 -440 248"
 }
-// entity 178
+// entity 177
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-144 -564 -176"
 }
-// entity 179
+// entity 178
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "144 -564 -176"
 }
-// entity 180
+// entity 179
 {
 "classname" "func_group"
 // brush 0
@@ -15144,7 +15139,7 @@
 ( 172 218 768 ) ( 161 229 768 ) ( 161 229 160 ) common/clip -30 0 0 0.3595579863 0.5 134217728 13 0
 }
 }
-// entity 181
+// entity 180
 {
 "classname" "func_group"
 // brush 0
@@ -15166,7 +15161,7 @@
 ( 5 201 208 ) ( 13 215 176 ) ( -16 230 176 ) common/clip 5 0 0 0.4449020028 0.5 134217728 13 0
 }
 }
-// entity 182
+// entity 181
 {
 "classname" "func_group"
 // brush 0
@@ -15188,14 +15183,14 @@
 ( 906 -226 896 ) ( 916 -238 896 ) ( 916 -238 288 ) common/clip 62 0 -180 0.3716279864 -0.5 134217728 13 0
 }
 }
-// entity 183
+// entity 182
 {
 "classname" "light"
 "_color" "0.4 0.4 0.4"
 "light" "30"
 "origin" "-992 -640 251"
 }
-// entity 184
+// entity 183
 {
 "classname" "func_group"
 // brush 0
@@ -15217,7 +15212,7 @@
 ( 1440 -84 384 ) ( 1440 -84 352 ) ( 1376 12 352 ) evil8_base/e8_base1 -32 -57 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 185
+// entity 184
 {
 "classname" "func_group"
 // brush 0
@@ -15239,7 +15234,7 @@
 ( 1404 128 224 ) ( 1416 128 224 ) ( 1416 128 256 ) evil8_base/e8_base1 -64 73 0 0.5 -0.5 134217728 0 0
 }
 }
-// entity 186
+// entity 185
 {
 "classname" "func_group"
 // brush 0
@@ -15261,7 +15256,7 @@
 ( 172 218 208 ) ( 161 229 176 ) ( 138 206 176 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 187
+// entity 186
 {
 "classname" "func_group"
 // brush 0
@@ -15283,7 +15278,7 @@
 ( 5 201 768 ) ( 13 215 768 ) ( 13 215 160 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 188
+// entity 187
 {
 "classname" "func_group"
 // brush 0
@@ -15305,21 +15300,21 @@
 ( 906 -226 416 ) ( 916 -238 384 ) ( 940 -217 384 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 189
+// entity 188
 {
 "classname" "misc_model"
 "angle" "270"
 "model" "models/mapobjects/morphed_tele/telepad.ase"
 "origin" "-1000 -632 176"
 }
-// entity 190
+// entity 189
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "20"
 "origin" "-996 -644 208"
 }
-// entity 191
+// entity 190
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -15327,7 +15322,7 @@
 "origin" "552 -664 -128"
 "target" "t26"
 }
-// entity 192
+// entity 191
 {
 "classname" "light"
 "_color" "0.9 0.9 1"

Modified: branches/nexuiz-2.0/data/maps/runningman_1on1remix.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/runningman_1on1remix.map
===================================================================
--- branches/nexuiz-2.0/data/maps/runningman_1on1remix.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/runningman_1on1remix.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -16328,6 +16328,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 0.000000 56.000000"
 }
 // entity 69
 {
@@ -16338,6 +16339,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 88.000000"
 }
 // entity 70
 {
@@ -16348,49 +16350,42 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 24.000000"
 }
 // entity 71
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured ^1Main Area"
-"origin" "768.000000 -256.000000 240.000000"
+"message" "^3 has captured the ^1Mega Health"
+"origin" "784.000000 840.000000 304.000000"
 "wait" "5"
 }
 // entity 72
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured the ^1Mega Health"
-"origin" "784.000000 816.000000 304.000000"
-"wait" "5"
-}
-// entity 73
-{
-"classname" "dom_controlpoint"
-"frags" "1"
 "message" "^3 has captured the ^1Rocket Launcher/Teleporter"
 "origin" "-1056.000000 -208.000000 208.000000"
 "wait" "5"
 }
-// entity 74
+// entity 73
 {
 "classname" "dom_controlpoint"
 "frags" "2"
 "message" "^3 has captured the ^1Nex-Tunnel"
 "origin" "256.000000 -176.000000 -376.000000"
-"scale" "1.3"
+"scale" "0.8"
 "wait" "5"
 }
-// entity 75
+// entity 74
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured the ^1lower Floor"
-"origin" "352.000000 -656.000000 -224.000000"
+"message" "^3 has captured the ^1lower teleport Floor"
+"origin" "304.000000 -1024.000000 -144.000000"
 "wait" "5"
 }
-// entity 76
+// entity 75
 {
 "classname" "trigger_teleport"
 "target" "t26"
@@ -16404,62 +16399,62 @@
 ( -32 -992 -160 ) ( -64 -992 -160 ) ( -64 -1088 -160 ) common/trigger 0 0 0 0.5 0.5 0 7 0
 }
 }
-// entity 77
+// entity 76
 {
 "classname" "misc_teleporter_dest"
 "angle" "90"
 "origin" "-992.000000 -528.000000 208.000000"
 "targetname" "t26"
 }
-// entity 78
+// entity 77
 {
 "classname" "item_armor_small"
 "origin" "-264.000000 -480.000000 192.000000"
 }
-// entity 79
+// entity 78
 {
 "classname" "item_armor_small"
 "origin" "-368.000000 -480.000000 192.000000"
 }
-// entity 80
+// entity 79
 {
 "classname" "item_armor_small"
 "origin" "-480.000000 -480.000000 192.000000"
 }
-// entity 81
+// entity 80
 {
 "classname" "item_armor_small"
 "origin" "-584.000000 -480.000000 192.000000"
 }
-// entity 82
+// entity 81
 {
 "classname" "item_armor_large"
 "origin" "-120.000000 144.000000 200.000000"
 }
-// entity 83
+// entity 82
 {
 "classname" "weapon_hagar"
 "origin" "280.000000 -608.000000 40.000000"
 }
-// entity 84
+// entity 83
 {
 "classname" "target_position"
 "origin" "-221.000000 226.000000 36.000000"
 "targetname" "t27"
 }
-// entity 85
+// entity 84
 {
 "classname" "target_position"
 "origin" "-633.000000 -410.000000 208.000000"
 "targetname" "t28"
 }
-// entity 86
+// entity 85
 {
 "classname" "target_position"
 "origin" "-631.000000 -14.000000 204.000000"
 "targetname" "t29"
 }
-// entity 87
+// entity 86
 {
 "classname" "trigger_multiple"
 "target" "t30"
@@ -16475,14 +16470,14 @@
 ( 1240 -424 1384 ) ( 1168 -424 1384 ) ( 1168 -552 1384 ) common/trigger -16 -48 0 0.5 0.5 0 7 0
 }
 }
-// entity 88
+// entity 87
 {
 "classname" "target_print"
 "message" "You're really shooting everything, don't you ?"
 "origin" "1152.000000 -392.000000 1600.000000"
 "targetname" "t30"
 }
-// entity 89
+// entity 88
 {
 "classname" "trigger_multiple"
 "target" "t31"
@@ -16496,14 +16491,14 @@
 ( 112 -976 1824 ) ( 112 -1104 1824 ) ( 112 -1104 1384 ) common/trigger 0 0 0 0.5 0.5 0 7 0
 }
 }
-// entity 90
+// entity 89
 {
 "classname" "target_print"
 "message" "HIT ME !!!!"
 "origin" "96.000000 -976.000000 1600.000000"
 "targetname" "t31"
 }
-// entity 91
+// entity 90
 {
 "classname" "trigger_multiple"
 "target" "t32"
@@ -16517,14 +16512,14 @@
 ( -528 -240 1384 ) ( -528 -168 1384 ) ( -656 -168 1384 ) common/trigger 0 0 -90 0.5 0.5 0 7 0
 }
 }
-// entity 92
+// entity 91
 {
 "classname" "target_print"
 "message" "Try to aim a little lower"
 "origin" "-552.000000 -200.000000 1736.000000"
 "targetname" "t32"
 }
-// entity 93
+// entity 92
 {
 "classname" "trigger_multiple"
 "target" "t33"
@@ -16538,21 +16533,21 @@
 ( -408 -184 1824 ) ( -536 -184 1824 ) ( -536 -184 1384 ) common/trigger 16 0 0 0.5 0.5 0 7 0
 }
 }
-// entity 94
+// entity 93
 {
 "classname" "target_print"
 "message" "Try to aim a little higher"
 "origin" "-408.000000 -152.000000 1600.000000"
 "targetname" "t33"
 }
-// entity 95
+// entity 94
 {
 "classname" "target_print"
 "message" "Yeah ! You got me ;)"
 "origin" "-448.000000 -160.000000 1680.000000"
 "targetname" "t34"
 }
-// entity 96
+// entity 95
 {
 "classname" "trigger_multiple"
 "target" "t34"
@@ -16566,7 +16561,7 @@
 ( -552 -152 1664 ) ( -568 -152 1664 ) ( -568 -240 1664 ) common/trigger 0 0 0 0.5 0.5 0 7 0
 }
 }
-// entity 97
+// entity 96
 {
 "classname" "func_rotating"
 "origin" "-0.000000 0.000000 0.000000"
@@ -16590,7 +16585,7 @@
 ( -32 -1032 -144 ) ( -120 -1032 -144 ) ( -120 -1048 -144 ) common/origin 0 0 0 0.5 0.5 0 14 0
 }
 }
-// entity 98
+// entity 97
 {
 "classname" "func_rotating"
 "origin" "0.000000 -0.000000 -0.000000"
@@ -16614,7 +16609,7 @@
 ( -88 -1040 -128 ) ( -72 -1040 -128 ) ( -72 -1040 -144 ) common/origin 16 0 -180 0.5 -0.5 0 14 0
 }
 }
-// entity 99
+// entity 98
 {
 "classname" "func_rotating"
 "origin" "-0.000000 0.000000 -0.000000"
@@ -16638,7 +16633,7 @@
 ( -952 -640 188 ) ( -1040 -640 188 ) ( -1040 -656 188 ) common/origin 48 16 0 0.5 0.5 0 14 0
 }
 }
-// entity 100
+// entity 99
 {
 "classname" "func_rotating"
 "origin" "-0.000000 -0.000000 -0.000000"
@@ -16662,13 +16657,13 @@
 ( -1008 -648 204 ) ( -992 -648 204 ) ( -992 -648 188 ) common/origin -31 24 -180 0.5 -0.5 0 14 0
 }
 }
-// entity 101
+// entity 100
 {
 "classname" "target_position"
 "origin" "500.000000 -664.000000 -244.000000"
 "targetname" "t35"
 }
-// entity 102
+// entity 101
 {
 "classname" "func_group"
 // brush 0
@@ -16805,7 +16800,7 @@
 ( 136 48 -64 ) ( 160 48 -64 ) ( 160 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 103
+// entity 102
 {
 "classname" "func_group"
 // brush 0
@@ -16889,7 +16884,7 @@
 ( 528 -400 0 ) ( 528 -352 0 ) ( 576 -352 0 ) evil8_base/e8metal01 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 104
+// entity 103
 {
 "classname" "func_group"
 // brush 0
@@ -16966,7 +16961,7 @@
 ( 304 -288 -64 ) ( 256 -288 -64 ) ( 304 -464 -64 ) common/caulk 0 -16 0 0.5 0.5 0 0 0
 }
 }
-// entity 105
+// entity 104
 {
 "classname" "func_group"
 // brush 0
@@ -17045,7 +17040,7 @@
 ( 704 -128 256 ) ( 704 304 256 ) ( 704 304 192 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 106
+// entity 105
 {
 "classname" "func_group"
 // brush 0
@@ -17102,7 +17097,7 @@
 ( -624 -368 0 ) ( -768 -416 0 ) ( -624 -368 48 ) common/caulk 0 47 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 107
+// entity 106
 {
 "classname" "func_group"
 // brush 0
@@ -17142,7 +17137,7 @@
 ( -384 -544 0 ) ( -640 -544 32 ) ( -384 -512 0 ) evil8_base/e8_base1 -128 64 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 108
+// entity 107
 {
 "classname" "func_group"
 // brush 0
@@ -17163,7 +17158,7 @@
 ( 560 -16 -96 ) ( 576 0 -96 ) ( 576 0 -19 ) common/caulk 0 -64 0 0.5 0.5 0 0 0
 }
 }
-// entity 109
+// entity 108
 {
 "classname" "func_group"
 // brush 0
@@ -17211,7 +17206,7 @@
 ( 576 512 0 ) ( 576 544 0 ) ( 352 512 0 ) common/caulk 0 -16 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 110
+// entity 109
 {
 "classname" "func_group"
 // brush 0
@@ -17224,7 +17219,7 @@
 ( 576 672 0 ) ( 320 704 32 ) ( 576 704 0 ) evil8_base/e8_base1 0 -127 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 111
+// entity 110
 {
 "classname" "func_group"
 // brush 0
@@ -17237,7 +17232,7 @@
 ( 192 64 0 ) ( 192 32 0 ) ( 448 64 0 ) common/caulk 0 -16 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 112
+// entity 111
 {
 "classname" "func_group"
 // brush 0
@@ -17251,7 +17246,7 @@
 ( 416 64 0 ) ( 416 32 0 ) ( 576 64 0 ) common/caulk -32 47 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 113
+// entity 112
 {
 "classname" "func_group"
 // brush 0
@@ -17264,7 +17259,7 @@
 ( 576 -1176 -128 ) ( 576 -1144 -128 ) ( 560 -1144 -96 ) evil8_base/e8_base1 -224 -80 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 114
+// entity 113
 {
 "classname" "func_group"
 // brush 0
@@ -17277,7 +17272,7 @@
 ( 720 80 448 ) ( 736 80 448 ) ( 736 112 448 ) evil8_base/e8_base1 64 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 115
+// entity 114
 {
 "classname" "func_group"
 // brush 0
@@ -17356,7 +17351,7 @@
 ( 608 304 176 ) ( 640 320 176 ) ( 608 304 768 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 116
+// entity 115
 {
 "classname" "func_group"
 // brush 0
@@ -17369,7 +17364,7 @@
 ( 800 272 576 ) ( 800 304 576 ) ( 736 304 448 ) evil8_lights/e8tmtllight2b 0 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 117
+// entity 116
 {
 "classname" "func_group"
 // brush 0
@@ -17448,7 +17443,7 @@
 ( 608 -464 176 ) ( 640 -448 176 ) ( 608 -464 768 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 118
+// entity 117
 {
 "classname" "func_group"
 // brush 0
@@ -17461,7 +17456,7 @@
 ( -48 -1176 32 ) ( -48 -1144 32 ) ( -48 -1144 -96 ) evil8_lights/e8tmtllight2b 16 -63 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 119
+// entity 118
 {
 "classname" "func_group"
 // brush 0
@@ -17474,7 +17469,7 @@
 ( 128 -1216 -128 ) ( 160 -1216 -128 ) ( 160 -1200 -96 ) evil8_base/e8_base1 -16 -79 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 120
+// entity 119
 {
 "classname" "func_group"
 // brush 0
@@ -17487,7 +17482,7 @@
 ( 384 -1200 32 ) ( 352 -1200 32 ) ( 352 -1200 -96 ) evil8_lights/e8tmtllight2b 0 -63 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 121
+// entity 120
 {
 "classname" "func_group"
 // brush 0
@@ -17509,21 +17504,21 @@
 ( -208 -192 896 ) ( -224 -192 896 ) ( -224 -192 288 ) evil8_base/e8_base1 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 122
+// entity 121
 {
 "classname" "misc_model"
 "angle" "225"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "152 216 176"
 }
-// entity 123
+// entity 122
 {
 "classname" "misc_model"
 "angle" "153.5"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "0 224 176"
 }
-// entity 124
+// entity 123
 {
 "classname" "func_group"
 // brush 0
@@ -17545,7 +17540,7 @@
 ( 464 688 768 ) ( 464 704 768 ) ( 464 704 160 ) evil8_base/e8_base1 -192 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 125
+// entity 124
 {
 "classname" "func_group"
 // brush 0
@@ -17593,7 +17588,7 @@
 ( 1024 608 0 ) ( 1024 672 0 ) ( 1248 672 8 ) evil8_base/e8metal01 128 -127 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 126
+// entity 125
 {
 "classname" "func_group"
 // brush 0
@@ -17606,7 +17601,7 @@
 ( 1280 512 0 ) ( 1024 544 0 ) ( 1024 512 0 ) common/caulk 0 -15 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 127
+// entity 126
 {
 "classname" "func_group"
 // brush 0
@@ -17619,7 +17614,7 @@
 ( 768 208 576 ) ( 768 176 576 ) ( 832 176 448 ) evil8_lights/e8tmtllight2b 0 127 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 128
+// entity 127
 {
 "classname" "func_group"
 // brush 0
@@ -17685,7 +17680,7 @@
 ( 928 192 672 ) ( 928 208 672 ) ( 928 208 768 ) evil8_base/e8metal01 64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 129
+// entity 128
 {
 "classname" "func_group"
 // brush 0
@@ -17698,7 +17693,7 @@
 ( 848 208 632 ) ( 848 176 632 ) ( 848 176 192 ) evil8_base/e8_base1 64 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 130
+// entity 129
 {
 "classname" "func_group"
 // brush 0
@@ -17711,7 +17706,7 @@
 ( 952 120 656 ) ( 960 120 672 ) ( 960 88 672 ) evil8_base/e8_base1 64 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 131
+// entity 130
 {
 "classname" "func_group"
 // brush 0
@@ -17724,7 +17719,7 @@
 ( 960 72 192 ) ( 992 72 192 ) ( 992 504 192 ) common/caulk -32 32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 132
+// entity 131
 {
 "classname" "func_group"
 // brush 0
@@ -17737,7 +17732,7 @@
 ( 1120 288 192 ) ( 1072 288 192 ) ( 1120 256 192 ) evil8_base/e8_base1 -192 14 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 133
+// entity 132
 {
 "classname" "func_group"
 // brush 0
@@ -17750,14 +17745,14 @@
 ( 1104 96 584 ) ( 1104 128 584 ) ( 1104 128 144 ) evil8_base/e8_base1 144 30 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 134
+// entity 133
 {
 "classname" "misc_model"
 "angle" "135"
 "model" "models/mapobjects/strale5_lamp2.ase"
 "origin" "928 -224 384"
 }
-// entity 135
+// entity 134
 {
 "classname" "func_group"
 // brush 0
@@ -17779,7 +17774,7 @@
 ( 1136 688 208 ) ( 1136 704 176 ) ( 1104 704 176 ) evil8_base/e8_base1 -64 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 136
+// entity 135
 {
 "classname" "func_group"
 // brush 0
@@ -17801,7 +17796,7 @@
 ( 816 -432 416 ) ( 832 -432 384 ) ( 832 -400 384 ) evil8_base/e8_base1 64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 137
+// entity 136
 {
 "classname" "func_group"
 // brush 0
@@ -17823,7 +17818,7 @@
 ( 1232 -112 896 ) ( 1232 -128 896 ) ( 1232 -128 288 ) evil8_base/e8_base1 192 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 138
+// entity 137
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17831,14 +17826,14 @@
 "origin" "80 -524 172"
 "target" "t2"
 }
-// entity 139
+// entity 138
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "250"
 "origin" "80 -516 168"
 }
-// entity 140
+// entity 139
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17846,14 +17841,14 @@
 "origin" "-192 -868 -130"
 "target" "t5"
 }
-// entity 141
+// entity 140
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "40"
 "origin" "-192 -868 -126"
 }
-// entity 142
+// entity 141
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17861,14 +17856,14 @@
 "origin" "0 -508 -124"
 "target" "t6"
 }
-// entity 143
+// entity 142
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "75"
 "origin" "0 -516 -128"
 }
-// entity 144
+// entity 143
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17876,56 +17871,56 @@
 "origin" "-424 -656 -128"
 "target" "t7"
 }
-// entity 145
+// entity 144
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "40"
 "origin" "-416 -656 -132"
 }
-// entity 146
+// entity 145
 {
 "classname" "light"
 "_color" "0.314264 0.528486 0.7500000"
 "light" "400"
 "origin" "-120 -176 -360"
 }
-// entity 147
+// entity 146
 {
 "classname" "light"
 "_color" "0.314264 0.528486 0.7500000"
 "light" "400"
 "origin" "16 -40 -360"
 }
-// entity 148
+// entity 147
 {
 "classname" "light"
 "_color" "0.314264 0.528486 0.7500000"
 "light" "400"
 "origin" "208 -40 -360"
 }
-// entity 149
+// entity 148
 {
 "classname" "light"
 "_color" "0.314264 0.528486 0.7500000"
 "light" "400"
 "origin" "192 -312 -360"
 }
-// entity 150
+// entity 149
 {
 "classname" "light"
 "_color" "0.314264 0.528486 0.7500000"
 "light" "400"
 "origin" "384 -312 -360"
 }
-// entity 151
+// entity 150
 {
 "classname" "light"
 "_color" "0.314264 0.528486 0.7500000"
 "light" "400"
 "origin" "552 -176 -360"
 }
-// entity 152
+// entity 151
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17933,14 +17928,14 @@
 "origin" "1108 -112 60"
 "target" "t11"
 }
-// entity 153
+// entity 152
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "175"
 "origin" "1116 -112 56"
 }
-// entity 154
+// entity 153
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17948,14 +17943,14 @@
 "origin" "879 -235 -4"
 "target" "t12"
 }
-// entity 155
+// entity 154
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "175"
 "origin" "885 -241 -8"
 }
-// entity 156
+// entity 155
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17963,14 +17958,14 @@
 "origin" "516 -240 -52"
 "target" "t13"
 }
-// entity 157
+// entity 156
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "175"
 "origin" "524 -240 -56"
 }
-// entity 158
+// entity 157
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -17978,21 +17973,21 @@
 "origin" "172 -168 -124"
 "target" "t14"
 }
-// entity 159
+// entity 158
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "100"
 "origin" "180 -168 -128"
 }
-// entity 160
+// entity 159
 {
 "classname" "light"
 "_color" "0.314264 0.528486 0.7500000"
 "light" "400"
 "origin" "552 -24 -360"
 }
-// entity 161
+// entity 160
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18000,14 +17995,14 @@
 "origin" "-424 112 -128"
 "target" "t15"
 }
-// entity 162
+// entity 161
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "40"
 "origin" "-418 112 -130"
 }
-// entity 163
+// entity 162
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18015,14 +18010,14 @@
 "origin" "-192 294 -128"
 "target" "t16"
 }
-// entity 164
+// entity 163
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "40"
 "origin" "-192 286 -130"
 }
-// entity 165
+// entity 164
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18030,14 +18025,14 @@
 "origin" "60 192 -124"
 "target" "t17"
 }
-// entity 166
+// entity 165
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "100"
 "origin" "60 192 -144"
 }
-// entity 167
+// entity 166
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18045,14 +18040,14 @@
 "origin" "620 192 -284"
 "target" "t18"
 }
-// entity 168
+// entity 167
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "150"
 "origin" "620 192 -296"
 }
-// entity 169
+// entity 168
 {
 "classname" "func_group"
 // brush 0
@@ -18074,7 +18069,7 @@
 ( 1392 464 768 ) ( 1408 464 768 ) ( 1408 464 160 ) evil8_base/e8_base1 -64 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 170
+// entity 169
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18082,14 +18077,14 @@
 "origin" "432 -524 172"
 "target" "t21"
 }
-// entity 171
+// entity 170
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "250"
 "origin" "432 -516 168"
 }
-// entity 172
+// entity 171
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18097,14 +18092,14 @@
 "origin" "-1044 180 292"
 "target" "t22"
 }
-// entity 173
+// entity 172
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "100"
 "origin" "-1038 174 288"
 }
-// entity 174
+// entity 173
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -18112,14 +18107,14 @@
 "origin" "272 632 176"
 "target" "t23"
 }
-// entity 175
+// entity 174
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "278 630 172"
 }
-// entity 176
+// entity 175
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -18127,105 +18122,105 @@
 "origin" "1336 628 172"
 "target" "t24"
 }
-// entity 177
+// entity 176
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "1330 622 168"
 }
-// entity 178
+// entity 177
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "350"
 "origin" "384 192 256"
 }
-// entity 179
+// entity 178
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "275"
 "origin" "384 512 256"
 }
-// entity 180
+// entity 179
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "250"
 "origin" "1216 512 256"
 }
-// entity 181
+// entity 180
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "250"
 "origin" "1248 224 352"
 }
-// entity 182
+// entity 181
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "300"
 "origin" "364 88 280"
 }
-// entity 183
+// entity 182
 {
 "classname" "light"
 "_color" "0.768002 0.768185 1.00000"
 "light" "350"
 "origin" "60 -72 380"
 }
-// entity 184
+// entity 183
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "200"
 "origin" "-432 -208 -64"
 }
-// entity 185
+// entity 184
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "280"
 "origin" "-484 -208 92"
 }
-// entity 186
+// entity 185
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "170"
 "origin" "-1072 -208 304"
 }
-// entity 187
+// entity 186
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "200"
 "origin" "256 -1024 -32"
 }
-// entity 188
+// entity 187
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "100"
 "origin" "784 512 96"
 }
-// entity 189
+// entity 188
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "50"
 "origin" "784 240 96"
 }
-// entity 190
+// entity 189
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "25"
 "origin" "944 144 -320"
 }
-// entity 191
+// entity 190
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18233,35 +18228,35 @@
 "origin" "327 -339 -124"
 "target" "t25"
 }
-// entity 192
+// entity 191
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "40"
 "origin" "333 -345 -128"
 }
-// entity 193
+// entity 192
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "50"
 "origin" "-992 -440 248"
 }
-// entity 194
+// entity 193
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "75"
 "origin" "-144 -564 -176"
 }
-// entity 195
+// entity 194
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "75"
 "origin" "144 -564 -176"
 }
-// entity 196
+// entity 195
 {
 "classname" "func_group"
 // brush 0
@@ -18283,7 +18278,7 @@
 ( 172 218 768 ) ( 161 229 768 ) ( 161 229 160 ) common/clip -30 0 0 0.3595579863 0.5 134217728 13 0
 }
 }
-// entity 197
+// entity 196
 {
 "classname" "func_group"
 // brush 0
@@ -18305,7 +18300,7 @@
 ( 5 201 208 ) ( 13 215 176 ) ( -16 230 176 ) common/clip 5 0 0 0.4449020028 0.5 134217728 13 0
 }
 }
-// entity 198
+// entity 197
 {
 "classname" "func_group"
 // brush 0
@@ -18327,14 +18322,14 @@
 ( 906 -226 896 ) ( 916 -238 896 ) ( 916 -238 288 ) common/clip 62 0 -180 0.3716279864 -0.5 134217728 13 0
 }
 }
-// entity 199
+// entity 198
 {
 "classname" "misc_model"
 "angle" "225"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "-172 240 176"
 }
-// entity 200
+// entity 199
 {
 "classname" "func_group"
 // brush 0
@@ -18356,7 +18351,7 @@
 ( -152 242 208 ) ( -163 253 176 ) ( -186 230 176 ) common/clip -40 0 0 0.3597260118 0.5 134217728 13 0
 }
 }
-// entity 201
+// entity 200
 {
 "classname" "func_group"
 // brush 0
@@ -18378,7 +18373,7 @@
 ( 172 218 208 ) ( 161 229 176 ) ( 138 206 176 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 202
+// entity 201
 {
 "classname" "func_group"
 // brush 0
@@ -18400,7 +18395,7 @@
 ( 5 201 768 ) ( 13 215 768 ) ( 13 215 160 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 203
+// entity 202
 {
 "classname" "func_group"
 // brush 0
@@ -18422,35 +18417,35 @@
 ( -152 242 768 ) ( -163 253 768 ) ( -163 253 160 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 204
+// entity 203
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "660 288 764"
 }
-// entity 205
+// entity 204
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "660 96 764"
 }
-// entity 206
+// entity 205
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "908 192 764"
 }
-// entity 207
+// entity 206
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "660 -480 764"
 }
-// entity 208
+// entity 207
 {
 "classname" "func_group"
 // brush 0
@@ -18463,7 +18458,7 @@
 ( 136 432 960 ) ( 144 432 960 ) ( 144 400 960 ) common/caulk -32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 209
+// entity 208
 {
 "classname" "func_group"
 // brush 0
@@ -18485,7 +18480,7 @@
 ( 208 432 208 ) ( 192 432 176 ) ( 192 400 176 ) evil8_base/e8_base1 64 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 210
+// entity 209
 {
 "classname" "func_group"
 // brush 0
@@ -18498,7 +18493,7 @@
 ( 464 752 736 ) ( 464 768 704 ) ( 432 768 704 ) evil8_base/e8_base1 0 128 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 211
+// entity 210
 {
 "classname" "func_group"
 // brush 0
@@ -18511,7 +18506,7 @@
 ( 784 760 960 ) ( 784 752 960 ) ( 752 752 960 ) common/caulk 32 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 212
+// entity 211
 {
 "classname" "func_group"
 // brush 0
@@ -18524,7 +18519,7 @@
 ( 1136 752 736 ) ( 1136 768 704 ) ( 1104 768 704 ) evil8_base/e8_base1 -64 128 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 213
+// entity 212
 {
 "classname" "func_group"
 // brush 0
@@ -18537,7 +18532,7 @@
 ( 1464 464 960 ) ( 1456 464 960 ) ( 1456 496 960 ) common/caulk 32 0 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 214
+// entity 213
 {
 "classname" "func_group"
 // brush 0
@@ -18550,7 +18545,7 @@
 ( 1232 -176 736 ) ( 1232 -192 704 ) ( 1264 -192 704 ) evil8_base/e8_base1 -192 126 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 215
+// entity 214
 {
 "classname" "func_group"
 // brush 0
@@ -18563,7 +18558,7 @@
 ( 888 -432 960 ) ( 880 -432 960 ) ( 880 -400 960 ) common/caulk 32 63 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 216
+// entity 215
 {
 "classname" "func_group"
 // brush 0
@@ -18576,7 +18571,7 @@
 ( -272 -192 736 ) ( -288 -192 704 ) ( -288 -224 704 ) evil8_base/e8_base1 32 125 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 217
+// entity 216
 {
 "classname" "func_group"
 // brush 0
@@ -18589,7 +18584,7 @@
 ( -520 240 960 ) ( -512 240 960 ) ( -512 208 960 ) common/caulk 0 -1 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 218
+// entity 217
 {
 "classname" "func_group"
 // brush 0
@@ -18602,7 +18597,7 @@
 ( -224 336 736 ) ( -224 352 704 ) ( -256 352 704 ) evil8_base/e8_base1 -160 125 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 219
+// entity 218
 {
 "classname" "func_group"
 // brush 0
@@ -18615,7 +18610,7 @@
 ( 226 684 736 ) ( 215 696 704 ) ( 192 673 704 ) evil8_base/e8_base1 179 191 -180 0.353576988 -0.5 134217728 0 0
 }
 }
-// entity 220
+// entity 219
 {
 "classname" "func_group"
 // brush 0
@@ -18628,35 +18623,35 @@
 ( -2 289 960 ) ( -6 282 960 ) ( -34 297 960 ) common/caulk 38 3 -119 0.4999780059 0.4999839962 134217728 0 0
 }
 }
-// entity 221
+// entity 220
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "388 -432 916"
 }
-// entity 222
+// entity 221
 {
 "classname" "light"
 "_color" "0.95 0.95 1.000000"
 "light" "7"
 "origin" "228 -432 916"
 }
-// entity 223
+// entity 222
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "68 -432 916"
 }
-// entity 224
+// entity 223
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "-92 -432 916"
 }
-// entity 225
+// entity 224
 {
 "classname" "func_group"
 // brush 0
@@ -18669,7 +18664,7 @@
 ( 955 -282 960 ) ( 950 -276 960 ) ( 972 -254 960 ) common/caulk 5 38 135 0.4999899864 0.4999470115 134217728 0 0
 }
 }
-// entity 226
+// entity 225
 {
 "classname" "func_group"
 // brush 0
@@ -18682,49 +18677,49 @@
 ( -448 -192 368 ) ( -480 -192 384 ) ( -480 -224 384 ) evil8_base/e8_base1 -223 -192 90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 227
+// entity 226
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "388 -304 404"
 }
-// entity 228
+// entity 227
 {
 "classname" "light"
 "_color" "0.95 0.95 1.000000"
 "light" "7"
 "origin" "228 -304 404"
 }
-// entity 229
+// entity 228
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "68 -304 404"
 }
-// entity 230
+// entity 229
 {
 "classname" "light"
 "_color" "0.968002 0.968185 1.000000"
 "light" "7"
 "origin" "-92 -304 404"
 }
-// entity 231
+// entity 230
 {
 "classname" "misc_model"
 "angle" "270"
 "model" "models/mapobjects/morphed_tele/telepad.ase"
 "origin" "-1000 -632 176"
 }
-// entity 232
+// entity 231
 {
 "classname" "misc_model"
 "angle" "270"
 "model" "models/mapobjects/morphed_tele/telepad.ase"
 "origin" "-80 -1024 -160"
 }
-// entity 233
+// entity 232
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -18732,14 +18727,14 @@
 "origin" "-210 270 120"
 "target" "t27"
 }
-// entity 234
+// entity 233
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-207 264 116"
 }
-// entity 235
+// entity 234
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -18747,14 +18742,14 @@
 "origin" "-634 -338 272"
 "target" "t28"
 }
-// entity 236
+// entity 235
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-631 -344 268"
 }
-// entity 237
+// entity 236
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -18762,42 +18757,42 @@
 "origin" "-630 -78 272"
 "target" "t29"
 }
-// entity 238
+// entity 237
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-633 -72 268"
 }
-// entity 239
+// entity 238
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "75"
 "origin" "368 444 -176"
 }
-// entity 240
+// entity 239
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "20"
 "origin" "-76 -1036 -124"
 }
-// entity 241
+// entity 240
 {
 "classname" "light"
 "_color" "0.768002 0.768185 0.900000"
 "light" "20"
 "origin" "-996 -644 208"
 }
-// entity 242
+// entity 241
 {
 "classname" "light"
 "_color" "0.4 0.4 0.4"
 "light" "20"
 "origin" "-996 -644 259"
 }
-// entity 243
+// entity 242
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
@@ -18805,14 +18800,14 @@
 "origin" "552 -664 -128"
 "target" "t35"
 }
-// entity 244
+// entity 243
 {
 "classname" "light"
 "_color" "0.846769 0.846769 1.000000"
 "light" "40"
 "origin" "546 -664 -130"
 }
-// entity 245
+// entity 244
 {
 "classname" "func_group"
 // brush 0
@@ -18834,7 +18829,7 @@
 ( 1404 128 352 ) ( 1416 128 352 ) ( 1416 128 384 ) evil8_base/e8_base1 -64 -183 0 0.5 -0.5 134217728 0 0
 }
 }
-// entity 246
+// entity 245
 {
 "classname" "func_group"
 // brush 0
@@ -18856,7 +18851,7 @@
 ( 1440 -84 256 ) ( 1440 -84 224 ) ( 1376 12 224 ) evil8_base/e8_base1 224 -57 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 247
+// entity 246
 {
 "classname" "func_group"
 // brush 0

Modified: branches/nexuiz-2.0/data/maps/runningmanctf.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/runningmanctf.map
===================================================================
--- branches/nexuiz-2.0/data/maps/runningmanctf.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/runningmanctf.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -30252,129 +30252,6 @@
 }
 // entity 155
 {
-"classname" "dom_team"
-"model" "models/domination/dom_unclaimed.md3"
-}
-// entity 156
-{
-"classname" "dom_team"
-"cnt" "13"
-"message" "Blue team has captured a control point"
-"model" "models/domination/dom_blue.md3"
-"netname" "^4Blue Team^3"
-"noise" "domination/claim.wav"
-"noise1" "domination/claim.wav"
-}
-// entity 157
-{
-"classname" "dom_team"
-"cnt" "4"
-"message" "Red team has captured a control point"
-"model" "models/domination/dom_red.md3"
-"netname" "^1Red Team^3"
-"noise" "domination/claim.wav"
-"noise1" "domination/claim.wav"
-}
-// entity 158
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^4blue ^1Main Area"
-"origin" "768.000000 -256.000000 224.000000"
-"wait" "5"
-}
-// entity 159
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^4blue ^1Mortar Niche"
-"origin" "784.000000 816.000000 320.000000"
-"wait" "5"
-}
-// entity 160
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^4blue ^1Rocket Launcher/Teleporter"
-"origin" "-1056.000000 -208.000000 208.000000"
-"wait" "5"
-}
-// entity 161
-{
-"classname" "dom_controlpoint"
-"frags" "2"
-"message" "^3 has captured the ^4blue ^1Nex-Tunnel"
-"origin" "256.000000 -176.000000 -384.000000"
-"scale" "1.15"
-"wait" "5"
-}
-// entity 162
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^4blue ^1lower Floor"
-"origin" "352.000000 -656.000000 -224.000000"
-"wait" "5"
-}
-// entity 163
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured ^1red Main Area"
-"origin" "-1920.000000 2432.000000 240.000000"
-"wait" "5"
-}
-// entity 164
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^1red Flag Niche"
-"origin" "-848.000000 2448.000000 304.000000"
-"wait" "5"
-}
-// entity 165
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^1red Rocket Launcher/Teleporter"
-"origin" "-1872.000000 608.000000 208.000000"
-"wait" "5"
-}
-// entity 166
-{
-"classname" "dom_controlpoint"
-"frags" "2"
-"message" "^3 has captured the ^1red Nex-Tunnel"
-"origin" "-1840.000000 1920.000000 -384.000000"
-"scale" "1.15"
-"wait" "5"
-}
-// entity 167
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^1red lower Floor"
-"origin" "-2320.000000 2016.000000 -224.000000"
-"wait" "5"
-}
-// entity 168
-{
-"classname" "dom_controlpoint"
-"frags" "2"
-"message" "^3 has captured the ^1Speed Corner"
-"origin" "-1904.000000 -240.000000 96.000000"
-"wait" "5"
-}
-// entity 169
-{
-"classname" "dom_controlpoint"
-"frags" "1"
-"message" "^3 has captured the ^1Strength Corner"
-"origin" "-480.000000 1184.000000 -224.000000"
-"wait" "5"
-}
-// entity 170
-{
 "classname" "func_rotating"
 "origin" "-0.000000 -0.000000 -0.000000"
 "speed" "400"
@@ -30397,7 +30274,7 @@
 ( -1008 -648 204 ) ( -992 -648 204 ) ( -992 -648 188 ) common/origin -31 24 -180 0.5 -0.5 0 14 0
 }
 }
-// entity 171
+// entity 156
 {
 "classname" "func_rotating"
 "origin" "-0.000000 0.000000 -0.000000"
@@ -30421,7 +30298,7 @@
 ( -952 -640 188 ) ( -1040 -640 188 ) ( -1040 -656 188 ) common/origin 48 16 0 0.5 0.5 0 14 0
 }
 }
-// entity 172
+// entity 157
 {
 "classname" "func_rotating"
 "origin" "0.000000 -0.000000 0.000000"
@@ -30445,7 +30322,7 @@
 ( -2348 668 188 ) ( -2260 668 188 ) ( -2260 684 188 ) common/origin -24 23 -180 0.5 0.5 0 14 0
 }
 }
-// entity 173
+// entity 158
 {
 "classname" "func_rotating"
 "origin" "0.000000 0.000000 -0.000000"
@@ -30469,7 +30346,7 @@
 ( -2316 668 204 ) ( -2300 668 204 ) ( -2300 668 188 ) common/origin -23 24 -180 0.5 -0.5 0 14 0
 }
 }
-// entity 174
+// entity 159
 {
 "classname" "func_group"
 // brush 0
@@ -30606,7 +30483,7 @@
 ( 384 -64 -96 ) ( 400 -48 -96 ) ( 384 -64 -64 ) common/caulk 0 -16 0 0.5 0.5 0 0 0
 }
 }
-// entity 175
+// entity 160
 {
 "classname" "func_group"
 // brush 0
@@ -30672,7 +30549,7 @@
 ( 272 -480 -96 ) ( 272 -512 -96 ) ( 272 -512 -64 ) common/caulk 0 -16 0 0.5 0.5 0 0 0
 }
 }
-// entity 176
+// entity 161
 {
 "classname" "func_group"
 // brush 0
@@ -30773,7 +30650,7 @@
 ( 192 -544 -88 ) ( 192 -544 -96 ) ( 256 -480 -96 ) common/caulk 0 -16 0 0.5 0.5 0 0 0
 }
 }
-// entity 177
+// entity 162
 {
 "classname" "func_group"
 // brush 0
@@ -30852,7 +30729,7 @@
 ( 608 112 176 ) ( 640 128 176 ) ( 608 112 768 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 178
+// entity 163
 {
 "classname" "func_group"
 // brush 0
@@ -30909,7 +30786,7 @@
 ( -768 -128 48 ) ( -768 0 48 ) ( -720 -16 16 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 179
+// entity 164
 {
 "classname" "func_group"
 // brush 0
@@ -30949,7 +30826,7 @@
 ( -640 -352 0 ) ( -384 -384 0 ) ( -384 -352 0 ) common/caulk 0 47 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 180
+// entity 165
 {
 "classname" "func_group"
 // brush 0
@@ -30970,7 +30847,7 @@
 ( 528 -832 -32 ) ( 576 -832 -32 ) ( 576 -800 0 ) common/caulk -32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 181
+// entity 166
 {
 "classname" "func_group"
 // brush 0
@@ -30982,7 +30859,7 @@
 ( 432 -832 -64 ) ( 528 -848 -72 ) ( 528 -832 -64 ) common/caulk -32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 182
+// entity 167
 {
 "classname" "func_group"
 // brush 0
@@ -31003,7 +30880,7 @@
 ( 528 -848 -72 ) ( 528 -832 -64 ) ( 576 -832 -64 ) common/caulk -32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 183
+// entity 168
 {
 "classname" "func_group"
 // brush 0
@@ -31033,7 +30910,7 @@
 ( 576 -824 -144 ) ( 528 -808 -112 ) ( 576 -800 -96 ) common/caulk 0 16 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 184
+// entity 169
 {
 "classname" "func_group"
 // brush 0
@@ -31054,7 +30931,7 @@
 ( 560 -64 -96 ) ( 608 -64 -96 ) ( 608 -64 -19 ) common/caulk 0 -64 0 0.5 0.5 0 0 0
 }
 }
-// entity 185
+// entity 170
 {
 "classname" "func_group"
 // brush 0
@@ -31102,7 +30979,7 @@
 ( 352 672 8 ) ( 576 672 0 ) ( 576 608 0 ) evil8_base/e8metal01 0 -128 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 186
+// entity 171
 {
 "classname" "func_group"
 // brush 0
@@ -31115,7 +30992,7 @@
 ( 576 512 0 ) ( 576 544 0 ) ( 320 512 0 ) common/caulk 0 -16 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 187
+// entity 172
 {
 "classname" "func_group"
 // brush 0
@@ -31128,7 +31005,7 @@
 ( 192 -96 0 ) ( 448 -128 32 ) ( 192 -128 0 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 188
+// entity 173
 {
 "classname" "func_group"
 // brush 0
@@ -31152,7 +31029,7 @@
 ( 576 0 48 ) ( 448 -128 32 ) ( 416 -96 8 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 189
+// entity 174
 {
 "classname" "func_group"
 // brush 0
@@ -31165,7 +31042,7 @@
 ( 560 -1144 32 ) ( 560 -1176 32 ) ( 560 -1176 -96 ) evil8_lights/e8tmtllight2b 16 -64 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 190
+// entity 175
 {
 "classname" "func_group"
 // brush 0
@@ -31178,7 +31055,7 @@
 ( 800 80 576 ) ( 800 112 576 ) ( 736 112 448 ) evil8_lights/e8tmtllight2b 0 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 191
+// entity 176
 {
 "classname" "func_group"
 // brush 0
@@ -31257,7 +31134,7 @@
 ( 704 64 256 ) ( 704 496 256 ) ( 704 496 192 ) evil8_base/e8metal01 -128 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 192
+// entity 177
 {
 "classname" "func_group"
 // brush 0
@@ -31270,7 +31147,7 @@
 ( 720 272 448 ) ( 736 272 448 ) ( 736 304 448 ) evil8_base/e8_base1 64 -128 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 193
+// entity 178
 {
 "classname" "func_group"
 // brush 0
@@ -31349,7 +31226,7 @@
 ( 704 -704 256 ) ( 704 -272 256 ) ( 704 -272 192 ) evil8_base/e8metal01 128 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 194
+// entity 179
 {
 "classname" "func_group"
 // brush 0
@@ -31371,7 +31248,7 @@
 ( 240 -528 208 ) ( 240 -544 176 ) ( 272 -544 176 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 195
+// entity 180
 {
 "classname" "func_group"
 // brush 0
@@ -31384,7 +31261,7 @@
 ( -64 -1144 -128 ) ( -64 -1176 -128 ) ( -48 -1176 -96 ) evil8_base/e8_base1 0 -79 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 196
+// entity 181
 {
 "classname" "func_group"
 // brush 0
@@ -31397,7 +31274,7 @@
 ( 160 -1200 32 ) ( 128 -1200 32 ) ( 128 -1200 -96 ) evil8_lights/e8tmtllight2b 0 -63 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 197
+// entity 182
 {
 "classname" "func_group"
 // brush 0
@@ -31410,7 +31287,7 @@
 ( 352 -1216 -128 ) ( 384 -1216 -128 ) ( 384 -1200 -96 ) evil8_base/e8_base1 -208 -79 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 198
+// entity 183
 {
 "classname" "func_group"
 // brush 0
@@ -31432,7 +31309,7 @@
 ( -112 -528 768 ) ( -112 -544 768 ) ( -112 -544 160 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 199
+// entity 184
 {
 "classname" "func_group"
 // brush 0
@@ -31454,7 +31331,7 @@
 ( -208 -192 416 ) ( -224 -192 384 ) ( -224 -224 384 ) evil8_base/e8_base1 -224 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 200
+// entity 185
 {
 "classname" "func_group"
 // brush 0
@@ -31476,21 +31353,21 @@
 ( -272 272 208 ) ( -272 288 176 ) ( -304 288 176 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 201
+// entity 186
 {
 "classname" "misc_model"
 "angle" "225"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "152 216 176"
 }
-// entity 202
+// entity 187
 {
 "classname" "misc_model"
 "angle" "153.5"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "0 224 176"
 }
-// entity 203
+// entity 188
 {
 "classname" "func_group"
 // brush 0
@@ -31512,7 +31389,7 @@
 ( 208 432 768 ) ( 192 432 768 ) ( 192 432 160 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 204
+// entity 189
 {
 "classname" "func_group"
 // brush 0
@@ -31534,7 +31411,7 @@
 ( 464 688 208 ) ( 464 704 176 ) ( 432 704 176 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 205
+// entity 190
 {
 "classname" "func_group"
 // brush 0
@@ -31582,7 +31459,7 @@
 ( 1248 512 0 ) ( 1024 544 0 ) ( 1024 512 0 ) common/caulk 0 -15 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 206
+// entity 191
 {
 "classname" "func_group"
 // brush 0
@@ -31595,7 +31472,7 @@
 ( 1024 704 0 ) ( 1280 704 32 ) ( 1024 672 0 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 207
+// entity 192
 {
 "classname" "func_group"
 // brush 0
@@ -31608,7 +31485,7 @@
 ( 848 208 448 ) ( 832 208 448 ) ( 832 176 448 ) evil8_base/e8_base1 -128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 208
+// entity 193
 {
 "classname" "func_group"
 // brush 0
@@ -31674,7 +31551,7 @@
 ( 960 144 672 ) ( 928 160 672 ) ( 928 160 704 ) evil8_base/e8metal01 64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 209
+// entity 194
 {
 "classname" "func_group"
 // brush 0
@@ -31687,7 +31564,7 @@
 ( 864 176 720 ) ( 864 176 728 ) ( 864 208 728 ) common/caulk 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 210
+// entity 195
 {
 "classname" "func_group"
 // brush 0
@@ -31700,7 +31577,7 @@
 ( 960 -104 192 ) ( 992 -104 192 ) ( 992 328 192 ) common/caulk -32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 211
+// entity 196
 {
 "classname" "func_group"
 // brush 0
@@ -31713,7 +31590,7 @@
 ( 952 296 656 ) ( 960 296 672 ) ( 960 264 672 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 212
+// entity 197
 {
 "classname" "func_group"
 // brush 0
@@ -31726,7 +31603,7 @@
 ( 1104 256 584 ) ( 1104 288 584 ) ( 1104 288 144 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 213
+// entity 198
 {
 "classname" "func_group"
 // brush 0
@@ -31739,14 +31616,14 @@
 ( 1120 128 192 ) ( 1072 128 192 ) ( 1120 96 192 ) evil8_base/e8_base1 -192 -50 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 214
+// entity 199
 {
 "classname" "misc_model"
 "angle" "135"
 "model" "models/mapobjects/strale5_lamp2.ase"
 "origin" "928 -224 384"
 }
-// entity 215
+// entity 200
 {
 "classname" "func_group"
 // brush 0
@@ -31768,7 +31645,7 @@
 ( 1136 688 768 ) ( 1136 704 768 ) ( 1136 704 160 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 216
+// entity 201
 {
 "classname" "func_group"
 // brush 0
@@ -31790,7 +31667,7 @@
 ( 816 -432 896 ) ( 832 -432 896 ) ( 832 -432 288 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 217
+// entity 202
 {
 "classname" "func_group"
 // brush 0
@@ -31812,7 +31689,7 @@
 ( 1232 -112 416 ) ( 1232 -128 384 ) ( 1264 -128 384 ) evil8_base/e8_base1 64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 218
+// entity 203
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31820,14 +31697,14 @@
 "origin" "80 -524 172"
 "target" "t2"
 }
-// entity 219
+// entity 204
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "250"
 "origin" "80 -516 168"
 }
-// entity 220
+// entity 205
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31835,14 +31712,14 @@
 "origin" "-192 -868 -130"
 "target" "t5"
 }
-// entity 221
+// entity 206
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-192 -868 -126"
 }
-// entity 222
+// entity 207
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31850,14 +31727,14 @@
 "origin" "0 -508 -124"
 "target" "t6"
 }
-// entity 223
+// entity 208
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "0 -516 -128"
 }
-// entity 224
+// entity 209
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31865,56 +31742,56 @@
 "origin" "-424 -656 -128"
 "target" "t7"
 }
-// entity 225
+// entity 210
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-416 -656 -132"
 }
-// entity 226
+// entity 211
 {
 "classname" "light"
 "_color" "0.3 0.5 1.000000"
 "light" "400"
 "origin" "-120 -176 -360"
 }
-// entity 227
+// entity 212
 {
 "classname" "light"
 "_color" "0.3 0.5 1.000000"
 "light" "400"
 "origin" "16 -40 -360"
 }
-// entity 228
+// entity 213
 {
 "classname" "light"
 "_color" "0.3 0.5 1.000000"
 "light" "400"
 "origin" "208 -40 -360"
 }
-// entity 229
+// entity 214
 {
 "classname" "light"
 "_color" "0.3 0.5 1.000000"
 "light" "400"
 "origin" "192 -312 -360"
 }
-// entity 230
+// entity 215
 {
 "classname" "light"
 "_color" "0.3 0.5 1.000000"
 "light" "400"
 "origin" "384 -312 -360"
 }
-// entity 231
+// entity 216
 {
 "classname" "light"
 "_color" "0.3 0.5 1.000000"
 "light" "400"
 "origin" "552 -176 -360"
 }
-// entity 232
+// entity 217
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31922,14 +31799,14 @@
 "origin" "1108 -112 60"
 "target" "t11"
 }
-// entity 233
+// entity 218
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "175"
 "origin" "1116 -112 56"
 }
-// entity 234
+// entity 219
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31937,14 +31814,14 @@
 "origin" "879 -235 -4"
 "target" "t12"
 }
-// entity 235
+// entity 220
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "175"
 "origin" "885 -241 -8"
 }
-// entity 236
+// entity 221
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31952,14 +31829,14 @@
 "origin" "516 -240 -52"
 "target" "t13"
 }
-// entity 237
+// entity 222
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "175"
 "origin" "524 -240 -56"
 }
-// entity 238
+// entity 223
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31967,21 +31844,21 @@
 "origin" "172 -168 -124"
 "target" "t14"
 }
-// entity 239
+// entity 224
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "100"
 "origin" "180 -168 -128"
 }
-// entity 240
+// entity 225
 {
 "classname" "light"
 "_color" "0.3 0.5 1.000000"
 "light" "400"
 "origin" "552 -24 -360"
 }
-// entity 241
+// entity 226
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -31989,14 +31866,14 @@
 "origin" "-424 112 -128"
 "target" "t15"
 }
-// entity 242
+// entity 227
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-418 112 -130"
 }
-// entity 243
+// entity 228
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -32004,14 +31881,14 @@
 "origin" "60 192 -124"
 "target" "t17"
 }
-// entity 244
+// entity 229
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "100"
 "origin" "60 192 -144"
 }
-// entity 245
+// entity 230
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -32019,14 +31896,14 @@
 "origin" "620 192 -284"
 "target" "t18"
 }
-// entity 246
+// entity 231
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "150"
 "origin" "620 192 -296"
 }
-// entity 247
+// entity 232
 {
 "classname" "func_group"
 // brush 0
@@ -32048,7 +31925,7 @@
 ( 1392 464 208 ) ( 1408 464 176 ) ( 1408 496 176 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 248
+// entity 233
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -32056,14 +31933,14 @@
 "origin" "432 -524 172"
 "target" "t21"
 }
-// entity 249
+// entity 234
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "250"
 "origin" "432 -516 168"
 }
-// entity 250
+// entity 235
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -32071,14 +31948,14 @@
 "origin" "272 632 176"
 "target" "t23"
 }
-// entity 251
+// entity 236
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "278 630 172"
 }
-// entity 252
+// entity 237
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -32086,105 +31963,105 @@
 "origin" "1336 628 172"
 "target" "t24"
 }
-// entity 253
+// entity 238
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "1330 622 168"
 }
-// entity 254
+// entity 239
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "350"
 "origin" "384 192 256"
 }
-// entity 255
+// entity 240
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "275"
 "origin" "384 512 256"
 }
-// entity 256
+// entity 241
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "250"
 "origin" "1216 512 256"
 }
-// entity 257
+// entity 242
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "250"
 "origin" "1248 224 352"
 }
-// entity 258
+// entity 243
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "500"
 "origin" "544 -192 352"
 }
-// entity 259
+// entity 244
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "500"
 "origin" "0 -192 224"
 }
-// entity 260
+// entity 245
 {
 "classname" "light"
 "_color" "0.66 0.65 0.7"
 "light" "200"
 "origin" "-432 -208 -64"
 }
-// entity 261
+// entity 246
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "200"
 "origin" "-640 64 224"
 }
-// entity 262
+// entity 247
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "170"
 "origin" "-1072 -208 304"
 }
-// entity 263
+// entity 248
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "200"
 "origin" "256 -1024 -32"
 }
-// entity 264
+// entity 249
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "100"
 "origin" "784 512 96"
 }
-// entity 265
+// entity 250
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "784 240 96"
 }
-// entity 266
+// entity 251
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "25"
 "origin" "944 144 -320"
 }
-// entity 267
+// entity 252
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -32192,35 +32069,35 @@
 "origin" "327 -339 -124"
 "target" "t25"
 }
-// entity 268
+// entity 253
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "333 -345 -128"
 }
-// entity 269
+// entity 254
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-992 -440 248"
 }
-// entity 270
+// entity 255
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-144 -564 -176"
 }
-// entity 271
+// entity 256
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "144 -564 -176"
 }
-// entity 272
+// entity 257
 {
 "classname" "func_group"
 // brush 0
@@ -32357,7 +32234,7 @@
 ( -1792 1824 -64 ) ( -1616 1824 -64 ) ( -1616 1800 -64 ) common/caulk 0 -63 -90 0.5 0.5 0 0 0
 }
 }
-// entity 273
+// entity 258
 {
 "classname" "func_group"
 // brush 0
@@ -32423,7 +32300,7 @@
 ( -2032 1728 -64 ) ( -2000 1728 -96 ) ( -2032 1728 -96 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 274
+// entity 259
 {
 "classname" "func_group"
 // brush 0
@@ -32524,7 +32401,7 @@
 ( -2128 1968 -64 ) ( -1952 1920 -64 ) ( -1952 1968 -64 ) common/caulk 0 -15 -90 0.5 0.5 0 0 0
 }
 }
-// entity 275
+// entity 260
 {
 "classname" "func_group"
 // brush 0
@@ -32603,7 +32480,7 @@
 ( -1360 2368 192 ) ( -1360 2368 256 ) ( -1792 2368 256 ) evil8_base/e8metal01 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 276
+// entity 261
 {
 "classname" "func_group"
 // brush 0
@@ -32660,7 +32537,7 @@
 ( -2032 1040 48 ) ( -2080 896 0 ) ( -2032 1040 0 ) common/caulk 0 46 0 0.5 -0.5 134217728 0 0
 }
 }
-// entity 277
+// entity 262
 {
 "classname" "func_group"
 // brush 0
@@ -32700,7 +32577,7 @@
 ( -2176 1280 0 ) ( -2208 1024 32 ) ( -2208 1280 0 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 278
+// entity 263
 {
 "classname" "func_group"
 // brush 0
@@ -32721,7 +32598,7 @@
 ( -2512 2192 -24 ) ( -2496 2192 -32 ) ( -2496 2240 -32 ) common/caulk 32 -63 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 279
+// entity 264
 {
 "classname" "func_group"
 // brush 0
@@ -32733,7 +32610,7 @@
 ( -2496 2192 -64 ) ( -2496 2096 -64 ) ( -2496 2096 -32 ) common/caulk 32 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 280
+// entity 265
 {
 "classname" "func_group"
 // brush 0
@@ -32754,7 +32631,7 @@
 ( -2496 2192 -64 ) ( -2496 2240 -64 ) ( -2464 2240 -96 ) common/caulk 32 -63 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 281
+// entity 266
 {
 "classname" "func_group"
 // brush 0
@@ -32766,7 +32643,7 @@
 ( -2272 2192 -96 ) ( -2352 2192 -112 ) ( -2464 2096 -96 ) evil8_base/e8metal01 0 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 282
+// entity 267
 {
 "classname" "func_group"
 // brush 0
@@ -32787,7 +32664,7 @@
 ( -1664 2240 -19 ) ( -1664 2240 -96 ) ( -1680 2224 -96 ) common/caulk 0 0 -180 0.5 -0.5 0 0 0
 }
 }
-// entity 283
+// entity 268
 {
 "classname" "func_group"
 // brush 0
@@ -32835,7 +32712,7 @@
 ( -1152 2016 0 ) ( -1120 2240 0 ) ( -1152 2240 0 ) common/caulk 0 48 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 284
+// entity 269
 {
 "classname" "func_group"
 // brush 0
@@ -32848,7 +32725,7 @@
 ( -960 2240 0 ) ( -960 1984 32 ) ( -992 2240 0 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 285
+// entity 270
 {
 "classname" "func_group"
 // brush 0
@@ -32861,7 +32738,7 @@
 ( -1600 2112 0 ) ( -1632 1856 0 ) ( -1600 1856 0 ) common/caulk 0 -15 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 286
+// entity 271
 {
 "classname" "func_group"
 // brush 0
@@ -32885,7 +32762,7 @@
 ( -1600 2240 0 ) ( -1632 2080 0 ) ( -1600 2080 0 ) common/caulk 32 -16 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 287
+// entity 272
 {
 "classname" "func_group"
 // brush 0
@@ -32898,7 +32775,7 @@
 ( -2808 2224 -96 ) ( -2808 2240 -128 ) ( -2840 2240 -128 ) evil8_base/e8_base1 32 -80 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 288
+// entity 273
 {
 "classname" "func_group"
 // brush 0
@@ -32911,7 +32788,7 @@
 ( -1552 2400 448 ) ( -1584 2400 448 ) ( -1584 2384 448 ) evil8_base/e8_base1 -192 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 289
+// entity 274
 {
 "classname" "func_group"
 // brush 0
@@ -32990,7 +32867,7 @@
 ( -1360 2272 768 ) ( -1344 2304 176 ) ( -1360 2272 176 ) evil8_base/e8metal01 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 290
+// entity 275
 {
 "classname" "func_group"
 // brush 0
@@ -33003,7 +32880,7 @@
 ( -1360 2400 448 ) ( -1360 2464 576 ) ( -1392 2464 576 ) evil8_lights/e8tmtllight2b 0 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 291
+// entity 276
 {
 "classname" "func_group"
 // brush 0
@@ -33082,7 +32959,7 @@
 ( -2128 2272 768 ) ( -2112 2304 176 ) ( -2128 2272 176 ) evil8_base/e8metal01 0 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 292
+// entity 277
 {
 "classname" "func_group"
 // brush 0
@@ -33104,7 +32981,7 @@
 ( -2208 1904 160 ) ( -2208 1904 768 ) ( -2192 1904 768 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 293
+// entity 278
 {
 "classname" "func_group"
 // brush 0
@@ -33117,7 +32994,7 @@
 ( -2808 1616 -96 ) ( -2808 1616 32 ) ( -2840 1616 32 ) evil8_lights/e8tmtllight2b -16 -62 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 294
+// entity 279
 {
 "classname" "func_group"
 // brush 0
@@ -33130,7 +33007,7 @@
 ( -2864 1824 -96 ) ( -2880 1824 -128 ) ( -2880 1792 -128 ) evil8_base/e8_base1 240 -79 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 295
+// entity 280
 {
 "classname" "func_group"
 // brush 0
@@ -33143,7 +33020,7 @@
 ( -2864 2016 -96 ) ( -2864 2016 32 ) ( -2864 2048 32 ) evil8_lights/e8tmtllight2b 0 -63 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 296
+// entity 281
 {
 "classname" "func_group"
 // brush 0
@@ -33165,7 +33042,7 @@
 ( -2208 1584 176 ) ( -2208 1552 176 ) ( -2192 1552 208 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 297
+// entity 282
 {
 "classname" "func_group"
 // brush 0
@@ -33187,7 +33064,7 @@
 ( -1856 1440 288 ) ( -1856 1440 896 ) ( -1856 1456 896 ) evil8_base/e8_base1 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 298
+// entity 283
 {
 "classname" "func_group"
 // brush 0
@@ -33209,21 +33086,21 @@
 ( -1376 1392 160 ) ( -1376 1392 768 ) ( -1392 1392 768 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 299
+// entity 284
 {
 "classname" "misc_model"
 "angle" "45"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "-1448 1816 176"
 }
-// entity 300
+// entity 285
 {
 "classname" "misc_model"
 "angle" "116"
 "model" "models/mapobjects/strale5_lamp.ase"
 "origin" "-1440 1664 176"
 }
-// entity 301
+// entity 286
 {
 "classname" "func_group"
 // brush 0
@@ -33245,7 +33122,7 @@
 ( -1264 1856 176 ) ( -1232 1856 176 ) ( -1232 1872 208 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 302
+// entity 287
 {
 "classname" "func_group"
 // brush 0
@@ -33267,7 +33144,7 @@
 ( -960 2128 160 ) ( -960 2128 768 ) ( -976 2128 768 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 303
+// entity 288
 {
 "classname" "func_group"
 // brush 0
@@ -33315,7 +33192,7 @@
 ( -992 2912 8 ) ( -992 2688 0 ) ( -1056 2688 0 ) evil8_base/e8metal01 -128 129 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 304
+// entity 289
 {
 "classname" "func_group"
 // brush 0
@@ -33328,7 +33205,7 @@
 ( -1152 2688 0 ) ( -1120 2688 0 ) ( -1152 2944 0 ) common/caulk 0 49 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 305
+// entity 290
 {
 "classname" "func_group"
 // brush 0
@@ -33341,7 +33218,7 @@
 ( -1488 2496 448 ) ( -1488 2432 576 ) ( -1456 2432 576 ) evil8_lights/e8tmtllight2b 0 127 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 306
+// entity 291
 {
 "classname" "func_group"
 // brush 0
@@ -33407,7 +33284,7 @@
 ( -1456 2592 768 ) ( -1456 2592 672 ) ( -1472 2592 672 ) evil8_base/e8metal01 -192 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 307
+// entity 292
 {
 "classname" "func_group"
 // brush 0
@@ -33420,7 +33297,7 @@
 ( -1488 2512 192 ) ( -1488 2512 632 ) ( -1456 2512 632 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 308
+// entity 293
 {
 "classname" "func_group"
 // brush 0
@@ -33433,7 +33310,7 @@
 ( -1576 2624 672 ) ( -1544 2624 672 ) ( -1544 2616 656 ) evil8_base/e8_base1 -192 127 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 309
+// entity 294
 {
 "classname" "func_group"
 // brush 0
@@ -33446,7 +33323,7 @@
 ( -1160 2656 192 ) ( -1592 2656 192 ) ( -1592 2624 192 ) common/caulk 32 -31 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 310
+// entity 295
 {
 "classname" "func_group"
 // brush 0
@@ -33459,7 +33336,7 @@
 ( -1408 2784 192 ) ( -1376 2736 192 ) ( -1376 2784 192 ) evil8_base/e8_base1 64 -242 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 311
+// entity 296
 {
 "classname" "func_group"
 // brush 0
@@ -33472,14 +33349,14 @@
 ( -1536 2768 144 ) ( -1536 2768 584 ) ( -1568 2768 584 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 312
+// entity 297
 {
 "classname" "misc_model"
 "angle" "315"
 "model" "models/mapobjects/strale5_lamp2.ase"
 "origin" "-1888 2592 384"
 }
-// entity 313
+// entity 298
 {
 "classname" "func_group"
 // brush 0
@@ -33501,7 +33378,7 @@
 ( -960 2768 176 ) ( -960 2800 176 ) ( -976 2800 208 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 314
+// entity 299
 {
 "classname" "func_group"
 // brush 0
@@ -33523,7 +33400,7 @@
 ( -2064 2496 384 ) ( -2096 2496 384 ) ( -2096 2480 416 ) evil8_base/e8_base1 -192 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 315
+// entity 300
 {
 "classname" "func_group"
 // brush 0
@@ -33545,7 +33422,7 @@
 ( -1792 2896 288 ) ( -1792 2896 896 ) ( -1776 2896 896 ) evil8_base/e8_base1 -64 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 316
+// entity 301
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33553,14 +33430,14 @@
 "origin" "-2188 1744 172"
 "target" "t27"
 }
-// entity 317
+// entity 302
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "250"
 "origin" "-2180 1744 168"
 }
-// entity 318
+// entity 303
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33568,14 +33445,14 @@
 "origin" "-2532 1472 -130"
 "target" "t28"
 }
-// entity 319
+// entity 304
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "40"
 "origin" "-2532 1472 -126"
 }
-// entity 320
+// entity 305
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33583,14 +33460,14 @@
 "origin" "-2172 1664 -124"
 "target" "t29"
 }
-// entity 321
+// entity 306
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-2180 1664 -128"
 }
-// entity 322
+// entity 307
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33598,56 +33475,56 @@
 "origin" "-2320 1240 -128"
 "target" "t30"
 }
-// entity 323
+// entity 308
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "40"
 "origin" "-2320 1248 -132"
 }
-// entity 324
+// entity 309
 {
 "classname" "light"
 "_color" "1 0.2 0.2"
 "light" "400"
 "origin" "-1840 1544 -360"
 }
-// entity 325
+// entity 310
 {
 "classname" "light"
 "_color" "1 0.2 0.2"
 "light" "400"
 "origin" "-1704 1680 -360"
 }
-// entity 326
+// entity 311
 {
 "classname" "light"
 "_color" "1 0.2 0.2"
 "light" "400"
 "origin" "-1704 1872 -360"
 }
-// entity 327
+// entity 312
 {
 "classname" "light"
 "_color" "1 0.2 0.2"
 "light" "400"
 "origin" "-1976 1856 -360"
 }
-// entity 328
+// entity 313
 {
 "classname" "light"
 "_color" "1 0.2 0.2"
 "light" "400"
 "origin" "-1976 2048 -360"
 }
-// entity 329
+// entity 314
 {
 "classname" "light"
 "_color" "1 0.2 0.2"
 "light" "400"
 "origin" "-1840 2216 -360"
 }
-// entity 330
+// entity 315
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33655,14 +33532,14 @@
 "origin" "-1776 2772 60"
 "target" "t34"
 }
-// entity 331
+// entity 316
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "175"
 "origin" "-1776 2780 56"
 }
-// entity 332
+// entity 317
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33670,14 +33547,14 @@
 "origin" "-1899 2543 -4"
 "target" "t35"
 }
-// entity 333
+// entity 318
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "175"
 "origin" "-1905 2549 -8"
 }
-// entity 334
+// entity 319
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33685,14 +33562,14 @@
 "origin" "-1904 2180 -52"
 "target" "t36"
 }
-// entity 335
+// entity 320
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "175"
 "origin" "-1904 2188 -56"
 }
-// entity 336
+// entity 321
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33700,21 +33577,21 @@
 "origin" "-1832 1836 -124"
 "target" "t37"
 }
-// entity 337
+// entity 322
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "100"
 "origin" "-1832 1844 -128"
 }
-// entity 338
+// entity 323
 {
 "classname" "light"
 "_color" "1 0.2 0.2"
 "light" "400"
 "origin" "-1688 2216 -360"
 }
-// entity 339
+// entity 324
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33722,14 +33599,14 @@
 "origin" "-1552 1240 -128"
 "target" "t38"
 }
-// entity 340
+// entity 325
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "40"
 "origin" "-1552 1246 -130"
 }
-// entity 341
+// entity 326
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33737,14 +33614,14 @@
 "origin" "-960 1414 -128"
 "target" "t39"
 }
-// entity 342
+// entity 327
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "40"
 "origin" "-960 1406 -130"
 }
-// entity 343
+// entity 328
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33752,14 +33629,14 @@
 "origin" "-1472 1724 -124"
 "target" "t40"
 }
-// entity 344
+// entity 329
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "100"
 "origin" "-1472 1724 -144"
 }
-// entity 345
+// entity 330
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33767,14 +33644,14 @@
 "origin" "-1472 2284 -284"
 "target" "t41"
 }
-// entity 346
+// entity 331
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "150"
 "origin" "-1472 2284 -296"
 }
-// entity 347
+// entity 332
 {
 "classname" "func_group"
 // brush 0
@@ -33796,7 +33673,7 @@
 ( -1200 3072 160 ) ( -1200 3072 768 ) ( -1200 3056 768 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 348
+// entity 333
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33804,14 +33681,14 @@
 "origin" "-2188 2096 172"
 "target" "t43"
 }
-// entity 349
+// entity 334
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "250"
 "origin" "-2180 2096 168"
 }
-// entity 350
+// entity 335
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33819,14 +33696,14 @@
 "origin" "-1032 1936 176"
 "target" "t45"
 }
-// entity 351
+// entity 336
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-1034 1942 172"
 }
-// entity 352
+// entity 337
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33834,105 +33711,105 @@
 "origin" "-1036 3000 172"
 "target" "t46"
 }
-// entity 353
+// entity 338
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-1042 2994 168"
 }
-// entity 354
+// entity 339
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "350"
 "origin" "-1472 2048 256"
 }
-// entity 355
+// entity 340
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "275"
 "origin" "-1152 2048 256"
 }
-// entity 356
+// entity 341
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "250"
 "origin" "-1152 2880 256"
 }
-// entity 357
+// entity 342
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "250"
 "origin" "-1440 2912 352"
 }
-// entity 358
+// entity 343
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "500"
 "origin" "-1856 2208 352"
 }
-// entity 359
+// entity 344
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "500"
 "origin" "-1856 1664 224"
 }
-// entity 360
+// entity 345
 {
 "classname" "light"
 "_color" "0.66 0.65 0.7"
 "light" "200"
 "origin" "-1872 1232 -64"
 }
-// entity 361
+// entity 346
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "200"
 "origin" "-1600 1024 224"
 }
-// entity 362
+// entity 347
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "170"
 "origin" "-1872 592 304"
 }
-// entity 363
+// entity 348
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "200"
 "origin" "-2688 1920 -32"
 }
-// entity 364
+// entity 349
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "100"
 "origin" "-1152 2448 96"
 }
-// entity 365
+// entity 350
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-1424 2448 96"
 }
-// entity 366
+// entity 351
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "25"
 "origin" "-1520 2608 -320"
 }
-// entity 367
+// entity 352
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -33940,35 +33817,35 @@
 "origin" "-2003 1991 -124"
 "target" "t47"
 }
-// entity 368
+// entity 353
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "40"
 "origin" "-2009 1997 -128"
 }
-// entity 369
+// entity 354
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "35"
 "origin" "-2104 672 248"
 }
-// entity 370
+// entity 355
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-2228 1520 -176"
 }
-// entity 371
+// entity 356
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-2228 1808 -176"
 }
-// entity 372
+// entity 357
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -33976,14 +33853,14 @@
 "origin" "-1872 -204 188"
 "target" "t48"
 }
-// entity 373
+// entity 358
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "125"
 "origin" "-1874 -210 184"
 }
-// entity 374
+// entity 359
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -33991,14 +33868,14 @@
 "origin" "-2104 -820 252"
 "target" "t49"
 }
-// entity 375
+// entity 360
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-2102 -814 248"
 }
-// entity 376
+// entity 361
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -34006,42 +33883,42 @@
 "origin" "-2480 -436 252"
 "target" "t50"
 }
-// entity 377
+// entity 362
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-2478 -430 248"
 }
-// entity 378
+// entity 363
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "175"
 "origin" "-1488 -208 248"
 }
-// entity 379
+// entity 364
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "175"
 "origin" "-1872 176 248"
 }
-// entity 380
+// entity 365
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-1768 -536 232"
 }
-// entity 381
+// entity 366
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "35"
 "origin" "-2200 -544 184"
 }
-// entity 382
+// entity 367
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -34049,14 +33926,14 @@
 "origin" "-250 704 -128"
 "target" "t51"
 }
-// entity 383
+// entity 368
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-258 704 -130"
 }
-// entity 384
+// entity 369
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -34064,49 +33941,49 @@
 "origin" "-426 1237 -128"
 "target" "t52"
 }
-// entity 385
+// entity 370
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-432 1231 -130"
 }
-// entity 386
+// entity 371
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "75"
 "origin" "-960 704 -248"
 }
-// entity 387
+// entity 372
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "75"
 "origin" "-752 704 -200"
 }
-// entity 388
+// entity 373
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "75"
 "origin" "-960 912 -200"
 }
-// entity 389
+// entity 374
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-1680 1912 -176"
 }
-// entity 390
+// entity 375
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "248 -16 -176"
 }
-// entity 391
+// entity 376
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
@@ -34114,56 +33991,56 @@
 "origin" "-1024 200 296"
 "target" "t53"
 }
-// entity 392
+// entity 377
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-1018 198 292"
 }
-// entity 393
+// entity 378
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-1280 -424 248"
 }
-// entity 394
+// entity 379
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-1280 16 248"
 }
-// entity 395
+// entity 380
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-1616 48 248"
 }
-// entity 396
+// entity 381
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-1664 384 248"
 }
-// entity 397
+// entity 382
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-2096 384 248"
 }
-// entity 398
+// entity 383
 {
 "classname" "light"
 "_color" "0.662 0.671 0.615"
 "light" "50"
 "origin" "-2112 -24 248"
 }
-// entity 399
+// entity 384
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
@@ -34171,56 +34048,56 @@
 "origin" "-1472 632 296"
 "target" "t54"
 }
-// entity 400
+// entity 385
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-1478 634 292"
 }
-// entity 401
+// entity 386
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "75"
 "origin" "-960 1190 -186"
 }
-// entity 402
+// entity 387
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "50"
 "origin" "-1248 1334 -186"
 }
-// entity 403
+// entity 388
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-506 696 -178"
 }
-// entity 404
+// entity 389
 {
 "classname" "light"
 "_color" "1 0.9 0.9"
 "light" "40"
 "origin" "-632 1303 -194"
 }
-// entity 405
+// entity 390
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "40"
 "origin" "-344 1039 -194"
 }
-// entity 406
+// entity 391
 {
 "classname" "light"
 "_color" "0.9 0.9 1"
 "light" "75"
 "origin" "-322 416 -178"
 }
-// entity 407
+// entity 392
 {
 "classname" "func_group"
 // brush 0
@@ -34242,7 +34119,7 @@
 ( -1439 1660 176 ) ( -1456 1687 176 ) ( -1469 1679 208 ) common/clip 7 0 0 0.4240719974 0.5 134217728 13 0
 }
 }
-// entity 408
+// entity 393
 {
 "classname" "func_group"
 // brush 0
@@ -34264,7 +34141,7 @@
 ( -1468 1798 176 ) ( -1444 1819 176 ) ( -1455 1831 208 ) common/clip 20 0 0 0.3713380098 0.5 134217728 13 0
 }
 }
-// entity 409
+// entity 394
 {
 "classname" "func_group"
 // brush 0
@@ -34286,7 +34163,7 @@
 ( -1876 2606 384 ) ( -1900 2585 384 ) ( -1889 2573 416 ) common/clip 19 0 0 0.3715820014 0.5 134217728 13 0
 }
 }
-// entity 410
+// entity 395
 {
 "classname" "func_group"
 // brush 0
@@ -34308,7 +34185,7 @@
 ( 174 218 208 ) ( 164 230 176 ) ( 140 209 176 ) common/clip 37 0 0 0.3715820014 0.5 134217728 13 0
 }
 }
-// entity 411
+// entity 396
 {
 "classname" "func_group"
 // brush 0
@@ -34330,7 +34207,7 @@
 ( 6 203 768 ) ( 13 216 768 ) ( 13 216 160 ) common/clip -36 0 -180 0.4262999892 -0.5 134217728 13 0
 }
 }
-// entity 412
+// entity 397
 {
 "classname" "func_group"
 // brush 0
@@ -34352,14 +34229,14 @@
 ( 908 -222 416 ) ( 919 -233 384 ) ( 942 -210 384 ) common/clip -46 0 0 0.3597410023 0.5 134217728 13 0
 }
 }
-// entity 413
+// entity 398
 {
 "classname" "light"
 "_color" "0.4 0.4 0.6"
 "light" "30"
 "origin" "-992 -640 251"
 }
-// entity 414
+// entity 399
 {
 "classname" "func_group"
 // brush 0
@@ -34381,7 +34258,7 @@
 ( 174 218 768 ) ( 164 230 768 ) ( 164 230 160 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 415
+// entity 400
 {
 "classname" "func_group"
 // brush 0
@@ -34403,7 +34280,7 @@
 ( 6 203 208 ) ( 13 216 176 ) ( -16 231 176 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 416
+// entity 401
 {
 "classname" "func_group"
 // brush 0
@@ -34425,7 +34302,7 @@
 ( 908 -222 896 ) ( 919 -233 896 ) ( 919 -233 288 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 417
+// entity 402
 {
 "classname" "func_group"
 // brush 0
@@ -34447,7 +34324,7 @@
 ( 1440 -84 384 ) ( 1440 -84 352 ) ( 1376 12 352 ) evil8_base/e8base_blue 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 418
+// entity 403
 {
 "classname" "func_group"
 // brush 0
@@ -34469,7 +34346,7 @@
 ( 1404 128 224 ) ( 1416 128 224 ) ( 1416 128 256 ) evil8_base/e8_base1 -64 73 0 0.5 -0.5 134217728 0 0
 }
 }
-// entity 419
+// entity 404
 {
 "classname" "func_group"
 // brush 0
@@ -34491,7 +34368,7 @@
 ( -1652 3040 352 ) ( -1748 3104 352 ) ( -1748 3104 384 ) evil8_base/e8base_red 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 420
+// entity 405
 {
 "classname" "func_group"
 // brush 0
@@ -34513,7 +34390,7 @@
 ( -1536 3080 256 ) ( -1536 3080 224 ) ( -1536 3068 224 ) evil8_base/e8_base1 -64 73 0 0.5 -0.5 134217728 0 0
 }
 }
-// entity 421
+// entity 406
 {
 "classname" "func_group"
 // brush 0
@@ -34535,7 +34412,7 @@
 ( -1456 1687 160 ) ( -1456 1687 768 ) ( -1469 1679 768 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 422
+// entity 407
 {
 "classname" "func_group"
 // brush 0
@@ -34557,7 +34434,7 @@
 ( -1432 1827 160 ) ( -1432 1827 768 ) ( -1443 1839 768 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 423
+// entity 408
 {
 "classname" "func_group"
 // brush 0
@@ -34579,16 +34456,141 @@
 ( -1900 2585 288 ) ( -1900 2585 896 ) ( -1889 2573 896 ) common/weapclip 0 0 0 0.5 0.5 134217728 5 0
 }
 }
-// entity 424
+// entity 409
 {
 "classname" "misc_model"
 "model" "models/mapobjects/morphed_tele/telepad.ase"
 "origin" "-2316 668 176"
 }
-// entity 425
+// entity 410
 {
 "classname" "misc_model"
 "angle" "90"
 "model" "models/mapobjects/morphed_tele/telepad.ase"
 "origin" "-992 -652 176"
 }
+// entity 411
+{
+"classname" "onslaught_generator"
+"origin" "784.000000 768.000000 288.000000"
+"team" "14"
+"targetname" "bluegen"
+}
+// entity 412
+{
+"classname" "onslaught_generator"
+"origin" "-896.000000 2448.000000 288.000000"
+"team" "5"
+"targetname" "redgen"
+}
+// entity 413
+{
+"classname" "onslaught_controlpoint"
+"origin" "-80.000000 -208.000000 0.000000"
+"message" "Big Blue room"
+"targetname" "bluecp"
+}
+// entity 414
+{
+"classname" "onslaught_link"
+"origin" "-208.000000 -128.000000 80.000000"
+"target" "middlelowcp"
+"target2" "bluecp"
+}
+// entity 415
+{
+"classname" "onslaught_controlpoint"
+"origin" "-1872.000000 1584.000000 0.000000"
+"targetname" "redcp"
+"message" "Big Red room"
+}
+// entity 416
+{
+"classname" "onslaught_link"
+"origin" "-1968.000000 1456.000000 80.000000"
+"target" "middlehighcp"
+"target2" "redcp"
+}
+// entity 417
+{
+"classname" "onslaught_link"
+"origin" "64.000000 -160.000000 80.000000"
+"target" "bluegen"
+"target2" "bluecp"
+}
+// entity 418
+{
+"classname" "onslaught_link"
+"origin" "-208.000000 -304.000000 80.000000"
+"target" "middlehighcp"
+"target2" "bluecp"
+}
+// entity 419
+{
+"classname" "onslaught_link"
+"origin" "-1732.000000 1772.000000 84.000000"
+"target" "redgen"
+"target2" "redcp"
+}
+// entity 420
+{
+"classname" "onslaught_link"
+"origin" "-1776.000000 1456.000000 80.000000"
+"target" "middlelowcp"
+"target2" "redcp"
+}
+// entity 421
+{
+"classname" "onslaught_controlpoint"
+"origin" "-480.000000 1184.000000 -256.000000"
+"targetname" "middlelowcp"
+"target" "middlelowcpspawns"
+"message" "Middle Low"
+}
+// entity 422
+{
+"classname" "onslaught_controlpoint"
+"origin" "-2144.000000 -480.000000 112.000000"
+"targetname" "middlehighcp"
+"target" "middlehighcpspawns"
+"message" "Middle High"
+}
+// entity 423
+{
+"classname" "info_player_deathmatch"
+"origin" "-352.000000 1056.000000 -232.000000"
+"targetname" "middlelowcpspawns"
+"angle" "180.000000"
+}
+// entity 424
+{
+"classname" "info_player_deathmatch"
+"origin" "-864.000000 800.000000 -296.000000"
+"targetname" "middlelowcpspawns"
+"angle" "180.000000"
+}
+// entity 425
+{
+"classname" "info_player_deathmatch"
+"origin" "-608.000000 1312.000000 -232.000000"
+"targetname" "middlelowcpspawns"
+"angle" "180.000000"
+}
+// entity 426
+{
+"classname" "info_player_deathmatch"
+"origin" "-1936.000000 -272.000000 80.000000"
+"targetname" "middlehighcpspawns"
+}
+// entity 427
+{
+"classname" "info_player_deathmatch"
+"origin" "-2336.000000 -416.000000 136.000000"
+"targetname" "middlehighcpspawns"
+}
+// entity 428
+{
+"classname" "info_player_deathmatch"
+"origin" "-2080.000000 -672.000000 136.000000"
+"targetname" "middlehighcpspawns"
+}

Modified: branches/nexuiz-2.0/data/maps/runningmanctf.mapinfo
===================================================================
--- branches/nexuiz-2.0/data/maps/runningmanctf.mapinfo	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/runningmanctf.mapinfo	2009-05-24 09:22:51 UTC (rev 6763)
@@ -6,7 +6,7 @@
 has weapons
 type dm 30 20
 type tdm 50 20 2
-type dom 200 20
+type ons 20
 type ctf 300 20
 type rune 200 20
 type lms 9 20

Modified: branches/nexuiz-2.0/data/maps/skyway.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/skyway.map
===================================================================
--- branches/nexuiz-2.0/data/maps/skyway.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/skyway.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -6963,6 +6963,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 0.000000 64.000000"
 }
 // entity 88
 {
@@ -6973,6 +6974,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 32.000000"
 }
 // entity 89
 {
@@ -6987,36 +6989,23 @@
 // entity 90
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Nex"
-"origin" "-560.000000 400.000000 288.000000"
-}
-// entity 91
-{
-"classname" "dom_controlpoint"
 "angle" "90"
 "message" "^3 has captured the ^1Electro"
 "origin" "-65.000000 1350.000000 112.000000"
 }
-// entity 92
+// entity 91
 {
 "classname" "dom_controlpoint"
 "message" "^3 has captured the ^1Viewpoint"
 "origin" "1170.000000 230.000000 430.000000"
 }
-// entity 93
+// entity 92
 {
 "classname" "dom_controlpoint"
-"angle" "45"
 "message" "^3 has captured a ^1Skyway"
-"origin" "620.000000 400.000000 984.000000"
-}
-// entity 94
-{
-"classname" "dom_controlpoint"
-"message" "^3 has captured a ^1Skyway"
 "origin" "190.000000 70.000000 792.000000"
 }
-// entity 95
+// entity 93
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7047,7 +7036,7 @@
 }
 }
 }
-// entity 96
+// entity 94
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7065,7 +7054,7 @@
 }
 }
 }
-// entity 97
+// entity 95
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7096,28 +7085,28 @@
 }
 }
 }
-// entity 98
+// entity 96
 {
 "classname" "light"
 "_fade" "1.0"
 "_light" "255 255 255 100"
 "origin" "1382 261 364"
 }
-// entity 99
+// entity 97
 {
 "classname" "light"
 "_fade" "1.0"
 "_light" "255 255 255 100"
 "origin" "1398 54 364"
 }
-// entity 100
+// entity 98
 {
 "classname" "light"
 "_fade" "1.0"
 "_light" "255 255 255 100"
 "origin" "1398 -174 364"
 }
-// entity 101
+// entity 99
 {
 "classname" "light_spot"
 "_cone" "45"
@@ -7128,7 +7117,7 @@
 "origin" "1382 261 359"
 "pitch" "-90"
 }
-// entity 102
+// entity 100
 {
 "classname" "light_spot"
 "_cone" "45"
@@ -7139,7 +7128,7 @@
 "origin" "1398 54 359"
 "pitch" "-90"
 }
-// entity 103
+// entity 101
 {
 "classname" "light_spot"
 "_cone" "45"
@@ -7150,21 +7139,21 @@
 "origin" "1398 -174 359"
 "pitch" "-90"
 }
-// entity 104
+// entity 102
 {
 "classname" "light"
 "_fade" "1.0"
 "_light" "255 255 128 50"
 "origin" "-365 1146 255"
 }
-// entity 105
+// entity 103
 {
 "classname" "light"
 "_fade" "1.0"
 "_light" "255 255 128 50"
 "origin" "170 1138 255"
 }
-// entity 106
+// entity 104
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7195,7 +7184,7 @@
 }
 }
 }
-// entity 107
+// entity 105
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7226,7 +7215,7 @@
 }
 }
 }
-// entity 108
+// entity 106
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7244,7 +7233,7 @@
 }
 }
 }
-// entity 109
+// entity 107
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7262,7 +7251,7 @@
 }
 }
 }
-// entity 110
+// entity 108
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7280,7 +7269,7 @@
 }
 }
 }
-// entity 111
+// entity 109
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7298,7 +7287,7 @@
 }
 }
 }
-// entity 112
+// entity 110
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7316,7 +7305,7 @@
 }
 }
 }
-// entity 113
+// entity 111
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7334,7 +7323,7 @@
 }
 }
 }
-// entity 114
+// entity 112
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7352,7 +7341,7 @@
 }
 }
 }
-// entity 115
+// entity 113
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7370,7 +7359,7 @@
 }
 }
 }
-// entity 116
+// entity 114
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7388,7 +7377,7 @@
 }
 }
 }
-// entity 117
+// entity 115
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7406,7 +7395,7 @@
 }
 }
 }
-// entity 118
+// entity 116
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7424,7 +7413,7 @@
 }
 }
 }
-// entity 119
+// entity 117
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7442,49 +7431,49 @@
 }
 }
 }
-// entity 120
+// entity 118
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asedoor.ase"
 "origin" "64 712 664"
 "spawnflags" "6"
 }
-// entity 121
+// entity 119
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asejp.ase"
 "origin" "568 296 252"
 "spawnflags" "6"
 }
-// entity 122
+// entity 120
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asejp.ase"
 "origin" "568 -120 252"
 "spawnflags" "6"
 }
-// entity 123
+// entity 121
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asetrim.ase"
 "origin" "824 448 672"
 "spawnflags" "6"
 }
-// entity 124
+// entity 122
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asesupport.ase"
 "origin" "712 152 248"
 "spawnflags" "6"
 }
-// entity 125
+// entity 123
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asesupport.ase"
 "origin" "512 152 248"
 "spawnflags" "6"
 }
-// entity 126
+// entity 124
 {
 "classname" "misc_model"
 "angle" "180"
@@ -7492,28 +7481,28 @@
 "origin" "448 -144 664"
 "spawnflags" "6"
 }
-// entity 127
+// entity 125
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asejp.ase"
 "origin" "-152 552 516"
 "spawnflags" "6"
 }
-// entity 128
+// entity 126
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/asedoor.ase"
 "origin" "768 -144 912"
 }
-// entity 129
+// entity 127
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/asedoor.ase"
 "origin" "560 944 912"
 }
-// entity 130
+// entity 128
 {
 "classname" "misc_model"
 "angle" "90"
@@ -7521,7 +7510,7 @@
 "origin" "-632 648 912"
 "spawnflags" "6"
 }
-// entity 131
+// entity 129
 {
 "classname" "misc_model"
 "angle" "180"
@@ -7529,42 +7518,42 @@
 "origin" "-320 -376 912"
 "spawnflags" "6"
 }
-// entity 132
+// entity 130
 {
 "classname" "misc_model"
 "angle" "90"
 "model" "models/mapobjects/asedoor.ase"
 "origin" "-632 -320 1104"
 }
-// entity 133
+// entity 131
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/asedoor.ase"
 "origin" "704 944 1104"
 }
-// entity 134
+// entity 132
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asedoor2.ase"
 "origin" "-144 848 232"
 "spawnflags" "6"
 }
-// entity 135
+// entity 133
 {
 "classname" "misc_model"
 "model" "models/mapobjects/asedoor3.ase"
 "origin" "-320 976 328"
 "spawnflags" "6"
 }
-// entity 136
+// entity 134
 {
 "classname" "misc_model"
 "angle" "270"
 "model" "models/mapobjects/asedoor.ase"
 "origin" "920 640 912"
 }
-// entity 137
+// entity 135
 {
 "classname" "misc_model"
 "angle" "270"
@@ -7572,720 +7561,720 @@
 "origin" "944 764 240"
 "spawnflags" "6"
 }
-// entity 138
+// entity 136
 {
 "classname" "misc_model"
 "model" "models/mapobjects/aseceiling.ase"
 "origin" "1192 56 392"
 "spawnflags" "6"
 }
-// entity 139
+// entity 137
 {
 "classname" "light"
 "light" "50"
 "origin" "-536 648 168"
 }
-// entity 140
+// entity 138
 {
 "classname" "light"
 "light" "20"
 "origin" "248 1096 168"
 }
-// entity 141
+// entity 139
 {
 "classname" "light"
 "light" "20"
 "origin" "-360 48 16"
 }
-// entity 142
+// entity 140
 {
 "classname" "light"
 "light" "20"
 "origin" "648 488 16"
 }
-// entity 143
+// entity 141
 {
 "classname" "light"
 "light" "20"
 "origin" "544 712 168"
 }
-// entity 144
+// entity 142
 {
 "classname" "light"
 "light" "20"
 "origin" "624 1160 528"
 }
-// entity 145
+// entity 143
 {
 "classname" "light"
 "light" "20"
 "origin" "1160 376 528"
 }
-// entity 146
+// entity 144
 {
 "classname" "light"
 "light" "50"
 "origin" "-792 40 560"
 }
-// entity 147
+// entity 145
 {
 "classname" "light"
 "light" "50"
 "origin" "-480 -256 168"
 }
-// entity 148
+// entity 146
 {
 "classname" "light"
 "light" "20"
 "origin" "584 16 168"
 }
-// entity 149
+// entity 147
 {
 "classname" "light"
 "light" "20"
 "origin" "-16 200 176"
 }
-// entity 150
+// entity 148
 {
 "classname" "light"
 "light" "20"
 "origin" "208 600 176"
 }
-// entity 151
+// entity 149
 {
 "classname" "light"
 "light" "20"
 "origin" "376 968 176"
 }
-// entity 152
+// entity 150
 {
 "classname" "light"
 "light" "20"
 "origin" "608 -56 168"
 }
-// entity 153
+// entity 151
 {
 "classname" "light_environment"
 "origin" "608 -56 160"
 }
-// entity 154
+// entity 152
 {
 "classname" "misc_model"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-432 1144 256"
 }
-// entity 155
+// entity 153
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "256 1144 256"
 }
-// entity 156
+// entity 154
 {
 "classname" "light"
 "light" "20"
 "origin" "152 304 96"
 }
-// entity 157
+// entity 155
 {
 "classname" "light"
 "light" "100"
 "origin" "-312 -32 840"
 }
-// entity 158
+// entity 156
 {
 "classname" "light"
 "light" "100"
 "origin" "-528 200 840"
 }
-// entity 159
+// entity 157
 {
 "classname" "light"
 "light" "100"
 "origin" "392 192 880"
 }
-// entity 160
+// entity 158
 {
 "classname" "light"
 "light" "100"
 "origin" "176 424 880"
 }
-// entity 161
+// entity 159
 {
 "classname" "light"
 "light" "100"
 "origin" "768 648 880"
 }
-// entity 162
+// entity 160
 {
 "classname" "light"
 "light" "100"
 "origin" "688 136 896"
 }
-// entity 163
+// entity 161
 {
 "classname" "light"
 "light" "100"
 "origin" "-296 -32 576"
 }
-// entity 164
+// entity 162
 {
 "classname" "light"
 "light" "100"
 "origin" "-512 200 576"
 }
-// entity 165
+// entity 163
 {
 "classname" "light"
 "light" "100"
 "origin" "408 192 616"
 }
-// entity 166
+// entity 164
 {
 "classname" "light"
 "light" "100"
 "origin" "192 424 616"
 }
-// entity 167
+// entity 165
 {
 "classname" "light"
 "light" "100"
 "origin" "784 648 616"
 }
-// entity 168
+// entity 166
 {
 "classname" "light"
 "light" "100"
 "origin" "704 136 632"
 }
-// entity 169
+// entity 167
 {
 "classname" "light"
 "light" "100"
 "origin" "-280 -32 296"
 }
-// entity 170
+// entity 168
 {
 "classname" "light"
 "light" "100"
 "origin" "-496 200 296"
 }
-// entity 171
+// entity 169
 {
 "classname" "light"
 "light" "100"
 "origin" "424 192 336"
 }
-// entity 172
+// entity 170
 {
 "classname" "light"
 "light" "200"
 "origin" "208 424 336"
 }
-// entity 173
+// entity 171
 {
 "classname" "light"
 "light" "100"
 "origin" "800 648 336"
 }
-// entity 174
+// entity 172
 {
 "classname" "light"
 "light" "100"
 "origin" "720 136 352"
 }
-// entity 175
+// entity 173
 {
 "classname" "misc_model"
 "model" "models/mapobjects/aseplats.ase"
 "origin" "160 320 968"
 "spawnflags" "6"
 }
-// entity 176
+// entity 174
 {
 "classname" "light"
 "light" "100"
 "origin" "560 872 856"
 }
-// entity 177
+// entity 175
 {
 "classname" "light"
 "light" "100"
 "origin" "704 856 1064"
 }
-// entity 178
+// entity 176
 {
 "classname" "light"
 "light" "100"
 "origin" "768 -80 880"
 }
-// entity 179
+// entity 177
 {
 "classname" "light"
 "light" "100"
 "origin" "-528 -320 1072"
 }
-// entity 180
+// entity 178
 {
 "classname" "misc_model"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-896 56 320"
 }
-// entity 181
+// entity 179
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-736 56 320"
 }
-// entity 182
+// entity 180
 {
 "classname" "misc_model"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-896 216 320"
 }
-// entity 183
+// entity 181
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-736 216 320"
 }
-// entity 184
+// entity 182
 {
 "classname" "misc_model"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-896 -96 320"
 }
-// entity 185
+// entity 183
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-736 -96 320"
 }
-// entity 186
+// entity 184
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "25"
 "origin" "-760 216 320"
 }
-// entity 187
+// entity 185
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "25"
 "origin" "-872 216 320"
 }
-// entity 188
+// entity 186
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "25"
 "origin" "-760 56 320"
 }
-// entity 189
+// entity 187
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "25"
 "origin" "-872 56 320"
 }
-// entity 190
+// entity 188
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "25"
 "origin" "-760 -96 320"
 }
-// entity 191
+// entity 189
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "25"
 "origin" "-872 -96 320"
 }
-// entity 192
+// entity 190
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-664 408 376"
 }
-// entity 193
+// entity 191
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-688 408 376"
 }
-// entity 194
+// entity 192
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-624 408 376"
 }
-// entity 195
+// entity 193
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-600 408 376"
 }
-// entity 196
+// entity 194
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-448 408 376"
 }
-// entity 197
+// entity 195
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-472 408 376"
 }
-// entity 198
+// entity 196
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-408 408 376"
 }
-// entity 199
+// entity 197
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-384 408 376"
 }
-// entity 200
+// entity 198
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-240 408 376"
 }
-// entity 201
+// entity 199
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-264 408 376"
 }
-// entity 202
+// entity 200
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-200 408 376"
 }
-// entity 203
+// entity 201
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-176 408 376"
 }
-// entity 204
+// entity 202
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-624 408 224"
 }
-// entity 205
+// entity 203
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-448 408 224"
 }
-// entity 206
+// entity 204
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-408 408 224"
 }
-// entity 207
+// entity 205
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-240 408 224"
 }
-// entity 208
+// entity 206
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-200 408 224"
 }
-// entity 209
+// entity 207
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-536 408 336"
 }
-// entity 210
+// entity 208
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-312 408 336"
 }
-// entity 211
+// entity 209
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-752 408 336"
 }
-// entity 212
+// entity 210
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-600 408 224"
 }
-// entity 213
+// entity 211
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-472 408 224"
 }
-// entity 214
+// entity 212
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-384 408 224"
 }
-// entity 215
+// entity 213
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-264 408 224"
 }
-// entity 216
+// entity 214
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-176 408 224"
 }
-// entity 217
+// entity 215
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-536 408 184"
 }
-// entity 218
+// entity 216
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-312 408 184"
 }
-// entity 219
+// entity 217
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "512 160 232"
 }
-// entity 220
+// entity 218
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "552 160 232"
 }
-// entity 221
+// entity 219
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "488 160 232"
 }
-// entity 222
+// entity 220
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "576 160 232"
 }
-// entity 223
+// entity 221
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "632 160 184"
 }
-// entity 224
+// entity 222
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "712 160 232"
 }
-// entity 225
+// entity 223
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "752 160 232"
 }
-// entity 226
+// entity 224
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "688 160 232"
 }
-// entity 227
+// entity 225
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "776 160 232"
 }
-// entity 228
+// entity 226
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "832 160 184"
 }
-// entity 229
+// entity 227
 {
 "classname" "misc_model"
 "angle" "90"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "212 -576 552"
 }
-// entity 230
+// entity 228
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "212 -552 552"
 }
-// entity 231
+// entity 229
 {
 "classname" "misc_model"
 "angle" "90"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-44 -576 552"
 }
-// entity 232
+// entity 230
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-44 -552 552"
 }
-// entity 233
+// entity 231
 {
 "classname" "misc_model"
 "angle" "90"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-556 -576 552"
 }
-// entity 234
+// entity 232
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-556 -552 552"
 }
-// entity 235
+// entity 233
 {
 "classname" "misc_model"
 "angle" "90"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-300 -576 552"
 }
-// entity 236
+// entity 234
 {
 "classname" "light"
 "_color" "0.978622 1.000000 0.819196"
 "light" "50"
 "origin" "-300 -552 552"
 }
-// entity 237
+// entity 235
 {
 "classname" "misc_model"
 "angle" "180"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "256 -304 200"
 }
-// entity 238
+// entity 236
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "232 -304 200"
 }
-// entity 239
+// entity 237
 {
 "classname" "misc_model"
 "angle" "90"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "128 -408 200"
 }
-// entity 240
+// entity 238
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "128 -384 200"
 }
-// entity 241
+// entity 239
 {
 "classname" "misc_model"
 "angle" "270"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "128 -192 200"
 }
-// entity 242
+// entity 240
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "128 -216 200"
 }
-// entity 243
+// entity 241
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "100"
 "origin" "128 -304 200"
 }
-// entity 244
+// entity 242
 {
 "classname" "misc_model"
 "angle" "360"
 "model" "models/mapobjects/el_wlight/el_wlight.md3"
 "origin" "-896 648 512"
 }
-// entity 245
+// entity 243
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"
 "light" "5"
 "origin" "-872 648 512"
 }
-// entity 246
+// entity 244
 {
 "classname" "light"
 "_color" "0.978616 1.000000 0.819195"

Modified: branches/nexuiz-2.0/data/maps/slimepit.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/slimepit.map
===================================================================
--- branches/nexuiz-2.0/data/maps/slimepit.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/slimepit.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -10874,6 +10874,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 72.000000 16.000000"
 }
 // entity 45
 {
@@ -10884,6 +10885,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 40.000000 16.000000"
 }
 // entity 46
 {
@@ -10894,39 +10896,33 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 104.000000 16.000000"
 }
 // entity 47
 {
 "classname" "dom_controlpoint"
-"angle" "90"
-"message" "^3 has captured the ^1Slime Alley"
-"origin" "-254.000000 -72.000000 -56.000000"
-}
-// entity 48
-{
-"classname" "dom_controlpoint"
 "message" "^3 has captured the ^1Upper Nex-Room"
 "origin" "528.000000 192.000000 352.000000"
 }
-// entity 49
+// entity 48
 {
 "classname" "dom_controlpoint"
 "message" "^3 has captured the ^1Electro"
 "origin" "528.000000 -660.000000 -56.000000"
 }
-// entity 50
+// entity 49
 {
 "classname" "dom_controlpoint"
 "message" "^3 has captured the ^1Mortar Bridge"
 "origin" "-628.000000 575.000000 352.000000"
 }
-// entity 51
+// entity 50
 {
 "classname" "dom_controlpoint"
 "message" "^3 has captured the ^1MG Room"
 "origin" "-1650.000000 0.000000 160.000000"
 }
-// entity 52
+// entity 51
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -10935,7 +10931,7 @@
 "origin" "-960 -768 96"
 "radius" "50"
 }
-// entity 53
+// entity 52
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -10948,7 +10944,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 54
+// entity 53
 {
 "classname" "light"
 "_color" "0.000000 0.501961 1.000000"
@@ -10957,7 +10953,7 @@
 "origin" "-72 216 104"
 "radius" "110"
 }
-// entity 55
+// entity 54
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -11001,7 +10997,7 @@
 }
 }
 }
-// entity 56
+// entity 55
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -11045,7 +11041,7 @@
 }
 }
 }
-// entity 57
+// entity 56
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -11089,7 +11085,7 @@
 }
 }
 }
-// entity 58
+// entity 57
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -11133,21 +11129,21 @@
 }
 }
 }
-// entity 59
+// entity 58
 {
 "classname" "light"
 "_color" "1.000000 0.970133 0.873312"
 "light" "100"
 "origin" "128 -864 240"
 }
-// entity 60
+// entity 59
 {
 "classname" "light"
 "_color" "0.252436 0.686145 1.000000"
 "light" "100"
 "origin" "864 -488 256"
 }
-// entity 61
+// entity 60
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -11193,14 +11189,14 @@
 }
 }
 }
-// entity 62
+// entity 61
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-408 -928 184"
 }
-// entity 63
+// entity 62
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11213,7 +11209,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 64
+// entity 63
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11222,7 +11218,7 @@
 "origin" "56 -384 48"
 "radius" "50"
 }
-// entity 65
+// entity 64
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11235,7 +11231,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 66
+// entity 65
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11244,7 +11240,7 @@
 "origin" "-568 -384 48"
 "radius" "50"
 }
-// entity 67
+// entity 66
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11257,7 +11253,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 68
+// entity 67
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11266,7 +11262,7 @@
 "origin" "-256 -72 48"
 "radius" "50"
 }
-// entity 69
+// entity 68
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11279,7 +11275,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 70
+// entity 69
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11288,7 +11284,7 @@
 "origin" "-256 120 456"
 "radius" "50"
 }
-// entity 71
+// entity 70
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11301,7 +11297,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 72
+// entity 71
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11310,7 +11306,7 @@
 "origin" "-640 336 48"
 "radius" "50"
 }
-// entity 73
+// entity 72
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11323,7 +11319,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 74
+// entity 73
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11332,7 +11328,7 @@
 "origin" "392 384 48"
 "radius" "50"
 }
-// entity 75
+// entity 74
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11345,7 +11341,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 76
+// entity 75
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11354,7 +11350,7 @@
 "origin" "392 -384 48"
 "radius" "50"
 }
-// entity 77
+// entity 76
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11367,7 +11363,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 78
+// entity 77
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11376,7 +11372,7 @@
 "origin" "-1216 -768 48"
 "radius" "50"
 }
-// entity 79
+// entity 78
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11389,7 +11385,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 80
+// entity 79
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11398,7 +11394,7 @@
 "origin" "-568 0 264"
 "radius" "50"
 }
-// entity 81
+// entity 80
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11411,7 +11407,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 82
+// entity 81
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11420,7 +11416,7 @@
 "origin" "-952 -192 264"
 "radius" "50"
 }
-// entity 83
+// entity 82
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11433,7 +11429,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 84
+// entity 83
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11442,7 +11438,7 @@
 "origin" "-1528 -456 264"
 "radius" "50"
 }
-// entity 85
+// entity 84
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11455,7 +11451,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 86
+// entity 85
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11464,7 +11460,7 @@
 "origin" "128 -648 264"
 "radius" "50"
 }
-// entity 87
+// entity 86
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11477,7 +11473,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 88
+// entity 87
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11486,7 +11482,7 @@
 "origin" "248 0 456"
 "radius" "50"
 }
-// entity 89
+// entity 88
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11499,7 +11495,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 90
+// entity 89
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11508,7 +11504,7 @@
 "origin" "392 0 456"
 "radius" "50"
 }
-// entity 91
+// entity 90
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11521,7 +11517,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 92
+// entity 91
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11530,7 +11526,7 @@
 "origin" "-424 576 456"
 "radius" "50"
 }
-// entity 93
+// entity 92
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11539,7 +11535,7 @@
 "origin" "-856 576 456"
 "radius" "50"
 }
-// entity 94
+// entity 93
 {
 "classname" "light"
 "_color" "0.396078 0.603922 0.490196"
@@ -11548,7 +11544,7 @@
 "origin" "424 -344 280"
 "radius" "100"
 }
-// entity 95
+// entity 94
 {
 "classname" "light"
 "_color" "0.396078 0.603922 0.490196"
@@ -11557,7 +11553,7 @@
 "origin" "424 -440 280"
 "radius" "100"
 }
-// entity 96
+// entity 95
 {
 "classname" "light"
 "_color" "0.396078 0.603922 0.490196"
@@ -11566,7 +11562,7 @@
 "origin" "424 -536 280"
 "radius" "100"
 }
-// entity 97
+// entity 96
 {
 "classname" "light"
 "_color" "0.396078 0.603922 0.490196"
@@ -11575,7 +11571,7 @@
 "origin" "424 -616 280"
 "radius" "100"
 }
-// entity 98
+// entity 97
 {
 "classname" "light"
 "_color" "0.396078 0.603922 0.490196"
@@ -11584,7 +11580,7 @@
 "origin" "368 -680 280"
 "radius" "100"
 }
-// entity 99
+// entity 98
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11597,7 +11593,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 100
+// entity 99
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11606,7 +11602,7 @@
 "origin" "-688 -648 48"
 "radius" "50"
 }
-// entity 101
+// entity 100
 {
 "classname" "light"
 "_color" "0.348318 0.931975 1.000000"
@@ -11615,7 +11611,7 @@
 "origin" "-488 -944 24"
 "radius" "200"
 }
-// entity 102
+// entity 101
 {
 "classname" "light"
 "_color" "0.000000 0.501961 1.000000"
@@ -11624,7 +11620,7 @@
 "origin" "-440 224 104"
 "radius" "75"
 }
-// entity 103
+// entity 102
 {
 "classname" "light"
 "_color" "0.000000 0.501961 1.000000"
@@ -11633,7 +11629,7 @@
 "origin" "128 296 104"
 "radius" "75"
 }
-// entity 104
+// entity 103
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11646,7 +11642,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 105
+// entity 104
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11655,7 +11651,7 @@
 "origin" "-1192 -216 360"
 "radius" "50"
 }
-// entity 106
+// entity 105
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11668,7 +11664,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 107
+// entity 106
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11677,7 +11673,7 @@
 "origin" "-1192 88 360"
 "radius" "50"
 }
-// entity 108
+// entity 107
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11690,7 +11686,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 109
+// entity 108
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11699,7 +11695,7 @@
 "origin" "-1496 88 360"
 "radius" "50"
 }
-// entity 110
+// entity 109
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11712,7 +11708,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 111
+// entity 110
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11721,133 +11717,133 @@
 "origin" "-1496 -216 360"
 "radius" "50"
 }
-// entity 112
+// entity 111
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-408 -864 184"
 }
-// entity 113
+// entity 112
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-408 -800 184"
 }
-// entity 114
+// entity 113
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-408 -736 184"
 }
-// entity 115
+// entity 114
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-104 -728 184"
 }
-// entity 116
+// entity 115
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-104 -792 184"
 }
-// entity 117
+// entity 116
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-104 -856 184"
 }
-// entity 118
+// entity 117
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-104 -920 184"
 }
-// entity 119
+// entity 118
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-320 -968 184"
 }
-// entity 120
+// entity 119
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-256 -968 184"
 }
-// entity 121
+// entity 120
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-192 -968 184"
 }
-// entity 122
+// entity 121
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-128 -968 184"
 }
-// entity 123
+// entity 122
 {
 "classname" "light"
 "_color" "0.093534 0.626832 1.000000"
 "light" "20"
 "origin" "-384 -968 184"
 }
-// entity 124
+// entity 123
 {
 "classname" "light"
 "_color" "0.252436 0.686145 1.000000"
 "light" "100"
 "origin" "864 -488 176"
 }
-// entity 125
+// entity 124
 {
 "classname" "light"
 "_color" "0.252436 0.686145 1.000000"
 "light" "100"
 "origin" "864 -696 176"
 }
-// entity 126
+// entity 125
 {
 "classname" "light"
 "_color" "0.252436 0.686145 1.000000"
 "light" "100"
 "origin" "864 -696 256"
 }
-// entity 127
+// entity 126
 {
 "classname" "light"
 "_color" "0.252436 0.686145 1.000000"
 "light" "100"
 "origin" "864 -896 256"
 }
-// entity 128
+// entity 127
 {
 "classname" "light"
 "_color" "0.252436 0.686145 1.000000"
 "light" "100"
 "origin" "864 -896 176"
 }
-// entity 129
+// entity 128
 {
 "classname" "light"
 "_color" "1.000000 0.970133 0.873312"
 "light" "100"
 "origin" "128 -936 240"
 }
-// entity 130
+// entity 129
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"
@@ -11860,7 +11856,7 @@
 "pitch" "-90"
 "radius" "150"
 }
-// entity 131
+// entity 130
 {
 "classname" "light"
 "_color" "0.913726 0.901961 0.854902"
@@ -11869,210 +11865,210 @@
 "origin" "-704 -832 96"
 "radius" "50"
 }
-// entity 132
+// entity 131
 {
 "classname" "light"
 "_color" "1.000000 0.970133 0.873312"
 "light" "100"
 "origin" "560 -784 240"
 }
-// entity 133
+// entity 132
 {
 "classname" "light"
 "_color" "1.000000 0.970133 0.873312"
 "light" "100"
 "origin" "632 -784 240"
 }
-// entity 134
+// entity 133
 {
 "classname" "light"
 "_color" "1.000000 0.970133 0.873312"
 "light" "100"
 "origin" "632 -560 240"
 }
-// entity 135
+// entity 134
 {
 "classname" "light"
 "_color" "1.000000 0.970133 0.873312"
 "light" "100"
 "origin" "560 -560 240"
 }
-// entity 136
+// entity 135
 {
 "classname" "light"
 "_color" "0.998444 1.000000 0.821393"
 "light" "200"
 "origin" "544 352 248"
 }
-// entity 137
+// entity 136
 {
 "classname" "light"
 "_color" "0.998444 1.000000 0.821393"
 "light" "200"
 "origin" "544 32 248"
 }
-// entity 138
+// entity 137
 {
 "classname" "light"
 "_color" "0.402126 1.000000 0.426251"
 "light" "40"
 "origin" "504 632 -56"
 }
-// entity 139
+// entity 138
 {
 "classname" "light"
 "_color" "0.402126 1.000000 0.426251"
 "light" "40"
 "origin" "904 632 -56"
 }
-// entity 140
+// entity 139
 {
 "classname" "light"
 "_color" "1.000000 0.574624 0.402121"
 "light" "200"
 "origin" "1128 192 480"
 }
-// entity 141
+// entity 140
 {
 "classname" "light"
 "_color" "0.697612 0.894194 1.000000"
 "light" "200"
 "origin" "744 192 536"
 }
-// entity 142
+// entity 141
 {
 "classname" "light"
 "_color" "0.697612 0.894194 1.000000"
 "light" "200"
 "origin" "744 288 536"
 }
-// entity 143
+// entity 142
 {
 "classname" "light"
 "_color" "0.697612 0.894194 1.000000"
 "light" "200"
 "origin" "744 96 536"
 }
-// entity 144
+// entity 143
 {
 "classname" "light"
 "_color" "0.402126 1.000000 0.426251"
 "light" "40"
 "origin" "504 -248 -56"
 }
-// entity 145
+// entity 144
 {
 "classname" "light"
 "_color" "0.402126 1.000000 0.426251"
 "light" "40"
 "origin" "904 -248 -56"
 }
-// entity 146
+// entity 145
 {
 "classname" "light"
 "_color" "1.000000 0.574624 0.402121"
 "light" "200"
 "origin" "1128 192 104"
 }
-// entity 147
+// entity 146
 {
 "classname" "light"
 "_color" "0.697612 0.894194 1.000000"
 "light" "200"
 "origin" "-240 -272 512"
 }
-// entity 148
+// entity 147
 {
 "classname" "light"
 "_color" "0.697612 0.894194 1.000000"
 "light" "200"
 "origin" "-240 -128 512"
 }
-// entity 149
+// entity 148
 {
 "classname" "light"
 "_color" "0.697612 0.894194 1.000000"
 "light" "200"
 "origin" "-240 -432 512"
 }
-// entity 150
+// entity 149
 {
 "classname" "light"
 "_color" "0.401373 1.000000 0.348318"
 "light" "200"
 "origin" "752 -672 32"
 }
-// entity 151
+// entity 150
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "15"
 "origin" "-352 128 160"
 }
-// entity 152
+// entity 151
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "15"
 "origin" "32 128 160"
 }
-// entity 153
+// entity 152
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "15"
 "origin" "256 -432 160"
 }
-// entity 154
+// entity 153
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "15"
 "origin" "264 -88 160"
 }
-// entity 155
+// entity 154
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "50"
 "origin" "-352 48 216"
 }
-// entity 156
+// entity 155
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "50"
 "origin" "32 48 216"
 }
-// entity 157
+// entity 156
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "50"
 "origin" "176 -88 216"
 }
-// entity 158
+// entity 157
 {
 "classname" "light"
 "_color" "0.602045 1.000000 0.679576"
 "light" "50"
 "origin" "168 -432 216"
 }
-// entity 159
+// entity 158
 {
 "classname" "light"
 "_color" "1.000000 0.996765 0.821393"
 "light" "200"
 "origin" "-792 576 264"
 }
-// entity 160
+// entity 159
 {
 "classname" "light"
 "_color" "1.000000 0.996765 0.821393"
 "light" "200"
 "origin" "-488 576 264"
 }
-// entity 161
+// entity 160
 {
 "classname" "light_spot"
 "_color" "0.913726 0.901961 0.854902"

Modified: branches/nexuiz-2.0/data/maps/soylent.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/soylent.map
===================================================================
--- branches/nexuiz-2.0/data/maps/soylent.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/soylent.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -4776,6 +4776,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "688.000000 0.000000 224.000000"
 }
 // entity 110
 {
@@ -4786,6 +4787,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "688.000000 0.000000 192.000000"
 }
 // entity 111
 {
@@ -4796,56 +4798,33 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "688.000000 0.000000 256.000000"
 }
 // entity 112
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured the ^1Mortar"
-"origin" "192.000000 -536.000000 432.000000"
-"wait" "5"
-}
-// entity 113
-{
-"classname" "dom_controlpoint"
-"frags" "1"
 "message" "^3 has captured the ^1Rocket Launcher"
 "origin" "608.000000 -680.000000 176.000000"
 "wait" "5"
 }
-// entity 114
+// entity 113
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured the ^1Nex"
-"origin" "32.000000 -1128.000000 688.000000"
-"wait" "5"
-}
-// entity 115
-{
-"classname" "dom_controlpoint"
-"frags" "1"
 "message" "^3 has captured the ^1Hagar"
 "origin" "-512.000000 -32.000000 696.000000"
 "wait" "5"
 }
-// entity 116
+// entity 114
 {
 "classname" "dom_controlpoint"
 "frags" "1"
-"message" "^3 has captured the ^1Skyway"
-"origin" "800.000000 -1368.000000 432.000000"
-"wait" "5"
-}
-// entity 117
-{
-"classname" "dom_controlpoint"
-"frags" "1"
 "message" "^3 has captured the ^1Roof"
 "origin" "288.000000 -488.000000 1232.000000"
 "wait" "5"
 }
-// entity 118
+// entity 115
 {
 "classname" "trigger_hurt"
 "dmg" "999"
@@ -4860,7 +4839,7 @@
 ( 1272 -536 -1128 ) ( 1272 -576 -1128 ) ( 1216 -536 -1128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 119
+// entity 116
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -4891,7 +4870,7 @@
 }
 }
 }
-// entity 120
+// entity 117
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -4935,7 +4914,7 @@
 }
 }
 }
-// entity 121
+// entity 118
 {
 "classname" "func_group"
 // brush 0
@@ -5093,7 +5072,7 @@
 ( 800 336 -1408 ) ( 768 336 -1408 ) ( 800 232 -1408 ) evil2_basemetal/p_mtl_brn 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 122
+// entity 119
 {
 "classname" "func_group"
 // brush 0
@@ -5106,7 +5085,7 @@
 ( 336 224 455 ) ( 304 224 455 ) ( 336 224 539 ) evil3_metals/mtldrk0 0 -64 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 123
+// entity 120
 {
 "classname" "func_group"
 // brush 0
@@ -5119,7 +5098,7 @@
 ( 912 384 384 ) ( 688 384 384 ) ( 688 208 384 ) evil3_metals/mtldrk1 0 96 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 124
+// entity 121
 {
 "classname" "func_group"
 // brush 0
@@ -5132,7 +5111,7 @@
 ( 176 384 448 ) ( 176 208 448 ) ( 176 208 384 ) evil3_metals/mtldrk1 -32 96 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 125
+// entity 122
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -5169,7 +5148,7 @@
 }
 }
 }
-// entity 126
+// entity 123
 {
 "classname" "func_group"
 // brush 0
@@ -5327,7 +5306,7 @@
 ( 800 336 -1408 ) ( 768 336 -1408 ) ( 800 232 -1408 ) evil2_basemetal/p_mtl_brn 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 127
+// entity 124
 {
 "classname" "func_group"
 // brush 0
@@ -5340,7 +5319,7 @@
 ( -216 254 487 ) ( -133 254 487 ) ( -133 350 487 ) evil3_metals/mtldrk0 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 128
+// entity 125
 {
 "classname" "func_group"
 // brush 0
@@ -5498,7 +5477,7 @@
 ( 800 -256 -1408 ) ( 768 -256 -1408 ) ( 800 -384 -1408 ) evil2_basemetal/p_mtl_brn -64 64 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 129
+// entity 126
 {
 "classname" "func_group"
 // brush 0
@@ -5665,7 +5644,7 @@
 ( 800 -544 -1408 ) ( 768 -544 -1408 ) ( 800 -672 -1408 ) evil2_basemetal/p_mtl_brn 0 64 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 130
+// entity 127
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -5683,7 +5662,7 @@
 }
 }
 }
-// entity 131
+// entity 128
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -5701,7 +5680,7 @@
 }
 }
 }
-// entity 132
+// entity 129
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -5719,7 +5698,7 @@
 }
 }
 }
-// entity 133
+// entity 130
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -5737,7 +5716,7 @@
 }
 }
 }
-// entity 134
+// entity 131
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -5755,7 +5734,7 @@
 }
 }
 }
-// entity 135
+// entity 132
 {
 "classname" "func_group"
 // brush 0
@@ -5768,7 +5747,7 @@
 ( -928 -432 448 ) ( -752 -432 448 ) ( -752 -432 384 ) evil3_metals/mtldrk1 -96 96 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 136
+// entity 133
 {
 "classname" "func_group"
 // brush 0
@@ -5781,7 +5760,7 @@
 ( -928 -496 384 ) ( -928 -720 384 ) ( -752 -720 384 ) evil3_metals/mtldrk1 0 160 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 137
+// entity 134
 {
 "classname" "func_group"
 // brush 0
@@ -5957,7 +5936,7 @@
 ( 800 336 -1408 ) ( 768 336 -1408 ) ( 800 232 -1408 ) evil2_basemetal/p_mtl_brn 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 138
+// entity 135
 {
 "classname" "func_group"
 // brush 0
@@ -6142,7 +6121,7 @@
 ( 800 -1160 -1408 ) ( 768 -1160 -1408 ) ( 800 -1264 -1408 ) evil2_basemetal/p_mtl_brn -64 0 -180 0.5 -0.5 0 0 0
 }
 }
-// entity 139
+// entity 136
 {
 "classname" "func_group"
 // brush 0
@@ -6155,7 +6134,7 @@
 ( -272 -1152 473 ) ( -240 -1152 473 ) ( -272 -1152 545 ) evil3_metals/mtldrk0 -128 32 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 140
+// entity 137
 {
 "classname" "func_group"
 // brush 0
@@ -6295,7 +6274,7 @@
 ( 800 -1160 -1408 ) ( 768 -1160 -1408 ) ( 800 -1264 -1408 ) evil2_basemetal/p_mtl_brn 128 63 -180 0.5 0.5 0 0 0
 }
 }
-// entity 141
+// entity 138
 {
 "classname" "func_group"
 // brush 0
@@ -6362,7 +6341,7 @@
 ( 808 -1144 176 ) ( 792 -1144 176 ) ( 808 -1152 176 ) common/caulk 32 -32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 142
+// entity 139
 {
 "classname" "func_group"
 // brush 0
@@ -6402,7 +6381,7 @@
 ( 336 -800 672 ) ( 336 -784 672 ) ( 240 -800 672 ) common/caulk 31 32 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 143
+// entity 140
 {
 "classname" "func_group"
 // brush 0
@@ -6433,7 +6412,7 @@
 ( 96 -480 832 ) ( 128 -480 832 ) ( 128 -480 784 ) evil4_walls/rbrick_bttmcem 0 4 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 144
+// entity 141
 {
 "classname" "func_group"
 // brush 0
@@ -6446,7 +6425,7 @@
 ( 160 -480 768 ) ( 128 -480 768 ) ( 128 -448 768 ) common/caulk -32 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 145
+// entity 142
 {
 "classname" "func_group"
 // brush 0
@@ -6477,7 +6456,7 @@
 ( -32 -480 816 ) ( -32 -448 816 ) ( -64 -448 816 ) common/caulk 32 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 146
+// entity 143
 {
 "classname" "func_group"
 // brush 0
@@ -6490,7 +6469,7 @@
 ( -96 -448 800 ) ( -96 -448 752 ) ( -64 -448 752 ) evil4_walls/rbrick_bttmcem -192 -92 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 147
+// entity 144
 {
 "classname" "func_group"
 // brush 0
@@ -6503,7 +6482,7 @@
 ( 128 -768 1008 ) ( 128 -768 1168 ) ( 192 -704 1168 ) common/caulk 32 32 -180 0.5 -0.5 0 0 0
 }
 }
-// entity 148
+// entity 145
 {
 "classname" "func_group"
 // brush 0
@@ -6516,7 +6495,7 @@
 ( 128 -160 1024 ) ( 128 -160 1184 ) ( 192 -224 1184 ) common/caulk -32 32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 149
+// entity 146
 {
 "classname" "func_group"
 // brush 0
@@ -6538,7 +6517,7 @@
 ( 272 -1008 816 ) ( 272 -1040 816 ) ( 304 -1040 816 ) common/caulk 0 31 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 150
+// entity 147
 {
 "classname" "func_group"
 // brush 0
@@ -6551,7 +6530,7 @@
 ( 336 -1040 800 ) ( 336 -1040 752 ) ( 304 -1040 752 ) evil4_walls/rbrick_bttmcem -160 -92 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 151
+// entity 148
 {
 "classname" "func_group"
 // brush 0
@@ -6564,7 +6543,7 @@
 ( 896 -224 1024 ) ( 960 -160 1024 ) ( 960 -160 1184 ) common/caulk 32 32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 152
+// entity 149
 {
 "classname" "func_group"
 // brush 0
@@ -6577,7 +6556,7 @@
 ( 704 -224 1168 ) ( 704 -224 1008 ) ( 672 -192 1008 ) common/caulk 32 32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 153
+// entity 150
 {
 "classname" "func_group"
 // brush 0
@@ -6590,7 +6569,7 @@
 ( -776 -608 236 ) ( -776 -592 236 ) ( -776 -608 331 ) common/caulk 32 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 154
+// entity 151
 {
 "classname" "func_group"
 // brush 0
@@ -6603,7 +6582,7 @@
 ( -776 -474 170 ) ( -776 -474 352 ) ( -776 -283 352 ) evil4_lights/s_bluelight 60 32 -90 0.7421879768 0.5 134217728 0 0
 }
 }
-// entity 155
+// entity 152
 {
 "classname" "func_group"
 // brush 0
@@ -6634,7 +6613,7 @@
 ( 608 -448 816 ) ( 608 -480 816 ) ( 640 -480 816 ) common/caulk -32 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 156
+// entity 153
 {
 "classname" "func_group"
 // brush 0
@@ -6647,7 +6626,7 @@
 ( 672 -480 800 ) ( 672 -480 752 ) ( 640 -480 752 ) evil4_walls/rbrick_bttmcem -64 -92 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 157
+// entity 154
 {
 "classname" "func_group"
 // brush 0
@@ -6678,7 +6657,7 @@
 ( 480 -448 832 ) ( 448 -448 832 ) ( 448 -448 784 ) evil4_walls/rbrick_bttmcem 128 2 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 158
+// entity 155
 {
 "classname" "func_group"
 // brush 0
@@ -6691,7 +6670,7 @@
 ( 416 -448 768 ) ( 448 -448 768 ) ( 448 -480 768 ) common/caulk 31 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 159
+// entity 156
 {
 "classname" "func_group"
 // brush 0
@@ -6704,7 +6683,7 @@
 ( 368 -1198 457 ) ( 284 -1198 457 ) ( 284 -1294 457 ) evil3_metals/mtldrk0 160 96 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 160
+// entity 157
 {
 "classname" "func_group"
 // brush 0
@@ -6717,7 +6696,7 @@
 ( 792 -1182 423 ) ( 709 -1182 423 ) ( 709 -1278 423 ) evil3_metals/mtldrk0 -128 63 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 161
+// entity 158
 {
 "classname" "func_group"
 // brush 0
@@ -6875,7 +6854,7 @@
 ( 1352 -344 520 ) ( 1368 -344 520 ) ( 1368 -400 520 ) evil3_metals/mtldrk0 -64 -31 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 162
+// entity 159
 {
 "classname" "func_group"
 // brush 0
@@ -7033,7 +7012,7 @@
 ( 1352 -528 480 ) ( 1368 -528 480 ) ( 1352 -624 480 ) evil3_metals/mtldrk0 -96 192 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 163
+// entity 160
 {
 "classname" "func_group"
 // brush 0
@@ -7064,7 +7043,7 @@
 ( 528 -640 832 ) ( 528 -672 832 ) ( 528 -672 784 ) evil4_walls/rbrick_bttmcem -64 4 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 164
+// entity 161
 {
 "classname" "func_group"
 // brush 0
@@ -7077,7 +7056,7 @@
 ( 528 -704 768 ) ( 528 -672 768 ) ( 560 -672 768 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 165
+// entity 162
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7095,7 +7074,7 @@
 }
 }
 }
-// entity 166
+// entity 163
 {
 "classname" "func_group"
 // brush 0
@@ -7108,7 +7087,7 @@
 ( 1384 -280 360 ) ( 1368 -280 360 ) ( 1384 -400 360 ) evil3_metals/mtldrk0 -64 192 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 167
+// entity 164
 {
 "classname" "func_group"
 // brush 0
@@ -7121,7 +7100,7 @@
 ( 1368 -240 464 ) ( 1400 -240 464 ) ( 1368 -288 464 ) evil3_metals/mtldrk0 -32 192 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 168
+// entity 165
 {
 "classname" "func_group"
 // brush 0
@@ -7134,7 +7113,7 @@
 ( 1352 -632 456 ) ( 1360 -632 456 ) ( 1360 -688 456 ) evil3_metals/mtldrk0 -128 0 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 169
+// entity 166
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7178,7 +7157,7 @@
 }
 }
 }
-// entity 170
+// entity 167
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7196,7 +7175,7 @@
 }
 }
 }
-// entity 171
+// entity 168
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7214,7 +7193,7 @@
 }
 }
 }
-// entity 172
+// entity 169
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7232,7 +7211,7 @@
 }
 }
 }
-// entity 173
+// entity 170
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7250,7 +7229,7 @@
 }
 }
 }
-// entity 174
+// entity 171
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7268,7 +7247,7 @@
 }
 }
 }
-// entity 175
+// entity 172
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7286,7 +7265,7 @@
 }
 }
 }
-// entity 176
+// entity 173
 {
 "classname" "func_group"
 // brush 0
@@ -7308,7 +7287,7 @@
 ( 928 -880 832 ) ( 896 -880 832 ) ( 896 -880 784 ) evil4_walls/rbrick_bttmcem 0 3 -180 0.5 -0.5 134217728 0 0
 }
 }
-// entity 177
+// entity 174
 {
 "classname" "func_group"
 // brush 0
@@ -7321,7 +7300,7 @@
 ( 896 -880 768 ) ( 928 -880 768 ) ( 928 -912 768 ) common/caulk 63 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 178
+// entity 175
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7339,7 +7318,7 @@
 }
 }
 }
-// entity 179
+// entity 176
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -7357,7 +7336,7 @@
 }
 }
 }
-// entity 180
+// entity 177
 {
 "classname" "func_group"
 // brush 0
@@ -7370,7 +7349,7 @@
 ( 299 -996 568 ) ( 490 -996 568 ) ( 490 -814 568 ) evil4_lights/s_bluelight 0 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 181
+// entity 178
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7378,7 +7357,7 @@
 "origin" "800 -120 656"
 "target" "t2"
 }
-// entity 182
+// entity 179
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7386,7 +7365,7 @@
 "origin" "288 -120 656"
 "target" "t3"
 }
-// entity 183
+// entity 180
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7394,7 +7373,7 @@
 "origin" "-224 -120 656"
 "target" "t4"
 }
-// entity 184
+// entity 181
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7402,7 +7381,7 @@
 "origin" "-424 -608 464"
 "target" "t5"
 }
-// entity 185
+// entity 182
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7410,21 +7389,21 @@
 "origin" "-424 -320 656"
 "target" "t6"
 }
-// entity 186
+// entity 183
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "300"
 "origin" "-416 -960 608"
 }
-// entity 187
+// entity 184
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "350"
 "origin" "144 -960 432"
 }
-// entity 188
+// entity 185
 {
 "classname" "light"
 "_color" "0.9 1 0.7"
@@ -7432,7 +7411,7 @@
 "origin" "-224 -808 448"
 "target" "t7"
 }
-// entity 189
+// entity 186
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7440,7 +7419,7 @@
 "origin" "-80 -608 400"
 "target" "t8"
 }
-// entity 190
+// entity 187
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7448,7 +7427,7 @@
 "origin" "-80 -480 400"
 "target" "t9"
 }
-// entity 191
+// entity 188
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7456,7 +7435,7 @@
 "origin" "-80 -368 400"
 "target" "t10"
 }
-// entity 192
+// entity 189
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7464,7 +7443,7 @@
 "origin" "-32 -304 400"
 "target" "t11"
 }
-// entity 193
+// entity 190
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7472,7 +7451,7 @@
 "origin" "96 -304 400"
 "target" "t12"
 }
-// entity 194
+// entity 191
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7480,7 +7459,7 @@
 "origin" "288 -232 400"
 "target" "t13"
 }
-// entity 195
+// entity 192
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7488,7 +7467,7 @@
 "origin" "400 -352 400"
 "target" "t14"
 }
-// entity 196
+// entity 193
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7496,7 +7475,7 @@
 "origin" "400 -480 400"
 "target" "t15"
 }
-// entity 197
+// entity 194
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7504,7 +7483,7 @@
 "origin" "656 -800 400"
 "target" "t16"
 }
-// entity 198
+// entity 195
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7512,7 +7491,7 @@
 "origin" "656 -928 400"
 "target" "t17"
 }
-// entity 199
+// entity 196
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7520,7 +7499,7 @@
 "origin" "656 -1056 400"
 "target" "t18"
 }
-// entity 200
+// entity 197
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7528,7 +7507,7 @@
 "origin" "912 -1056 400"
 "target" "t19"
 }
-// entity 201
+// entity 198
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7536,7 +7515,7 @@
 "origin" "912 -928 400"
 "target" "t20"
 }
-// entity 202
+// entity 199
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7544,7 +7523,7 @@
 "origin" "912 -800 400"
 "target" "t21"
 }
-// entity 203
+// entity 200
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7552,7 +7531,7 @@
 "origin" "1008 -608 400"
 "target" "t22"
 }
-// entity 204
+// entity 201
 {
 "classname" "light"
 "_color" "0.8 1 0.6"
@@ -7560,7 +7539,7 @@
 "origin" "1008 -320 400"
 "target" "t23"
 }
-// entity 205
+// entity 202
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7568,7 +7547,7 @@
 "origin" "800 -144 840"
 "target" "t24"
 }
-// entity 206
+// entity 203
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7576,7 +7555,7 @@
 "origin" "288 -144 840"
 "target" "t25"
 }
-// entity 207
+// entity 204
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7584,7 +7563,7 @@
 "origin" "-224 -144 840"
 "target" "t26"
 }
-// entity 208
+// entity 205
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7592,7 +7571,7 @@
 "origin" "-400 -320 840"
 "target" "t27"
 }
-// entity 209
+// entity 206
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7600,7 +7579,7 @@
 "origin" "-400 -608 840"
 "target" "t28"
 }
-// entity 210
+// entity 207
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7608,7 +7587,7 @@
 "origin" "-224 -784 840"
 "target" "t29"
 }
-// entity 211
+// entity 208
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7616,7 +7595,7 @@
 "origin" "288 -784 840"
 "target" "t30"
 }
-// entity 212
+// entity 209
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7624,7 +7603,7 @@
 "origin" "288 -1024 840"
 "target" "t31"
 }
-// entity 213
+// entity 210
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7632,7 +7611,7 @@
 "origin" "112 -464 840"
 "target" "t32"
 }
-// entity 214
+// entity 211
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7640,7 +7619,7 @@
 "origin" "-48 -464 840"
 "target" "t33"
 }
-// entity 215
+// entity 212
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7648,7 +7627,7 @@
 "origin" "624 -464 840"
 "target" "t34"
 }
-// entity 216
+// entity 213
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7656,7 +7635,7 @@
 "origin" "464 -464 840"
 "target" "t35"
 }
-// entity 217
+// entity 214
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7664,7 +7643,7 @@
 "origin" "544 -656 840"
 "target" "t36"
 }
-// entity 218
+// entity 215
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7672,7 +7651,7 @@
 "origin" "976 -320 840"
 "target" "t37"
 }
-// entity 219
+// entity 216
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7680,7 +7659,7 @@
 "origin" "976 -608 840"
 "target" "t38"
 }
-// entity 220
+// entity 217
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7688,7 +7667,7 @@
 "origin" "912 -896 840"
 "target" "t39"
 }
-// entity 221
+// entity 218
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7696,7 +7675,7 @@
 "origin" "912 -896 744"
 "target" "t40"
 }
-// entity 222
+// entity 219
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7704,7 +7683,7 @@
 "origin" "320 -1024 744"
 "target" "t41"
 }
-// entity 223
+// entity 220
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7712,7 +7691,7 @@
 "origin" "144 -464 744"
 "target" "t42"
 }
-// entity 224
+// entity 221
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7720,14 +7699,14 @@
 "origin" "-80 -464 744"
 "target" "t43"
 }
-// entity 225
+// entity 222
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "200"
 "origin" "32 -480 592"
 }
-// entity 226
+// entity 223
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7735,7 +7714,7 @@
 "origin" "656 -464 744"
 "target" "t44"
 }
-// entity 227
+// entity 224
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7743,7 +7722,7 @@
 "origin" "432 -464 744"
 "target" "t45"
 }
-// entity 228
+// entity 225
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7751,7 +7730,7 @@
 "origin" "800 -176 248"
 "target" "t46"
 }
-// entity 229
+// entity 226
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7759,7 +7738,7 @@
 "origin" "672 -176 248"
 "target" "t47"
 }
-// entity 230
+// entity 227
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7767,7 +7746,7 @@
 "origin" "544 -176 248"
 "target" "t48"
 }
-// entity 231
+// entity 228
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7775,7 +7754,7 @@
 "origin" "544 -336 248"
 "target" "t49"
 }
-// entity 232
+// entity 229
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7783,7 +7762,7 @@
 "origin" "672 -336 248"
 "target" "t50"
 }
-// entity 233
+// entity 230
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7791,7 +7770,7 @@
 "origin" "800 -336 248"
 "target" "t51"
 }
-// entity 234
+// entity 231
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7799,7 +7778,7 @@
 "origin" "944 -256 248"
 "target" "t52"
 }
-// entity 235
+// entity 232
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7807,7 +7786,7 @@
 "origin" "800 -176 200"
 "target" "t53"
 }
-// entity 236
+// entity 233
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7815,7 +7794,7 @@
 "origin" "672 -176 200"
 "target" "t54"
 }
-// entity 237
+// entity 234
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7823,7 +7802,7 @@
 "origin" "544 -176 200"
 "target" "t55"
 }
-// entity 238
+// entity 235
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7831,7 +7810,7 @@
 "origin" "944 -256 200"
 "target" "t56"
 }
-// entity 239
+// entity 236
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7839,7 +7818,7 @@
 "origin" "544 -336 200"
 "target" "t57"
 }
-// entity 240
+// entity 237
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7847,7 +7826,7 @@
 "origin" "672 -336 200"
 "target" "t58"
 }
-// entity 241
+// entity 238
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7855,7 +7834,7 @@
 "origin" "800 -336 200"
 "target" "t59"
 }
-// entity 242
+// entity 239
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7863,7 +7842,7 @@
 "origin" "432 -576 248"
 "target" "t60"
 }
-// entity 243
+// entity 240
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7871,7 +7850,7 @@
 "origin" "432 -448 248"
 "target" "t61"
 }
-// entity 244
+// entity 241
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7879,7 +7858,7 @@
 "origin" "432 -576 200"
 "target" "t62"
 }
-// entity 245
+// entity 242
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -7887,14 +7866,14 @@
 "origin" "432 -448 200"
 "target" "t63"
 }
-// entity 246
+// entity 243
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "160"
 "origin" "800 -960 208"
 }
-// entity 247
+// entity 244
 {
 "classname" "light"
 "_color" "0.878262 1.000000 0.570487"
@@ -7902,7 +7881,7 @@
 "origin" "288 -808 656"
 "target" "t65"
 }
-// entity 248
+// entity 245
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
@@ -7910,7 +7889,7 @@
 "origin" "-1024 512 1280"
 "target" "t67"
 }
-// entity 249
+// entity 246
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
@@ -7918,7 +7897,7 @@
 "origin" "-960 -1280 1280"
 "target" "t68"
 }
-// entity 250
+// entity 247
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
@@ -7926,7 +7905,7 @@
 "origin" "1568 480 1280"
 "target" "t69"
 }
-// entity 251
+// entity 248
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
@@ -7934,7 +7913,7 @@
 "origin" "1568 -1376 1024"
 "target" "t70"
 }
-// entity 252
+// entity 249
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
@@ -7942,7 +7921,7 @@
 "origin" "64 -1920 704"
 "target" "t71"
 }
-// entity 253
+// entity 250
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
@@ -7950,7 +7929,7 @@
 "origin" "768 -1920 704"
 "target" "t72"
 }
-// entity 254
+// entity 251
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
@@ -7958,7 +7937,7 @@
 "origin" "32 896 1088"
 "target" "t73"
 }
-// entity 255
+// entity 252
 {
 "classname" "func_group"
 // brush 0
@@ -7971,105 +7950,105 @@
 ( 224 -456 568 ) ( 224 -444 568 ) ( 224 -456 576 ) evil3_metals/mtldrk1 65 -159 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 256
+// entity 253
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "160"
 "origin" "608 -496 208"
 }
-// entity 257
+// entity 254
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "300"
 "origin" "1008 32 496"
 }
-// entity 258
+// entity 255
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "160"
 "origin" "544 -936 208"
 }
-// entity 259
+// entity 256
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "250"
 "origin" "32 -480 912"
 }
-// entity 260
+// entity 257
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "250"
 "origin" "544 -480 912"
 }
-// entity 261
+// entity 258
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "350"
 "origin" "288 -896 312"
 }
-// entity 262
+// entity 259
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "200"
 "origin" "1184 -472 208"
 }
-// entity 263
+// entity 260
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "200"
 "origin" "800 80 304"
 }
-// entity 264
+// entity 261
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "200"
 "origin" "288 80 304"
 }
-// entity 265
+// entity 262
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "200"
 "origin" "-224 80 304"
 }
-// entity 266
+// entity 263
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "200"
 "origin" "-624 -320 304"
 }
-// entity 267
+// entity 264
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "200"
 "origin" "-624 -608 304"
 }
-// entity 268
+// entity 265
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "200"
 "origin" "-224 -1088 208"
 }
-// entity 269
+// entity 266
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "250"
 "origin" "552 -576 584"
 }
-// entity 270
+// entity 267
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
@@ -8077,48 +8056,48 @@
 "origin" "544 -688 744"
 "target" "t74"
 }
-// entity 271
+// entity 268
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "80"
 "origin" "536 -800 464"
 }
-// entity 272
+// entity 269
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "60"
 "origin" "296 -624 464"
 }
-// entity 273
+// entity 270
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
 "light" "200"
 "origin" "424 80 752"
 }
-// entity 274
+// entity 271
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "50"
 "origin" "256 -1040 688"
 }
-// entity 275
+// entity 272
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "150"
 "origin" "64 -1168 768"
 }
-// entity 276
+// entity 273
 {
 "classname" "_skybox"
 "_scale" "64"
 "origin" "1282 -598 -1220"
 }
-// entity 277
+// entity 274
 {
 "classname" "func_group"
 // brush 0
@@ -8176,7 +8155,7 @@
 ( 1229 -578 -1176 ) ( 1229 -580 -1174 ) ( 1239 -578 -1176 ) evil3_metals/mtldrk1 166 146 -180 0.0179689992 -0.0091150003 0 0 0
 }
 }
-// entity 278
+// entity 275
 {
 "classname" "func_group"
 // brush 0
@@ -8225,7 +8204,7 @@
 ( 1229 -641 -1171 ) ( 1239 -641 -1171 ) ( 1239 -606 -1206 ) evil3_metals/mtldrk1 166 146 -180 0.0179689992 -0.0091150003 0 0 0
 }
 }
-// entity 279
+// entity 276
 {
 "classname" "func_group"
 // brush 0
@@ -8283,7 +8262,7 @@
 ( 1325 -578 -1176 ) ( 1325 -580 -1174 ) ( 1335 -578 -1176 ) evil3_metals/mtldrk1 166 146 -180 0.0179689992 -0.0091150003 0 0 0
 }
 }
-// entity 280
+// entity 277
 {
 "classname" "func_group"
 // brush 0
@@ -8332,7 +8311,7 @@
 ( 1325 -641 -1171 ) ( 1335 -641 -1171 ) ( 1335 -606 -1206 ) evil3_metals/mtldrk1 166 146 -180 0.0179689992 -0.0091150003 0 0 0
 }
 }
-// entity 281
+// entity 278
 {
 "classname" "func_group"
 // brush 0
@@ -8390,7 +8369,7 @@
 ( 1287 -571 -1171 ) ( 1277 -571 -1171 ) ( 1277 -606 -1206 ) evil3_metals/mtldrk1 166 146 -180 0.0179689992 -0.0091150003 0 0 0
 }
 }
-// entity 282
+// entity 279
 {
 "classname" "func_group"
 // brush 0
@@ -8439,7 +8418,7 @@
 ( 1287 -634 -1176 ) ( 1287 -632 -1174 ) ( 1277 -634 -1176 ) evil3_metals/mtldrk1 166 146 -180 0.0179689992 -0.0091150003 0 0 0
 }
 }
-// entity 283
+// entity 280
 {
 "classname" "func_group"
 // brush 0
@@ -8452,7 +8431,7 @@
 ( 1331 -562 -1236 ) ( 1339 -562 -1236 ) ( 1339 -552 -1236 ) evil3_metals/mtldrk0 -29 -7 -180 0.0799999982 -0.0500000007 0 0 0
 }
 }
-// entity 284
+// entity 281
 {
 "classname" "func_group"
 // brush 0
@@ -8510,7 +8489,7 @@
 ( 1335 -611 -1241 ) ( 1335 -608 -1241 ) ( 1335 -611 -1233 ) evil3_metals/mtldrk0 -36 102 0 0.0799560025 0.049927 0 0 0
 }
 }
-// entity 285
+// entity 282
 {
 "classname" "func_group"
 // brush 0
@@ -8568,7 +8547,7 @@
 ( 1226 -605 -1246 ) ( 1226 -597 -1246 ) ( 1216 -597 -1246 ) evil3_metals/mtldrk0 -91 -252 -90 0.0799560025 -0.049927 0 0 0
 }
 }
-// entity 286
+// entity 283
 {
 "classname" "func_group"
 // brush 0
@@ -8581,132 +8560,132 @@
 ( 1288 -590 -1174 ) ( 1292 -590 -1174 ) ( 1292 -610 -1174 ) evil1_woods/wood_rot 0 0 0 0.0599999987 0.0599999987 0 0 0
 }
 }
-// entity 287
+// entity 284
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "80"
 "origin" "544 -1056 464"
 }
-// entity 288
+// entity 285
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "80"
 "origin" "288 -328 464"
 }
-// entity 289
+// entity 286
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "80"
 "origin" "56 -496 464"
 }
-// entity 290
+// entity 287
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "160"
 "origin" "888 -424 208"
 }
-// entity 291
+// entity 288
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "100"
 "origin" "800 -80 920"
 }
-// entity 292
+// entity 289
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "80"
 "origin" "288 -80 920"
 }
-// entity 293
+// entity 290
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "80"
 "origin" "-224 -80 920"
 }
-// entity 294
+// entity 291
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "100"
 "origin" "-464 -320 920"
 }
-// entity 295
+// entity 292
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "100"
 "origin" "-464 -608 920"
 }
-// entity 296
+// entity 293
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "100"
 "origin" "-224 -848 920"
 }
-// entity 297
+// entity 294
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "85"
 "origin" "800 96 744"
 }
-// entity 298
+// entity 295
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "85"
 "origin" "288 96 744"
 }
-// entity 299
+// entity 296
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "85"
 "origin" "-224 96 744"
 }
-// entity 300
+// entity 297
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "85"
 "origin" "-624 -320 744"
 }
-// entity 301
+// entity 298
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "100"
 "origin" "-600 -480 664"
 }
-// entity 302
+// entity 299
 {
 "classname" "light"
 "_color" "0.8 1 1"
 "light" "80"
 "origin" "264 -448 448"
 }
-// entity 303
+// entity 300
 {
 "classname" "light"
 "_color" "0.9 1 0.9"
 "light" "80"
 "origin" "552 -288 776"
 }
-// entity 304
+// entity 301
 {
 "classname" "misc_model"
 "model" "models/mapobjects/hrjumpad.ase"
 "origin" "1208 64 136"
 }
-// entity 305
+// entity 302
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -8743,7 +8722,7 @@
 }
 }
 }
-// entity 306
+// entity 303
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -8780,7 +8759,7 @@
 }
 }
 }
-// entity 307
+// entity 304
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -8817,7 +8796,7 @@
 }
 }
 }
-// entity 308
+// entity 305
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -8854,7 +8833,7 @@
 }
 }
 }
-// entity 309
+// entity 306
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -8891,7 +8870,7 @@
 }
 }
 }
-// entity 310
+// entity 307
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -8928,7 +8907,7 @@
 }
 }
 }
-// entity 311
+// entity 308
 {
 "classname" "func_group"
 // brush 0
@@ -8941,7 +8920,7 @@
 ( 408 -936 344 ) ( 408 -936 356 ) ( 416 -936 344 ) common/caulk -32 0 -90 0.5 0.5 134217728 4 0
 }
 }
-// entity 312
+// entity 309
 {
 "classname" "func_group"
 // brush 0
@@ -8954,7 +8933,7 @@
 ( 220 -1080 261 ) ( 220 -1080 70 ) ( 402 -1080 70 ) evil4_lights/s_bluelight 0 32 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 313
+// entity 310
 {
 "classname" "func_group"
 // brush 0
@@ -8967,7 +8946,7 @@
 ( 320 -712 344 ) ( 320 -712 356 ) ( 320 -704 344 ) common/caulk -31 0 -90 0.5 0.5 134217728 4 0
 }
 }
-// entity 314
+// entity 311
 {
 "classname" "func_group"
 // brush 0
@@ -8980,7 +8959,7 @@
 ( -264 -1036 517 ) ( -264 -1036 326 ) ( -264 -854 326 ) evil4_lights/s_bluelight -80 -32 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 315
+// entity 312
 {
 "classname" "func_group"
 // brush 0
@@ -8993,7 +8972,7 @@
 ( 635 -996 312 ) ( 826 -996 312 ) ( 826 -814 312 ) evil4_lights/s_bluelight 0 32 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 316
+// entity 313
 {
 "classname" "func_group"
 // brush 0
@@ -9006,7 +8985,7 @@
 ( 808 -960 312 ) ( 796 -960 312 ) ( 808 -960 320 ) common/caulk -32 0 0 0.5 0.5 134217728 4 0
 }
 }
-// entity 317
+// entity 314
 {
 "classname" "func_group"
 // brush 0
@@ -9019,7 +8998,7 @@
 ( 570 -1144 82 ) ( 570 -1144 264 ) ( 379 -1144 264 ) evil4_lights/s_bluelight -31 32 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 318
+// entity 315
 {
 "classname" "func_group"
 // brush 0
@@ -9032,7 +9011,7 @@
 ( 576 -504 312 ) ( 576 -492 312 ) ( 576 -504 320 ) common/caulk 0 0 -180 0.5 -0.5 134217728 4 0
 }
 }
-// entity 319
+// entity 316
 {
 "classname" "func_group"
 // brush 0
@@ -9045,7 +9024,7 @@
 ( 891 -484 312 ) ( 1082 -484 312 ) ( 1082 -302 312 ) evil4_lights/s_bluelight 0 -32 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 320
+// entity 317
 {
 "classname" "func_group"
 // brush 0
@@ -9058,7 +9037,7 @@
 ( 1352 -326 122 ) ( 1352 -326 304 ) ( 1352 -517 304 ) evil4_lights/s_bluelight 47 32 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 321
+// entity 318
 {
 "classname" "func_group"
 // brush 0
@@ -9071,7 +9050,7 @@
 ( 1352 -312 216 ) ( 1352 -328 216 ) ( 1360 -312 216 ) common/caulk -32 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 322
+// entity 319
 {
 "classname" "func_group"
 // brush 0
@@ -9084,7 +9063,7 @@
 ( 518 224 138 ) ( 518 224 320 ) ( 709 224 320 ) evil4_lights/s_bluelight 78 -32 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 323
+// entity 320
 {
 "classname" "func_group"
 // brush 0
@@ -9097,7 +9076,7 @@
 ( 280 224 232 ) ( 296 224 232 ) ( 280 232 232 ) common/caulk -31 -47 -180 0.5 0.5 134217728 0 0
 }
 }
-// entity 324
+// entity 321
 {
 "classname" "func_group"
 // brush 0
@@ -9110,7 +9089,7 @@
 ( -506 224 138 ) ( -506 224 320 ) ( -315 224 320 ) evil4_lights/s_bluelight 78 32 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 325
+// entity 322
 {
 "classname" "func_group"
 // brush 0
@@ -9123,7 +9102,7 @@
 ( 840 56 480 ) ( 840 72 480 ) ( 832 56 480 ) common/caulk 33 33 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 326
+// entity 323
 {
 "classname" "func_group"
 // brush 0
@@ -9136,7 +9115,7 @@
 ( 840 -282 386 ) ( 840 -282 568 ) ( 840 -91 568 ) evil4_lights/s_bluelight 61 32 -90 0.5 -0.5 134217728 0 0
 }
 }
-// entity 327
+// entity 324
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9154,7 +9133,7 @@
 }
 }
 }
-// entity 328
+// entity 325
 {
 "classname" "func_group"
 "type" "patchThick"
@@ -9198,7 +9177,7 @@
 }
 }
 }
-// entity 329
+// entity 326
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -9216,14 +9195,14 @@
 }
 }
 }
-// entity 330
+// entity 327
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"
 "light" "12"
 "origin" "1308 -606 -1222"
 }
-// entity 331
+// entity 328
 {
 "classname" "light"
 "_color" "0.3 0.333 0.3"

Modified: branches/nexuiz-2.0/data/maps/starship.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/starship.map
===================================================================
--- branches/nexuiz-2.0/data/maps/starship.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/starship.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -39460,7 +39460,7 @@
 // entity 115
 {
 "classname" "item_strength"
-"origin" "-506.000000 -1267.000000 -13.000000"
+"origin" "-512.000000 -1280.000000 -64.000000"
 }
 // entity 116
 {
@@ -39486,16 +39486,18 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 0.000000 32.000000"
 }
 // entity 121
 {
 "classname" "dom_team"
-"cnt" "13"
-"message" "Blue team has captured a control point"
-"model" "models/domination/dom_blue.md3"
-"netname" "^4Blue Team^3"
+"cnt" "12"
+"message" "Yellow team has captured a control point"
+"model" "models/domination/dom_yellow.md3"
+"netname" "^3Yellow Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 96.000000"
 }
 // entity 122
 {
@@ -39510,97 +39512,31 @@
 // entity 123
 {
 "classname" "dom_controlpoint"
-"origin" "1028.000000 384.000000 24.000000"
+"origin" "1024.000000 384.000000 16.000000"
 }
 // entity 124
 {
 "classname" "dom_controlpoint"
-"origin" "1028.000000 -1024.000000 88.000000"
+"origin" "1024.000000 -1024.000000 80.000000"
 }
 // entity 125
 {
 "classname" "dom_controlpoint"
-"angle" "90"
-"origin" "-160.000000 820.000000 24.000000"
+"origin" "-572.000000 -538.000000 24.000000"
 }
 // entity 126
 {
 "classname" "dom_controlpoint"
-"origin" "-572.000000 -538.000000 24.000000"
+"origin" "328.000000 -64.000000 152.000000"
 }
 // entity 127
 {
-"classname" "dom_controlpoint"
-"origin" "326.000000 -60.000000 152.000000"
+"classname" "dom_team"
+"cnt" "13"
+"message" "Blue team has captured a control point"
+"model" "models/domination/dom_blue.md3"
+"netname" "^4Blue Team^3"
+"noise" "domination/claim.wav"
+"noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 64.000000"
 }
-// entity 128
-{
-"classname" "item_flag_team1"
-"origin" "1028.000000 -1024.000000 88.000000"
-}
-// entity 129
-{
-"classname" "item_flag_team2"
-"angle" "90"
-"origin" "-160.000000 820.000000 24.000000"
-}
-// entity 130
-{
-"classname" "info_player_team1"
-"angle" "0"
-"origin" "630.000000 -1280.000000 88.000000"
-}
-// entity 131
-{
-"classname" "info_player_team1"
-"angle" "85"
-"origin" "770.000000 -1280.000000 88.000000"
-}
-// entity 132
-{
-"classname" "info_player_team1"
-"angle" "-25"
-"origin" "570.000000 -1000.000000 -72.000000"
-}
-// entity 133
-{
-"classname" "info_player_team1"
-"angle" "90"
-"origin" "830.000000 -1010.000000 -72.000000"
-}
-// entity 134
-{
-"classname" "info_player_team1"
-"angle" "135"
-"origin" "1080.000000 -1370.000000 88.000000"
-}
-// entity 135
-{
-"classname" "info_player_team2"
-"angle" "-90"
-"origin" "-220.000000 780.000000 -168.000000"
-}
-// entity 136
-{
-"classname" "info_player_team2"
-"angle" "-45"
-"origin" "-100.000000 780.000000 -168.000000"
-}
-// entity 137
-{
-"classname" "info_player_team2"
-"angle" "90"
-"origin" "-680.000000 210.000000 -168.000000"
-}
-// entity 138
-{
-"classname" "info_player_team2"
-"angle" "90"
-"origin" "-580.000000 190.000000 24.000000"
-}
-// entity 139
-{
-"classname" "info_player_team2"
-"angle" "90"
-"origin" "-330.000000 590.000000 24.000000"
-}

Modified: branches/nexuiz-2.0/data/maps/stormkeep.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/maps/stormkeep.map
===================================================================
--- branches/nexuiz-2.0/data/maps/stormkeep.map	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/maps/stormkeep.map	2009-05-24 09:22:51 UTC (rev 6763)
@@ -15240,20 +15240,12 @@
 // entity 575
 {
 "classname" "dom_controlpoint"
-"message" " has captured the ^1Hallways"
-"origin" "-206.0 -488.8 -150.0"
-"frags" "3"
-"wait" "5"
-}
-// entity 576
-{
-"classname" "dom_controlpoint"
 "message" " has captured the ^1Lavaroom"
 "origin" "1457.1  19.9 -110.0"
 "frags" "1"
 "wait" "5"
 }
-// entity 577
+// entity 576
 {
 "classname" "dom_controlpoint"
 "message" " controls the ^1Nex & Strength"
@@ -15261,7 +15253,7 @@
 "frags" "1"
 "wait" "5"
 }
-// entity 578
+// entity 577
 {
 "classname" "dom_controlpoint"
 "message" " has captured the ^1Upper Platform"
@@ -15269,7 +15261,7 @@
 "frags" "1"
 "wait" "5"
 }
-// entity 579
+// entity 578
 {
 "classname" "dom_controlpoint"
 "message" " has captured the ^1Teleport Room"
@@ -15277,103 +15269,103 @@
 "frags" "1"
 "wait" "5"
 }
-// entity 580
+// entity 579
 {
 "classname" "light"
 "origin" "416 12 -16"
 "light" "25"
 }
-// entity 581
+// entity 580
 {
 "classname" "light"
 "origin" "-496 400 -16"
 "light" "25"
 }
-// entity 582
+// entity 581
 {
 "classname" "light"
 "origin" "-496 276 -16"
 "light" "25"
 }
-// entity 583
+// entity 582
 {
 "classname" "light"
 "origin" "-128 12 -16"
 "light" "25"
 }
-// entity 584
+// entity 583
 {
 "classname" "light"
 "origin" "192 12 -16"
 "light" "25"
 }
-// entity 585
+// entity 584
 {
 "classname" "light"
 "origin" "-472 40 -16"
 "light" "25"
 }
-// entity 586
+// entity 585
 {
 "classname" "light"
 "origin" "-372 12 -16"
 "light" "25"
 }
-// entity 587
+// entity 586
 {
 "classname" "light"
 "origin" "-320 624 -16"
 "light" "25"
 }
-// entity 588
+// entity 587
 {
 "classname" "light"
 "origin" "-432 568 -16"
 "light" "25"
 }
-// entity 589
+// entity 588
 {
 "classname" "light"
 "origin" "560 68 -16"
 "light" "25"
 }
-// entity 590
+// entity 589
 {
 "classname" "light"
 "origin" "336 624 -16"
 "light" "25"
 }
-// entity 591
+// entity 590
 {
 "classname" "light"
 "origin" "492 568 -16"
 "light" "25"
 }
-// entity 592
+// entity 591
 {
 "classname" "light"
 "origin" "560 420 -16"
 "light" "25"
 }
-// entity 593
+// entity 592
 {
 "classname" "light"
 "origin" "560 192 -16"
 "light" "25"
 }
-// entity 594
+// entity 593
 {
 "classname" "light"
 "light" "20"
 "origin" "1112 368 -16"
 }
-// entity 595
+// entity 594
 {
 "classname" "light"
 "light" "20"
 "origin" "988 200 -16"
 }
-// entity 596
+// entity 595
 {
 "classname" "light"
 "light" "20"

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-05-24 09:22:51 UTC (rev 6763)
@@ -1727,12 +1727,12 @@
 	
 	pressedkeys = getstatf(STAT_PRESSED_KEYS);
 	drawpic(pos + '-15   -6   0', "gfx/keys/key_bg.tga",           bgsize, '1 1 1', .1, DRAWFLAG_NORMAL);
-	drawpic(pos + ' 83.5  9   0', "gfx/keys/key_crouch.tga",   ' 24 24 0', '1 1 1', .5 * ((pressedkeys & KEY_CROUCH) + 1), DRAWFLAG_NORMAL);
-	drawpic(pos + ' 32   -1.5 0', "gfx/keys/key_forward.tga",  ' 32 32 0', '1 1 1', .5 * ((pressedkeys & KEY_FORWARD) + 1), DRAWFLAG_NORMAL);
-	drawpic(pos + '-11.5  9   0', "gfx/keys/key_jump.tga",     ' 24 24 0', '1 1 1', .5 * ((pressedkeys & KEY_JUMP) + 1), DRAWFLAG_NORMAL);
-	drawpic(pos + ' -1   32   0', "gfx/keys/key_left.tga",     ' 32 32 0', '1 1 1', .5 * ((pressedkeys & KEY_LEFT) + 1), DRAWFLAG_NORMAL);
-	drawpic(pos + ' 32   32   0', "gfx/keys/key_backward.tga", ' 32 32 0', '1 1 1', .5 * ((pressedkeys & KEY_BACKWARD) + 1), DRAWFLAG_NORMAL);
-	drawpic(pos + ' 65   32   0', "gfx/keys/key_right.tga",    ' 32 32 0', '1 1 1', .5 * ((pressedkeys & KEY_RIGHT) + 1), DRAWFLAG_NORMAL);
+	drawpic(pos + ' 83.5  9   0', ((pressedkeys & KEY_CROUCH) ? "gfx/keys/key_crouch_inv.tga" : "gfx/keys/key_crouch.tga"), ' 24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	drawpic(pos + ' 32   -1.5 0', ((pressedkeys & KEY_FORWARD) ? "gfx/keys/key_forward_inv.tga" : "gfx/keys/key_forward.tga"),  ' 32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	drawpic(pos + '-11.5  9   0', ((pressedkeys & KEY_JUMP) ? "gfx/keys/key_jump_inv.tga" : "gfx/keys/key_jump.tga"),     ' 24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	drawpic(pos + ' -1   32   0', ((pressedkeys & KEY_LEFT) ? "gfx/keys/key_left_inv.tga" : "gfx/keys/key_left.tga"),     ' 32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	drawpic(pos + ' 32   32   0', ((pressedkeys & KEY_BACKWARD) ? "gfx/keys/key_backward_inv.tga" : "gfx/keys/key_backward.tga"), ' 32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	drawpic(pos + ' 65   32   0', ((pressedkeys & KEY_RIGHT) ? "gfx/keys/key_right_inv.tga" : "gfx/keys/key_right.tga"),    ' 32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
 }
 
 float GetAmmoStat(float i)

Modified: branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc	2009-05-24 09:22:51 UTC (rev 6763)
@@ -1,30 +1,3 @@
-#ifdef HSOI
-// HUGE SET - stored in a string
-string HugeSetOfIntegers_empty()
-{
-	return "";
-}
-float HugeSetOfIntegers_get(string pArr, float i)
-{
-	return stof(substring(pArr, i * 4, 4));
-}
-float HugeSetOfIntegers_length(string pArr)
-{
-	return strlen(pArr) / 4;
-}
-string HugeSetOfIntegers_concat(string a1, string a2)
-{
-	return strcat(a1, a2);
-}
-string HugeSetOfIntegers_insert(string a1, float n, string a2)
-	// special concat function to build up large lists in less time by binary concatenation
-{
-	string s;
-	s = strcat("    ", ftos(n));
-	return strcat(a1, substring(s, strlen(s) - 4, 4), a2);
-}
-#endif
-
 // generic string stuff
 float startsWith(string haystack, string needle)
 {
@@ -159,78 +132,29 @@
 
 // filter the info by game type mask (updates MapInfo_count)
 //
-#ifdef HSOI
-string _MapInfo_filtered;
+float _MapInfo_filtered;
+float _MapInfo_filtered_allocated;
 float MapInfo_FilterList_Lookup(float i)
 {
-	return MapInfo_FilterList_Lookup(i);
+	return stof(bufstr_get(_MapInfo_filtered, i));
 }
 
-string MapInfo_FilterGametype_Recursive(float pGametype, float pFeatures, float pFlagsRequired, float pFlagsForbidden, float pBegin, float pEnd, float pAbortOnGenerate)
+void _MapInfo_FilterList_swap(float i, float j, entity pass)
 {
-	float m, valid;
-	string l, r;
-
-	if(pBegin == pEnd)
-		return HugeSetOfIntegers_empty();
-
-	m = floor((pBegin + pEnd) / 2);
-
-	l = MapInfo_FilterGametype_Recursive(pGametype, pFeatures, pBegin, m, pAbortOnGenerate);
-	if not(l)
-		return string_null; // BAIL OUT
-	if(MapInfo_Get_ByName(_MapInfo_GlobItem(m), 1, 0) == 2) // if we generated one... BAIL OUT and let the caller continue in the next frame.
-		if(pAbortOnGenerate)
-		{
-			MapInfo_progress = m / _MapInfo_globcount;
-			return string_null; // BAIL OUT
-		}
-	valid = (((MapInfo_Map_supportedGametypes & pGametype) != 0);
-	valid = valid && ((MapInfo_Map_supportedFeatures & pFeatures) == pFeatures));
-	valid = valid && (MapInfo_Map_flags & pFlagsForbidden == 0);
-	valid = valid && (MapInfo_Map_flags & pFlagsRequired == pFlagsRequired);
-	r = MapInfo_FilterGametype_Recursive(pGametype, pFeatures, pFlagsRequired, pFlagsForbidden, m + 1, pEnd, pAbortOnGenerate);
-	if not(r)
-		return string_null; // BAIL OUT
-
-	if(valid)
-		return HugeSetOfIntegers_insert(l, m, r);
-	else
-		return HugeSetOfIntegers_concat(l, r);
+	string h;
+	h = bufstr_get(_MapInfo_filtered, i);
+	bufstr_set(_MapInfo_filtered, i, bufstr_get(_MapInfo_filtered, j));
+	bufstr_set(_MapInfo_filtered, j, h);
 }
 
-float MapInfo_FilterGametype(float pGametype, float pFeatures, float pFlagsRequired, float pFlagsForbidden, float pAbortOnGenerate)
+float _MapInfo_FilterList_cmp(float i, float j, entity pass)
 {
-	if(_MapInfo_filtered)
-		strunzone(_MapInfo_filtered);
-	_MapInfo_filtered = MapInfo_FilterGametype_Recursive(pGametype, pFeatures, pFlagsRequired, pFlagsForbidden, 0, _MapInfo_globcount, pAbortOnGenerate);
-	if not(_MapInfo_filtered)
-	{
-		dprint("Autogenerated a .mapinfo, doing the rest later.\n");
-		return 0;
-	}
-	_MapInfo_filtered = strzone(_MapInfo_filtered);
-	MapInfo_count = HugeSetOfIntegers_length(_MapInfo_filtered);
-	MapInfo_ClearTemps();
-	return 1;
+	string a, b;
+	a = _MapInfo_GlobItem(stof(bufstr_get(_MapInfo_filtered, i)));
+	b = _MapInfo_GlobItem(stof(bufstr_get(_MapInfo_filtered, j)));
+	return strcasecmp(a, b);
 }
 
-void MapInfo_Filter_Free()
-{
-	if(_MapInfo_filtered)
-	{
-		strunzone(_MapInfo_filtered);
-		_MapInfo_filtered = string_null;
-	}
-}
-#else
-float _MapInfo_filtered;
-float _MapInfo_filtered_allocated;
-float MapInfo_FilterList_Lookup(float i)
-{
-	return stof(bufstr_get(_MapInfo_filtered, i));
-}
-
 float MapInfo_FilterGametype(float pGametype, float pFeatures, float pFlagsRequired, float pFlagsForbidden, float pAbortOnGenerate)
 {
 	float i, j;
@@ -257,6 +181,10 @@
 	}
 	MapInfo_count = j + 1;
 	MapInfo_ClearTemps();
+	
+	// sometimes the glob isn't sorted nicely, so fix it here...
+	heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, world);
+
 	return 1;
 }
 
@@ -268,7 +196,6 @@
 		_MapInfo_filtered_allocated = 0;
 	}
 }
-#endif
 
 // load info about the i-th map into the MapInfo_Map_* globals
 string MapInfo_BSPName_ByID(float i)

Modified: branches/nexuiz-2.0/data/qcsrc/common/util.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/util.qc	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/common/util.qc	2009-05-24 09:22:51 UTC (rev 6763)
@@ -1328,7 +1328,7 @@
 	return 1;
 }
 
-void shuffle(float n, shuffle_swapfunc_t swap)
+void shuffle(float n, swapfunc_t swap, entity pass)
 {
 	float i, j;
 	for(i = 1; i < n; ++i)
@@ -1344,7 +1344,7 @@
 		//     q.e.d.
 		j = floor(random() * (i + 1));
 		if(j != i)
-			swap(j, i);
+			swap(j, i, pass);
 	}
 }
 
@@ -1374,7 +1374,7 @@
 }
 
 string _shufflewords_str;
-void _shufflewords_swapfunc(float i, float j)
+void _shufflewords_swapfunc(float i, float j, entity pass)
 {
 	_shufflewords_str = swapwords(_shufflewords_str, i, j);
 }
@@ -1383,7 +1383,7 @@
 	float n;
 	_shufflewords_str = str;
 	n = tokenizebyseparator(str, " ");
-	shuffle(n, _shufflewords_swapfunc);
+	shuffle(n, _shufflewords_swapfunc, world);
 	str = _shufflewords_str;
 	_shufflewords_str = string_null;
 	return str;
@@ -1480,3 +1480,56 @@
 	v_z = ((f & 0xFF) - 128) / 4;
 	return v;
 }
+
+void heapsort(float n, swapfunc_t swap, comparefunc_t cmp, entity pass)
+{
+	float start, end, root, child;
+
+	// heapify
+	start = floor((n - 2) / 2);
+	while(start >= 0)
+	{
+		// siftdown(start, count-1);
+		root = start;
+		while(root * 2 + 1 <= n-1)
+		{
+			child = root * 2 + 1;
+			if(child < n-1)
+				if(cmp(child, child+1, pass) < 0)
+					++child;
+			if(cmp(root, child, pass) < 0)
+			{
+				swap(root, child, pass);
+				root = child;
+			}
+			else
+				break;
+		}
+		// end of siftdown
+		--start;
+	}
+
+	// extract
+	end = n - 1;
+	while(end > 0)
+	{
+		swap(0, end, pass);
+		--end;
+		// siftdown(0, end);
+		root = 0;
+		while(root * 2 + 1 <= end)
+		{
+			child = root * 2 + 1;
+			if(child < end && cmp(child, child+1, pass) < 0)
+				++child;
+			if(cmp(root, child, pass) < 0)
+			{
+				swap(root, child, pass);
+				root = child;
+			}
+			else
+				break;
+		}
+		// end of siftdown
+	}
+}

Modified: branches/nexuiz-2.0/data/qcsrc/common/util.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/util.qh	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/common/util.qh	2009-05-24 09:22:51 UTC (rev 6763)
@@ -140,8 +140,10 @@
 
 float isGametypeInFilter(float gt, float tp, string pattern);
 
-typedef void(float i1, float i2) shuffle_swapfunc_t; // is only ever called for i1 < i2
-void shuffle(float n, shuffle_swapfunc_t swap);
+typedef void(float i1, float i2, entity pass) swapfunc_t; // is only ever called for i1 < i2
+typedef float(float i1, float i2, entity pass) comparefunc_t; // <0 for <, ==0 for ==, >0 for > (like strcmp)
+void shuffle(float n, swapfunc_t swap, entity pass);
+void heapsort(float n, swapfunc_t swap, comparefunc_t cmp, entity pass);
 
 string swapwords(string str, float i, float j);
 string shufflewords(string str);

Modified: branches/nexuiz-2.0/data/qcsrc/menu/menu.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/menu.qh	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/menu/menu.qh	2009-05-24 09:22:51 UTC (rev 6763)
@@ -1,6 +1,7 @@
 #define localcmd cmd
 
 #define NULL (null_entity)
+#define world NULL
 
 // constants
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/bots.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots.qc	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots.qc	2009-05-24 09:22:51 UTC (rev 6763)
@@ -1653,8 +1653,6 @@
 
 void navigation_add_bestgoal(entity goal)
 {
-	local float i;
-
 	if(bestgoalsrindex>0)
 	{
 		++bestgoalsrindex;
@@ -1677,7 +1675,6 @@
 
 entity navigation_get_bestgoal()
 {
-	local float i;
 	local entity ent;
 
 	ent = navigation_bestgoals[bestgoalsrindex];

Modified: branches/nexuiz-2.0/data/qcsrc/server/bots_scripting.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots_scripting.qc	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots_scripting.qc	2009-05-24 09:22:51 UTC (rev 6763)
@@ -199,7 +199,7 @@
 void bot_queuecommand(entity bot, string cmdstring, string parm)
 {
 	entity cmd;
-	local float queue_index, cmd_parm_type, i;
+	local float cmd_parm_type, i;
 
 	if not(bot.isbot)
 		return;
@@ -245,7 +245,7 @@
 
 void bot_cmdhelp(string scmd)
 {
-	local float i, index, ntype;
+	local float i, ntype;
 	local string stype;
 
 	if(!bot_cmds_initialized)
@@ -851,8 +851,7 @@
 // NOTE: Of course you need to include your commands here too :)
 float bot_execute_commands()
 {
-	local float status, index, ispressingkey;
-	local entity cmd;
+	local float status, ispressingkey;
 
 	// Find command
 	bot_setcurrentcommand();

Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2009-05-24 09:22:51 UTC (rev 6763)
@@ -381,13 +381,15 @@
 	string s, modifications, motd;
 
 	if(self.cvar_scr_centertime == 0) return;
-	if((time - self.jointime) > cvar("welcome_message_time")
-	   && !self.BUTTON_INFO)
-		return;
 
+	if(!cvar("g_campaign"))
+		if((time - self.jointime) > cvar("welcome_message_time")
+		   && !self.BUTTON_INFO)
+			return;
+
 	if( !(timeoutStatus >= 1) ) { //really print the WelcomeMessage to the player every frame when timeout-seconds are shown or the game is restarted, to make sure that the shown number is accurate
 		if(self.welcomemessage_time > time) return;
-		self.welcomemessage_time = time + self.cvar_scr_centertime * 0.6;
+		self.welcomemessage_time = time + max(0.5, self.cvar_scr_centertime * 0.6);
 	}
 
 	if(cvar("g_campaign"))
@@ -587,9 +589,7 @@
 		else if(g_race)
 			dm = race_teams;
 		else
-			dm = cvar("g_tdm_teams");
-		if(dm < 2)
-			error("g_tdm_teams < 2, not enough teams to play team deathmatch\n");
+			dm = 2;
 
 		if(dm >= 4)
 		{
@@ -1289,7 +1289,10 @@
 {
 	float numteams;
 
-	numteams = cvar("g_tdm_teams");
+	numteams = cvar("g_tdm_teams_override");
+	if(numteams < 2)
+		numteams = cvar("g_tdm_teams");
+	numteams = bound(2, numteams, 4);
 
 	tdm_spawnteam("Red", COLOR_TEAM1-1);
 	tdm_spawnteam("Blue", COLOR_TEAM2-1);

Modified: branches/nexuiz-2.0/data/scripts/entities.def
===================================================================
--- branches/nexuiz-2.0/data/scripts/entities.def	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/data/scripts/entities.def	2009-05-24 09:22:51 UTC (rev 6763)
@@ -86,6 +86,9 @@
 -------- KEYS --------
 angle: determines the direction in which the button will move (up = -1, down = -2).
 target: all entities with a matching targetname will be triggered.
+target2: all entities with a matching targetname will be triggered.
+target3: all entities with a matching targetname will be triggered.
+target4: all entities with a matching targetname will be triggered.
 speed: speed of button's displacement (default 40).
 wait: number of seconds button stays pressed (default 1, -1 = return immediately).
 lip: lip remaining at end of move (default 4 units).

Modified: branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-05-24 09:17:59 UTC (rev 6762)
+++ branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-05-24 09:22:51 UTC (rev 6763)
@@ -86,6 +86,9 @@
 -------- KEYS --------
 angle: determines the direction in which the button will move (up = -1, down = -2).
 target: all entities with a matching targetname will be triggered.
+target2: all entities with a matching targetname will be triggered.
+target3: all entities with a matching targetname will be triggered.
+target4: all entities with a matching targetname will be triggered.
 speed: speed of button's displacement (default 40).
 wait: number of seconds button stays pressed (default 1, -1 = return immediately).
 lip: lip remaining at end of move (default 4 units).



More information about the nexuiz-commits mailing list