[nexuiz-commits] r6348 - in branches/nexuiz-2.0: . Docs Docs/htmlfiles data data/maps data/models/items data/qcsrc/server data/textures misc/tools

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Mar 28 14:57:56 EDT 2009


Author: div0
Date: 2009-03-28 14:57:46 -0400 (Sat, 28 Mar 2009)
New Revision: 6348

Removed:
   branches/nexuiz-2.0/data/textures/50hpskin.tga
   branches/nexuiz-2.0/data/textures/50hpskin_bump.tga
   branches/nexuiz-2.0/data/textures/50hpskin_gloss.tga
   branches/nexuiz-2.0/data/textures/50hpskin_glow.tga
   branches/nexuiz-2.0/data/textures/bulletammoskin.jpg
   branches/nexuiz-2.0/data/textures/electroskin.tga
   branches/nexuiz-2.0/data/textures/electroskin_bump.tga
   branches/nexuiz-2.0/data/textures/electroskin_gloss.tga
   branches/nexuiz-2.0/data/textures/electroskin_glow.tga
   branches/nexuiz-2.0/data/textures/electroskin_shirt.tga
   branches/nexuiz-2.0/data/textures/glaunch.tga
   branches/nexuiz-2.0/data/textures/glaunch_bump.tga
   branches/nexuiz-2.0/data/textures/glaunch_gloss.tga
   branches/nexuiz-2.0/data/textures/glaunch_glow.tga
   branches/nexuiz-2.0/data/textures/glaunch_pants.tga
   branches/nexuiz-2.0/data/textures/glaunch_shirt.tga
   branches/nexuiz-2.0/data/textures/grenskin.jpg
   branches/nexuiz-2.0/data/textures/hagar.tga
   branches/nexuiz-2.0/data/textures/hagar_gloss.tga
   branches/nexuiz-2.0/data/textures/hagar_glow.tga
   branches/nexuiz-2.0/data/textures/hagar_norm.tga
   branches/nexuiz-2.0/data/textures/hagar_pants.tga
   branches/nexuiz-2.0/data/textures/hagar_shirt.tga
   branches/nexuiz-2.0/data/textures/hlac.tga
   branches/nexuiz-2.0/data/textures/hlac_glass.tga
   branches/nexuiz-2.0/data/textures/hlac_plasma.tga
   branches/nexuiz-2.0/data/textures/laskin.tga
   branches/nexuiz-2.0/data/textures/laskin_bump.tga
   branches/nexuiz-2.0/data/textures/laskin_gloss.tga
   branches/nexuiz-2.0/data/textures/laskin_glow.tga
   branches/nexuiz-2.0/data/textures/lhskin.tga
   branches/nexuiz-2.0/data/textures/lhskin_bump.tga
   branches/nexuiz-2.0/data/textures/lhskin_gloss.tga
   branches/nexuiz-2.0/data/textures/lhskin_glow.tga
   branches/nexuiz-2.0/data/textures/mhskin.tga
   branches/nexuiz-2.0/data/textures/mhskin_bump.tga
   branches/nexuiz-2.0/data/textures/mhskin_gloss.tga
   branches/nexuiz-2.0/data/textures/mhskin_glow.tga
   branches/nexuiz-2.0/data/textures/rocket1.tga
   branches/nexuiz-2.0/data/textures/rocketam.jpg
   branches/nexuiz-2.0/data/textures/rocketam_bump.jpg
   branches/nexuiz-2.0/data/textures/rrclip_d.jpg
   branches/nexuiz-2.0/data/textures/rrclip_d_bump.jpg
   branches/nexuiz-2.0/data/textures/rrclip_d_spec.tga
   branches/nexuiz-2.0/data/textures/rrfx_d.jpg
   branches/nexuiz-2.0/data/textures/rrfx_d_norm.tga
   branches/nexuiz-2.0/data/textures/rrfx_d_spec.tga
   branches/nexuiz-2.0/data/textures/rrock_d.jpg
   branches/nexuiz-2.0/data/textures/rrock_d_bump.tga
   branches/nexuiz-2.0/data/textures/rrock_d_gloss.tga
   branches/nexuiz-2.0/data/textures/rrock_d_glow.tga
   branches/nexuiz-2.0/data/textures/saskin.tga
   branches/nexuiz-2.0/data/textures/saskin_bump.tga
   branches/nexuiz-2.0/data/textures/saskin_gloss.tga
   branches/nexuiz-2.0/data/textures/saskin_glow.tga
   branches/nexuiz-2.0/data/textures/shard.tga
   branches/nexuiz-2.0/data/textures/shard_gloss.tga
   branches/nexuiz-2.0/data/textures/shard_glow.tga
   branches/nexuiz-2.0/data/textures/shard_norm.tga
   branches/nexuiz-2.0/data/textures/shellsamm.tga
   branches/nexuiz-2.0/data/textures/shellsamm_glow.tga
   branches/nexuiz-2.0/data/textures/shotgun.tga
   branches/nexuiz-2.0/data/textures/shotgun_bump.tga
   branches/nexuiz-2.0/data/textures/shotgun_gloss.tga
   branches/nexuiz-2.0/data/textures/shotgun_glow.tga
   branches/nexuiz-2.0/data/textures/shotgun_pants.tga
   branches/nexuiz-2.0/data/textures/shotgun_shirt.tga
   branches/nexuiz-2.0/data/textures/shskin.tga
   branches/nexuiz-2.0/data/textures/shskin_bump.tga
   branches/nexuiz-2.0/data/textures/shskin_gloss.tga
   branches/nexuiz-2.0/data/textures/shskin_glow.tga
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/Docs/basics.html
   branches/nexuiz-2.0/Docs/faq.html
   branches/nexuiz-2.0/Docs/htmlfiles/basics.aft
   branches/nexuiz-2.0/Docs/htmlfiles/faq.aft
   branches/nexuiz-2.0/data/Makefile
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/maps/accident.map
   branches/nexuiz-2.0/data/maps/aggressor.map
   branches/nexuiz-2.0/data/maps/aneurysm.map
   branches/nexuiz-2.0/data/maps/basement.map
   branches/nexuiz-2.0/data/maps/basementctf.map
   branches/nexuiz-2.0/data/maps/bleach.bsp
   branches/nexuiz-2.0/data/maps/bleach.map
   branches/nexuiz-2.0/data/maps/bloodprison.map
   branches/nexuiz-2.0/data/maps/bloodprisonctf.map
   branches/nexuiz-2.0/data/maps/bluesky.map
   branches/nexuiz-2.0/data/maps/darkzone.map
   branches/nexuiz-2.0/data/maps/dieselpower.map
   branches/nexuiz-2.0/data/maps/dismal.map
   branches/nexuiz-2.0/data/maps/downer.map
   branches/nexuiz-2.0/data/maps/eggandbacon.map
   branches/nexuiz-2.0/data/maps/evilspace.map
   branches/nexuiz-2.0/data/maps/farewell.map
   branches/nexuiz-2.0/data/maps/final_rage.map
   branches/nexuiz-2.0/data/maps/ons-reborn.map
   branches/nexuiz-2.0/data/maps/reslimed.map
   branches/nexuiz-2.0/data/maps/ruiner.map
   branches/nexuiz-2.0/data/maps/runningman.map
   branches/nexuiz-2.0/data/maps/runningman_1on1remix.map
   branches/nexuiz-2.0/data/maps/runningmanctf.map
   branches/nexuiz-2.0/data/maps/silvercity.map
   branches/nexuiz-2.0/data/maps/skyway.map
   branches/nexuiz-2.0/data/maps/slimepit.map
   branches/nexuiz-2.0/data/maps/soylent.map
   branches/nexuiz-2.0/data/maps/starship.map
   branches/nexuiz-2.0/data/maps/stormkeep.map
   branches/nexuiz-2.0/data/maps/strength.map
   branches/nexuiz-2.0/data/maps/turret_test.map
   branches/nexuiz-2.0/data/maps/warfare.map
   branches/nexuiz-2.0/data/models/items/g_a1.md3
   branches/nexuiz-2.0/data/models/items/g_a25.md3
   branches/nexuiz-2.0/data/models/items/g_a50.md3
   branches/nexuiz-2.0/data/models/items/g_armormedium.md3
   branches/nexuiz-2.0/data/models/items/g_h1.md3
   branches/nexuiz-2.0/data/models/items/g_h100.md3
   branches/nexuiz-2.0/data/models/items/g_h25.md3
   branches/nexuiz-2.0/data/models/items/g_h50.md3
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
   branches/nexuiz-2.0/misc/tools/makebuild.sh
Log:
r6334 | div0 | 2009-03-27 20:13:42 +0100 (Fri, 27 Mar 2009) | 2 lines
remove some stuff in case the build system is used
r6335 | mand1nga | 2009-03-28 13:35:00 +0100 (Sat, 28 Mar 2009) | 1 line
faq fixes by Ronan, please review the mapping section
r6336 | mand1nga | 2009-03-28 14:09:57 +0100 (Sat, 28 Mar 2009) | 1 line
faq fixed :)
r6337 | m0rfar | 2009-03-28 15:15:54 +0100 (Sat, 28 Mar 2009) | 1 line
Radiant texture fixes again. People should learn to prefix "textures/" on skin names.
r6338 | div0 | 2009-03-28 15:17:38 +0100 (Sat, 28 Mar 2009) | 2 lines
try adding readme.html
r6339 | m0rfar | 2009-03-28 16:05:39 +0100 (Sat, 28 Mar 2009) | 2 lines
Removed a lot of DOM points on Bleach.
All maps now use the proper entity names for health and armors (a few q3 items remain unchanged though), so netradiant can show them. 
r6340 | div0 | 2009-03-28 16:21:12 +0100 (Sat, 28 Mar 2009) | 2 lines
shut up about "zero modelindex" if the player is dead and has a zero modelindex for a reason
r6341 | div0 | 2009-03-28 16:39:22 +0100 (Sat, 28 Mar 2009) | 2 lines
fix some ALT= atttributes
r6342 | tzork | 2009-03-28 16:45:19 +0100 (Sat, 28 Mar 2009) | 1 line
use pickups.tga for a_a50.md3
r6343 | m0rfar | 2009-03-28 16:50:45 +0100 (Sat, 28 Mar 2009) | 1 line
and again
r6344 | m0rfar | 2009-03-28 16:56:51 +0100 (Sat, 28 Mar 2009) | 1 line
rotate!
r6345 | m0rfar | 2009-03-28 17:06:09 +0100 (Sat, 28 Mar 2009) | 1 line
We can remove these skins now thanks to tZork :)
r6346 | div0 | 2009-03-28 17:12:06 +0100 (Sat, 28 Mar 2009) | 2 lines
g_shootfromfixedorigin cvar (fixed shotorg)
r6347 | m0rfar | 2009-03-28 18:51:54 +0100 (Sat, 28 Mar 2009) | 1 line
more unused skins removed


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/.patchsets	2009-03-28 18:57:46 UTC (rev 6348)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6039,6044-6332
+revisions_applied = 1-6039,6044-6347

Modified: branches/nexuiz-2.0/Docs/basics.html
===================================================================
--- branches/nexuiz-2.0/Docs/basics.html	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/Docs/basics.html	2009-03-28 18:57:46 UTC (rev 6348)
@@ -146,49 +146,49 @@
 <p class="Body">
 Almost all weapons in Nexuiz have two firing modes, so make sure you know both.  You normally (depending on game-mode) start equipped with two weapons: the Laser and the shotgun.  You can bind these weapons to a key at the <em>settings/input</em> menu or in the console using the command <em>bind key &quot;impulse <strong>n</strong>&quot;</em>, where n is the number of the weapon.
 </p>
-<table style="border: 0"><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-laser.png" alt="Laser"></td><td style="border: 0"><p class="Body">
+<table style="border: 0"><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-laser.png" alt="laser"></td><td style="border: 0"><p class="Body">
 The <strong>Laser</strong> is not often used as a weapon, as it does not do much damage - but it's a useful tool to move around the map, because it has a significant push.  The 'explosion' from its projectile will push you and other players around a lot.  The trick to using it to move around is to use this push to gain speed or to do huge jumps.  For an easy start, take the Laser, look down at the floor, and press fire.  It will push you high into the air.  If you press jump and fire at the same time, you will get even higher - but it depends on the timing, and, for more advanced jumps, also on the angle you fire at the floor, as well as how fast and in which direction you move.  For example if you just run forwards, look down and press fire it will catapult you forward with great speed.  Play around with it, and watch others, and you will learn a very useful skill in Nexuiz.  The secondary fire mode of the Laser switches back to the last used weapon.  The Laser does not use up any ammo.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-laser.png" alt="Laser"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hookgun.png" alt="hookgun"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-laser.png" alt="laser"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hookgun.png" alt="hookgun"></td><td style="border: 0"><p class="Body">
 The <strong>Grappling Hook</strong> is an other movement tool.  The primary mode attaches itself to all sorts of solid objects and will pull you there to move through the map like spider man.  You can get very fast that way or reach spots you would not get to by other means.  The secondary firemode drops a small gravity bomb that will affect enemy players and also releases a lot of smoke which will make you harder to see and hit.  The gravity bomb uses cell ammo.  There is also a mutator that adds a off-hand hook which can be used all the time, uses no ammo but only does the pulling part.
 </p>
 </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hookgun.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-porto.png" alt="porto"></td><td style="border: 0"><p class="Body">
 The <strong>Port-O-Launch</strong> is the perfection of movement.  The grenade it launches creates two portals.  On the first impact it creates the entrance portal, on the second impact the exit portal.  If you enter the first one you (or others players and also projectiles!!) will be teleported to the second portal.  As the first portal will teleport everything it can't be hit but the second portal is quite fragile and, because of the used wormhole technology, will take the other portal along if it lost too much energy.  The wormhole is also the reason why the portals energy decays after some time.  You can replenish the energy by simply teleporting something through it.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-porto.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-shotgun.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-porto.png" alt="porto"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-shotgun.png" alt="shotgun"></td><td style="border: 0"><p class="Body">
 The <strong>Shotgun</strong> is very similar to that of other games.  It shoots several bullets with a high spread, so it does very high damage at close range, but becomes very inaccurate at distance.  It is also very useful to knock opponents out after you already hit them hard with a rocket or another projectile, and subsequently closed to a distance because it's hard to miss with the Shotgun at close range.  The primary fire mode fires once with a short reload, while the secondary fire mode shoots three very quick shots, but with a long reload afterwards.  The secondary firemode also has a higher spread so the primary is useful for a longer distance than the secondary firemode.  The Shotgun uses shell ammo which is not shared with any other weapons.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-shotgun.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-uzi.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-shotgun.png" alt="shotgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-uzi.png" alt="uzi"></td><td style="border: 0"><p class="Body">
 The <strong>Machine Gun</strong> is also quite self-explanatory.  It shoots bullets at a high rate of fire, and can do significant damage.  The primary fire mode has a high spread and is thus quite inaccurate - but it fires very fast and deals more damage per second than most other weapons.  It is therefore devastating when used at close quarters.  One of the Machine Gun's unique features is that the first bullet after pressing fire has less spread and does more damage than the rest - keep this in mind when using it.  The secondary fire mode is much slower, but its the same as the primary modes <em>first</em> bullets.  This firemode is therefore very useful as an improvised sniper weapon for mid range kills.  Like the Shotgun, it is an excellent finishing weapon, but its effective use relies heavily on a good, steady aim.  The Machine Gun uses bullet ammo just as the camping rifle.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-uzi.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hlac.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-uzi.png" alt="uzi"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hlac.png" alt="hlac"></td><td style="border: 0"><p class="Body">
 The <strong>Heavy Laser Assault Cannon</strong> (HLAC) is a similar gun but fires highly accelerated Laser bolts at an insane refire rate.  The bolts explode on impact and for some extra damage the secondary mode fires several of them at once.  This is only gun that has reduced spread when crouching!  Beware of your cell ammo (shared with the Electro, Crylink and (Minsta)Nex), this baby eats it like crazy.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hlac.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-gl.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hlac.png" alt="hlac"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-gl.png" alt="gl"></td><td style="border: 0"><p class="Body">
 The <strong>Mortar</strong> is a grenade-launcher on steroids.  Both firing modes shoot a fast-moving projectile grenade which is influenced by gravity, and thus moves in a parabolic trajectory.  The primary fire mode shoots grenades that explode on impact while the secondary fire mode shoots grenades which will bounce off objects, and either explode on contact with an other player, or after a few seconds if they are not triggered.  The grenades' arc makes them harder to aim, but also hard to dodge.  Since they deal quite high damage, with an excellent rate of fire, the Mortar is a solid all-round weapon once you've got the hang of aiming it.  The Mortar uses rocket ammo which is shared with the Rocket Launcher, T.A.G. and the Hagar.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-gl.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-electro.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-gl.png" alt="gl"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-electro.png" alt="electro"></td><td style="border: 0"><p class="Body">
 The <strong>Electro</strong> is a rather underestimated gun.  Contrary to its name, it does not deal electricity damage, but rather fires plasma - understanding this will help you to use it well.  The primary fire mode shoots a plasma projectile which does quite high damage on impact.  It also explodes rather like a rocket or grenade, and is quite comparable in use to the Quake 2 rocket launcher.  The secondary fire mode spits out balls of contained plasma that will bounce like grenades, and deal similarly high damage.  Those blobs have a short trajectory and so do not get very far - but they're useful for blocking a way, or for spamming around your opponent so that he is hedged in by them.  If you use the primary fire mode to hit these contained plasma blobs, they will explode more violently than without, causing a lot of extra damage.  This combo is very effective in corridors and small rooms.  The Electro uses cell ammo which is shared with the Crylink, HLAC and the (Minsta)Nex.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-electro.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-crylink.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-electro.png" alt="electro"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-crylink.png" alt="crylink"></td><td style="border: 0"><p class="Body">
 The <strong>Crylink</strong> is comparable to the Shotgun but shoots slow plasma projectiles; so it's harder to aim but they also do more damage.  The primary fire mode shoots several bouncing projectiles at a high rate of fire and narrow spread.  Each bounce causes splash damage so try to hit the floor near someone for damage from both the splash and the bullets themselves.  The secondary fire mode has a wider, horizontal spread and lower rate of fire.  This mode does not bounce but does more damage and is sometimes easier to aim.  The Crylink uses cell ammo which is shared with the Electro, HLAC and the (Minsta)Nex.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-crylink.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-nex.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-crylink.png" alt="crylink"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-nex.png" alt="nex"></td><td style="border: 0"><p class="Body">
 The <strong>Nex</strong> is a powerful sniper weapon.  Its primary fire mode fires a hitscan antimatter lance for significant damage, but requires a very precise aim, and has a relatively long reload time.  The secondary fire mode activates zoom.  The Nex uses cell ammo which is shared with the HLAC, Crylink, MinstaNex and the Electro.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-nex.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-minstanex.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-nex.png" alt="nex"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-minstanex.png" alt="minstanex"></td><td style="border: 0"><p class="Body">
 The <strong>MinstaNex</strong> is a sniper's wet dream.  Similar to the nex but MUCH more powerful.  One hit, one kill, no kidding!  The secondary firemode is identical to the Laser's primary shot.  Back in the glory days this gun was used solely in Minstagib to train steady aim and fast movement, now this gun can spread fear in every gamemode.  Cell ammo is also used by Nex, Crylink, HLAC and Electro.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-minstanex.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-campingrifle.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-minstanex.png" alt="minstanex"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-campingrifle.png" alt="campingrifle"></td><td style="border: 0"><p class="Body">
 The <strong>Rifle</strong> is a kind of mixture of a sniper rifle and an assault gun.  The primary mode is quite similar to the nex but fires a bullet.  The rate of fire is quite moderate.  The secondary mode can be used to empty the whole magazine of bullets in an quick burst.  This firemode is less wall piercing and has some spread to it but is deadly at mid-to-close range.  The magazine is reloaded automatically if you equip the Rifle.  It is also the only gun that can do headshots which cause extra damage, so aim with care, as this gun can out-perform the nex.  The Rifle uses the same bullet ammo as the Machine Gun.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-campingrifle.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hagar.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-campingrifle.png" alt="campingrifle"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hagar.png" alt="hagar"></td><td style="border: 0"><p class="Body">
 The <strong>Hagar</strong> can be compared to the plasma gun from Quake3.  It has a very high rate of fire, with moderate damage, and some splash damage.  The primary fire mode shoots small missiles at high speed and an extraordinary rate of fire.  The secondary fire mode shoots the same missiles, but at a slower speed and rate of fire, and without the instant trigger.  This means that they will bounce once when hitting a floor or a wall, giving you the opportunity to fire around corners, or double your chances to hit someone by spamming an area.  The Hagar uses rocket ammo which is shared with the Mortar, T.A.G. and the Rocket Launcher.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hagar.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-rl.png" alt="porto"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hagar.png" alt="hagar"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-rl.png" alt="rl"></td><td style="border: 0"><p class="Body">
 The <strong>Rocket Launcher</strong> is a little different from that of other games, in that the rockets move relatively slowly.  The primary fire mode shoots a slow-moving, high-damage rocket projectile at a medium rate of fire.  The secondary fire mode will explode all your flying rockets at once.  This means that you don't need to hit your opponent directly - just get the rocket <em>near</em> him, and use the secondary fire to cause splash damage which will badly hurt him.  The Rocket Launcher uses rocket ammo which is shared with the Mortar, T.A.G. and the Hagar.
 </p>
-</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-rl.png" alt="hookgun"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-seeker.png" alt="seeker"></td><td style="border: 0"><p class="Body">
+</td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-rl.png" alt="rl"></td></tr><tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-seeker.png" alt="seeker"></td><td style="border: 0"><p class="Body">
 The <strong>T.A.G. Seeker</strong> is a unique weapon system.  The primary fire mode launches a small tagging device.  If it hits someone it will automatically release several target seeking rockets that will follow the tagged target for quite a while.  Its fun to watch them run!  The secondary firemode launches small rockets that explode after a few meters and thus create a sort of explosion shield that will severely damage everyone in its radius and also stops incoming (tag-)rockets.  Rocket ammo is shared with the Mortar, Hagar and Rocket Launcher.
 </p>
 </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-seeker.png" alt="seeker"></td></tr></table><p class="Body">

Modified: branches/nexuiz-2.0/Docs/faq.html
===================================================================
--- branches/nexuiz-2.0/Docs/faq.html	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/Docs/faq.html	2009-03-28 18:57:46 UTC (rev 6348)
@@ -76,15 +76,15 @@
 <ul>
 <li> <a class="link" href="#How do I install Nexuiz?">How do I install Nexuiz?</a></li>
 <li> <a class="link" href="#When I start Nexuiz all I see is a black screen or a black screen with some checkered squares">When I start Nexuiz all I see is a black screen or a black screen with some checkered squares</a></li>
-<li> <a class="link" href="#Using Linux i only see the map but no players and items">Using Linux i only see the map but no players and items</a></li>
-<li> <a class="link" href="#When i start Nexuiz my screen is flickering">When i start Nexuiz my screen is flickering</a></li>
+<li> <a class="link" href="#Using Linux I only see the map but no players and items">Using Linux I only see the map but no players and items</a></li>
+<li> <a class="link" href="#When I start Nexuiz my screen is flickering">When I start Nexuiz my screen is flickering</a></li>
 <li> <a class="link" href="#How can I speed up my frame rate?">How can I speed up my frame rate?</a></li>
 <li> <a class="link" href="#The sound is broken, it crackles and stutters">The sound is broken, it crackles and stutters</a></li>
 <li> <a class="link" href="#Mouse is too slow and sensitivity is at top (on Mac / Linux)">Mouse is too slow and sensitivity is at top (on Mac / Linux)</a></li>
 <li> <a class="link" href="#I can't switch to 32 bit color depth (on Windows)">I can't switch to 32 bit color depth (on Windows)</a></li>
 <li> <a class="link" href="#When I join a server or after a map change I see nothing but a black screen, but I can still move and shoot">When I join a server or after a map change I see nothing but a black screen, but I can still move and shoot</a></li>
 <li> <a class="link" href="#How to report crashes">How to report crashes</a></li>
-<li> <a class="link" href="#Where can i get more help?">Where can i get more help?</a></li>
+<li> <a class="link" href="#Where can I get more help?">Where can I get more help?</a></li>
 </ul>
 <li> <a class="link" href="#General questions">General questions</a></li>
 <ul>
@@ -93,19 +93,19 @@
 <li> <a class="link" href="#How do I open the console?">How do I open the console?</a></li>
 <li> <a class="link" href="#What console commands/variables are there?">What console commands/variables are there?</a></li>
 <li> <a class="link" href="#How can I use colors in my nickname and messages?">How can I use colors in my nickname and messages?</a></li>
-<li> <a class="link" href="#How do i watch/record demos?">How do i watch/record demos?</a></li>
+<li> <a class="link" href="#How do I watch/record demos?">How do I watch/record demos?</a></li>
 </ul>
 <li> <a class="link" href="#Server setup">Server setup</a></li>
 <ul>
 <li> <a class="link" href="#How do I start a server?">How do I start a server?</a></li>
 <li> <a class="link" href="#Which ports do I have to open in firewall/forward from my router to run a server?">Which ports do I have to open in firewall/forward from my router to run a server?</a></li>
 <li> <a class="link" href="#Is there some kind of rcon?">Is there some kind of rcon?</a></li>
-<li> <a class="link" href="#How can i kick people who are using special characters in their names?">How can i kick people who are using special characters in their names?</a></li>
+<li> <a class="link" href="#How can I kick people who are using special characters in their names?">How can I kick people who are using special characters in their names?</a></li>
 </ul>
 <li> <a class="link" href="#Development">Development</a></li>
 <ul>
-<li> <a class="link" href="#How do i set up gtkradiant to create/edit Nexuiz maps?">How do i set up gtkradiant to create/edit Nexuiz maps?</a></li>
-<li> <a class="link" href="#Where can i get latest development versions of the source code?">Where can i get latest development versions of the source code?</a>
+<li> <a class="link" href="#How can I create or edit Nexuiz maps?">How can I create or edit Nexuiz maps?</a></li>
+<li> <a class="link" href="#Where can I get latest development versions of the source code?">Where can I get latest development versions of the source code?</a>
 
 </li>
 </ul>
@@ -148,7 +148,7 @@
 </ol>
 </p>
 <!--End Section 2-->
-<h3><a name="Using Linux i only see the map but no players and items">Using Linux i only see the map but no players and items</a></h3>
+<h3><a name="Using Linux I only see the map but no players and items">Using Linux I only see the map but no players and items</a></h3>
 <p class="Body">
 This happens when the engine has trouble to initialize OpenGL.  The reasons could be:
 <ol>
@@ -157,7 +157,7 @@
 </ol>
 </p>
 <!--End Section 2-->
-<h3><a name="When i start Nexuiz my screen is flickering">When i start Nexuiz my screen is flickering</a></h3>
+<h3><a name="When I start Nexuiz my screen is flickering">When I start Nexuiz my screen is flickering</a></h3>
 <p class="Body">
 This is known to happen on Windows with Intel graphic chips and is a bug in the graphics drivers.  A workaround is to set <tt>Flip-Policiy</tt> to <tt>blit</tt>.  Open the control panel, there should be an icon called <tt>Intel(R) GMA driver</tt> (or something like that), double click it. Click on <tt>3D Settings</tt> to find the screen with those settings.
 </p>
@@ -204,7 +204,7 @@
 On Windows: Click Start-&gt;Run, and enter drwtsn32, click Ok in the next window, run Nexuiz and wait for the crash.  Then go to <tt>C:\Documents and Settings\All Users\Application Data\Microsoft\Dr Watson</tt> there should be a file called &quot;drwtsn32.log&quot;, give that file along with the engine's build date to the developers.  You'll see that date when you open the ingame console (<a class="link" href="#How do I open the console?">How do I open the console?</a>).  Note that some folders of that path may be hidden or have a translated name if you're using a non-english windows.
 </p>
 <!--End Section 2-->
-<h3><a name="Where can i get more help?">Where can i get more help?</a></h3>
+<h3><a name="Where can I get more help?">Where can I get more help?</a></h3>
 <p class="Body">
 Visit <a class="link" href="http://alientrap.org/forum">the official Nexuiz forum</a> there is a <a class="link" href="http://alientrap.org/forum/viewforum.php?f=3">support and bug report area</a>.  Or get on <a class="link" href="http://en.wikipedia.org/wiki/Internet_Relay_Chat">IRC</a> to chat with other or ask for help.  There is the normal users channel (irc://irc.quakenet.org/nexuiz) and the developers channel (irc://irc.anynet.org/alientrap)
 </p>
@@ -253,11 +253,11 @@
 <tr><td> ^9     </td><td> ^x444      </td><td> dark grey&nbsp;&nbsp; </td></tr>
 </table></center>
 <!--End Section 2-->
-<h3><a name="How do i watch/record demos?">How do i watch/record demos?</a></h3>
+<h3><a name="How do I watch/record demos?">How do I watch/record demos?</a></h3>
 <p class="Body">
-Demos are recordings of matches that you have played. To automatically record a demo each time you play enable the option <tt>Record demos while playing</tt> in the <tt>Settings / Demos</tt> menu. Or if you just want to record some matches open the console and type <tt>rec &lt;demos/name&gt;</tt> before playing. That is before starting a game or connecting to a server. The demo file will then be stored in <tt>Nexuiz/data/demos/&lt;name&gt;.dem</tt> (on Windows) or <tt>~/.nexuiz/data/demos/&lt;name&gt;.dem</tt> (on Linux, Mac).
+Demos are recordings of matches that you have played. To automatically record a demo each time you play enable the option <tt>Record demos while playing</tt> in the <tt>Multiplayer / Demos</tt> menu. Or if you just want to record some matches open the console and type <tt>rec &lt;demos/name&gt;</tt> before playing. That is before starting a game or connecting to a server. The demo file will then be stored in <tt>Nexuiz/data/demos/&lt;name&gt;.dem</tt> (on Windows) or <tt>~/.nexuiz/data/demos/&lt;name&gt;.dem</tt> (on Linux, Mac).
 If you downloaded a demo, copy it to <tt>Nexuiz/data/demos/&lt;name&gt;.dem</tt> (on Linux, Mac, Windows) or <tt>~/.nexuiz/data/demos/&lt;name&gt;.dem</tt> (on Linux, Mac).  You might have to create this directory if you have never recorded a demo before.
-To watch demos you can choose a demo file in the <tt>Settings / Demos</tt> and click the play button. Also you can watch demos typing <tt>ply &lt;demos/name&gt;</tt> in the console (<a class="link" href="#How do I open the console?">How do I open the console?</a>). You can list all your demo files by typing <tt>dem</tt> on the console.Some useful key bindings for viewing demos and making videos are listed <a class="link" href="http://www.alientrap.org/forum/viewtopic.php?p=357#357">here</a>.  A simple way to automatically record demos can be found <a class="link" href="http://www.alientrap.org/forum/viewtopic.php?t=90">here</a>.
+To watch demos you can choose a demo file in the <tt>Multiplayer / Demos</tt> and click the play button. Also you can watch demos typing <tt>ply &lt;demos/name&gt;</tt> in the console (<a class="link" href="#How do I open the console?">How do I open the console?</a>). You can list all your demo files by typing <tt>dem</tt> on the console.Some useful key bindings for viewing demos and making videos are listed <a class="link" href="http://www.alientrap.org/forum/viewtopic.php?p=357#357">here</a>.  A simple way to automatically record demos can be found <a class="link" href="http://www.alientrap.org/forum/viewtopic.php?t=90">here</a>.
 </p>
 <!--End Section 2-->
 <!-- End SectLevel2 -->
@@ -281,7 +281,7 @@
 Yes starting with Nexuiz 2.0 there is rcon (QuakeWorld compatible).  To use it you must enter <tt>rcon_password &lt;password&gt;</tt> in the server console or server config file.  The Nexuiz client has to set the same password in the same fashion.  You can then issue commands with <tt>rcon &lt;command&gt;</tt> if you are connected to the server or will have to set <tt>rcon_address &lt;ip/hostname&gt;</tt> or <tt>rcon_address &lt;ip/hostname&gt;:&lt;port&gt;</tt> to point to the server.  There are also external rcon tools but make sure you use a QW compatible rcon tool.
 </p>
 <!--End Section 2-->
-<h3><a name="How can i kick people who are using special characters in their names?">How can i kick people who are using special characters in their names?</a></h3>
+<h3><a name="How can I kick people who are using special characters in their names?">How can I kick people who are using special characters in their names?</a></h3>
 <p class="Body">
 Enter <tt>status</tt> at the server console.  You will see a list of all players.  In front of their names you will see a number (the player id).  You can kick the player you don't like with <tt>kick # &lt;player id&gt; &lt;reason&gt;</tt> (notice the space after #).
 </p>
@@ -290,22 +290,23 @@
 <!--End Section 1-->
 <h2><a name="Development">Development</a></h2>
 <!-- Start SectLevel2 -->
-<h3><a name="How do i set up gtkradiant to create/edit Nexuiz maps?">How do i set up gtkradiant to create/edit Nexuiz maps?</a></h3>
+<h3><a name="How can I create or edit Nexuiz maps?">How can I create or edit Nexuiz maps?</a></h3>
 <p class="Body">
-There's a <a class="link" href="http://www.alientrap.org/forum/viewtopic.php?t=10">guide</a> on gtkradiant setup in the forums.
-There are also <a class="link" href="http://www.alientrap.org/forum/viewtopic.php?p=33">Windows tool</a> that will help you to setup gtkradiant 1.4 and a <a class="link" href="http://www.alientrap.org/forum/viewtopic.php?p=841">Linux script</a> to configure gtkradiant 1.5.
+You need <a class="link" href="http://icculus.org/netradiant/">NetRadiant</a>, a stabilized Q3 map editor. For convenience, a snapshot configured for Nexuiz is included in <tt>extra/</tt> for Windows and MAC-Intel, but the program is not officially supported by Alientrap.
 </p>
 <!--End Section 2-->
-<h3><a name="Where can i get latest development versions of the source code?">Where can i get latest development versions of the source code?</a></h3>
+<h3><a name="Where can I get latest development versions of the source code?">Where can I get latest development versions of the source code?</a></h3>
 <p class="Body">
 <strong>Engine:</strong> instructions are available at <a class="link" href="http://icculus.org/twilight/darkplaces/download.html">http://icculus.org/twilight/darkplaces/download.html</a> look for <tt>Accessing the SVN server</tt> (you will need a <a class="link" href="http://subversion.tigris.org/project_packages.html">svn client</a>, beta builds are available <a class="link" href="http://icculus.org/twilight/darkplaces/files/">here</a>)
 </p>
 <p class="Body">
 <strong>Game data:</strong> to check out the Nexuiz svn, you'll need a <a class="link" href="http://subversion.tigris.org/project_packages.html">svn client</a>.  To check out the repository with a command line svn client, do
+</p>
 <div class="block"><pre>
 svn co svn://svn.icculus.org/nexuiz/trunk/
 </pre></div>
-To compile the game code you need <a class="link" href="http://sourceforge.net/project/showfiles.php?group_id=116842&amp;package_id=129507">fteqcc</a>.  Just download it and run it twice, once in <tt>data/qcsrc/menu</tt> and once in <tt>data/qcsrc/server</tt>.
+<p class="Body">
+To compile the game code you need <a class="link" href="http://sourceforge.net/project/showfiles.php?group_id=116842&amp;package_id=129507">fteqcc</a>.  Just download it and run it 3 times, once in <tt>data/qcsrc/menu</tt>, once in <tt>data/qcsrc/server</tt> and once in <tt>data/qcsrc/client</tt>.  Alternatively a Makefile is available in <tt>data/</tt> to perform directly the operation.
 </p>
 <!--End Section 2-->
 <!-- End SectLevel2 -->

Modified: branches/nexuiz-2.0/Docs/htmlfiles/basics.aft
===================================================================
--- branches/nexuiz-2.0/Docs/htmlfiles/basics.aft	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/Docs/htmlfiles/basics.aft	2009-03-28 18:57:46 UTC (rev 6348)
@@ -60,10 +60,10 @@
 Almost all weapons in Nexuiz have two firing modes, so make sure you know both.  You normally (depending on game-mode) start equipped with two weapons: the Laser and the shotgun.  You can bind these weapons to a key at the ''settings/input'' menu or in the console using the command ''bind key "impulse _n_"'', where n is the number of the weapon.
 
 #---PASS-HTML <table style="border: 0">
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-laser.png" alt="Laser"></td><td style="border: 0">
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-laser.png" alt="laser"></td><td style="border: 0">
 The _Laser_ is not often used as a weapon, as it does not do much damage - but it's a useful tool to move around the map, because it has a significant push.  The 'explosion' from its projectile will push you and other players around a lot.  The trick to using it to move around is to use this push to gain speed or to do huge jumps.  For an easy start, take the Laser, look down at the floor, and press fire.  It will push you high into the air.  If you press jump and fire at the same time, you will get even higher - but it depends on the timing, and, for more advanced jumps, also on the angle you fire at the floor, as well as how fast and in which direction you move.  For example if you just run forwards, look down and press fire it will catapult you forward with great speed.  Play around with it, and watch others, and you will learn a very useful skill in Nexuiz.  The secondary fire mode of the Laser switches back to the last used weapon.  The Laser does not use up any ammo.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-laser.png" alt="Laser"></td></tr>
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-laser.png" alt="laser"></td></tr>
 #---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hookgun.png" alt="hookgun"></td><td style="border: 0">
 The _Grappling Hook_ is an other movement tool.  The primary mode attaches itself to all sorts of solid objects and will pull you there to move through the map like spider man.  You can get very fast that way or reach spots you would not get to by other means.  The secondary firemode drops a small gravity bomb that will affect enemy players and also releases a lot of smoke which will make you harder to see and hit.  The gravity bomb uses cell ammo.  There is also a mutator that adds a off-hand hook which can be used all the time, uses no ammo but only does the pulling part.
 
@@ -71,51 +71,51 @@
 #---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-porto.png" alt="porto"></td><td style="border: 0">
 The _Port-O-Launch_ is the perfection of movement.  The grenade it launches creates two portals.  On the first impact it creates the entrance portal, on the second impact the exit portal.  If you enter the first one you (or others players and also projectiles!!) will be teleported to the second portal.  As the first portal will teleport everything it can't be hit but the second portal is quite fragile and, because of the used wormhole technology, will take the other portal along if it lost too much energy.  The wormhole is also the reason why the portals energy decays after some time.  You can replenish the energy by simply teleporting something through it.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-porto.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-shotgun.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-porto.png" alt="porto"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-shotgun.png" alt="shotgun"></td><td style="border: 0">
 The _Shotgun_ is very similar to that of other games.  It shoots several bullets with a high spread, so it does very high damage at close range, but becomes very inaccurate at distance.  It is also very useful to knock opponents out after you already hit them hard with a rocket or another projectile, and subsequently closed to a distance because it's hard to miss with the Shotgun at close range.  The primary fire mode fires once with a short reload, while the secondary fire mode shoots three very quick shots, but with a long reload afterwards.  The secondary firemode also has a higher spread so the primary is useful for a longer distance than the secondary firemode.  The Shotgun uses shell ammo which is not shared with any other weapons.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-shotgun.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-uzi.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-shotgun.png" alt="shotgun"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-uzi.png" alt="uzi"></td><td style="border: 0">
 The _Machine Gun_ is also quite self-explanatory.  It shoots bullets at a high rate of fire, and can do significant damage.  The primary fire mode has a high spread and is thus quite inaccurate - but it fires very fast and deals more damage per second than most other weapons.  It is therefore devastating when used at close quarters.  One of the Machine Gun's unique features is that the first bullet after pressing fire has less spread and does more damage than the rest - keep this in mind when using it.  The secondary fire mode is much slower, but its the same as the primary modes ''first'' bullets.  This firemode is therefore very useful as an improvised sniper weapon for mid range kills.  Like the Shotgun, it is an excellent finishing weapon, but its effective use relies heavily on a good, steady aim.  The Machine Gun uses bullet ammo just as the camping rifle.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-uzi.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hlac.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-uzi.png" alt="uzi"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hlac.png" alt="hlac"></td><td style="border: 0">
 The _Heavy Laser Assault Cannon_ (HLAC) is a similar gun but fires highly accelerated Laser bolts at an insane refire rate.  The bolts explode on impact and for some extra damage the secondary mode fires several of them at once.  This is only gun that has reduced spread when crouching!  Beware of your cell ammo (shared with the Electro, Crylink and (Minsta)Nex), this baby eats it like crazy.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hlac.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-gl.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hlac.png" alt="hlac"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-gl.png" alt="gl"></td><td style="border: 0">
 The _Mortar_ is a grenade-launcher on steroids.  Both firing modes shoot a fast-moving projectile grenade which is influenced by gravity, and thus moves in a parabolic trajectory.  The primary fire mode shoots grenades that explode on impact while the secondary fire mode shoots grenades which will bounce off objects, and either explode on contact with an other player, or after a few seconds if they are not triggered.  The grenades' arc makes them harder to aim, but also hard to dodge.  Since they deal quite high damage, with an excellent rate of fire, the Mortar is a solid all-round weapon once you've got the hang of aiming it.  The Mortar uses rocket ammo which is shared with the Rocket Launcher, T.A.G. and the Hagar.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-gl.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-electro.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-gl.png" alt="gl"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-electro.png" alt="electro"></td><td style="border: 0">
 The _Electro_ is a rather underestimated gun.  Contrary to its name, it does not deal electricity damage, but rather fires plasma - understanding this will help you to use it well.  The primary fire mode shoots a plasma projectile which does quite high damage on impact.  It also explodes rather like a rocket or grenade, and is quite comparable in use to the Quake 2 rocket launcher.  The secondary fire mode spits out balls of contained plasma that will bounce like grenades, and deal similarly high damage.  Those blobs have a short trajectory and so do not get very far - but they're useful for blocking a way, or for spamming around your opponent so that he is hedged in by them.  If you use the primary fire mode to hit these contained plasma blobs, they will explode more violently than without, causing a lot of extra damage.  This combo is very effective in corridors and small rooms.  The Electro uses cell ammo which is shared with the Crylink, HLAC and the (Minsta)Nex.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-electro.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-crylink.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-electro.png" alt="electro"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-crylink.png" alt="crylink"></td><td style="border: 0">
 The _Crylink_ is comparable to the Shotgun but shoots slow plasma projectiles; so it's harder to aim but they also do more damage.  The primary fire mode shoots several bouncing projectiles at a high rate of fire and narrow spread.  Each bounce causes splash damage so try to hit the floor near someone for damage from both the splash and the bullets themselves.  The secondary fire mode has a wider, horizontal spread and lower rate of fire.  This mode does not bounce but does more damage and is sometimes easier to aim.  The Crylink uses cell ammo which is shared with the Electro, HLAC and the (Minsta)Nex.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-crylink.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-nex.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-crylink.png" alt="crylink"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-nex.png" alt="nex"></td><td style="border: 0">
 The _Nex_ is a powerful sniper weapon.  Its primary fire mode fires a hitscan antimatter lance for significant damage, but requires a very precise aim, and has a relatively long reload time.  The secondary fire mode activates zoom.  The Nex uses cell ammo which is shared with the HLAC, Crylink, MinstaNex and the Electro.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-nex.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-minstanex.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-nex.png" alt="nex"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-minstanex.png" alt="minstanex"></td><td style="border: 0">
 The _MinstaNex_ is a sniper's wet dream.  Similar to the nex but MUCH more powerful.  One hit, one kill, no kidding!  The secondary firemode is identical to the Laser's primary shot.  Back in the glory days this gun was used solely in Minstagib to train steady aim and fast movement, now this gun can spread fear in every gamemode.  Cell ammo is also used by Nex, Crylink, HLAC and Electro.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-minstanex.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-campingrifle.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-minstanex.png" alt="minstanex"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-campingrifle.png" alt="campingrifle"></td><td style="border: 0">
 The _Rifle_ is a kind of mixture of a sniper rifle and an assault gun.  The primary mode is quite similar to the nex but fires a bullet.  The rate of fire is quite moderate.  The secondary mode can be used to empty the whole magazine of bullets in an quick burst.  This firemode is less wall piercing and has some spread to it but is deadly at mid-to-close range.  The magazine is reloaded automatically if you equip the Rifle.  It is also the only gun that can do headshots which cause extra damage, so aim with care, as this gun can out-perform the nex.  The Rifle uses the same bullet ammo as the Machine Gun.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-campingrifle.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hagar.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-campingrifle.png" alt="campingrifle"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-hagar.png" alt="hagar"></td><td style="border: 0">
 The _Hagar_ can be compared to the plasma gun from Quake3.  It has a very high rate of fire, with moderate damage, and some splash damage.  The primary fire mode shoots small missiles at high speed and an extraordinary rate of fire.  The secondary fire mode shoots the same missiles, but at a slower speed and rate of fire, and without the instant trigger.  This means that they will bounce once when hitting a floor or a wall, giving you the opportunity to fire around corners, or double your chances to hit someone by spamming an area.  The Hagar uses rocket ammo which is shared with the Mortar, T.A.G. and the Rocket Launcher.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hagar.png" alt="hookgun"></td></tr>
-#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-rl.png" alt="porto"></td><td style="border: 0">
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-hagar.png" alt="hagar"></td></tr>
+#---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-rl.png" alt="rl"></td><td style="border: 0">
 The _Rocket Launcher_ is a little different from that of other games, in that the rockets move relatively slowly.  The primary fire mode shoots a slow-moving, high-damage rocket projectile at a medium rate of fire.  The secondary fire mode will explode all your flying rockets at once.  This means that you don't need to hit your opponent directly - just get the rocket ''near'' him, and use the secondary fire to cause splash damage which will badly hurt him.  The Rocket Launcher uses rocket ammo which is shared with the Mortar, T.A.G. and the Hagar.
 
-#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-rl.png" alt="hookgun"></td></tr>
+#---PASS-HTML </td><td style="border: 0; vertical-align: bottom; text-align: right"><img src="htmlfiles/weaponimg/firstperson-rl.png" alt="rl"></td></tr>
 #---PASS-HTML <tr><td style="border: 0; vertical-align: top; text-align: left"><img src="htmlfiles/weaponimg/thirdperson-seeker.png" alt="seeker"></td><td style="border: 0">
 The _T.A.G. Seeker_ is a unique weapon system.  The primary fire mode launches a small tagging device.  If it hits someone it will automatically release several target seeking rockets that will follow the tagged target for quite a while.  Its fun to watch them run!  The secondary firemode launches small rockets that explode after a few meters and thus create a sort of explosion shield that will severely damage everyone in its radius and also stops incoming (tag-)rockets.  Rocket ammo is shared with the Mortar, Hagar and Rocket Launcher.
 

Modified: branches/nexuiz-2.0/Docs/htmlfiles/faq.aft
===================================================================
--- branches/nexuiz-2.0/Docs/htmlfiles/faq.aft	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/Docs/htmlfiles/faq.aft	2009-03-28 18:57:46 UTC (rev 6348)
@@ -44,12 +44,12 @@
 	4. the engine could not initialize OpenGL.  Please install the latest drivers for your graphic card.  You will probably find one for your card there: [intel (http://intel.com)] [ati (http://ati.com)] [nvidia (http://nvidia.com)]
 	5. your download might be corrupted, please download Nexuiz again
 
-** Using Linux i only see the map but no players and items
+** Using Linux I only see the map but no players and items
 This happens when the engine has trouble to initialize OpenGL.  The reasons could be:
 	1. the engine could not initialize OpenGL.  Please install the latest drivers for your graphic card.  You will probably find one for your card there: [intel (http://intel.com)] [ati (http://ati.com)] [nvidia (http://nvidia.com)]
 	2. You do not have permissions needed for 3d acceleration.  Usually you need to add yourself to the group |video|, you can do that via console as root like this: |usermod -a -G video YOURUSERNAME|.  You need to logoff/in afterwards.
 
-** When i start Nexuiz my screen is flickering
+** When I start Nexuiz my screen is flickering
 This is known to happen on Windows with Intel graphic chips and is a bug in the graphics drivers.  A workaround is to set |Flip-Policiy| to |blit|.  Open the control panel, there should be an icon called |Intel(R) GMA driver| (or something like that), double click it. Click on |3D Settings| to find the screen with those settings.
 
 ** How can I speed up my frame rate?
@@ -79,7 +79,7 @@
 
 On Windows: Click Start->Run, and enter drwtsn32, click Ok in the next window, run Nexuiz and wait for the crash.  Then go to |C:\Documents and Settings\All Users\Application Data\Microsoft\Dr Watson| there should be a file called "drwtsn32.log", give that file along with the engine's build date to the developers.  You'll see that date when you open the ingame console ([How do I open the console?]).  Note that some folders of that path may be hidden or have a translated name if you're using a non-english windows.
 
-** Where can i get more help?
+** Where can I get more help?
 Visit [the official Nexuiz forum (http://alientrap.org/forum)] there is a [support and bug report area (http://alientrap.org/forum/viewforum.php?f=3)].  Or get on [IRC (http://en.wikipedia.org/wiki/Internet__Relay__Chat)] to chat with other or ask for help.  There is the normal users channel (irc://irc.quakenet.org/nexuiz) and the developers channel (irc://irc.anynet.org/alientrap)
 
 * General questions
@@ -124,10 +124,10 @@
 	! ^9     ! ^x444      ! dark grey         !
 	!--------!--------------------------------!
 
-** How do i watch/record demos?
-Demos are recordings of matches that you have played. To automatically record a demo each time you play enable the option |Record demos while playing| in the |Settings / Demos| menu. Or if you just want to record some matches open the console and type |rec <demos/name>| before playing. That is before starting a game or connecting to a server. The demo file will then be stored in |Nexuiz/data/demos/<name>.dem| (on Windows) or |~/.nexuiz/data/demos/<name>.dem| (on Linux, Mac).
+** How do I watch/record demos?
+Demos are recordings of matches that you have played. To automatically record a demo each time you play enable the option |Record demos while playing| in the |Multiplayer / Demos| menu. Or if you just want to record some matches open the console and type |rec <demos/name>| before playing. That is before starting a game or connecting to a server. The demo file will then be stored in |Nexuiz/data/demos/<name>.dem| (on Windows) or |~/.nexuiz/data/demos/<name>.dem| (on Linux, Mac).
 If you downloaded a demo, copy it to |Nexuiz/data/demos/<name>.dem| (on Linux, Mac, Windows) or |~/.nexuiz/data/demos/<name>.dem| (on Linux, Mac).  You might have to create this directory if you have never recorded a demo before.
-To watch demos you can choose a demo file in the |Settings / Demos| and click the play button. Also you can watch demos typing |ply <demos/name>| in the console ([How do I open the console?]). You can list all your demo files by typing |dem| on the console.Some useful key bindings for viewing demos and making videos are listed [here (http://www.alientrap.org/forum/viewtopic.php?p=357#357)].  A simple way to automatically record demos can be found [here (http://www.alientrap.org/forum/viewtopic.php?t=90)].
+To watch demos you can choose a demo file in the |Multiplayer / Demos| and click the play button. Also you can watch demos typing |ply <demos/name>| in the console ([How do I open the console?]). You can list all your demo files by typing |dem| on the console.Some useful key bindings for viewing demos and making videos are listed [here (http://www.alientrap.org/forum/viewtopic.php?p=357#357)].  A simple way to automatically record demos can be found [here (http://www.alientrap.org/forum/viewtopic.php?t=90)].
 
 * Server setup
 
@@ -142,20 +142,21 @@
 ** Is there some kind of rcon?
 Yes starting with Nexuiz 2.0 there is rcon (QuakeWorld compatible).  To use it you must enter |rcon__password <password>| in the server console or server config file.  The Nexuiz client has to set the same password in the same fashion.  You can then issue commands with |rcon <command>| if you are connected to the server or will have to set |rcon__address <ip/hostname>| or |rcon__address <ip/hostname>:<port>| to point to the server.  There are also external rcon tools but make sure you use a QW compatible rcon tool.
 
-** How can i kick people who are using special characters in their names?
+** How can I kick people who are using special characters in their names?
 Enter |status| at the server console.  You will see a list of all players.  In front of their names you will see a number (the player id).  You can kick the player you don't like with |kick # <player id> <reason>| (notice the space after #).
 
 * Development
 
-** How do i set up gtkradiant to create/edit Nexuiz maps?
-There's a [guide (http://www.alientrap.org/forum/viewtopic.php?t=10)] on gtkradiant setup in the forums.
-There are also [Windows tool (http://www.alientrap.org/forum/viewtopic.php?p=33)] that will help you to setup gtkradiant 1.4 and a [Linux script (http://www.alientrap.org/forum/viewtopic.php?p=841)] to configure gtkradiant 1.5.
+** How can I create or edit Nexuiz maps?
+You need [NetRadiant (http://icculus.org/netradiant/)], a stabilized Q3 map editor. For convenience, a snapshot configured for Nexuiz is included in |extra/| for Windows and MAC-Intel, but the program is not officially supported by Alientrap.
 
-** Where can i get latest development versions of the source code?
+** Where can I get latest development versions of the source code?
 _Engine:_ instructions are available at http://icculus.org/twilight/darkplaces/download.html look for |Accessing the SVN server| (you will need a [svn client (http://subversion.tigris.org/project_packages.html)], beta builds are available [here (http://icculus.org/twilight/darkplaces/files/)])
 
 _Game data:_ to check out the Nexuiz svn, you'll need a [svn client (http://subversion.tigris.org/project_packages.html)].  To check out the repository with a command line svn client, do
+
 ^<<
 svn co svn://svn.icculus.org/nexuiz/trunk/
 ^>>
-To compile the game code you need [fteqcc (http://sourceforge.net/project/showfiles.php?group\_id=116842&package\_id=129507)].  Just download it and run it twice, once in |data/qcsrc/menu| and once in |data/qcsrc/server|.
+
+To compile the game code you need [fteqcc (http://sourceforge.net/project/showfiles.php?group\_id=116842&package\_id=129507)].  Just download it and run it 3 times, once in |data/qcsrc/menu|, once in |data/qcsrc/server| and once in |data/qcsrc/client|.  Alternatively a Makefile is available in |data/| to perform directly the operation.

Modified: branches/nexuiz-2.0/data/Makefile
===================================================================
--- branches/nexuiz-2.0/data/Makefile	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/Makefile	2009-03-28 18:57:46 UTC (rev 6348)
@@ -12,12 +12,16 @@
 # It will automagically add an engine check with -TID and then change back to -TFTE
 FTEQCCFLAGS_CSPROGS ?= 
 
+# nexuiz svn build system overrides this by command line argument
+NEX_BUILDSYSTEM =
+
 all: qc
 
 .PHONY: update-cvarcount
 update-cvarcount:
-	! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || diff ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; }
-	DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh
+	[ "$(NEX_BUILDSYSTEM)" = "" ] || [ "$(NEX_BUILDSYSTEM)" = "1" ]
+	[ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || diff ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; } }
+	[ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
 
 .PHONY: qc
 qc: menu.dat progs.dat csprogs.dat

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-03-28 18:57:46 UTC (rev 6348)
@@ -24,7 +24,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default c57e95e5c45c75494b2b35e5edaad80c
+set cvar_check_default 11669b91ec9e0214a0e0ac37a3573c1a
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -395,6 +395,7 @@
 set g_antilag_bullets 1 "Bullets AntiLag (0 = no AntiLag, 1 = server side hit scan in the past) - DO NOT TOUCH (severely changes weapon balance)"
 set g_shootfromeye 0
 set g_shootfromcenter 0
+set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used"
 set g_pinata 0
 set g_weapon_stay 0
 set g_powerup_superhealth 1

Modified: branches/nexuiz-2.0/data/maps/accident.map
===================================================================
--- branches/nexuiz-2.0/data/maps/accident.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/accident.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -35988,7 +35988,7 @@
 }
 // entity 20
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2016 640 808"
 }
 // entity 21
@@ -36052,42 +36052,42 @@
 }
 // entity 32
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2144 640 808"
 }
 // entity 33
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2272 640 808"
 }
 // entity 34
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2400 640 808"
 }
 // entity 35
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2592 640 720"
 }
 // entity 36
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2080 640 808"
 }
 // entity 37
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2208 640 808"
 }
 // entity 38
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2336 640 808"
 }
 // entity 39
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2464 640 808"
 }
 // entity 40
@@ -36110,12 +36110,12 @@
 }
 // entity 43
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2480 504 288"
 }
 // entity 44
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2416 504 288"
 }
 // entity 45
@@ -36140,57 +36140,57 @@
 }
 // entity 49
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2528 640 808"
 }
 // entity 50
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3184 0 160"
 }
 // entity 51
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3088 0 160"
 }
 // entity 52
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2352 -504 288"
 }
 // entity 53
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2544 -504 288"
 }
 // entity 54
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2480 -504 288"
 }
 // entity 55
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2416 -504 288"
 }
 // entity 56
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2544 504 288"
 }
 // entity 57
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2352 504 288"
 }
 // entity 58
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3232 0 160"
 }
 // entity 59
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3136 0 160"
 }
 // entity 60
@@ -39096,7 +39096,7 @@
 }
 // entity 257
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-2016 640 808"
 }
 // entity 258
@@ -39160,22 +39160,22 @@
 }
 // entity 269
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-2144 640 808"
 }
 // entity 270
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-2272 640 808"
 }
 // entity 271
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-2400 640 808"
 }
 // entity 272
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2592 640 720"
 }
 // entity 273
@@ -39270,22 +39270,22 @@
 }
 // entity 288
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2080 640 808"
 }
 // entity 289
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2208 640 808"
 }
 // entity 290
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2336 640 808"
 }
 // entity 291
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2464 640 808"
 }
 // entity 292
@@ -39308,12 +39308,12 @@
 }
 // entity 295
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2480 504 312"
 }
 // entity 296
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2416 504 312"
 }
 // entity 297
@@ -39344,58 +39344,58 @@
 }
 // entity 302
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-2528 640 808"
 }
 // entity 303
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-3184 0 160"
 }
 // entity 304
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-3088 0 160"
 "angle" "0"
 }
 // entity 305
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2352 -504 312"
 }
 // entity 306
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2544 -504 312"
 }
 // entity 307
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2480 -504 312"
 }
 // entity 308
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2416 -504 312"
 }
 // entity 309
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2544 504 312"
 }
 // entity 310
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2352 504 312"
 }
 // entity 311
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-3232 0 160"
 }
 // entity 312
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-3136 0 160"
 }
 // entity 313

Modified: branches/nexuiz-2.0/data/maps/aggressor.map
===================================================================
--- branches/nexuiz-2.0/data/maps/aggressor.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/aggressor.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -7739,7 +7739,7 @@
 }
 // entity 58
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-96.000000 -320.000000 -240.000000"
 }
 // entity 59
@@ -7767,7 +7767,7 @@
 }
 // entity 61
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "384.000000 192.000000 -48.000000"
 }
 // entity 62
@@ -7784,7 +7784,7 @@
 }
 // entity 64
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-96.000000 -192.000000 304.000000"
 }
 // entity 65
@@ -7858,24 +7858,24 @@
 }
 // entity 73
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "90"
 "origin" "80.000000 -336.000000 -144.000000"
 }
 // entity 74
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "120.000000 80.000000 144.000000"
 }
 // entity 75
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-392.000000 608.000000 -48.000000"
 }
 // entity 76
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "-90"
 "origin" "384.000000 352.000000 -48.000000"
 }
@@ -7903,7 +7903,7 @@
 }
 // entity 81
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "64.000000 -128.000000 144.000000"
 }
 // entity 82
@@ -7975,42 +7975,42 @@
 }
 // entity 91
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-112.000000 1008.000000 -48.000000"
 }
 // entity 92
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-80.000000 1008.000000 -48.000000"
 }
 // entity 93
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-80.000000 976.000000 -48.000000"
 }
 // entity 94
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-112.000000 976.000000 -48.000000"
 }
 // entity 95
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-704.000000 352.000000 144.000000"
 }
 // entity 96
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-704.000000 320.000000 144.000000"
 }
 // entity 97
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-672.000000 320.000000 144.000000"
 }
 // entity 98
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-672.000000 352.000000 144.000000"
 }
 // entity 99

Modified: branches/nexuiz-2.0/data/maps/aneurysm.map
===================================================================
--- branches/nexuiz-2.0/data/maps/aneurysm.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/aneurysm.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -29744,22 +29744,22 @@
 }
 // entity 6
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1064.000000 80.000000 -208.000000"
 }
 // entity 7
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1032.000000 48.000000 -208.000000"
 }
 // entity 8
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "888.000000 -80.000000 -208.000000"
 }
 // entity 9
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "920.000000 -48.000000 -208.000000"
 }
 // entity 10
@@ -29799,12 +29799,12 @@
 }
 // entity 17
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-512.000000 512.000000 88.000000"
 }
 // entity 18
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-504.000000 320.000000 88.000000"
 }
 // entity 19
@@ -29824,22 +29824,22 @@
 }
 // entity 22
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-680.000000 1344.000000 64.000000"
 }
 // entity 23
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "32.000000 1752.000000 72.000000"
 }
 // entity 24
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1240.000000 1296.000000 -216.000000"
 }
 // entity 25
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1232.000000 816.000000 -216.000000"
 }
 // entity 26
@@ -29849,32 +29849,32 @@
 }
 // entity 27
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1088.000000 192.000000 24.000000"
 }
 // entity 28
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1088.000000 224.000000 24.000000"
 }
 // entity 29
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1088.000000 256.000000 24.000000"
 }
 // entity 30
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1088.000000 288.000000 24.000000"
 }
 // entity 31
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1088.000000 320.000000 24.000000"
 }
 // entity 32
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1088.000000 352.000000 24.000000"
 }
 // entity 33
@@ -29884,7 +29884,7 @@
 }
 // entity 34
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1184.000000 104.000000 272.000000"
 }
 // entity 35
@@ -29895,7 +29895,7 @@
 }
 // entity 36
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "1136.000000 680.000000 272.000000"
 }
 // entity 37
@@ -30348,7 +30348,7 @@
 }
 // entity 109
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-84.000000 -92.000000 -56.000000"
 "spawnflags" "1"
 }
@@ -30502,7 +30502,7 @@
 }
 // entity 130
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-256.000000 1920.000000 80.000000"
 }
 // entity 131
@@ -30591,12 +30591,12 @@
 }
 // entity 146
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "345.000000 1014.000000 45.000000"
 }
 // entity 147
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "378.000000 1902.000000 -67.000000"
 }
 // entity 148

Modified: branches/nexuiz-2.0/data/maps/basement.map
===================================================================
--- branches/nexuiz-2.0/data/maps/basement.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/basement.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -7214,7 +7214,7 @@
 }
 // entity 82
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "424 348 80"
 }
 // entity 83
@@ -7224,7 +7224,7 @@
 }
 // entity 84
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1024 -448 -112"
 }
 // entity 85
@@ -7245,7 +7245,7 @@
 }
 // entity 88
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "416 -32 -120"
 }
 // entity 89
@@ -7275,18 +7275,18 @@
 }
 // entity 94
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-91 587 -108"
 "angle" "-90"
 }
 // entity 95
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-84 -136 24"
 }
 // entity 96
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-84 -172 24"
 }
 // entity 97

Modified: branches/nexuiz-2.0/data/maps/basementctf.map
===================================================================
--- branches/nexuiz-2.0/data/maps/basementctf.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/basementctf.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -16756,32 +16756,32 @@
 // entity 2
 {
 "origin" "-1088 -704 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 3
 {
 "origin" "-1088 -640 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 4
 {
 "origin" "-1088 -576 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 5
 {
 "origin" "-832 -896 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 6
 {
 "origin" "-768 -896 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 7
 {
 "origin" "-704 -896 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 8
 {
@@ -16801,22 +16801,22 @@
 // entity 11
 {
 "origin" "-384 320 272"
-"classname" "item_health25"
+"classname" "item_health_medium"
 }
 // entity 12
 {
 "origin" "-320 320 272"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 13
 {
 "origin" "-256 320 272"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 14
 {
 "origin" "-192 320 272"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 15
 {
@@ -16826,7 +16826,7 @@
 // entity 16
 {
 "origin" "64 -704 16"
-"classname" "item_health25"
+"classname" "item_health_medium"
 }
 // entity 17
 {
@@ -16846,7 +16846,7 @@
 // entity 20
 {
 "origin" "-480 -288 16"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 21
 {
@@ -16856,32 +16856,32 @@
 // entity 22
 {
 "origin" "-960 448 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 23
 {
 "origin" "-1024 448 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 24
 {
 "origin" "-896 448 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 25
 {
 "origin" "-1664 -832 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 26
 {
 "origin" "-1536 -832 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 27
 {
 "origin" "-1600 -832 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 28
 {
@@ -16891,7 +16891,7 @@
 // entity 29
 {
 "origin" "-2080 -96 16"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 30
 {
@@ -16911,7 +16911,7 @@
 // entity 33
 {
 "origin" "-2624 320 16"
-"classname" "item_health25"
+"classname" "item_health_medium"
 }
 // entity 34
 {
@@ -16921,22 +16921,22 @@
 // entity 35
 {
 "origin" "-2368 -704 272"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 36
 {
 "origin" "-2304 -704 272"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 37
 {
 "origin" "-2240 -704 272"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 38
 {
 "origin" "-2176 -704 272"
-"classname" "item_health25"
+"classname" "item_health_medium"
 }
 // entity 39
 {
@@ -16956,32 +16956,32 @@
 // entity 42
 {
 "origin" "-1856 512 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 43
 {
 "origin" "-1792 512 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 44
 {
 "origin" "-1728 512 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 45
 {
 "origin" "-1472 192 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 46
 {
 "origin" "-1472 256 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 47
 {
 "origin" "-1472 320 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 48
 {

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

Modified: branches/nexuiz-2.0/data/maps/bleach.map
===================================================================
--- branches/nexuiz-2.0/data/maps/bleach.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/bleach.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -28510,7 +28510,7 @@
 }
 // entity 10
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "3536.000000 -808.000000 464.000000"
 }
 // entity 11
@@ -28540,22 +28540,22 @@
 }
 // entity 16
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1456.000000 240.000000 456.000000"
 }
 // entity 17
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1456.000000 -176.000000 456.000000"
 }
 // entity 18
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "960.000000 -176.000000 456.000000"
 }
 // entity 19
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "960.000000 240.000000 456.000000"
 }
 // entity 20
@@ -28570,12 +28570,12 @@
 }
 // entity 22
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-280.000000 -376.000000 408.000000"
 }
 // entity 23
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-280.000000 440.000000 408.000000"
 }
 // entity 24
@@ -28585,7 +28585,7 @@
 }
 // entity 25
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "104.000000 32.000000 560.000000"
 }
 // entity 26
@@ -31205,87 +31205,87 @@
 }
 // entity 293
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2208.000000 160.000000 -160.000000"
 }
 // entity 294
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1936.000000 144.000000 -160.000000"
 }
 // entity 295
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1928.000000 -80.000000 -160.000000"
 }
 // entity 296
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2208.000000 -96.000000 -160.000000"
 }
 // entity 297
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1784.000000 -104.000000 -176.000000"
 }
 // entity 298
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1872.000000 -192.000000 -176.000000"
 }
 // entity 299
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1944.000000 -272.000000 -176.000000"
 }
 // entity 300
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2216.000000 -272.000000 -176.000000"
 }
 // entity 301
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2296.000000 -200.000000 -176.000000"
 }
 // entity 302
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2384.000000 -112.000000 -176.000000"
 }
 // entity 303
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2384.000000 168.000000 -176.000000"
 }
 // entity 304
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2296.000000 256.000000 -176.000000"
 }
 // entity 305
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2224.000000 336.000000 -176.000000"
 }
 // entity 306
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1944.000000 336.000000 -176.000000"
 }
 // entity 307
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1864.000000 264.000000 -176.000000"
 }
 // entity 308
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1776.000000 176.000000 -176.000000"
 }
 // entity 309
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "3536.000000 -1040.000000 264.000000"
 }
 // entity 310
@@ -31300,24 +31300,24 @@
 }
 // entity 312
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "2512.000000 700.000000 236.000000"
 "spawnflags" "4"
 "target" "t261"
 }
 // entity 313
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2844.000000 -36.000000 152.000000"
 }
 // entity 314
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3312.000000 936.000000 144.000000"
 }
 // entity 315
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3312.000000 1112.000000 144.000000"
 }
 // entity 316
@@ -31352,107 +31352,107 @@
 }
 // entity 322
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2840.000000 680.000000 -216.000000"
 }
 // entity 323
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2840.000000 864.000000 -216.000000"
 }
 // entity 324
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3224.000000 864.000000 -216.000000"
 }
 // entity 325
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3224.000000 680.000000 -216.000000"
 }
 // entity 326
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2552.000000 1256.000000 -168.000000"
 }
 // entity 327
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2616.000000 1320.000000 -168.000000"
 }
 // entity 328
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2744.000000 1448.000000 -168.000000"
 }
 // entity 329
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2680.000000 1384.000000 -168.000000"
 }
 // entity 330
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2808.000000 1496.000000 -168.000000"
 }
 // entity 331
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2888.000000 1520.000000 -168.000000"
 }
 // entity 332
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2968.000000 1520.000000 -168.000000"
 }
 // entity 333
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3048.000000 1520.000000 -168.000000"
 }
 // entity 334
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3136.000000 1520.000000 -168.000000"
 }
 // entity 335
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3216.000000 1480.000000 -168.000000"
 }
 // entity 336
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3272.000000 1416.000000 -168.000000"
 }
 // entity 337
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "3040.000000 1184.000000 -48.000000"
 }
 // entity 338
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3368.000000 760.000000 432.000000"
 }
 // entity 339
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3376.000000 1216.000000 432.000000"
 }
 // entity 340
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2728.000000 1104.000000 144.000000"
 }
 // entity 341
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2696.000000 1104.000000 144.000000"
 }
 // entity 342
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2696.000000 1136.000000 144.000000"
 }
 // entity 343
@@ -31462,7 +31462,7 @@
 }
 // entity 344
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2896.000000 -1472.000000 -168.000000"
 }
 // entity 345
@@ -31472,42 +31472,42 @@
 }
 // entity 346
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2792.000000 -1192.000000 80.000000"
 }
 // entity 347
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2768.000000 -928.000000 96.000000"
 }
 // entity 348
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2776.000000 -680.000000 104.000000"
 }
 // entity 349
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2952.000000 -568.000000 120.000000"
 }
 // entity 350
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "3104.000000 -568.000000 128.000000"
 }
 // entity 351
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "3288.000000 -672.000000 144.000000"
 }
 // entity 352
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "3400.000000 -904.000000 144.000000"
 }
 // entity 353
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1856.000000 32.000000 -184.000000"
 "spawnflags" "1"
 }
@@ -32012,6 +32012,7 @@
 {
 "classname" "dom_team"
 "model" "models/domination/dom_unclaimed.md3"
+"origin" "0.000000 0.000000 152.000000"
 }
 // entity 388
 {
@@ -32022,6 +32023,7 @@
 "netname" "^4Blue Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 120.000000"
 }
 // entity 389
 {
@@ -32032,6 +32034,7 @@
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 88.000000"
 }
 // entity 390
 {
@@ -32042,6 +32045,7 @@
 "netname" "^6Pink Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 56.000000"
 }
 // entity 391
 {
@@ -32052,6 +32056,7 @@
 "netname" "^3Yellow Team^3"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
+"origin" "0.000000 0.000000 24.000000"
 }
 // entity 392
 {
@@ -32062,234 +32067,191 @@
 // entity 393
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Upper Hallway"
-"origin" "1000.000000 32.000000 464.000000"
-}
-// entity 394
-{
-"classname" "dom_controlpoint"
 "message" "^3 has captured an ^1Upper Hallway-Corner"
 "origin" "2000.000000 932.000000 464.000000"
 }
-// entity 395
+// entity 394
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured an ^1Upper Hallway-Corner"
-"origin" "2000.000000 -882.000000 464.000000"
-}
-// entity 396
-{
-"classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Megahealth"
-"origin" "3500.000000 -500.000000 480.000000"
-}
-// entity 397
-{
-"classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Spiral Stairs"
-"origin" "3000.000000 -700.000000 124.000000"
-}
-// entity 398
-{
-"classname" "dom_controlpoint"
 "message" "^3 has captured the ^1Strength"
 "origin" "3040.000000 -1250.000000 -152.000000"
 }
-// entity 399
+// entity 395
 {
 "classname" "dom_controlpoint"
-"angle" "90"
-"message" "^3 has captured the ^1Teleporter"
-"origin" "3040.000000 200.000000 160.000000"
-}
-// entity 400
-{
-"classname" "dom_controlpoint"
-"angle" "90"
+"angle" "90.000000"
 "message" "^3 has captured the ^1Lower Ramp"
-"origin" "3540.000000 1025.000000 -144.000000"
+"origin" "3176.000000 1192.000000 -40.000000"
 }
-// entity 401
+// entity 396
 {
 "classname" "dom_controlpoint"
-"message" "^3 has captured the ^1Upper Ramp"
-"origin" "3200.000000 1270.000000 440.000000"
-}
-// entity 402
-{
-"classname" "dom_controlpoint"
 "angle" "90"
 "message" "^3 has captured the ^1Generator"
 "origin" "2550.000000 32.000000 -144.000000"
 }
-// entity 403
+// entity 397
 {
-"classname" "dom_controlpoint"
-"message" "^3 has captured ^1Generator Stairs"
-"origin" "1500.000000 32.000000 -102.000000"
-}
-// entity 404
-{
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3166 1504 134"
 }
-// entity 405
+// entity 398
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3038 1376 -218"
 }
-// entity 406
+// entity 399
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3584 -384 -180"
 }
-// entity 407
+// entity 400
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "15"
 "origin" "3220 -1112 132"
 }
-// entity 408
+// entity 401
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "15"
 "origin" "312 112 64"
 }
-// entity 409
+// entity 402
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "25"
 "origin" "312 112 128"
 }
-// entity 410
+// entity 403
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "15"
 "origin" "312 112 192"
 }
-// entity 411
+// entity 404
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "25"
 "origin" "312 112 256"
 }
-// entity 412
+// entity 405
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "15"
 "origin" "312 112 312"
 }
-// entity 413
+// entity 406
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "25"
 "origin" "312 112 384"
 }
-// entity 414
+// entity 407
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "25"
 "origin" "312 -48 384"
 }
-// entity 415
+// entity 408
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "15"
 "origin" "312 -48 312"
 }
-// entity 416
+// entity 409
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "25"
 "origin" "312 -48 256"
 }
-// entity 417
+// entity 410
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "15"
 "origin" "312 -48 192"
 }
-// entity 418
+// entity 411
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "25"
 "origin" "312 -48 128"
 }
-// entity 419
+// entity 412
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "15"
 "origin" "312 -48 64"
 }
-// entity 420
+// entity 413
 {
 "classname" "light"
 "_color" "0 0.5 0.8"
 "light" "30"
 "origin" "320 32 368"
 }
-// entity 421
+// entity 414
 {
 "classname" "light"
 "_color" "0 0.8 1"
 "light" "40"
 "origin" "-88 32 616"
 }
-// entity 422
+// entity 415
 {
 "classname" "light"
 "_color" "0 0.8 1"
 "light" "100"
 "origin" "-272 40 416"
 }
-// entity 423
+// entity 416
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "500"
 "origin" "32 296 16"
 }
-// entity 424
+// entity 417
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "2384 1000 552"
 }
-// entity 425
+// entity 418
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "2388 -928 544"
 }
-// entity 426
+// entity 419
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 -260 508"
 }
-// entity 427
+// entity 420
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32297,7 +32259,7 @@
 "origin" "1728 -260 512"
 "target" "t257"
 }
-// entity 428
+// entity 421
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32305,21 +32267,21 @@
 "origin" "1728 -436 512"
 "target" "t256"
 }
-// entity 429
+// entity 422
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 -436 508"
 }
-// entity 430
+// entity 423
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 -540 508"
 }
-// entity 431
+// entity 424
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32327,7 +32289,7 @@
 "origin" "1728 -540 512"
 "target" "t255"
 }
-// entity 432
+// entity 425
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32335,21 +32297,21 @@
 "origin" "1728 -692 512"
 "target" "t254"
 }
-// entity 433
+// entity 426
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1720 -692 508"
 }
-// entity 434
+// entity 427
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1720 -828 508"
 }
-// entity 435
+// entity 428
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32357,7 +32319,7 @@
 "origin" "1728 -828 512"
 "target" "t253"
 }
-// entity 436
+// entity 429
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32365,21 +32327,21 @@
 "origin" "1728 -1004 512"
 "target" "t252"
 }
-// entity 437
+// entity 430
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 -1004 508"
 }
-// entity 438
+// entity 431
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1868 -1152 508"
 }
-// entity 439
+// entity 432
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32387,7 +32349,7 @@
 "origin" "1868 -1144 512"
 "target" "t251"
 }
-// entity 440
+// entity 433
 {
 "classname" "light"
 "_color" "0 0.7 0.775"
@@ -32395,14 +32357,14 @@
 "origin" "1725 -1144 512"
 "target" "t250"
 }
-// entity 441
+// entity 434
 {
 "classname" "light"
 "_color" "0 0.7 0.775"
 "light" "70"
 "origin" "1719 -1149 508"
 }
-// entity 442
+// entity 435
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32410,21 +32372,21 @@
 "origin" "2044 -1144 512"
 "target" "t249"
 }
-// entity 443
+// entity 436
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2044 -1152 508"
 }
-// entity 444
+// entity 437
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2180 -1152 508"
 }
-// entity 445
+// entity 438
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32432,7 +32394,7 @@
 "origin" "2180 -1144 512"
 "target" "t248"
 }
-// entity 446
+// entity 439
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32440,21 +32402,21 @@
 "origin" "2308 -1144 512"
 "target" "t247"
 }
-// entity 447
+// entity 440
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2308 -1152 508"
 }
-// entity 448
+// entity 441
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2280 -672 508"
 }
-// entity 449
+// entity 442
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32462,7 +32424,7 @@
 "origin" "2280 -680 512"
 "target" "t246"
 }
-// entity 450
+// entity 443
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32470,14 +32432,14 @@
 "origin" "2184 -628 512"
 "target" "t245"
 }
-// entity 451
+// entity 444
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2192 -628 508"
 }
-// entity 452
+// entity 445
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32485,21 +32447,21 @@
 "origin" "2184 -404 512"
 "target" "t244"
 }
-// entity 453
+// entity 446
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "2192 -404 508"
 }
-// entity 454
+// entity 447
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "2192 -508 508"
 }
-// entity 455
+// entity 448
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32507,14 +32469,14 @@
 "origin" "2184 -508 512"
 "target" "t243"
 }
-// entity 456
+// entity 449
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "2192 -284 508"
 }
-// entity 457
+// entity 450
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32522,14 +32484,14 @@
 "origin" "2184 -284 512"
 "target" "t242"
 }
-// entity 458
+// entity 451
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2300 32 428"
 }
-// entity 459
+// entity 452
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32537,14 +32499,14 @@
 "origin" "2184 340 512"
 "target" "t241"
 }
-// entity 460
+// entity 453
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "2192 340 508"
 }
-// entity 461
+// entity 454
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32552,21 +32514,21 @@
 "origin" "2184 564 512"
 "target" "t240"
 }
-// entity 462
+// entity 455
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "2192 564 508"
 }
-// entity 463
+// entity 456
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "2192 460 508"
 }
-// entity 464
+// entity 457
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32574,14 +32536,14 @@
 "origin" "2184 460 512"
 "target" "t239"
 }
-// entity 465
+// entity 458
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2192 708 508"
 }
-// entity 466
+// entity 459
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32589,7 +32551,7 @@
 "origin" "2184 708 512"
 "target" "t238"
 }
-// entity 467
+// entity 460
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32597,21 +32559,21 @@
 "origin" "2284 776 512"
 "target" "t237"
 }
-// entity 468
+// entity 461
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2284 768 508"
 }
-// entity 469
+// entity 462
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2308 1208 508"
 }
-// entity 470
+// entity 463
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32619,7 +32581,7 @@
 "origin" "2308 1200 512"
 "target" "t236"
 }
-// entity 471
+// entity 464
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32627,21 +32589,21 @@
 "origin" "2180 1200 512"
 "target" "t235"
 }
-// entity 472
+// entity 465
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2180 1208 508"
 }
-// entity 473
+// entity 466
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "2044 1208 508"
 }
-// entity 474
+// entity 467
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32649,14 +32611,14 @@
 "origin" "2044 1200 512"
 "target" "t234"
 }
-// entity 475
+// entity 468
 {
 "classname" "light"
 "_color" "0 0.7 0.775"
 "light" "70"
 "origin" "1719 1205 508"
 }
-// entity 476
+// entity 469
 {
 "classname" "light"
 "_color" "0 0.7 0.775"
@@ -32664,7 +32626,7 @@
 "origin" "1725 1200 512"
 "target" "t233"
 }
-// entity 477
+// entity 470
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32672,21 +32634,21 @@
 "origin" "1868 1200 512"
 "target" "t232"
 }
-// entity 478
+// entity 471
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1868 1208 508"
 }
-// entity 479
+// entity 472
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 1060 508"
 }
-// entity 480
+// entity 473
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32694,7 +32656,7 @@
 "origin" "1728 1060 512"
 "target" "t231"
 }
-// entity 481
+// entity 474
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32702,21 +32664,21 @@
 "origin" "1728 884 512"
 "target" "t230"
 }
-// entity 482
+// entity 475
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1720 884 508"
 }
-// entity 483
+// entity 476
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1720 748 508"
 }
-// entity 484
+// entity 477
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32724,7 +32686,7 @@
 "origin" "1728 748 512"
 "target" "t229"
 }
-// entity 485
+// entity 478
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32732,21 +32694,21 @@
 "origin" "1728 596 512"
 "target" "t228"
 }
-// entity 486
+// entity 479
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 596 508"
 }
-// entity 487
+// entity 480
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 492 508"
 }
-// entity 488
+// entity 481
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32754,7 +32716,7 @@
 "origin" "1728 492 512"
 "target" "t227"
 }
-// entity 489
+// entity 482
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32762,21 +32724,21 @@
 "origin" "1652 -200 512"
 "target" "t226"
 }
-// entity 490
+// entity 483
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1652 -208 508"
 }
-// entity 491
+// entity 484
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1652 272 508"
 }
-// entity 492
+// entity 485
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32784,7 +32746,7 @@
 "origin" "1652 264 512"
 "target" "t225"
 }
-// entity 493
+// entity 486
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32792,21 +32754,21 @@
 "origin" "1728 316 512"
 "target" "t224"
 }
-// entity 494
+// entity 487
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1720 316 508"
 }
-// entity 495
+// entity 488
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1508 -208 508"
 }
-// entity 496
+// entity 489
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32814,7 +32776,7 @@
 "origin" "1508 -200 512"
 "target" "t223"
 }
-// entity 497
+// entity 490
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32822,21 +32784,21 @@
 "origin" "1508 264 512"
 "target" "t222"
 }
-// entity 498
+// entity 491
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1508 272 508"
 }
-// entity 499
+// entity 492
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1408 272 508"
 }
-// entity 500
+// entity 493
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32844,7 +32806,7 @@
 "origin" "1408 264 512"
 "target" "t221"
 }
-// entity 501
+// entity 494
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32852,21 +32814,21 @@
 "origin" "1408 -200 512"
 "target" "t220"
 }
-// entity 502
+// entity 495
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1408 -208 508"
 }
-// entity 503
+// entity 496
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "904 -208 508"
 }
-// entity 504
+// entity 497
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32874,7 +32836,7 @@
 "origin" "904 -200 512"
 "target" "t219"
 }
-// entity 505
+// entity 498
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32882,21 +32844,21 @@
 "origin" "904 264 512"
 "target" "t218"
 }
-// entity 506
+// entity 499
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "904 272 508"
 }
-// entity 507
+// entity 500
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1004 272 508"
 }
-// entity 508
+// entity 501
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32904,7 +32866,7 @@
 "origin" "1004 264 512"
 "target" "t217"
 }
-// entity 509
+// entity 502
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
@@ -32912,21 +32874,21 @@
 "origin" "1004 -200 512"
 "target" "t216"
 }
-// entity 510
+// entity 503
 {
 "classname" "light"
 "_color" "0 0.6 0.75"
 "light" "70"
 "origin" "1004 -208 508"
 }
-// entity 511
+// entity 504
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1148 -208 508"
 }
-// entity 512
+// entity 505
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32934,7 +32896,7 @@
 "origin" "1148 -200 512"
 "target" "t215"
 }
-// entity 513
+// entity 506
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32942,21 +32904,21 @@
 "origin" "1148 264 512"
 "target" "t214"
 }
-// entity 514
+// entity 507
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1148 272 508"
 }
-// entity 515
+// entity 508
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1244 272 508"
 }
-// entity 516
+// entity 509
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32964,7 +32926,7 @@
 "origin" "1244 264 512"
 "target" "t213"
 }
-// entity 517
+// entity 510
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32972,21 +32934,21 @@
 "origin" "1244 -200 512"
 "target" "t212"
 }
-// entity 518
+// entity 511
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "1244 -208 508"
 }
-// entity 519
+// entity 512
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "752 -208 508"
 }
-// entity 520
+// entity 513
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -32994,7 +32956,7 @@
 "origin" "752 -200 512"
 "target" "t206"
 }
-// entity 521
+// entity 514
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -33002,21 +32964,21 @@
 "origin" "752 264 512"
 "target" "t205"
 }
-// entity 522
+// entity 515
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "752 272 508"
 }
-// entity 523
+// entity 516
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "656 272 508"
 }
-// entity 524
+// entity 517
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -33024,7 +32986,7 @@
 "origin" "656 264 512"
 "target" "t204"
 }
-// entity 525
+// entity 518
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -33032,21 +32994,21 @@
 "origin" "656 -200 512"
 "target" "t203"
 }
-// entity 526
+// entity 519
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "656 -208 508"
 }
-// entity 527
+// entity 520
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "520 -208 508"
 }
-// entity 528
+// entity 521
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -33054,7 +33016,7 @@
 "origin" "520 -200 512"
 "target" "t202"
 }
-// entity 529
+// entity 522
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -33062,707 +33024,707 @@
 "origin" "520 264 512"
 "target" "t201"
 }
-// entity 530
+// entity 523
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "70"
 "origin" "520 272 508"
 }
-// entity 531
+// entity 524
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -336 672"
 }
-// entity 532
+// entity 525
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -144 672"
 }
-// entity 533
+// entity 526
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -240 672"
 }
-// entity 534
+// entity 527
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -240 672"
 }
-// entity 535
+// entity 528
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -144 672"
 }
-// entity 536
+// entity 529
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -336 672"
 }
-// entity 537
+// entity 530
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -424 672"
 }
-// entity 538
+// entity 531
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -424 672"
 }
-// entity 539
+// entity 532
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -976 672"
 }
-// entity 540
+// entity 533
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -976 672"
 }
-// entity 541
+// entity 534
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -888 672"
 }
-// entity 542
+// entity 535
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -696 672"
 }
-// entity 543
+// entity 536
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -792 672"
 }
-// entity 544
+// entity 537
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -792 672"
 }
-// entity 545
+// entity 538
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -696 672"
 }
-// entity 546
+// entity 539
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -888 672"
 }
-// entity 547
+// entity 540
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 -1040 672"
 }
-// entity 548
+// entity 541
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 -1040 672"
 }
-// entity 549
+// entity 542
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 1120 672"
 }
-// entity 550
+// entity 543
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 1120 672"
 }
-// entity 551
+// entity 544
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 968 672"
 }
-// entity 552
+// entity 545
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 776 672"
 }
-// entity 553
+// entity 546
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 872 672"
 }
-// entity 554
+// entity 547
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 872 672"
 }
-// entity 555
+// entity 548
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 776 672"
 }
-// entity 556
+// entity 549
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 968 672"
 }
-// entity 557
+// entity 550
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 1056 672"
 }
-// entity 558
+// entity 551
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 1056 672"
 }
-// entity 559
+// entity 552
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 504 672"
 }
-// entity 560
+// entity 553
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 504 672"
 }
-// entity 561
+// entity 554
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 416 672"
 }
-// entity 562
+// entity 555
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 224 672"
 }
-// entity 563
+// entity 556
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2032 320 672"
 }
-// entity 564
+// entity 557
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 320 672"
 }
-// entity 565
+// entity 558
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 224 672"
 }
-// entity 566
+// entity 559
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1872 416 672"
 }
-// entity 567
+// entity 560
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1584 -48 672"
 }
-// entity 568
+// entity 561
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1776 -48 672"
 }
-// entity 569
+// entity 562
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1680 -48 672"
 }
-// entity 570
+// entity 563
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1680 112 672"
 }
-// entity 571
+// entity 564
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1776 112 672"
 }
-// entity 572
+// entity 565
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1584 112 672"
 }
-// entity 573
+// entity 566
 {
 "classname" "light"
 "_color" "0 0.7 0.7"
 "light" "45"
 "origin" "1360 40 648"
 }
-// entity 574
+// entity 567
 {
 "classname" "light"
 "_color" "0 0.7 0.7"
 "light" "45"
 "origin" "1448 40 648"
 }
-// entity 575
+// entity 568
 {
 "classname" "light"
 "_color" "0 0.7 0.7"
 "light" "45"
 "origin" "1528 40 648"
 }
-// entity 576
+// entity 569
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1096 112 672"
 }
-// entity 577
+// entity 570
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1288 112 672"
 }
-// entity 578
+// entity 571
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "1192 112 672"
 }
-// entity 579
+// entity 572
 {
 "classname" "light"
 "_color" "0 0.7 0.7"
 "light" "45"
 "origin" "1040 32 648"
 }
-// entity 580
+// entity 573
 {
 "classname" "light"
 "_color" "0 0.7 0.7"
 "light" "45"
 "origin" "960 32 648"
 }
-// entity 581
+// entity 574
 {
 "classname" "light"
 "_color" "0 0.7 0.7"
 "light" "45"
 "origin" "872 32 648"
 }
-// entity 582
+// entity 575
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "-8 112 672"
 }
-// entity 583
+// entity 576
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "88 112 672"
 }
-// entity 584
+// entity 577
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "280 112 672"
 }
-// entity 585
+// entity 578
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "184 112 672"
 }
-// entity 586
+// entity 579
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "568 112 672"
 }
-// entity 587
+// entity 580
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "664 112 672"
 }
-// entity 588
+// entity 581
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "472 112 672"
 }
-// entity 589
+// entity 582
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "376 112 672"
 }
-// entity 590
+// entity 583
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "760 112 672"
 }
-// entity 591
+// entity 584
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "760 -48 672"
 }
-// entity 592
+// entity 585
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "376 -48 672"
 }
-// entity 593
+// entity 586
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "472 -48 672"
 }
-// entity 594
+// entity 587
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "664 -48 672"
 }
-// entity 595
+// entity 588
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "568 -48 672"
 }
-// entity 596
+// entity 589
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "184 -48 672"
 }
-// entity 597
+// entity 590
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "280 -48 672"
 }
-// entity 598
+// entity 591
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "88 -48 672"
 }
-// entity 599
+// entity 592
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "-8 -48 672"
 }
-// entity 600
+// entity 593
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "3472 592 -64"
 }
-// entity 601
+// entity 594
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "2984 472 -12"
 }
-// entity 602
+// entity 595
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "2984 544 -36"
 }
-// entity 603
+// entity 596
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "2984 612 -56"
 }
-// entity 604
+// entity 597
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "2984 680 -76"
 }
-// entity 605
+// entity 598
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "2984 744 -96"
 }
-// entity 606
+// entity 599
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "2984 812 -116"
 }
-// entity 607
+// entity 600
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "2980 880 -136"
 }
-// entity 608
+// entity 601
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3092 880 -136"
 }
-// entity 609
+// entity 602
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3096 812 -116"
 }
-// entity 610
+// entity 603
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3096 744 -96"
 }
-// entity 611
+// entity 604
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3096 680 -76"
 }
-// entity 612
+// entity 605
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3096 612 -56"
 }
-// entity 613
+// entity 606
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3096 544 -36"
 }
-// entity 614
+// entity 607
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3096 472 -12"
 }
-// entity 615
+// entity 608
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "3548 1024 -64"
 }
-// entity 616
+// entity 609
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2416 1264 136"
 }
-// entity 617
+// entity 610
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2896 1604 136"
 }
-// entity 618
+// entity 611
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2844 1604 136"
 }
-// entity 619
+// entity 612
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2796 1604 136"
 }
-// entity 620
+// entity 613
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2752 1596 136"
 }
-// entity 621
+// entity 614
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3216 1604 136"
 }
-// entity 622
+// entity 615
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3264 1604 136"
 }
-// entity 623
+// entity 616
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3312 1592 136"
 }
-// entity 624
+// entity 617
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3636 1264 136"
 }
-// entity 625
+// entity 618
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3656 1232 136"
 }
-// entity 626
+// entity 619
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3632 720 136"
 }
-// entity 627
+// entity 620
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 764 136"
 }
-// entity 628
+// entity 621
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 772 136"
 }
-// entity 629
+// entity 622
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 828 136"
 }
-// entity 630
+// entity 623
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33770,14 +33732,14 @@
 "origin" "2404 868 136"
 "target" "t145"
 }
-// entity 631
+// entity 624
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 868 136"
 }
-// entity 632
+// entity 625
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33785,21 +33747,21 @@
 "origin" "2404 916 136"
 "target" "t146"
 }
-// entity 633
+// entity 626
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 916 136"
 }
-// entity 634
+// entity 627
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 964 136"
 }
-// entity 635
+// entity 628
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33807,7 +33769,7 @@
 "origin" "2404 964 136"
 "target" "t147"
 }
-// entity 636
+// entity 629
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33815,21 +33777,21 @@
 "origin" "2404 1012 136"
 "target" "t143"
 }
-// entity 637
+// entity 630
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 1012 136"
 }
-// entity 638
+// entity 631
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 1060 136"
 }
-// entity 639
+// entity 632
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33837,14 +33799,14 @@
 "origin" "2404 1060 136"
 "target" "t144"
 }
-// entity 640
+// entity 633
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 1108 136"
 }
-// entity 641
+// entity 634
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33852,7 +33814,7 @@
 "origin" "2404 1108 136"
 "target" "t142"
 }
-// entity 642
+// entity 635
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33860,14 +33822,14 @@
 "origin" "2404 1156 136"
 "target" "t141"
 }
-// entity 643
+// entity 636
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 1156 136"
 }
-// entity 644
+// entity 637
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -33875,21 +33837,21 @@
 "origin" "2404 1196 136"
 "target" "t140"
 }
-// entity 645
+// entity 638
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2404 1196 136"
 }
-// entity 646
+// entity 639
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "3632 856 -152"
 }
-// entity 647
+// entity 640
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -33897,7 +33859,7 @@
 "origin" "3632 816 -168"
 "target" "t99"
 }
-// entity 648
+// entity 641
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -33905,7 +33867,7 @@
 "origin" "3632 888 -168"
 "target" "t98"
 }
-// entity 649
+// entity 642
 {
 "classname" "light"
 "_color" "0 0.9 0.8"
@@ -33913,7 +33875,7 @@
 "origin" "3632 640 -168"
 "target" "t97"
 }
-// entity 650
+// entity 643
 {
 "classname" "light"
 "_color" "0 0.9 0.8"
@@ -33921,14 +33883,14 @@
 "origin" "3632 568 -168"
 "target" "t96"
 }
-// entity 651
+// entity 644
 {
 "classname" "light"
 "_color" "0 0.9 0.8"
 "light" "40"
 "origin" "3632 608 -152"
 }
-// entity 652
+// entity 645
 {
 "classname" "light"
 "_color" "0 0.8 0.7"
@@ -33936,7 +33898,7 @@
 "origin" "3440 432 -168"
 "target" "t95"
 }
-// entity 653
+// entity 646
 {
 "classname" "light"
 "_color" "0 0.8 0.7"
@@ -33944,35 +33906,35 @@
 "origin" "3368 432 -168"
 "target" "t94"
 }
-// entity 654
+// entity 647
 {
 "classname" "light"
 "_color" "0 0.8 0.7"
 "light" "40"
 "origin" "3408 432 -152"
 }
-// entity 655
+// entity 648
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3040 -760 632"
 }
-// entity 656
+// entity 649
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3184 -928 536"
 }
-// entity 657
+// entity 650
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3040 -1080 544"
 }
-// entity 658
+// entity 651
 {
 "classname" "light"
 "_color" "0 0.75 1"
@@ -33980,21 +33942,21 @@
 "origin" "3040 -1104 632"
 "target" "t87"
 }
-// entity 659
+// entity 652
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "160"
 "origin" "2768 -928 620"
 }
-// entity 660
+// entity 653
 {
 "classname" "light"
 "_color" "0 0.6 0.9"
 "light" "160"
 "origin" "2768 -928 172"
 }
-// entity 661
+// entity 654
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
@@ -34002,14 +33964,14 @@
 "origin" "3140 -818 136"
 "target" "t84"
 }
-// entity 662
+// entity 655
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
 "light" "10"
 "origin" "3140 -818 136"
 }
-// entity 663
+// entity 656
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
@@ -34017,21 +33979,21 @@
 "origin" "2929 -827 96"
 "target" "t83"
 }
-// entity 664
+// entity 657
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
 "light" "10"
 "origin" "2929 -827 96"
 }
-// entity 665
+// entity 658
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
 "light" "10"
 "origin" "2939 -1039 72"
 }
-// entity 666
+// entity 659
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
@@ -34039,7 +34001,7 @@
 "origin" "2939 -1039 72"
 "target" "t82"
 }
-// entity 667
+// entity 660
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
@@ -34047,14 +34009,14 @@
 "origin" "3192 -904 136"
 "target" "t81"
 }
-// entity 668
+// entity 661
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
 "light" "10"
 "origin" "3192 -904 136"
 }
-// entity 669
+// entity 662
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
@@ -34062,21 +34024,21 @@
 "origin" "3016 -776 112"
 "target" "t80"
 }
-// entity 670
+// entity 663
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
 "light" "10"
 "origin" "3016 -776 112"
 }
-// entity 671
+// entity 664
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
 "light" "10"
 "origin" "3064 -776 120"
 }
-// entity 672
+// entity 665
 {
 "classname" "light"
 "_color" "0 0.75 0.5"
@@ -34084,546 +34046,546 @@
 "origin" "3064 -776 120"
 "target" "t79"
 }
-// entity 673
+// entity 666
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "190"
 "origin" "3272 -696 -20"
 }
-// entity 674
+// entity 667
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "190"
 "origin" "3240 -1128 -20"
 }
-// entity 675
+// entity 668
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3256 -536 84"
 }
-// entity 676
+// entity 669
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3320 -600 84"
 }
-// entity 677
+// entity 670
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3384 -664 84"
 }
-// entity 678
+// entity 671
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3472 -800 84"
 }
-// entity 679
+// entity 672
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3456 -728 84"
 }
-// entity 680
+// entity 673
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3472 -896 84"
 }
-// entity 681
+// entity 674
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3472 -1088 84"
 }
-// entity 682
+// entity 675
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3472 -992 84"
 }
-// entity 683
+// entity 676
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3456 -1136 84"
 }
-// entity 684
+// entity 677
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3376 -1200 84"
 }
-// entity 685
+// entity 678
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3312 -1264 84"
 }
-// entity 686
+// entity 679
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3248 -1328 84"
 }
-// entity 687
+// entity 680
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3160 -1352 84"
 }
-// entity 688
+// entity 681
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3064 -1352 84"
 }
-// entity 689
+// entity 682
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3024 -1328 84"
 }
-// entity 690
+// entity 683
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3024 -1232 84"
 }
-// entity 691
+// entity 684
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3024 -1136 84"
 }
-// entity 692
+// entity 685
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2768 -1256 36"
 }
-// entity 693
+// entity 686
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2704 -1192 36"
 }
-// entity 694
+// entity 687
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2640 -1128 36"
 }
-// entity 695
+// entity 688
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2608 -1000 44"
 }
-// entity 696
+// entity 689
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2608 -792 44"
 }
-// entity 697
+// entity 690
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2640 -704 60"
 }
-// entity 698
+// entity 691
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2704 -640 60"
 }
-// entity 699
+// entity 692
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2768 -576 60"
 }
-// entity 700
+// entity 693
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2832 -512 60"
 }
-// entity 701
+// entity 694
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3024 -496 68"
 }
-// entity 702
+// entity 695
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2928 -496 68"
 }
-// entity 703
+// entity 696
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3104 -496 84"
 }
-// entity 704
+// entity 697
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3200 -496 84"
 }
-// entity 705
+// entity 698
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2600 -568 68"
 }
-// entity 706
+// entity 699
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2680 -488 68"
 }
-// entity 707
+// entity 700
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2904 -392 68"
 }
-// entity 708
+// entity 701
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2776 -392 68"
 }
-// entity 709
+// entity 702
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3048 -392 68"
 }
-// entity 710
+// entity 703
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3176 -392 68"
 }
-// entity 711
+// entity 704
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2504 -664 68"
 }
-// entity 712
+// entity 705
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3304 -424 68"
 }
-// entity 713
+// entity 706
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3576 -1096 68"
 }
-// entity 714
+// entity 707
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3576 -968 68"
 }
-// entity 715
+// entity 708
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3576 -696 68"
 }
-// entity 716
+// entity 709
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3576 -824 68"
 }
-// entity 717
+// entity 710
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3480 -600 68"
 }
-// entity 718
+// entity 711
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3400 -520 68"
 }
-// entity 719
+// entity 712
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2648 -1336 68"
 }
-// entity 720
+// entity 713
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2568 -1256 68"
 }
-// entity 721
+// entity 714
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2472 -1032 68"
 }
-// entity 722
+// entity 715
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2472 -1160 68"
 }
-// entity 723
+// entity 716
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2472 -888 68"
 }
-// entity 724
+// entity 717
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2472 -760 68"
 }
-// entity 725
+// entity 718
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2744 -1432 68"
 }
-// entity 726
+// entity 719
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3544 -1192 68"
 }
-// entity 727
+// entity 720
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2872 -1464 68"
 }
-// entity 728
+// entity 721
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3000 -1464 68"
 }
-// entity 729
+// entity 722
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3272 -1464 68"
 }
-// entity 730
+// entity 723
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3144 -1464 68"
 }
-// entity 731
+// entity 724
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3368 -1368 68"
 }
-// entity 732
+// entity 725
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3448 -1288 68"
 }
-// entity 733
+// entity 726
 {
 "classname" "light"
 "_color" "0 0.65 0.7"
 "light" "240"
 "origin" "2688 -576 -76"
 }
-// entity 734
+// entity 727
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "240"
 "origin" "2768 -928 -76"
 }
-// entity 735
+// entity 728
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "240"
 "origin" "3040 -1344 -76"
 }
-// entity 736
+// entity 729
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "240"
 "origin" "3440 -928 -76"
 }
-// entity 737
+// entity 730
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "240"
 "origin" "3040 -512 -60"
 }
-// entity 738
+// entity 731
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "30"
 "origin" "3584 -384 368"
 }
-// entity 739
+// entity 732
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "90"
 "origin" "3216 -1112 184"
 }
-// entity 740
+// entity 733
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "90"
 "origin" "3584 -384 16"
 }
-// entity 741
+// entity 734
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "50"
 "origin" "3584 -384 96"
 }
-// entity 742
+// entity 735
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "30"
 "origin" "3584 -384 208"
 }
-// entity 743
+// entity 736
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3496 -472 524"
 }
-// entity 744
+// entity 737
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "40"
 "origin" "3232 -416 332"
 }
-// entity 745
+// entity 738
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "60"
 "origin" "3560 -992 340"
 }
-// entity 746
+// entity 739
 {
 "classname" "light"
 "_color" "0 0.6 0.9"
 "light" "200"
 "origin" "2880 -1096 416"
 }
-// entity 747
+// entity 740
 {
 "classname" "light"
 "_color" "0 0.6 0.9"
 "light" "200"
 "origin" "2872 -760 416"
 }
-// entity 748
+// entity 741
 {
 "classname" "light"
 "_color" "0 0.6 0.9"
 "light" "200"
 "origin" "3200 -760 416"
 }
-// entity 749
+// entity 742
 {
 "classname" "light"
 "_color" "0 0.6 0.9"
 "light" "200"
 "origin" "3208 -1096 416"
 }
-// entity 750
+// entity 743
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -34658,14 +34620,14 @@
 }
 }
 }
-// entity 751
+// entity 744
 {
 "classname" "light"
 "_color" "0 0.8 0.7"
 "light" "40"
 "origin" "3440 -1512 -152"
 }
-// entity 752
+// entity 745
 {
 "classname" "light"
 "_color" "0 0.8 0.7"
@@ -34673,7 +34635,7 @@
 "origin" "3400 -1512 -168"
 "target" "t76"
 }
-// entity 753
+// entity 746
 {
 "classname" "light"
 "_color" "0 0.8 0.7"
@@ -34681,7 +34643,7 @@
 "origin" "3472 -1512 -168"
 "target" "t75"
 }
-// entity 754
+// entity 747
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
@@ -34689,7 +34651,7 @@
 "origin" "3224 -1512 -168"
 "target" "t74"
 }
-// entity 755
+// entity 748
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
@@ -34697,21 +34659,21 @@
 "origin" "3152 -1512 -168"
 "target" "t73"
 }
-// entity 756
+// entity 749
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
 "light" "40"
 "origin" "3192 -1512 -152"
 }
-// entity 757
+// entity 750
 {
 "classname" "light"
 "_color" "0 0.9 0.8"
 "light" "40"
 "origin" "3632 -1336 -152"
 }
-// entity 758
+// entity 751
 {
 "classname" "light"
 "_color" "0 0.9 0.8"
@@ -34719,7 +34681,7 @@
 "origin" "3632 -1376 -168"
 "target" "t72"
 }
-// entity 759
+// entity 752
 {
 "classname" "light"
 "_color" "0 0.9 0.8"
@@ -34727,7 +34689,7 @@
 "origin" "3632 -1304 -168"
 "target" "t71"
 }
-// entity 760
+// entity 753
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34735,7 +34697,7 @@
 "origin" "3632 -1056 -168"
 "target" "t70"
 }
-// entity 761
+// entity 754
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34743,14 +34705,14 @@
 "origin" "3632 -1128 -168"
 "target" "t69"
 }
-// entity 762
+// entity 755
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "3632 -1088 -152"
 }
-// entity 763
+// entity 756
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
@@ -34758,7 +34720,7 @@
 "origin" "3632 -760 -168"
 "target" "t66"
 }
-// entity 764
+// entity 757
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
@@ -34766,14 +34728,14 @@
 "origin" "3632 -832 -168"
 "target" "t65"
 }
-// entity 765
+// entity 758
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
 "light" "40"
 "origin" "3632 -792 -152"
 }
-// entity 766
+// entity 759
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
@@ -34781,7 +34743,7 @@
 "origin" "3128 -336 -168"
 "target" "t62"
 }
-// entity 767
+// entity 760
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
@@ -34789,21 +34751,21 @@
 "origin" "3200 -336 -168"
 "target" "t61"
 }
-// entity 768
+// entity 761
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
 "light" "40"
 "origin" "3160 -336 -152"
 }
-// entity 769
+// entity 762
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "2888 -336 -152"
 }
-// entity 770
+// entity 763
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34811,7 +34773,7 @@
 "origin" "2928 -336 -168"
 "target" "t60"
 }
-// entity 771
+// entity 764
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34819,49 +34781,49 @@
 "origin" "2856 -336 -168"
 "target" "t59"
 }
-// entity 772
+// entity 765
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "180"
 "origin" "2080 -28 -48"
 }
-// entity 773
+// entity 766
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "180"
 "origin" "2148 32 -48"
 }
-// entity 774
+// entity 767
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "180"
 "origin" "2080 92 -48"
 }
-// entity 775
+// entity 768
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "2480 32 -92"
 }
-// entity 776
+// entity 769
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "2080 432 -92"
 }
-// entity 777
+// entity 770
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "2080 -368 -92"
 }
-// entity 778
+// entity 771
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -34869,7 +34831,7 @@
 "origin" "1824 128 8"
 "target" "t42"
 }
-// entity 779
+// entity 772
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -34877,7 +34839,7 @@
 "origin" "1912 128 8"
 "target" "t41"
 }
-// entity 780
+// entity 773
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -34885,7 +34847,7 @@
 "origin" "1824 -64 8"
 "target" "t40"
 }
-// entity 781
+// entity 774
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -34893,7 +34855,7 @@
 "origin" "1912 -64 8"
 "target" "t39"
 }
-// entity 782
+// entity 775
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34901,7 +34863,7 @@
 "origin" "1892 52 -4"
 "target" "t38"
 }
-// entity 783
+// entity 776
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34909,7 +34871,7 @@
 "origin" "1892 12 -4"
 "target" "t37"
 }
-// entity 784
+// entity 777
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34917,7 +34879,7 @@
 "origin" "1820 12 -4"
 "target" "t36"
 }
-// entity 785
+// entity 778
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34925,21 +34887,21 @@
 "origin" "1820 52 -4"
 "target" "t35"
 }
-// entity 786
+// entity 779
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "50"
 "origin" "1322 -134 -28"
 }
-// entity 787
+// entity 780
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "50"
 "origin" "1316 184 -28"
 }
-// entity 788
+// entity 781
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34947,7 +34909,7 @@
 "origin" "1752 52 -4"
 "target" "t34"
 }
-// entity 789
+// entity 782
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34955,7 +34917,7 @@
 "origin" "1752 12 -4"
 "target" "t33"
 }
-// entity 790
+// entity 783
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34963,7 +34925,7 @@
 "origin" "1688 12 -4"
 "target" "t32"
 }
-// entity 791
+// entity 784
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34971,7 +34933,7 @@
 "origin" "1688 52 -4"
 "target" "t31"
 }
-// entity 792
+// entity 785
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34979,7 +34941,7 @@
 "origin" "1624 52 -4"
 "target" "t30"
 }
-// entity 793
+// entity 786
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34987,7 +34949,7 @@
 "origin" "1624 12 -4"
 "target" "t29"
 }
-// entity 794
+// entity 787
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -34995,7 +34957,7 @@
 "origin" "1560 12 -4"
 "target" "t28"
 }
-// entity 795
+// entity 788
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35003,7 +34965,7 @@
 "origin" "1560 52 -4"
 "target" "t27"
 }
-// entity 796
+// entity 789
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35011,7 +34973,7 @@
 "origin" "1496 52 -4"
 "target" "t26"
 }
-// entity 797
+// entity 790
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35019,7 +34981,7 @@
 "origin" "1432 12 -4"
 "target" "t24"
 }
-// entity 798
+// entity 791
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35027,56 +34989,56 @@
 "origin" "1432 52 -4"
 "target" "t23"
 }
-// entity 799
+// entity 792
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "30"
 "origin" "320 32 240"
 }
-// entity 800
+// entity 793
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "50"
 "origin" "320 32 128"
 }
-// entity 801
+// entity 794
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "90"
 "origin" "320 32 48"
 }
-// entity 802
+// entity 795
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "500"
 "origin" "32 -232 16"
 }
-// entity 803
+// entity 796
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "120"
 "origin" "64 -256 496"
 }
-// entity 804
+// entity 797
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "120"
 "origin" "64 320 496"
 }
-// entity 805
+// entity 798
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "120"
 "origin" "128 32 584"
 }
-// entity 806
+// entity 799
 {
 "classname" "func_group"
 "type" "patchCapped"
@@ -35111,35 +35073,35 @@
 }
 }
 }
-// entity 807
+// entity 800
 {
 "classname" "light"
 "_color" "0 0.8 1"
 "light" "230"
 "origin" "8 88 480"
 }
-// entity 808
+// entity 801
 {
 "classname" "light"
 "_color" "0 0.8 1"
 "light" "230"
 "origin" "-120 88 480"
 }
-// entity 809
+// entity 802
 {
 "classname" "light"
 "_color" "0 0.8 1"
 "light" "230"
 "origin" "-120 -24 480"
 }
-// entity 810
+// entity 803
 {
 "classname" "light"
 "_color" "0 0.8 1"
 "light" "230"
 "origin" "8 -24 480"
 }
-// entity 811
+// entity 804
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -35147,7 +35109,7 @@
 "origin" "-272 320 16"
 "target" "t2"
 }
-// entity 812
+// entity 805
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -35155,175 +35117,175 @@
 "origin" "-272 -256 16"
 "target" "t1"
 }
-// entity 813
+// entity 806
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "552 -352 148"
 }
-// entity 814
+// entity 807
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "100"
 "origin" "796 32 84"
 }
-// entity 815
+// entity 808
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "552 -288 148"
 }
-// entity 816
+// entity 809
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "552 -224 148"
 }
-// entity 817
+// entity 810
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "20"
 "origin" "552 -164 148"
 }
-// entity 818
+// entity 811
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "504 -224 196"
 }
-// entity 819
+// entity 812
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "504 -288 196"
 }
-// entity 820
+// entity 813
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "504 -352 196"
 }
-// entity 821
+// entity 814
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "456 -352 236"
 }
-// entity 822
+// entity 815
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "456 -288 236"
 }
-// entity 823
+// entity 816
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "456 -224 236"
 }
-// entity 824
+// entity 817
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "456 288 236"
 }
-// entity 825
+// entity 818
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "456 352 236"
 }
-// entity 826
+// entity 819
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "456 416 236"
 }
-// entity 827
+// entity 820
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "504 416 196"
 }
-// entity 828
+// entity 821
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "504 352 196"
 }
-// entity 829
+// entity 822
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "504 288 196"
 }
-// entity 830
+// entity 823
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "552 228 148"
 }
-// entity 831
+// entity 824
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "552 288 148"
 }
-// entity 832
+// entity 825
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "552 352 148"
 }
-// entity 833
+// entity 826
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "552 416 148"
 }
-// entity 834
+// entity 827
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "100"
 "origin" "768 272 120"
 }
-// entity 835
+// entity 828
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "100"
 "origin" "944 272 100"
 }
-// entity 836
+// entity 829
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "100"
 "origin" "1128 272 52"
 }
-// entity 837
+// entity 830
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35331,7 +35293,7 @@
 "origin" "752 60 144"
 "target" "t4"
 }
-// entity 838
+// entity 831
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35339,7 +35301,7 @@
 "origin" "824 60 144"
 "target" "t5"
 }
-// entity 839
+// entity 832
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35347,7 +35309,7 @@
 "origin" "940 56 116"
 "target" "t6"
 }
-// entity 840
+// entity 833
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35355,7 +35317,7 @@
 "origin" "996 56 104"
 "target" "t7"
 }
-// entity 841
+// entity 834
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35363,7 +35325,7 @@
 "origin" "1060 56 88"
 "target" "t8"
 }
-// entity 842
+// entity 835
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35371,7 +35333,7 @@
 "origin" "1120 56 72"
 "target" "t9"
 }
-// entity 843
+// entity 836
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35379,7 +35341,7 @@
 "origin" "1188 56 56"
 "target" "t10"
 }
-// entity 844
+// entity 837
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35387,7 +35349,7 @@
 "origin" "1280 56 32"
 "target" "t11"
 }
-// entity 845
+// entity 838
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35395,14 +35357,14 @@
 "origin" "1360 56 12"
 "target" "t12"
 }
-// entity 846
+// entity 839
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "100"
 "origin" "876 32 12"
 }
-// entity 847
+// entity 840
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35410,7 +35372,7 @@
 "origin" "1360 16 12"
 "target" "t13"
 }
-// entity 848
+// entity 841
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35418,7 +35380,7 @@
 "origin" "1280 16 32"
 "target" "t14"
 }
-// entity 849
+// entity 842
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35426,7 +35388,7 @@
 "origin" "1188 16 56"
 "target" "t15"
 }
-// entity 850
+// entity 843
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35434,7 +35396,7 @@
 "origin" "1120 16 72"
 "target" "t16"
 }
-// entity 851
+// entity 844
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35442,7 +35404,7 @@
 "origin" "1060 16 88"
 "target" "t17"
 }
-// entity 852
+// entity 845
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35450,7 +35412,7 @@
 "origin" "996 16 104"
 "target" "t18"
 }
-// entity 853
+// entity 846
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35458,7 +35420,7 @@
 "origin" "940 16 116"
 "target" "t19"
 }
-// entity 854
+// entity 847
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35466,7 +35428,7 @@
 "origin" "824 12 144"
 "target" "t20"
 }
-// entity 855
+// entity 848
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35474,28 +35436,28 @@
 "origin" "752 12 144"
 "target" "t21"
 }
-// entity 856
+// entity 849
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "100"
 "origin" "1128 -200 52"
 }
-// entity 857
+// entity 850
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "100"
 "origin" "944 -200 100"
 }
-// entity 858
+// entity 851
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "100"
 "origin" "768 -200 120"
 }
-// entity 859
+// entity 852
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
@@ -35503,14 +35465,14 @@
 "origin" "1192 32 -68"
 "target" "t22"
 }
-// entity 860
+// entity 853
 {
 "classname" "light"
 "_color" "0.1 0.7 0.8"
 "light" "200"
 "origin" "1956 32 552"
 }
-// entity 861
+// entity 854
 {
 "classname" "light"
 "_color" "0 0.8 1"
@@ -35518,7 +35480,7 @@
 "origin" "1678 -380 -172"
 "target" "t43"
 }
-// entity 862
+// entity 855
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35526,63 +35488,63 @@
 "origin" "1496 12 -4"
 "target" "t25"
 }
-// entity 863
+// entity 856
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "45"
 "origin" "1418 34 -120"
 }
-// entity 864
+// entity 857
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "45"
 "origin" "1586 34 -160"
 }
-// entity 865
+// entity 858
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "45"
 "origin" "1770 34 -184"
 }
-// entity 866
+// entity 859
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "180"
 "origin" "2020 32 -48"
 }
-// entity 867
+// entity 860
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "120"
 "origin" "2044 32 -160"
 }
-// entity 868
+// entity 861
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "120"
 "origin" "2080 68 -160"
 }
-// entity 869
+// entity 862
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "120"
 "origin" "2116 32 -160"
 }
-// entity 870
+// entity 863
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "120"
 "origin" "2080 -4 -160"
 }
-// entity 871
+// entity 864
 {
 "classname" "light"
 "_color" "0 0.8 1"
@@ -35590,7 +35552,7 @@
 "origin" "1742 -428 -172"
 "target" "t44"
 }
-// entity 872
+// entity 865
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -35598,7 +35560,7 @@
 "origin" "1912 -488 -168"
 "target" "t45"
 }
-// entity 873
+// entity 866
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -35606,21 +35568,21 @@
 "origin" "1984 -488 -168"
 "target" "t46"
 }
-// entity 874
+// entity 867
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "40"
 "origin" "1944 -488 -152"
 }
-// entity 875
+// entity 868
 {
 "classname" "light"
 "_color" "0 0.5 1"
 "light" "40"
 "origin" "2208 -488 -152"
 }
-// entity 876
+// entity 869
 {
 "classname" "light"
 "_color" "0 0.5 1"
@@ -35628,7 +35590,7 @@
 "origin" "2248 -488 -168"
 "target" "t47"
 }
-// entity 877
+// entity 870
 {
 "classname" "light"
 "_color" "0 0.5 1"
@@ -35636,7 +35598,7 @@
 "origin" "2176 -488 -168"
 "target" "t48"
 }
-// entity 878
+// entity 871
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
@@ -35644,7 +35606,7 @@
 "origin" "2176 552 -168"
 "target" "t49"
 }
-// entity 879
+// entity 872
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
@@ -35652,21 +35614,21 @@
 "origin" "2248 552 -168"
 "target" "t50"
 }
-// entity 880
+// entity 873
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
 "light" "40"
 "origin" "2208 552 -152"
 }
-// entity 881
+// entity 874
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "1944 552 -152"
 }
-// entity 882
+// entity 875
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35674,7 +35636,7 @@
 "origin" "1984 552 -168"
 "target" "t51"
 }
-// entity 883
+// entity 876
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35682,7 +35644,7 @@
 "origin" "1912 552 -168"
 "target" "t52"
 }
-// entity 884
+// entity 877
 {
 "classname" "light"
 "_color" "0 1 0.8"
@@ -35690,7 +35652,7 @@
 "origin" "1742 492 -172"
 "target" "t53"
 }
-// entity 885
+// entity 878
 {
 "classname" "light"
 "_color" "0 1 0.8"
@@ -35698,91 +35660,91 @@
 "origin" "1678 444 -172"
 "target" "t54"
 }
-// entity 886
+// entity 879
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2040 248 -168"
 }
-// entity 887
+// entity 880
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2120 248 -168"
 }
-// entity 888
+// entity 881
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2288 -8 -168"
 }
-// entity 889
+// entity 882
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2288 72 -168"
 }
-// entity 890
+// entity 883
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2120 -184 -168"
 }
-// entity 891
+// entity 884
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2040 -184 -168"
 }
-// entity 892
+// entity 885
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2040 -184 0"
 }
-// entity 893
+// entity 886
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2120 -184 0"
 }
-// entity 894
+// entity 887
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2288 72 0"
 }
-// entity 895
+// entity 888
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2288 -8 0"
 }
-// entity 896
+// entity 889
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2120 248 0"
 }
-// entity 897
+// entity 890
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2040 248 0"
 }
-// entity 898
+// entity 891
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35790,7 +35752,7 @@
 "origin" "2600 200 -168"
 "target" "t55"
 }
-// entity 899
+// entity 892
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -35798,21 +35760,21 @@
 "origin" "2600 128 -168"
 "target" "t56"
 }
-// entity 900
+// entity 893
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "2600 168 -152"
 }
-// entity 901
+// entity 894
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
 "light" "40"
 "origin" "2600 -96 -152"
 }
-// entity 902
+// entity 895
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
@@ -35820,7 +35782,7 @@
 "origin" "2600 -136 -168"
 "target" "t57"
 }
-// entity 903
+// entity 896
 {
 "classname" "light"
 "_color" "0 0.7 0.6"
@@ -35828,49 +35790,49 @@
 "origin" "2600 -64 -168"
 "target" "t58"
 }
-// entity 904
+// entity 897
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3040 -868 -140"
 }
-// entity 905
+// entity 898
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "2980 -928 -140"
 }
-// entity 906
+// entity 899
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3104 -936 -140"
 }
-// entity 907
+// entity 900
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3044 -992 -140"
 }
-// entity 908
+// entity 901
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3408 -1344 -140"
 }
-// entity 909
+// entity 902
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3464 -1288 -140"
 }
-// entity 910
+// entity 903
 {
 "classname" "light"
 "_color" "0 0.75 1"
@@ -35878,14 +35840,14 @@
 "origin" "3040 -1160 520"
 "target" "t86"
 }
-// entity 911
+// entity 904
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3040 -1096 640"
 }
-// entity 912
+// entity 905
 {
 "classname" "light"
 "_color" "0 0.75 1"
@@ -35893,7 +35855,7 @@
 "origin" "3040 -680 632"
 "target" "t88"
 }
-// entity 913
+// entity 906
 {
 "classname" "light"
 "_color" "0 0.75 1"
@@ -35901,14 +35863,14 @@
 "origin" "3040 -696 512"
 "target" "t89"
 }
-// entity 914
+// entity 907
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3040 -776 536"
 }
-// entity 915
+// entity 908
 {
 "classname" "light"
 "_color" "0 0.75 1"
@@ -35916,7 +35878,7 @@
 "origin" "3272 -936 504"
 "target" "t90"
 }
-// entity 916
+// entity 909
 {
 "classname" "light"
 "_color" "0 0.75 1"
@@ -35924,21 +35886,21 @@
 "origin" "3288 -936 616"
 "target" "t91"
 }
-// entity 917
+// entity 910
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3200 -928 632"
 }
-// entity 918
+// entity 911
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
 "light" "40"
 "origin" "3452 -1337 264"
 }
-// entity 919
+// entity 912
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
@@ -35946,7 +35908,7 @@
 "origin" "3424 -1365 248"
 "target" "t92"
 }
-// entity 920
+// entity 913
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
@@ -35954,728 +35916,728 @@
 "origin" "3475 -1314 248"
 "target" "t93"
 }
-// entity 921
+// entity 914
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3452 628 340"
 }
-// entity 922
+// entity 915
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3372 548 340"
 }
-// entity 923
+// entity 916
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3148 452 340"
 }
-// entity 924
+// entity 917
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3276 452 340"
 }
-// entity 925
+// entity 918
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3004 452 340"
 }
-// entity 926
+// entity 919
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2876 452 340"
 }
-// entity 927
+// entity 920
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3548 724 340"
 }
-// entity 928
+// entity 921
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2748 484 340"
 }
-// entity 929
+// entity 922
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2476 1156 340"
 }
-// entity 930
+// entity 923
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2476 1028 340"
 }
-// entity 931
+// entity 924
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2476 756 340"
 }
-// entity 932
+// entity 925
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2476 884 340"
 }
-// entity 933
+// entity 926
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2572 660 340"
 }
-// entity 934
+// entity 927
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2652 580 340"
 }
-// entity 935
+// entity 928
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3404 1396 340"
 }
-// entity 936
+// entity 929
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3484 1316 340"
 }
-// entity 937
+// entity 930
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3580 1092 340"
 }
-// entity 938
+// entity 931
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3580 1220 340"
 }
-// entity 939
+// entity 932
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3580 948 340"
 }
-// entity 940
+// entity 933
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3580 820 340"
 }
-// entity 941
+// entity 934
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3308 1492 340"
 }
-// entity 942
+// entity 935
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "2508 1252 340"
 }
-// entity 943
+// entity 936
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "30"
 "origin" "3180 1560 340"
 }
-// entity 944
+// entity 937
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "10"
 "origin" "3052 1560 340"
 }
-// entity 945
+// entity 938
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "10"
 "origin" "2780 1560 340"
 }
-// entity 946
+// entity 939
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "10"
 "origin" "2908 1560 340"
 }
-// entity 947
+// entity 940
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "10"
 "origin" "2840 1560 340"
 }
-// entity 948
+// entity 941
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "10"
 "origin" "2984 1560 340"
 }
-// entity 949
+// entity 942
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "10"
 "origin" "3112 1560 340"
 }
-// entity 950
+// entity 943
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "40"
 "origin" "3038 992 596"
 }
-// entity 951
+// entity 944
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3296 644 384"
 }
-// entity 952
+// entity 945
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3356 704 384"
 }
-// entity 953
+// entity 946
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3428 772 384"
 }
-// entity 954
+// entity 947
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3404 840 384"
 }
-// entity 955
+// entity 948
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3340 840 384"
 }
-// entity 956
+// entity 949
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
 "light" "10"
 "origin" "3216 840 384"
 }
-// entity 957
+// entity 950
 {
 "classname" "light"
 "_color" "0 0.8 0.85"
 "light" "10"
 "origin" "3280 840 384"
 }
-// entity 958
+// entity 951
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "3024 840 384"
 }
-// entity 959
+// entity 952
 {
 "classname" "light"
 "_color" "0 0.65 0.95"
 "light" "10"
 "origin" "2964 848 384"
 }
-// entity 960
+// entity 953
 {
 "classname" "light"
 "_color" "0 0.75 0.95"
 "light" "10"
 "origin" "3084 840 384"
 }
-// entity 961
+// entity 954
 {
 "classname" "light"
 "_color" "0 0.75 0.9"
 "light" "10"
 "origin" "3148 840 384"
 }
-// entity 962
+// entity 955
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "10"
 "origin" "2912 912 384"
 }
-// entity 963
+// entity 956
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "10"
 "origin" "2888 972 384"
 }
-// entity 964
+// entity 957
 {
 "classname" "light"
 "_color" "0 0.75 0.9"
 "light" "10"
 "origin" "2956 568 384"
 }
-// entity 965
+// entity 958
 {
 "classname" "light"
 "_color" "0 0.75 0.95"
 "light" "10"
 "origin" "2892 568 384"
 }
-// entity 966
+// entity 959
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2832 568 384"
 }
-// entity 967
+// entity 960
 {
 "classname" "light"
 "_color" "0 0.8 0.85"
 "light" "10"
 "origin" "3088 568 384"
 }
-// entity 968
+// entity 961
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
 "light" "10"
 "origin" "3024 568 384"
 }
-// entity 969
+// entity 962
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3148 568 384"
 }
-// entity 970
+// entity 963
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3212 568 384"
 }
-// entity 971
+// entity 964
 {
 "classname" "light"
 "_color" "0 0.7 1"
 "light" "10"
 "origin" "2764 568 384"
 }
-// entity 972
+// entity 965
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "10"
 "origin" "2696 568 384"
 }
-// entity 973
+// entity 966
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "40"
 "origin" "2872 904 400"
 }
-// entity 974
+// entity 967
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 856 400"
 }
-// entity 975
+// entity 968
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 820 400"
 }
-// entity 976
+// entity 969
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 784 400"
 }
-// entity 977
+// entity 970
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 676 400"
 }
-// entity 978
+// entity 971
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 712 400"
 }
-// entity 979
+// entity 972
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 748 400"
 }
-// entity 980
+// entity 973
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 636 400"
 }
-// entity 981
+// entity 974
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 600 400"
 }
-// entity 982
+// entity 975
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1368 400"
 }
-// entity 983
+// entity 976
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1340 400"
 }
-// entity 984
+// entity 977
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1228 400"
 }
-// entity 985
+// entity 978
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1264 400"
 }
-// entity 986
+// entity 979
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1300 400"
 }
-// entity 987
+// entity 980
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1192 400"
 }
-// entity 988
+// entity 981
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1156 400"
 }
-// entity 989
+// entity 982
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "5"
 "origin" "2872 1120 400"
 }
-// entity 990
+// entity 983
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "40"
 "origin" "2872 1072 400"
 }
-// entity 991
+// entity 984
 {
 "classname" "light"
 "_color" "0 0.7 1"
 "light" "10"
 "origin" "2780 1328 384"
 }
-// entity 992
+// entity 985
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3212 1408 384"
 }
-// entity 993
+// entity 986
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3148 1408 384"
 }
-// entity 994
+// entity 987
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
 "light" "10"
 "origin" "3024 1408 384"
 }
-// entity 995
+// entity 988
 {
 "classname" "light"
 "_color" "0 0.8 0.85"
 "light" "10"
 "origin" "3088 1408 384"
 }
-// entity 996
+// entity 989
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "2832 1376 384"
 }
-// entity 997
+// entity 990
 {
 "classname" "light"
 "_color" "0 0.75 0.95"
 "light" "10"
 "origin" "2892 1408 384"
 }
-// entity 998
+// entity 991
 {
 "classname" "light"
 "_color" "0 0.75 0.9"
 "light" "10"
 "origin" "2956 1408 384"
 }
-// entity 999
+// entity 992
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "10"
 "origin" "2912 1064 384"
 }
-// entity 1000
+// entity 993
 {
 "classname" "light"
 "_color" "0 0.75 0.9"
 "light" "10"
 "origin" "3148 1136 384"
 }
-// entity 1001
+// entity 994
 {
 "classname" "light"
 "_color" "0 0.75 0.95"
 "light" "10"
 "origin" "3084 1136 384"
 }
-// entity 1002
+// entity 995
 {
 "classname" "light"
 "_color" "0 0.65 0.95"
 "light" "10"
 "origin" "2964 1128 384"
 }
-// entity 1003
+// entity 996
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "10"
 "origin" "3024 1136 384"
 }
-// entity 1004
+// entity 997
 {
 "classname" "light"
 "_color" "0 0.8 0.85"
 "light" "10"
 "origin" "3280 1136 384"
 }
-// entity 1005
+// entity 998
 {
 "classname" "light"
 "_color" "0 0.8 0.9"
 "light" "10"
 "origin" "3216 1136 384"
 }
-// entity 1006
+// entity 999
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3340 1136 384"
 }
-// entity 1007
+// entity 1000
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3404 1136 384"
 }
-// entity 1008
+// entity 1001
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3428 1204 384"
 }
-// entity 1009
+// entity 1002
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3356 1272 384"
 }
-// entity 1010
+// entity 1003
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "10"
 "origin" "3296 1332 384"
 }
-// entity 1011
+// entity 1004
 {
 "classname" "light"
 "_color" "0 0.6 1"
 "light" "10"
 "origin" "2888 1028 384"
 }
-// entity 1012
+// entity 1005
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "230"
 "origin" "3160 992 636"
 }
-// entity 1013
+// entity 1006
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "230"
 "origin" "2936 992 636"
 }
-// entity 1014
+// entity 1007
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "230"
 "origin" "3040 1104 636"
 }
-// entity 1015
+// entity 1008
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "230"
 "origin" "3040 880 636"
 }
-// entity 1016
+// entity 1009
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "90"
 "origin" "3040 1376 -180"
 }
-// entity 1017
+// entity 1010
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "50"
 "origin" "3040 1376 -100"
 }
-// entity 1018
+// entity 1011
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "30"
 "origin" "3040 1376 12"
 }
-// entity 1019
+// entity 1012
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "320"
 "origin" "3040 684 332"
 }
-// entity 1020
+// entity 1013
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "320"
 "origin" "3040 764 332"
 }
-// entity 1021
+// entity 1014
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "160"
 "origin" "3040 1308 332"
 }
-// entity 1022
+// entity 1015
 {
 "classname" "light"
 "_color" "0 0.75 1"
 "light" "230"
 "origin" "3040 1228 332"
 }
-// entity 1023
+// entity 1016
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 1044 136"
 }
-// entity 1024
+// entity 1017
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36683,7 +36645,7 @@
 "origin" "3652 1044 136"
 "target" "t103"
 }
-// entity 1025
+// entity 1018
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36691,21 +36653,21 @@
 "origin" "3652 1092 136"
 "target" "t104"
 }
-// entity 1026
+// entity 1019
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 1092 136"
 }
-// entity 1027
+// entity 1020
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 1188 136"
 }
-// entity 1028
+// entity 1021
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36713,7 +36675,7 @@
 "origin" "3652 1188 136"
 "target" "t105"
 }
-// entity 1029
+// entity 1022
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36721,21 +36683,21 @@
 "origin" "3652 1140 136"
 "target" "t106"
 }
-// entity 1030
+// entity 1023
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 1140 136"
 }
-// entity 1031
+// entity 1024
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 948 136"
 }
-// entity 1032
+// entity 1025
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36743,7 +36705,7 @@
 "origin" "3652 948 136"
 "target" "t107"
 }
-// entity 1033
+// entity 1026
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36751,21 +36713,21 @@
 "origin" "3652 996 136"
 "target" "t108"
 }
-// entity 1034
+// entity 1027
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 996 136"
 }
-// entity 1035
+// entity 1028
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 900 136"
 }
-// entity 1036
+// entity 1029
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36773,7 +36735,7 @@
 "origin" "3652 900 136"
 "target" "t109"
 }
-// entity 1037
+// entity 1030
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36781,14 +36743,14 @@
 "origin" "3652 852 136"
 "target" "t110"
 }
-// entity 1038
+// entity 1031
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 852 136"
 }
-// entity 1039
+// entity 1032
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36796,21 +36758,21 @@
 "origin" "3652 812 136"
 "target" "t112"
 }
-// entity 1040
+// entity 1033
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3652 812 136"
 }
-// entity 1041
+// entity 1034
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3327 418 136"
 }
-// entity 1042
+// entity 1035
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36818,14 +36780,14 @@
 "origin" "3327 418 136"
 "target" "t113"
 }
-// entity 1043
+// entity 1036
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3355 446 136"
 }
-// entity 1044
+// entity 1037
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36833,7 +36795,7 @@
 "origin" "3355 446 136"
 "target" "t114"
 }
-// entity 1045
+// entity 1038
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36841,21 +36803,21 @@
 "origin" "3389 480 136"
 "target" "t115"
 }
-// entity 1046
+// entity 1039
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3389 480 136"
 }
-// entity 1047
+// entity 1040
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3457 548 136"
 }
-// entity 1048
+// entity 1041
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36863,7 +36825,7 @@
 "origin" "3457 548 136"
 "target" "t116"
 }
-// entity 1049
+// entity 1042
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36871,21 +36833,21 @@
 "origin" "3423 514 136"
 "target" "t117"
 }
-// entity 1050
+// entity 1043
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3423 514 136"
 }
-// entity 1051
+// entity 1044
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3559 650 136"
 }
-// entity 1052
+// entity 1045
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36893,7 +36855,7 @@
 "origin" "3559 650 136"
 "target" "t118"
 }
-// entity 1053
+// entity 1046
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36901,21 +36863,21 @@
 "origin" "3593 684 136"
 "target" "t119"
 }
-// entity 1054
+// entity 1047
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3593 684 136"
 }
-// entity 1055
+// entity 1048
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3525 616 136"
 }
-// entity 1056
+// entity 1049
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36923,7 +36885,7 @@
 "origin" "3525 616 136"
 "target" "t120"
 }
-// entity 1057
+// entity 1050
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36931,21 +36893,21 @@
 "origin" "3491 582 136"
 "target" "t121"
 }
-// entity 1058
+// entity 1051
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3491 582 136"
 }
-// entity 1059
+// entity 1052
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2557 1402 136"
 }
-// entity 1060
+// entity 1053
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36953,7 +36915,7 @@
 "origin" "2557 1402 136"
 "target" "t122"
 }
-// entity 1061
+// entity 1054
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36961,21 +36923,21 @@
 "origin" "2523 1368 136"
 "target" "t123"
 }
-// entity 1062
+// entity 1055
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2523 1368 136"
 }
-// entity 1063
+// entity 1056
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2455 1300 136"
 }
-// entity 1064
+// entity 1057
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36983,7 +36945,7 @@
 "origin" "2455 1300 136"
 "target" "t124"
 }
-// entity 1065
+// entity 1058
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -36991,21 +36953,21 @@
 "origin" "2489 1334 136"
 "target" "t125"
 }
-// entity 1066
+// entity 1059
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2489 1334 136"
 }
-// entity 1067
+// entity 1060
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2625 1470 136"
 }
-// entity 1068
+// entity 1061
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37013,7 +36975,7 @@
 "origin" "2625 1470 136"
 "target" "t126"
 }
-// entity 1069
+// entity 1062
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37021,21 +36983,21 @@
 "origin" "2591 1436 136"
 "target" "t127"
 }
-// entity 1070
+// entity 1063
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2591 1436 136"
 }
-// entity 1071
+// entity 1064
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2659 1504 136"
 }
-// entity 1072
+// entity 1065
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37043,7 +37005,7 @@
 "origin" "2659 1504 136"
 "target" "t128"
 }
-// entity 1073
+// entity 1066
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37051,14 +37013,14 @@
 "origin" "2693 1538 136"
 "target" "t129"
 }
-// entity 1074
+// entity 1067
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2693 1538 136"
 }
-// entity 1075
+// entity 1068
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37066,21 +37028,21 @@
 "origin" "2721 1566 136"
 "target" "t130"
 }
-// entity 1076
+// entity 1069
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2721 1566 136"
 }
-// entity 1077
+// entity 1070
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3610 1295 136"
 }
-// entity 1078
+// entity 1071
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37088,14 +37050,14 @@
 "origin" "3610 1295 136"
 "target" "t131"
 }
-// entity 1079
+// entity 1072
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3582 1323 136"
 }
-// entity 1080
+// entity 1073
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37103,7 +37065,7 @@
 "origin" "3582 1323 136"
 "target" "t132"
 }
-// entity 1081
+// entity 1074
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37111,21 +37073,21 @@
 "origin" "3548 1357 136"
 "target" "t133"
 }
-// entity 1082
+// entity 1075
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3548 1357 136"
 }
-// entity 1083
+// entity 1076
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3480 1425 136"
 }
-// entity 1084
+// entity 1077
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37133,7 +37095,7 @@
 "origin" "3480 1425 136"
 "target" "t134"
 }
-// entity 1085
+// entity 1078
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37141,21 +37103,21 @@
 "origin" "3514 1391 136"
 "target" "t135"
 }
-// entity 1086
+// entity 1079
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3514 1391 136"
 }
-// entity 1087
+// entity 1080
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3378 1527 136"
 }
-// entity 1088
+// entity 1081
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37163,7 +37125,7 @@
 "origin" "3378 1527 136"
 "target" "t136"
 }
-// entity 1089
+// entity 1082
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37171,21 +37133,21 @@
 "origin" "3344 1561 136"
 "target" "t137"
 }
-// entity 1090
+// entity 1083
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3344 1561 136"
 }
-// entity 1091
+// entity 1084
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3412 1493 136"
 }
-// entity 1092
+// entity 1085
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37193,7 +37155,7 @@
 "origin" "3412 1493 136"
 "target" "t138"
 }
-// entity 1093
+// entity 1086
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
@@ -37201,133 +37163,133 @@
 "origin" "3446 1459 136"
 "target" "t139"
 }
-// entity 1094
+// entity 1087
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "3446 1459 136"
 }
-// entity 1095
+// entity 1088
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "30"
 "origin" "3168 1504 332"
 }
-// entity 1096
+// entity 1089
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "50"
 "origin" "3168 1504 220"
 }
-// entity 1097
+// entity 1090
 {
 "classname" "light"
 "_color" "0 0.5 0.7"
 "light" "90"
 "origin" "3168 1504 140"
 }
-// entity 1098
+// entity 1091
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2448 724 136"
 }
-// entity 1099
+// entity 1092
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2480 692 136"
 }
-// entity 1100
+// entity 1093
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2512 660 136"
 }
-// entity 1101
+// entity 1094
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2544 628 136"
 }
-// entity 1102
+// entity 1095
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2576 596 136"
 }
-// entity 1103
+// entity 1096
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2608 564 136"
 }
-// entity 1104
+// entity 1097
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2640 532 136"
 }
-// entity 1105
+// entity 1098
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2672 500 136"
 }
-// entity 1106
+// entity 1099
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2704 468 136"
 }
-// entity 1107
+// entity 1100
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2736 436 136"
 }
-// entity 1108
+// entity 1101
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "5"
 "origin" "2776 412 136"
 }
-// entity 1109
+// entity 1102
 {
 "classname" "light"
 "_color" "0 1 0.8"
 "light" "40"
 "origin" "1712 464 -152"
 }
-// entity 1110
+// entity 1103
 {
 "classname" "light"
 "_color" "0 0.8 1"
 "light" "40"
 "origin" "1712 -400 -152"
 }
-// entity 1111
+// entity 1104
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "2512 992 -68"
 }
-// entity 1112
+// entity 1105
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37335,7 +37297,7 @@
 "origin" "3632 1184 -168"
 "target" "t148"
 }
-// entity 1113
+// entity 1106
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37343,21 +37305,21 @@
 "origin" "3632 1112 -168"
 "target" "t149"
 }
-// entity 1114
+// entity 1107
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "3632 1152 -152"
 }
-// entity 1115
+// entity 1108
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "3168 1584 -152"
 }
-// entity 1116
+// entity 1109
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37365,7 +37327,7 @@
 "origin" "3208 1584 -168"
 "target" "t150"
 }
-// entity 1117
+// entity 1110
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37373,14 +37335,14 @@
 "origin" "3136 1584 -168"
 "target" "t151"
 }
-// entity 1118
+// entity 1111
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "40"
 "origin" "3381 1498 -152"
 }
-// entity 1119
+// entity 1112
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37388,7 +37350,7 @@
 "origin" "3353 1526 -168"
 "target" "t152"
 }
-// entity 1120
+// entity 1113
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37396,7 +37358,7 @@
 "origin" "3404 1475 -168"
 "target" "t153"
 }
-// entity 1121
+// entity 1114
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37404,7 +37366,7 @@
 "origin" "3574 1300 -173"
 "target" "t154"
 }
-// entity 1122
+// entity 1115
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37412,14 +37374,14 @@
 "origin" "3523 1351 -173"
 "target" "t155"
 }
-// entity 1123
+// entity 1116
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "40"
 "origin" "3551 1323 -157"
 }
-// entity 1124
+// entity 1117
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37427,7 +37389,7 @@
 "origin" "2880 1584 -168"
 "target" "t158"
 }
-// entity 1125
+// entity 1118
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37435,21 +37397,21 @@
 "origin" "2952 1584 -168"
 "target" "t159"
 }
-// entity 1126
+// entity 1119
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "2912 1584 -152"
 }
-// entity 1127
+// entity 1120
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "40"
 "origin" "2709 1503 -157"
 }
-// entity 1128
+// entity 1121
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37457,7 +37419,7 @@
 "origin" "2681 1475 -173"
 "target" "t160"
 }
-// entity 1129
+// entity 1122
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37465,7 +37427,7 @@
 "origin" "2732 1526 -173"
 "target" "t161"
 }
-// entity 1130
+// entity 1123
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37473,7 +37435,7 @@
 "origin" "2557 1356 -168"
 "target" "t162"
 }
-// entity 1131
+// entity 1124
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
@@ -37481,21 +37443,21 @@
 "origin" "2506 1305 -168"
 "target" "t163"
 }
-// entity 1132
+// entity 1125
 {
 "classname" "light"
 "_color" "0 0.7 0.9"
 "light" "40"
 "origin" "2534 1333 -152"
 }
-// entity 1133
+// entity 1126
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "2448 1120 -152"
 }
-// entity 1134
+// entity 1127
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37503,7 +37465,7 @@
 "origin" "2448 1080 -168"
 "target" "t164"
 }
-// entity 1135
+// entity 1128
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37511,7 +37473,7 @@
 "origin" "2448 1152 -168"
 "target" "t165"
 }
-// entity 1136
+// entity 1129
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37519,7 +37481,7 @@
 "origin" "2448 908 -168"
 "target" "t166"
 }
-// entity 1137
+// entity 1130
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37527,63 +37489,63 @@
 "origin" "2448 836 -168"
 "target" "t167"
 }
-// entity 1138
+// entity 1131
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
 "light" "40"
 "origin" "2448 876 -152"
 }
-// entity 1139
+// entity 1132
 {
 "classname" "light"
 "_color" "0.2 0.85 0.6"
 "light" "40"
 "origin" "3040 888 -148"
 }
-// entity 1140
+// entity 1133
 {
 "classname" "light"
 "_color" "0.2 0.85 0.6"
 "light" "40"
 "origin" "3040 812 -124"
 }
-// entity 1141
+// entity 1134
 {
 "classname" "light"
 "_color" "0.2 0.85 0.6"
 "light" "40"
 "origin" "3040 740 -100"
 }
-// entity 1142
+// entity 1135
 {
 "classname" "light"
 "_color" "0.2 0.85 0.6"
 "light" "40"
 "origin" "3040 520 -28"
 }
-// entity 1143
+// entity 1136
 {
 "classname" "light"
 "_color" "0.2 0.85 0.6"
 "light" "40"
 "origin" "3040 592 -52"
 }
-// entity 1144
+// entity 1137
 {
 "classname" "light"
 "_color" "0.2 0.85 0.6"
 "light" "40"
 "origin" "3040 668 -76"
 }
-// entity 1145
+// entity 1138
 {
 "classname" "light"
 "_color" "0.2 0.85 0.6"
 "light" "40"
 "origin" "3040 444 -8"
 }
-// entity 1146
+// entity 1139
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37591,7 +37553,7 @@
 "origin" "2980 880 -136"
 "target" "t171"
 }
-// entity 1147
+// entity 1140
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37599,7 +37561,7 @@
 "origin" "3092 880 -136"
 "target" "t175"
 }
-// entity 1148
+// entity 1141
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37607,7 +37569,7 @@
 "origin" "3096 812 -116"
 "target" "t176"
 }
-// entity 1149
+// entity 1142
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37615,7 +37577,7 @@
 "origin" "2984 812 -116"
 "target" "t177"
 }
-// entity 1150
+// entity 1143
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37623,7 +37585,7 @@
 "origin" "2984 744 -96"
 "target" "t178"
 }
-// entity 1151
+// entity 1144
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37631,7 +37593,7 @@
 "origin" "3096 744 -96"
 "target" "t179"
 }
-// entity 1152
+// entity 1145
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37639,7 +37601,7 @@
 "origin" "3096 544 -36"
 "target" "t180"
 }
-// entity 1153
+// entity 1146
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37647,7 +37609,7 @@
 "origin" "2984 544 -36"
 "target" "t181"
 }
-// entity 1154
+// entity 1147
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37655,7 +37617,7 @@
 "origin" "2984 612 -56"
 "target" "t182"
 }
-// entity 1155
+// entity 1148
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37663,7 +37625,7 @@
 "origin" "3096 612 -56"
 "target" "t183"
 }
-// entity 1156
+// entity 1149
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37671,7 +37633,7 @@
 "origin" "3092 680 -76"
 "target" "t184"
 }
-// entity 1157
+// entity 1150
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37679,7 +37641,7 @@
 "origin" "2980 680 -76"
 "target" "t185"
 }
-// entity 1158
+// entity 1151
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37687,7 +37649,7 @@
 "origin" "2984 472 -12"
 "target" "t186"
 }
-// entity 1159
+// entity 1152
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37695,21 +37657,21 @@
 "origin" "3096 472 -12"
 "target" "t187"
 }
-// entity 1160
+// entity 1153
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "2936 992 -176"
 }
-// entity 1161
+// entity 1154
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "3160 992 -176"
 }
-// entity 1162
+// entity 1155
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37717,7 +37679,7 @@
 "origin" "3060 352 272"
 "target" "t188"
 }
-// entity 1163
+// entity 1156
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37725,7 +37687,7 @@
 "origin" "3060 284 272"
 "target" "t189"
 }
-// entity 1164
+// entity 1157
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37733,7 +37695,7 @@
 "origin" "3060 212 272"
 "target" "t190"
 }
-// entity 1165
+// entity 1158
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37741,7 +37703,7 @@
 "origin" "3060 44 340"
 "target" "t191"
 }
-// entity 1166
+// entity 1159
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37749,7 +37711,7 @@
 "origin" "3060 100 312"
 "target" "t192"
 }
-// entity 1167
+// entity 1160
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37757,7 +37719,7 @@
 "origin" "3060 152 284"
 "target" "t193"
 }
-// entity 1168
+// entity 1161
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37765,7 +37727,7 @@
 "origin" "3020 152 284"
 "target" "t194"
 }
-// entity 1169
+// entity 1162
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37773,7 +37735,7 @@
 "origin" "3020 100 312"
 "target" "t195"
 }
-// entity 1170
+// entity 1163
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37781,7 +37743,7 @@
 "origin" "3020 44 340"
 "target" "t196"
 }
-// entity 1171
+// entity 1164
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37789,7 +37751,7 @@
 "origin" "3020 212 272"
 "target" "t197"
 }
-// entity 1172
+// entity 1165
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37797,7 +37759,7 @@
 "origin" "3020 284 272"
 "target" "t198"
 }
-// entity 1173
+// entity 1166
 {
 "classname" "light"
 "_color" "0 0.8 0.8"
@@ -37805,231 +37767,231 @@
 "origin" "3020 352 272"
 "target" "t199"
 }
-// entity 1174
+// entity 1167
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "60"
 "origin" "3296 -32 216"
 }
-// entity 1175
+// entity 1168
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "30"
 "origin" "3275 290 208"
 }
-// entity 1176
+// entity 1169
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "30"
 "origin" "3275 186 208"
 }
-// entity 1177
+// entity 1170
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "30"
 "origin" "3275 -182 208"
 }
-// entity 1178
+// entity 1171
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "30"
 "origin" "2811 -182 208"
 }
-// entity 1179
+// entity 1172
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "30"
 "origin" "2811 -54 208"
 }
-// entity 1180
+// entity 1173
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "30"
 "origin" "2811 202 208"
 }
-// entity 1181
+// entity 1174
 {
 "classname" "light"
 "_color" "0 0.4 0.7"
 "light" "30"
 "origin" "2811 74 208"
 }
-// entity 1182
+// entity 1175
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3302 928 -98"
 }
-// entity 1183
+// entity 1176
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3364 928 -98"
 }
-// entity 1184
+// entity 1177
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3416 972 -98"
 }
-// entity 1185
+// entity 1178
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3416 1074 -98"
 }
-// entity 1186
+// entity 1179
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3364 1120 -98"
 }
-// entity 1187
+// entity 1180
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3302 1120 -98"
 }
-// entity 1188
+// entity 1181
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3064 1496 -92"
 }
-// entity 1189
+// entity 1182
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2968 1496 -92"
 }
-// entity 1190
+// entity 1183
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3152 1480 -92"
 }
-// entity 1191
+// entity 1184
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3216 1416 -92"
 }
-// entity 1192
+// entity 1185
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3280 1336 -92"
 }
-// entity 1193
+// entity 1186
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "3280 1248 -92"
 }
-// entity 1194
+// entity 1187
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2800 1200 -92"
 }
-// entity 1195
+// entity 1188
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2800 1296 -92"
 }
-// entity 1196
+// entity 1189
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2824 1384 -92"
 }
-// entity 1197
+// entity 1190
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2896 1448 -92"
 }
-// entity 1198
+// entity 1191
 {
 "classname" "light"
 "_color" "0 0.6 0.65"
 "light" "90"
 "origin" "3376 -1032 168"
 }
-// entity 1199
+// entity 1192
 {
 "classname" "light"
 "_color" "0 0.6 0.65"
 "light" "90"
 "origin" "3136 -1264 168"
 }
-// entity 1200
+// entity 1193
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "15"
 "origin" "320 32 16"
 }
-// entity 1201
+// entity 1194
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "20"
 "origin" "3342 1024 78"
 }
-// entity 1202
+// entity 1195
 {
 "classname" "light"
 "_color" "0 0.6 0.8"
 "light" "300"
 "origin" "3036 -312 240"
 }
-// entity 1203
+// entity 1196
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2608 -1064 44"
 }
-// entity 1204
+// entity 1197
 {
 "classname" "light"
 "_color" "0.45 0.5 0"
 "light" "20"
 "origin" "2608 -856 44"
 }
-// entity 1205
+// entity 1198
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"
 "light" "10"
 "origin" "608 4 36"
 }
-// entity 1206
+// entity 1199
 {
 "classname" "light"
 "_color" "0.5 0.5 0.1"

Modified: branches/nexuiz-2.0/data/maps/bloodprison.map
===================================================================
--- branches/nexuiz-2.0/data/maps/bloodprison.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/bloodprison.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -8942,11 +8942,11 @@
 }
 }
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "2048.000082 1600.000102 16.000001"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "2640.000203 1280.000000 216.000008"
 }
 {
@@ -8976,7 +8976,7 @@
 "targetname" "t1"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1472.000020 2240.000000 208.000008"
 }
 {
@@ -8984,27 +8984,27 @@
 "origin" "2368.000082 2432.000122 224.000009"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2336.000162 1792.000122 352.000014"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2336.000162 1840.000000 352.000014"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2336.000162 1888.000082 352.000014"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2336.000162 1936.000162 352.000014"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2336.000162 1984.000041 352.000014"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2336.000162 2032.000122 352.000014"
 }
 {
@@ -9013,12 +9013,12 @@
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2192.000122 992.000020 352.000014"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2192.000122 928.000082 352.000014"
 }
 {
@@ -9038,12 +9038,12 @@
 }
 {
 "angle" "360"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "944.000041 1840.000000 208.000008"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1104.000041 2256.000162 208.000008"
 }
 {
@@ -9075,12 +9075,12 @@
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2688.000082 1600.000102 16.000001"
 }
 {
 "angle" "270"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1680.000102 1840.000000 -48.000002"
 }
 {
@@ -9099,23 +9099,23 @@
 "origin" "2560.000000 2384.000041 224.000009"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1680.000102 1008.000082 352.000014"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1632.000020 1056.000061 352.000014"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1584.000041 1104.000041 352.000014"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1536.000061 1152.000020 352.000014"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1488.000082 1200.000000 352.000014"
 }
 {

Modified: branches/nexuiz-2.0/data/maps/bloodprisonctf.map
===================================================================
--- branches/nexuiz-2.0/data/maps/bloodprisonctf.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/bloodprisonctf.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -18368,7 +18368,7 @@
 }
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "2864.000041 1920.000000 216.000010"
 }
 {
@@ -18386,7 +18386,7 @@
 "targetname" "blueteleport"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "4032.000326 960.000000 208.000005"
 }
 {
@@ -18394,27 +18394,27 @@
 "origin" "3136.000162 768.000031 224.000015"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3168.000082 1408.000082 352.000020"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "3168.000082 1360.000102 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3168.000082 1312.000020 352.000020"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "3168.000082 1264.000041 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3168.000082 1216.000061 352.000020"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "3168.000082 1168.000082 352.000020"
 }
 {
@@ -18423,12 +18423,12 @@
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3312.000122 2208.000082 352.000020"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3312.000122 2272.000122 352.000020"
 }
 {
@@ -18448,12 +18448,12 @@
 }
 {
 "angle" "360"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "4560.000000 1360.000102 208.000005"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "4400.000000 944.000041 208.000005"
 }
 {
@@ -18485,12 +18485,12 @@
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3448.000082 1600.000102 16.000001"
 }
 {
 "angle" "270"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3824.000244 1360.000102 -48.000002"
 }
 {
@@ -18509,23 +18509,23 @@
 "origin" "2944.000041 816.000010 224.000015"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3824.000244 2192.000122 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3872.000326 2144.000041 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3920.000000 2096.000162 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "3968.000082 2048.000082 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "4016.000163 2000.000000 352.000020"
 }
 {
@@ -18736,27 +18736,27 @@
 "origin" "2368.000082 2432.000122 224.000015"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2336.000162 1792.000122 352.000020"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2336.000162 1840.000000 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2336.000162 1888.000082 352.000020"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2336.000162 1936.000162 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "2336.000162 1984.000041 352.000020"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "2336.000162 2032.000122 352.000020"
 }
 {
@@ -18765,12 +18765,12 @@
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2192.000122 992.000020 352.000020"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2192.000122 928.000082 352.000020"
 }
 {
@@ -18790,12 +18790,12 @@
 }
 {
 "angle" "360"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "944.000041 1840.000000 208.000005"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1104.000041 2256.000162 208.000005"
 }
 {
@@ -18827,12 +18827,12 @@
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2048.000082 1600.000102 16.000001"
 }
 {
 "angle" "270"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1680.000102 1840.000000 -48.000002"
 }
 {
@@ -18851,27 +18851,27 @@
 "origin" "2560.000000 2384.000041 224.000015"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1680.000102 1008.000082 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1632.000020 1056.000061 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1584.000041 1104.000041 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1536.000061 1152.000020 352.000020"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1488.000082 1200.000000 352.000020"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "2640.000203 1280.000000 216.000010"
 }
 {
@@ -18889,7 +18889,7 @@
 "targetname" "redteleport"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1472.000020 2240.000000 208.000005"
 }
 {
@@ -19084,7 +19084,7 @@
 "origin" "1856.000162 1600.000102 368.000005"
 }
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "2752.000122 1600.000102 16.000001"
 }
 {

Modified: branches/nexuiz-2.0/data/maps/bluesky.map
===================================================================
--- branches/nexuiz-2.0/data/maps/bluesky.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/bluesky.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -6838,11 +6838,11 @@
 "origin" "32.000000 -752.000000 -104.000000"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "736.000000 -672.000000 96.000000"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-688.000000 272.000000 96.000000"
 }
 {
@@ -6871,30 +6871,30 @@
 }
 {
 "angle" "360"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "448.000000 -672.000000 -208.000000"
 }
 {
 "angle" "360"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "448.000000 256.000000 -208.000000"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-400.000000 288.000000 -224.000000"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-400.000000 -640.000000 -224.000000"
 }
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-896.000000 384.000000 288.000000"
 }
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "960.000000 -704.000000 288.000000"
 }
 {
@@ -6948,11 +6948,11 @@
 "origin" "-224.000000 -800.000000 288.000000"
 }
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "272.000000 -464.000000 -368.000000"
 }
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-208.000000 -464.000000 -368.000000"
 }
 {

Modified: branches/nexuiz-2.0/data/maps/darkzone.map
===================================================================
--- branches/nexuiz-2.0/data/maps/darkzone.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/darkzone.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -6308,25 +6308,25 @@
 }
 // entity 18
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "270"
 "origin" "48.000000 272.000000 272.000000"
 }
 // entity 19
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "315"
 "origin" "-560.000000 -80.000000 280.000000"
 }
 // entity 20
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "912.000000 -80.000000 256.000000"
 }
 // entity 21
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "90"
 "origin" "1072.000000 64.000000 256.000000"
 }
@@ -6427,7 +6427,7 @@
 }
 // entity 39
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1120.000000 1024.000000 256.000000"
 }
 // entity 40
@@ -6607,19 +6607,19 @@
 }
 // entity 62
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "angle" "90"
 "origin" "-1016.000000 -216.000000 352.000000"
 "spawnflags" "2"
 }
 // entity 63
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "416.000000 784.000000 240.000000"
 }
 // entity 64
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "416.000000 656.000000 240.000000"
 }
 // entity 65
@@ -6629,7 +6629,7 @@
 }
 // entity 66
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "90"
 "origin" "64.000000 -424.000000 272.000000"
 }
@@ -6640,7 +6640,7 @@
 }
 // entity 68
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "270"
 "origin" "792.000000 1168.000000 48.000000"
 }
@@ -6673,7 +6673,7 @@
 }
 // entity 74
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1048.000000 -1112.000000 144.000000"
 }
 // entity 75
@@ -6702,7 +6702,7 @@
 }
 // entity 79
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "90"
 "origin" "-544.000000 -1152.000000 40.000000"
 }

Modified: branches/nexuiz-2.0/data/maps/dieselpower.map
===================================================================
--- branches/nexuiz-2.0/data/maps/dieselpower.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/dieselpower.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -25341,7 +25341,7 @@
 }
 // entity 3
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "496 1680 400"
 }
 // entity 4
@@ -25392,13 +25392,13 @@
 }
 // entity 9
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2208 -64 -752"
 "angle" "180"
 }
 // entity 10
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1920 -64 -624"
 }
 // entity 11
@@ -25443,7 +25443,7 @@
 }
 // entity 17
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "1184 168 152"
 }
 // entity 18
@@ -25484,27 +25484,27 @@
 }
 // entity 24
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-800 -352 16"
 }
 // entity 25
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "560 128 24"
 }
 // entity 26
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "560 0 24"
 }
 // entity 27
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "560 -128 24"
 }
 // entity 28
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "560 -256 24"
 }
 // entity 29
@@ -25559,27 +25559,27 @@
 }
 // entity 37
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2504 -1288 -368"
 }
 // entity 38
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1192 -1416 -424"
 }
 // entity 39
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1600 -1760 -208"
 }
 // entity 40
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1632 -1760 -208"
 }
 // entity 41
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1664 -1760 -208"
 }
 // entity 42
@@ -48100,16 +48100,16 @@
 }
 // entity 905
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1184 1280 -104"
 }
 // entity 906
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1040 -528 -432"
 }
 // entity 907
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "2168 -1208 -752"
 }

Modified: branches/nexuiz-2.0/data/maps/dismal.map
===================================================================
--- branches/nexuiz-2.0/data/maps/dismal.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/dismal.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -2504,7 +2504,7 @@
 }
 // entity 2
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-488.000000 -768.000000 2.000000"
 }
 // entity 3
@@ -2524,13 +2524,13 @@
 }
 // entity 6
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "-90"
 "origin" "192.000000 520.000000 2.000000"
 }
 // entity 7
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "90"
 "origin" "191.000000 -1278.000000 2.000000"
 }
@@ -2561,12 +2561,12 @@
 }
 // entity 13
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "2480.000000 -400.000000 -72.000000"
 }
 // entity 14
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "90"
 "origin" "2544.000000 -1268.000000 8.000000"
 }
@@ -2577,7 +2577,7 @@
 }
 // entity 16
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "3224.000000 0.000000 8.000000"
 }
 // entity 17
@@ -2587,7 +2587,7 @@
 }
 // entity 18
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "-90"
 "origin" "2544.000000 508.000000 0.000000"
 }

Modified: branches/nexuiz-2.0/data/maps/downer.map
===================================================================
--- branches/nexuiz-2.0/data/maps/downer.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/downer.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -7927,22 +7927,22 @@
 }
 // entity 35
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "96.000000 1248.000000 216.000000"
 }
 // entity 36
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "96.000000 1200.000000 216.000000"
 }
 // entity 37
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "144.000000 1248.000000 216.000000"
 }
 // entity 38
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "144.000000 1200.000000 216.000000"
 }
 // entity 39
@@ -7957,47 +7957,47 @@
 }
 // entity 41
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "728.000000 928.000000 16.000000"
 }
 // entity 42
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "728.000000 872.000000 16.000000"
 }
 // entity 43
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "672.000000 872.000000 16.000000"
 }
 // entity 44
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-88.000000 1112.000000 16.000000"
 }
 // entity 45
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-88.000000 1044.000000 16.000000"
 }
 // entity 46
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-288.000000 1056.000000 248.000000"
 }
 // entity 47
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-624.000000 800.000000 248.000000"
 }
 // entity 48
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-728.000000 296.000000 216.000000"
 }
 // entity 49
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-128.000000 1632.000000 24.000000"
 }
 // entity 50
@@ -8007,22 +8007,22 @@
 }
 // entity 51
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-656.000000 808.000000 -152.000000"
 }
 // entity 52
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-656.000000 744.000000 -152.000000"
 }
 // entity 53
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-600.000000 744.000000 -152.000000"
 }
 // entity 54
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-168.000000 1176.000000 -136.000000"
 }
 // entity 55
@@ -8037,7 +8037,7 @@
 }
 // entity 57
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "512.000000 480.000000 -208.000000"
 }
 // entity 58

Modified: branches/nexuiz-2.0/data/maps/eggandbacon.map
===================================================================
--- branches/nexuiz-2.0/data/maps/eggandbacon.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/eggandbacon.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -597,17 +597,17 @@
 }
 // entity 31
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1280 576 96"
 }
 // entity 32
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1280 -576 96"
 }
 // entity 33
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1504 256 96"
 }
 // entity 34
@@ -762,19 +762,19 @@
 }
 // entity 59
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1280 -576 96"
 "angle" "180"
 }
 // entity 60
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1280 576 96"
 "angle" "180"
 }
 // entity 61
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1504 -256 96"
 "angle" "180"
 }
@@ -934,12 +934,12 @@
 }
 // entity 87
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1768 712 472"
 }
 // entity 88
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1768 -712 472"
 "angle" "180"
 }
@@ -1064,7 +1064,7 @@
 }
 // entity 108
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "0 0 512"
 "noalign" "1"
 "team" "3"

Modified: branches/nexuiz-2.0/data/maps/evilspace.map
===================================================================
--- branches/nexuiz-2.0/data/maps/evilspace.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/evilspace.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -4794,7 +4794,7 @@
 "origin" "-600.000000 462.000000 -56.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-96.000000 -184.000000 -72.000000"
 }
 {
@@ -4819,20 +4819,20 @@
 }
 {
 "angle" "90"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "582.000000 -122.000000 -64.000000"
 }
 {
 "angle" "90"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-626.000000 -122.000000 -64.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -184.000000 -72.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "64.000000 -184.000000 -72.000000"
 }
 {
@@ -4862,7 +4862,7 @@
 }
 {
 "angle" "90"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-8.000000 152.000000 -408.000000"
 }
 {
@@ -4897,11 +4897,11 @@
 }
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "904.000000 480.000000 -416.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "904.000000 542.000000 -416.000000"
 }
 {
@@ -4921,24 +4921,24 @@
 "origin" "-1296.000000 208.000000 -228.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-926.000000 464.000000 -416.000000"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-16.000000 704.000000 106.000000"
 "spawnflags" "1"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1310.000000 676.000000 -226.000000"
 }
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-864.000000 400.000000 -416.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-352.000000 1008.000000 -416.000000"
 }
 {
@@ -5062,20 +5062,20 @@
 "origin" "1392.000000 1040.000000 -224.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "320.000000 1008.000000 -416.000000"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "832.000000 400.000000 -416.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1272.000000 676.000000 -226.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-926.000000 526.000000 -416.000000"
 }
 {

Modified: branches/nexuiz-2.0/data/maps/farewell.map
===================================================================
--- branches/nexuiz-2.0/data/maps/farewell.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/farewell.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -12248,7 +12248,7 @@
 }
 // entity 2
 {
-"classname" "item_armor_body"
+"classname" "item_armor_large"
 "origin" "696 512 48"
 }
 // entity 3
@@ -12265,86 +12265,86 @@
 }
 // entity 5
 {
-"classname" "item_armor_shard"
+"classname" "item_armor_small"
 "origin" "-160 -656 208"
 }
 // entity 6
 {
-"classname" "item_armor_shard"
+"classname" "item_armor_small"
 "origin" "-352 -656 208"
 }
 // entity 7
 {
-"classname" "item_armor_shard"
+"classname" "item_armor_small"
 "origin" "-224 -656 208"
 }
 // entity 8
 {
-"classname" "item_armor_shard"
+"classname" "item_armor_small"
 "origin" "-288 -656 208"
 }
 // entity 9
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "64 384 48"
 }
 // entity 10
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Stairs"
 "origin" "-968 -152 232"
 }
 // entity 11
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Upper Atrium"
 "origin" "-24 -376 248"
 }
 // entity 12
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Lower Atrium"
 "origin" "248 40 40"
 }
 // entity 13
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Armor"
 "origin" "616 488 104"
 }
 // entity 14
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Teleporter"
 "origin" "568 -184 40"
 }
 // entity 15
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Machinegun"
 "origin" "580 -152 248"
 }
 // entity 16
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-456 -8 40"
 "message" "Rocketlauncher"
 }
 // entity 17
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Grenadelauncher"
 "origin" "88 456 376"
 }
 // entity 18
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Crylink"
 "origin" "-936 680 392"
 }
 // entity 19
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Mega Health"
 "origin" "-1224 248 248"
 }
@@ -12411,29 +12411,29 @@
 }
 // entity 31
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "-704 0 16"
 }
 // entity 32
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "320 720 352"
 "angle" "180"
 }
 // entity 33
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "320 640 352"
 "angle" "180"
 }
 // entity 34
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "-496 0 208"
 }
 // entity 35
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "-496 -80 208"
 }
 // entity 36
@@ -12852,55 +12852,55 @@
 }
 // entity 51
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-120 136 40"
 "message" "Lower Atrium"
 }
 // entity 52
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-72 -216 40"
 "message" "Lower Atrium"
 }
 // entity 53
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-424 -88 248"
 "message" "Upper Atrium"
 }
 // entity 54
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-232 -536 248"
 "message" "Upper Atrium"
 }
 // entity 55
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-424 392 328"
 "message" "Upper Atrium"
 }
 // entity 56
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-168 424 376"
 "message" "Upper Atrium"
 }
 // entity 57
 {
-"classname" "target_location"
+"classname" "info_location"
 "message" "Upper Atrium"
 "origin" "232 648 376"
 }
 // entity 58
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-712 -136 120"
 "message" "Stairs"
 }
 // entity 59
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-728 -456 152"
 "message" "Stairs"
 }
@@ -13017,7 +13017,7 @@
 }
 // entity 79
 {
-"classname" "target_location"
+"classname" "info_location"
 "origin" "-960 -336 112"
 "message" "Electro"
 }

Modified: branches/nexuiz-2.0/data/maps/final_rage.map
===================================================================
--- branches/nexuiz-2.0/data/maps/final_rage.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/final_rage.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -11163,7 +11163,7 @@
 }
 // entity 21
 {
-"classname" "item_armor_body"
+"classname" "item_armor_large"
 "origin" "672 1440 280"
 }
 // entity 22
@@ -11237,7 +11237,7 @@
 }
 // entity 31
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "640 424 -48"
 }
 // entity 32
@@ -11827,27 +11827,27 @@
 }
 // entity 58
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "632 320 312"
 }
 // entity 59
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "616 360 312"
 }
 // entity 60
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "616 440 312"
 }
 // entity 61
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "632 480 312"
 }
 // entity 62
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "600 400 312"
 }
 // entity 63
@@ -11858,7 +11858,7 @@
 }
 // entity 64
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "576 -672 144"
 }
 // entity 65
@@ -12210,12 +12210,12 @@
 }
 // entity 91
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "960 528 -112"
 }
 // entity 92
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1008 576 -112"
 }
 // entity 93
@@ -12237,17 +12237,17 @@
 }
 // entity 96
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 960 144"
 }
 // entity 97
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1024 1024 144"
 }
 // entity 98
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "960 960 144"
 }
 // entity 99
@@ -12267,17 +12267,17 @@
 }
 // entity 102
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "208 432 176"
 }
 // entity 103
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "208 496 176"
 }
 // entity 104
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "144 432 176"
 }
 // entity 105
@@ -12322,7 +12322,7 @@
 }
 // entity 112
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "576 -616 -80"
 }
 // entity 113
@@ -12856,7 +12856,7 @@
 }
 // entity 133
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "152 -88 -16"
 }
 // entity 134
@@ -14060,32 +14060,32 @@
 }
 // entity 225
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-608 -544 336"
 }
 // entity 226
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-608 -480 336"
 }
 // entity 227
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-544 -544 336"
 }
 // entity 228
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "416 608 400"
 }
 // entity 229
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "352 608 400"
 }
 // entity 230
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "416 544 400"
 }
 // entity 231
@@ -14749,17 +14749,17 @@
 }
 // entity 325
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "80 1000 144"
 }
 // entity 326
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "120 1040 144"
 }
 // entity 327
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "40 960 144"
 }
 // entity 328

Modified: branches/nexuiz-2.0/data/maps/ons-reborn.map
===================================================================
--- branches/nexuiz-2.0/data/maps/ons-reborn.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/ons-reborn.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -153285,12 +153285,12 @@
 }
 // entity 128
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-6432 6688 2056"
 }
 // entity 129
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-6240 6304 2096"
 }
 // entity 130
@@ -153644,12 +153644,12 @@
 }
 // entity 186
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-6688 6688 2056"
 }
 // entity 187
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-6560 6560 2056"
 }
 // entity 188
@@ -153696,7 +153696,7 @@
 }
 // entity 195
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-6040 -456 2848"
 }
 // entity 196
@@ -153721,12 +153721,12 @@
 }
 // entity 200
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-5776 -608 2624"
 }
 // entity 201
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-2480 2720 4056"
 }
 // entity 202
@@ -153991,7 +153991,7 @@
 }
 // entity 234
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3576 6304 2864"
 }
 // entity 235
@@ -154076,7 +154076,7 @@
 }
 // entity 246
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "2720 7136 2640"
 }
 // entity 247
@@ -154165,13 +154165,13 @@
 }
 // entity 254
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "6184 -6568 2528"
 "angle" "180"
 }
 // entity 255
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "5992 -6184 2568"
 "angle" "180"
 }
@@ -154345,13 +154345,13 @@
 }
 // entity 281
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "6440 -6568 2528"
 "angle" "180"
 }
 // entity 282
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "6312 -6440 2528"
 "angle" "180"
 }
@@ -154710,7 +154710,7 @@
 }
 // entity 331
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "3088 -1000 3192"
 }
 // entity 332
@@ -154862,7 +154862,7 @@
 }
 // entity 351
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "728 -5592 3624"
 }
 // entity 352
@@ -155669,7 +155669,7 @@
 }
 // entity 381
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "6000 328 3120"
 }
 // entity 382

Modified: branches/nexuiz-2.0/data/maps/reslimed.map
===================================================================
--- branches/nexuiz-2.0/data/maps/reslimed.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/reslimed.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -21758,27 +21758,27 @@
 }
 // entity 18
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "524.000000 380.000000 352.000000"
 }
 // entity 19
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-688.000000 -400.000000 -48.000000"
 }
 // entity 20
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "224.000000 -384.000000 -48.000000"
 }
 // entity 21
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "152.000000 -424.000000 176.000000"
 }
 // entity 22
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-256.000000 -696.000000 376.000000"
 }
 // entity 23
@@ -22576,17 +22576,17 @@
 }
 // entity 32
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -832.000000 176.000000"
 }
 // entity 33
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -896.000000 176.000000"
 }
 // entity 34
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -960.000000 176.000000"
 }
 // entity 35
@@ -22602,7 +22602,7 @@
 }
 // entity 37
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-640.000000 932.000000 80.000000"
 }
 // entity 38
@@ -23021,7 +23021,7 @@
 }
 // entity 45
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1028.000000 -1724.000000 -56.000000"
 }
 // entity 46
@@ -23134,22 +23134,22 @@
 }
 // entity 47
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "984.000000 -1112.000000 160.000000"
 }
 // entity 48
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "576.000000 -1120.000000 176.000000"
 }
 // entity 49
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "512.000000 -1120.000000 176.000000"
 }
 // entity 50
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "448.000000 -1120.000000 176.000000"
 }
 // entity 51
@@ -23166,7 +23166,7 @@
 }
 // entity 53
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1552.000000 -808.000000 40.000000"
 }
 // entity 54
@@ -23349,7 +23349,7 @@
 }
 // entity 84
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1344.000000 -64.000000 -96.000000"
 "spawnflags" "1"
 }
@@ -23360,19 +23360,19 @@
 }
 // entity 86
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1344.000000 -64.000000 -160.000000"
 "spawnflags" "1"
 }
 // entity 87
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1344.000000 -64.000000 -32.000000"
 "spawnflags" "1"
 }
 // entity 88
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1344.000000 -64.000000 32.000000"
 "spawnflags" "1"
 }
@@ -23496,7 +23496,7 @@
 }
 // entity 91
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-328.000000 -680.000000 384.000000"
 }
 // entity 92
@@ -23507,7 +23507,7 @@
 }
 // entity 93
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1424.000000 -64.000000 -232.000000"
 "spawnflags" "1"
 }

Modified: branches/nexuiz-2.0/data/maps/ruiner.map
===================================================================
--- branches/nexuiz-2.0/data/maps/ruiner.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/ruiner.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -8570,7 +8570,7 @@
 }
 // entity 75
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "0 64 -96"
 }
 // entity 76
@@ -8585,7 +8585,7 @@
 }
 // entity 78
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "16 880 -344"
 }
 // entity 79
@@ -8600,81 +8600,81 @@
 }
 // entity 81
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "288 1056 -96"
 "angle" "315"
 }
 // entity 82
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "225"
 "origin" "1056 1056 -96"
 }
 // entity 83
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "384 48 -224"
 }
 // entity 84
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "320 48 -224"
 }
 // entity 85
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "256 48 -256"
 }
 // entity 86
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "192 48 -288"
 }
 // entity 87
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "128 48 -320"
 }
 // entity 88
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "64 48 -352"
 }
 // entity 89
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "96 1072 160"
 "angle" "270"
 }
 // entity 90
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "270"
 "origin" "-16 1072 160"
 }
 // entity 91
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 -64 -240"
 }
 // entity 92
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 -128 -240"
 }
 // entity 93
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 -192 -240"
 }
 // entity 94
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 -256 -240"
 }
 // entity 95
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 -320 -240"
 }
 // entity 96
@@ -8905,22 +8905,22 @@
 }
 // entity 118
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-192 384 32"
 }
 // entity 119
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-192 320 32"
 }
 // entity 120
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-192 256 32"
 }
 // entity 121
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-192 192 32"
 }
 // entity 122
@@ -9130,7 +9130,7 @@
 }
 // entity 146
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "848 432 -96"
 }
 // entity 147

Modified: branches/nexuiz-2.0/data/maps/runningman.map
===================================================================
--- branches/nexuiz-2.0/data/maps/runningman.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/runningman.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -13017,7 +13017,7 @@
 }
 // entity 23
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "368.000000 368.000000 -240.000000"
 }
 // entity 24
@@ -13053,13 +13053,13 @@
 }
 // entity 28
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "-912.000000 -208.000000 192.000000"
 }
 // entity 29
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-888.000000 -208.000000 344.000000"
 }
 // entity 30
@@ -13115,73 +13115,73 @@
 }
 // entity 39
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-160.000000 -208.000000 16.000000"
 }
 // entity 40
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -208.000000 -240.000000"
 }
 // entity 41
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -144.000000 -240.000000"
 }
 // entity 42
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -272.000000 -240.000000"
 }
 // entity 43
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -80.000000 -240.000000"
 }
 // entity 44
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -16.000000 -240.000000"
 }
 // entity 45
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -336.000000 -240.000000"
 }
 // entity 46
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -400.000000 -240.000000"
 }
 // entity 47
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "1344.000000 -88.000000 16.000000"
 }
 // entity 48
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 -24.000000 16.000000"
 }
 // entity 49
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 40.000000 16.000000"
 }
 // entity 50
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 104.000000 16.000000"
 }
 // entity 51
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 168.000000 16.000000"
 }
 // entity 52
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 232.000000 16.000000"
 }
 // entity 53
@@ -13191,7 +13191,7 @@
 }
 // entity 54
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "896.000000 -424.000000 208.000000"
 }
 // entity 55
@@ -13221,7 +13221,7 @@
 }
 // entity 60
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "368.000000 192.000000 -416.000000"
 }
 // entity 61

Modified: branches/nexuiz-2.0/data/maps/runningman_1on1remix.map
===================================================================
--- branches/nexuiz-2.0/data/maps/runningman_1on1remix.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/runningman_1on1remix.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -16075,7 +16075,7 @@
 }
 // entity 23
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "784.000000 776.000000 296.000000"
 }
 // entity 24
@@ -16111,12 +16111,12 @@
 }
 // entity 28
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "-912.000000 -208.000000 192.000000"
 }
 // entity 29
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-888.000000 -208.000000 344.000000"
 }
 // entity 30
@@ -16167,67 +16167,67 @@
 }
 // entity 38
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -208.000000 -240.000000"
 }
 // entity 39
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -144.000000 -240.000000"
 }
 // entity 40
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -272.000000 -240.000000"
 }
 // entity 41
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -80.000000 -240.000000"
 }
 // entity 42
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -16.000000 -240.000000"
 }
 // entity 43
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -336.000000 -240.000000"
 }
 // entity 44
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -400.000000 -240.000000"
 }
 // entity 45
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1344.000000 -88.000000 16.000000"
 }
 // entity 46
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 -24.000000 16.000000"
 }
 // entity 47
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 40.000000 16.000000"
 }
 // entity 48
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 104.000000 16.000000"
 }
 // entity 49
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 168.000000 16.000000"
 }
 // entity 50
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 232.000000 16.000000"
 }
 // entity 51
@@ -16237,7 +16237,7 @@
 }
 // entity 52
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "896.000000 -424.000000 208.000000"
 }
 // entity 53
@@ -16267,7 +16267,7 @@
 }
 // entity 58
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "368.000000 360.000000 -240.000000"
 }
 // entity 59
@@ -16413,27 +16413,27 @@
 }
 // entity 78
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-264.000000 -480.000000 192.000000"
 }
 // entity 79
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-368.000000 -480.000000 192.000000"
 }
 // entity 80
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-480.000000 -480.000000 192.000000"
 }
 // entity 81
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-584.000000 -480.000000 192.000000"
 }
 // entity 82
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-120.000000 144.000000 200.000000"
 }
 // entity 83

Modified: branches/nexuiz-2.0/data/maps/runningmanctf.map
===================================================================
--- branches/nexuiz-2.0/data/maps/runningmanctf.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/runningmanctf.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -29477,7 +29477,7 @@
 }
 // entity 21
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "368.000000 368.000000 -240.000000"
 }
 // entity 22
@@ -29513,12 +29513,12 @@
 }
 // entity 26
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "-912.000000 -208.000000 192.000000"
 }
 // entity 27
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-2200.000000 -536.000000 128.000000"
 }
 // entity 28
@@ -29562,72 +29562,72 @@
 }
 // entity 35
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-160.000000 -208.000000 16.000000"
 }
 // entity 36
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -208.000000 -240.000000"
 }
 // entity 37
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -144.000000 -240.000000"
 }
 // entity 38
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -272.000000 -240.000000"
 }
 // entity 39
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -80.000000 -240.000000"
 }
 // entity 40
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -16.000000 -240.000000"
 }
 // entity 41
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -336.000000 -240.000000"
 }
 // entity 42
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -400.000000 -240.000000"
 }
 // entity 43
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1344.000000 -88.000000 16.000000"
 }
 // entity 44
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 -24.000000 16.000000"
 }
 // entity 45
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 40.000000 16.000000"
 }
 // entity 46
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 104.000000 16.000000"
 }
 // entity 47
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 168.000000 16.000000"
 }
 // entity 48
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1344.000000 232.000000 16.000000"
 }
 // entity 49
@@ -29637,7 +29637,7 @@
 }
 // entity 50
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "896.000000 -424.000000 208.000000"
 }
 // entity 51
@@ -29667,7 +29667,7 @@
 }
 // entity 56
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "368.000000 192.000000 -416.000000"
 }
 // entity 57
@@ -29824,7 +29824,7 @@
 }
 // entity 77
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-1296.000000 2032.000000 -240.000000"
 }
 // entity 78
@@ -29860,7 +29860,7 @@
 }
 // entity 82
 {
-"classname" "item_health"
+"classname" "item_health_medium"
 "origin" "-1872.000000 752.000000 192.000000"
 }
 // entity 83
@@ -29904,72 +29904,72 @@
 }
 // entity 90
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1872.000000 1504.000000 16.000000"
 }
 // entity 91
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1872.000000 1344.000000 -240.000000"
 }
 // entity 92
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1808.000000 1344.000000 -240.000000"
 }
 // entity 93
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1936.000000 1344.000000 -240.000000"
 }
 // entity 94
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1744.000000 1344.000000 -240.000000"
 }
 // entity 95
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-1680.000000 1344.000000 -240.000000"
 }
 // entity 96
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2000.000000 1344.000000 -240.000000"
 }
 // entity 97
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-2064.000000 1344.000000 -240.000000"
 }
 // entity 98
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1752.000000 3008.000000 16.000000"
 }
 // entity 99
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-1688.000000 3008.000000 16.000000"
 }
 // entity 100
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-1624.000000 3008.000000 16.000000"
 }
 // entity 101
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-1560.000000 3008.000000 16.000000"
 }
 // entity 102
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-1496.000000 3008.000000 16.000000"
 }
 // entity 103
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-1432.000000 3008.000000 16.000000"
 }
 // entity 104
@@ -29979,7 +29979,7 @@
 }
 // entity 105
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-2088.000000 2560.000000 208.000000"
 }
 // entity 106
@@ -30009,7 +30009,7 @@
 }
 // entity 111
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1472.000000 2032.000000 -416.000000"
 }
 // entity 112
@@ -30052,22 +30052,22 @@
 }
 // entity 119
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1456.000000 -208.000000 64.000000"
 }
 // entity 120
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1520.000000 -208.000000 64.000000"
 }
 // entity 121
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1872.000000 144.000000 64.000000"
 }
 // entity 122
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1872.000000 208.000000 64.000000"
 }
 // entity 123
@@ -30089,37 +30089,37 @@
 }
 // entity 126
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-440.000000 1032.000000 -240.000000"
 }
 // entity 127
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-472.000000 1064.000000 -240.000000"
 }
 // entity 128
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-504.000000 1096.000000 -240.000000"
 }
 // entity 129
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-536.000000 1128.000000 -240.000000"
 }
 // entity 130
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-568.000000 1160.000000 -240.000000"
 }
 // entity 131
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-600.000000 1192.000000 -240.000000"
 }
 // entity 132
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-632.000000 1224.000000 -240.000000"
 }
 // entity 133

Modified: branches/nexuiz-2.0/data/maps/silvercity.map
===================================================================
--- branches/nexuiz-2.0/data/maps/silvercity.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/silvercity.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -8332,7 +8332,7 @@
 }
 // entity 50
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1817.000000 6.000000 1139.000000"
 }
 // entity 51
@@ -8362,7 +8362,7 @@
 }
 // entity 56
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1810.000000 -2.000000 1139.000000"
 }
 // entity 57
@@ -8387,7 +8387,7 @@
 }
 // entity 61
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "noalign" "1"
 "origin" "-9.000000 1722.000000 1417.000000"
 }
@@ -8398,22 +8398,22 @@
 }
 // entity 63
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-605.000000 848.000000 -261.000000"
 }
 // entity 64
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-605.000000 668.000000 -261.000000"
 }
 // entity 65
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-508.000000 512.000000 -261.000000"
 }
 // entity 66
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1490.000000 -1589.000000 -261.000000"
 }
 // entity 67
@@ -8448,7 +8448,7 @@
 }
 // entity 73
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1985.000000 -230.000000 -300.000000"
 }
 // entity 74
@@ -8458,7 +8458,7 @@
 }
 // entity 75
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-535.000000 -213.000000 59.000000"
 }
 // entity 76
@@ -8473,23 +8473,23 @@
 }
 // entity 78
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1566.000000 -439.000000 251.000000"
 }
 // entity 79
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1316.000000 868.000000 59.000000"
 }
 // entity 80
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "-1316.000000 993.000000 59.000000"
 }
 // entity 81
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-545.000000 219.000000 1411.000000"
 }
 // entity 82
@@ -8504,7 +8504,7 @@
 }
 // entity 84
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "519.000000 -1385.000000 -261.000000"
 }
 // entity 85
@@ -8524,7 +8524,7 @@
 }
 // entity 88
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1976.000000 -1984.000000 -59.000000"
 }
 // entity 89

Modified: branches/nexuiz-2.0/data/maps/skyway.map
===================================================================
--- branches/nexuiz-2.0/data/maps/skyway.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/skyway.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -6557,42 +6557,42 @@
 }
 // entity 15
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-567.000000 -349.000000 1019.000000"
 }
 // entity 16
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "426.000000 278.000000 546.000000"
 }
 // entity 17
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "93.000000 704.000000 -30.000000"
 }
 // entity 18
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "179.000000 704.000000 -30.000000"
 }
 // entity 19
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "256.000000 704.000000 -30.000000"
 }
 // entity 20
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "333.000000 704.000000 -30.000000"
 }
 // entity 21
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "410.000000 704.000000 -30.000000"
 }
 // entity 22
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "486.000000 704.000000 -30.000000"
 }
 // entity 23
@@ -6690,12 +6690,12 @@
 }
 // entity 41
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-320.000000 512.000000 105.000000"
 }
 // entity 42
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "621.000000 99.000000 114.000000"
 }
 // entity 43
@@ -6826,12 +6826,12 @@
 }
 // entity 60
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "560.000000 632.000000 792.000000"
 }
 // entity 61
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "8.000000 48.000000 792.000000"
 }
 // entity 62
@@ -6841,27 +6841,27 @@
 }
 // entity 63
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-480.000000 640.000000 792.000000"
 }
 // entity 64
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-400.000000 640.000000 792.000000"
 }
 // entity 65
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 640.000000 792.000000"
 }
 // entity 66
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-248.000000 640.000000 792.000000"
 }
 // entity 67
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-192.000000 640.000000 792.000000"
 }
 // entity 68
@@ -6871,42 +6871,42 @@
 }
 // entity 69
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-304.000000 888.000000 424.000000"
 }
 // entity 70
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-208.000000 816.000000 424.000000"
 }
 // entity 71
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-208.000000 888.000000 424.000000"
 }
 // entity 72
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-304.000000 816.000000 424.000000"
 }
 // entity 73
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "648.000000 1248.000000 440.000000"
 }
 // entity 74
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "744.000000 1176.000000 440.000000"
 }
 // entity 75
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "744.000000 1248.000000 440.000000"
 }
 // entity 76
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "648.000000 1176.000000 440.000000"
 }
 // entity 77
@@ -6926,12 +6926,12 @@
 }
 // entity 80
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1312.000000 728.000000 424.000000"
 }
 // entity 81
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1240.000000 728.000000 424.000000"
 }
 // entity 82
@@ -6946,12 +6946,12 @@
 }
 // entity 84
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "235.000000 933.000000 1003.000000"
 }
 // entity 85
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "70.000000 784.000000 1003.000000"
 }
 // entity 86

Modified: branches/nexuiz-2.0/data/maps/slimepit.map
===================================================================
--- branches/nexuiz-2.0/data/maps/slimepit.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/slimepit.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -9903,27 +9903,27 @@
 }
 // entity 20
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-452.000000 12.000000 192.000000"
 }
 // entity 21
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-688.000000 -400.000000 -48.000000"
 }
 // entity 22
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "224.000000 -384.000000 -48.000000"
 }
 // entity 23
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "152.000000 -424.000000 176.000000"
 }
 // entity 24
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-128.000000 16.000000 368.000000"
 }
 // entity 25
@@ -10832,37 +10832,37 @@
 }
 // entity 36
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -704.000000 176.000000"
 }
 // entity 37
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -768.000000 176.000000"
 }
 // entity 38
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -832.000000 176.000000"
 }
 // entity 39
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -896.000000 176.000000"
 }
 // entity 40
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -960.000000 176.000000"
 }
 // entity 41
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-16.000000 -1024.000000 176.000000"
 }
 // entity 42
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-640.000000 576.000000 0.000000"
 }
 // entity 43

Modified: branches/nexuiz-2.0/data/maps/soylent.map
===================================================================
--- branches/nexuiz-2.0/data/maps/soylent.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/soylent.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -3999,7 +3999,7 @@
 }
 // entity 2
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "1040.000000 -464.000000 400.000000"
 }
 // entity 3
@@ -4038,12 +4038,12 @@
 }
 // entity 7
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "32.000000 64.000000 672.000000"
 }
 // entity 8
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "560.000000 -896.000000 160.000000"
 }
 // entity 9
@@ -4058,17 +4058,17 @@
 }
 // entity 11
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "976.000000 -800.000000 400.000000"
 }
 // entity 12
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "976.000000 -928.000000 400.000000"
 }
 // entity 13
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "976.000000 -1056.000000 400.000000"
 }
 // entity 14
@@ -4083,22 +4083,22 @@
 }
 // entity 16
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-560.000000 -480.000000 464.000000"
 }
 // entity 17
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "544.000000 -800.000000 400.000000"
 }
 // entity 18
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "544.000000 -928.000000 400.000000"
 }
 // entity 19
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "544.000000 -1056.000000 400.000000"
 }
 // entity 20
@@ -4118,12 +4118,12 @@
 }
 // entity 23
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "544.000000 208.000000 656.000000"
 }
 // entity 24
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "272.000000 -1024.000000 656.000000"
 }
@@ -4146,7 +4146,7 @@
 }
 // entity 28
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "960.000000 64.000000 144.000000"
 }
 // entity 29

Modified: branches/nexuiz-2.0/data/maps/starship.map
===================================================================
--- branches/nexuiz-2.0/data/maps/starship.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/starship.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -38652,22 +38652,22 @@
 }
 // entity 1
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-320.000000 -352.000000 -176.000000"
 }
 // entity 2
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1296.000000 576.000000 16.000000"
 }
 // entity 3
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "576.000000 -752.000000 -80.000000"
 }
 // entity 4
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-224.000000 -32.000000 16.000000"
 }
 // entity 5
@@ -38691,7 +38691,7 @@
 }
 // entity 8
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "896.000000 -192.000000 -80.000000"
 }
 // entity 9
@@ -38701,17 +38701,17 @@
 }
 // entity 10
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "608.000000 -128.000000 -80.000000"
 }
 // entity 11
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-320.000000 -768.000000 16.000000"
 }
 // entity 12
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "576.000000 -1344.000000 80.000000"
 }
 // entity 13
@@ -38749,17 +38749,17 @@
 }
 // entity 16
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-416.000000 -32.000000 16.000000"
 }
 // entity 17
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "128.000000 128.000000 16.000000"
 }
 // entity 18
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "112.000000 432.000000 -176.000000"
 }
 // entity 19
@@ -38923,32 +38923,32 @@
 }
 // entity 35
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "128.000000 -464.000000 -80.000000"
 }
 // entity 36
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-320.000000 768.000000 -176.000000"
 }
 // entity 37
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1024.000000 768.000000 16.000000"
 }
 // entity 38
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-352.000000 480.000000 -176.000000"
 }
 // entity 39
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-672.000000 224.000000 16.000000"
 }
 // entity 40
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-160.000000 608.000000 16.000000"
 }
 // entity 41
@@ -39033,48 +39033,48 @@
 }
 // entity 50
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "angle" "90"
 "origin" "704.000000 -1088.000000 -80.000000"
 }
 // entity 51
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "832.000000 -1344.000000 80.000000"
 }
 // entity 52
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1104.000000 -1024.000000 80.000000"
 }
 // entity 53
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-320.000000 -896.000000 16.000000"
 }
 // entity 54
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-576.000000 -768.000000 16.000000"
 }
 // entity 55
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-576.000000 -896.000000 16.000000"
 }
 // entity 56
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "896.000000 -384.000000 -80.000000"
 }
 // entity 57
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "544.000000 656.000000 -144.000000"
 }
 // entity 58
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "544.000000 496.000000 -144.000000"
 }
 // entity 59
@@ -39449,7 +39449,7 @@
 }
 // entity 113
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1296.000000 192.000000 16.000000"
 }
 // entity 114

Modified: branches/nexuiz-2.0/data/maps/stormkeep.map
===================================================================
--- branches/nexuiz-2.0/data/maps/stormkeep.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/stormkeep.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -14795,17 +14795,17 @@
 }
 // entity 494
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-936 1128 8"
 }
 // entity 495
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-936 1176 8"
 }
 // entity 496
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1256 640 -24"
 }
 // entity 497
@@ -14825,13 +14825,13 @@
 }
 // entity 500
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "176 1240 -16"
 }
 // entity 501
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "180"
 "origin" "176 1336 -16"
 }
@@ -14859,7 +14859,7 @@
 }
 // entity 506
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-924 -144 88"
 }
 // entity 507
@@ -14870,32 +14870,32 @@
 }
 // entity 508
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1760 304 -16"
 }
 // entity 509
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1752 360 -16"
 }
 // entity 510
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1735 416 -16"
 }
 // entity 511
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1704 472 -16"
 }
 // entity 512
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1652.000000 516.000000 -16.000000"
 }
 // entity 513
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "1696 -264 -16"
 }
 // entity 514
@@ -14915,12 +14915,12 @@
 }
 // entity 517
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-408 -448 -8"
 }
 // entity 518
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-464 -448 -8"
 }
 // entity 519
@@ -14951,48 +14951,48 @@
 }
 // entity 524
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1208 -752 0"
 }
 // entity 525
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1280 -824 0"
 }
 // entity 526
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1376 -872 0"
 }
 // entity 527
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1512 -872 0"
 }
 // entity 528
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1608 -824 0"
 }
 // entity 529
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1664 -776 0"
 }
 // entity 530
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1704 -712 0"
 }
 // entity 531
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "135"
 "origin" "568 -800 -128"
 }
 // entity 532
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "200 -800 -128"
 "angle" "45"
 }
@@ -15010,13 +15010,13 @@
 }
 // entity 535
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "270"
 "origin" "-920 1624 8"
 }
 // entity 536
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "angle" "270"
 "origin" "-824 1624 8"
 }
@@ -15027,87 +15027,87 @@
 }
 // entity 538
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-464 200 32"
 }
 // entity 539
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-464 264 32"
 }
 // entity 540
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-464 328 32"
 }
 // entity 541
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-464 392 32"
 }
 // entity 542
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-464 456 32"
 }
 // entity 543
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "192 -920 8"
 }
 // entity 544
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "256 -920 8"
 }
 // entity 545
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "320 -920 8"
 }
 // entity 546
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "384 -920 8"
 }
 // entity 547
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "448 -920 8"
 }
 // entity 548
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "512 -920 8"
 }
 // entity 549
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "576 -920 8"
 }
 // entity 550
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "640 -920 8"
 }
 // entity 551
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-936 1032 8"
 }
 // entity 552
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-936 1080 8"
 }
 // entity 553
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-936 936 8"
 }
 // entity 554
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-936 984 8"
 }
 // entity 555

Modified: branches/nexuiz-2.0/data/maps/strength.map
===================================================================
--- branches/nexuiz-2.0/data/maps/strength.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/strength.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -27177,57 +27177,57 @@
 }
 // entity 260
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1504 1632 304"
 }
 // entity 261
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "832 1856 528"
 }
 // entity 262
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "896 1856 528"
 }
 // entity 263
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1216 832 528"
 }
 // entity 264
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1280 832 528"
 }
 // entity 265
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1344 832 528"
 }
 // entity 266
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1408 832 528"
 }
 // entity 267
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1472 832 528"
 }
 // entity 268
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1536 832 560"
 }
 // entity 269
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1600 832 592"
 }
 // entity 270
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1664 832 624"
 }
 // entity 271
@@ -27269,12 +27269,12 @@
 }
 // entity 277
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "928 576 144"
 }
 // entity 278
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "928 1088 144"
 }
 // entity 279
@@ -27301,42 +27301,42 @@
 }
 // entity 283
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "1792 160 1440"
 }
 // entity 284
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "880 1248 1184"
 }
 // entity 285
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "784 1248 1184"
 }
 // entity 286
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "512 544 1168"
 }
 // entity 287
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "640 544 1168"
 }
 // entity 288
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "768 544 1168"
 }
 // entity 289
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "896 544 1168"
 }
 // entity 290
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 544 1168"
 }
 // entity 291
@@ -27370,7 +27370,7 @@
 }
 // entity 296
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "spawnflags" "1"
 "origin" "1344 1328 800"
 }
@@ -27398,32 +27398,32 @@
 }
 // entity 301
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "192 1408 144"
 }
 // entity 302
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "256 1408 144"
 }
 // entity 303
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "320 1408 144"
 }
 // entity 304
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "384 1408 144"
 }
 // entity 305
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "448 1408 144"
 }
 // entity 306
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "848 336 720"
 }
 // entity 307
@@ -27445,17 +27445,17 @@
 }
 // entity 310
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "144 208 1440"
 }
 // entity 311
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "256 96 1440"
 }
 // entity 312
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1544 1856 1040"
 }
 // entity 313
@@ -27577,32 +27577,32 @@
 }
 // entity 333
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1536 1088 1200"
 }
 // entity 334
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1536 1032 1200"
 }
 // entity 335
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1536 1144 1200"
 }
 // entity 336
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1400 1856 1040"
 }
 // entity 337
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1448 1856 1040"
 }
 // entity 338
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "1496 1856 1040"
 }
 // entity 339
@@ -28484,7 +28484,7 @@
 }
 // entity 415
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "224 320 160"
 }
 // entity 416
@@ -28583,22 +28583,22 @@
 }
 // entity 426
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1280 1952 1648"
 }
 // entity 427
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1184 1952 1648"
 }
 // entity 428
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1024 1952 1648"
 }
 // entity 429
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "1104 1952 1648"
 }
 // entity 430

Modified: branches/nexuiz-2.0/data/maps/turret_test.map
===================================================================
--- branches/nexuiz-2.0/data/maps/turret_test.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/turret_test.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -2063,13 +2063,13 @@
 }
 // entity 14
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1024 192 16"
 }
 // entity 15
 {
 "origin" "1024 -192 16"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 16
 {
@@ -2095,31 +2095,31 @@
 // entity 20
 {
 "origin" "1152 192 16"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 21
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1024 320 16"
 }
 // entity 22
 {
 "origin" "1152 320 16"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 23
 {
 "origin" "1024 -320 16"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 24
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1152 -320 16"
 }
 // entity 25
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "1152 -192 16"
 }
 // entity 26
@@ -2577,43 +2577,43 @@
 }
 // entity 35
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-4040 -256 16"
 }
 // entity 36
 {
 "origin" "-3776 128 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 37
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-3776 -64 16"
 }
 // entity 38
 {
 "origin" "-4160 -256 16"
-"classname" "item_armor1"
+"classname" "item_armor_small"
 }
 // entity 39
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-3968 -256 16"
 }
 // entity 40
 {
 "origin" "-4096 -256 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 41
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-3776 64 16"
 }
 // entity 42
 {
 "origin" "-3776 0 16"
-"classname" "item_health1"
+"classname" "item_health_small"
 }
 // entity 43
 {
@@ -2701,33 +2701,33 @@
 }
 // entity 55
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-3544 -1136 48"
 }
 // entity 56
 {
 "origin" "-3464 -1248 48"
-"classname" "item_health25"
+"classname" "item_health_medium"
 }
 // entity 57
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-3200 704 48"
 }
 // entity 58
 {
 "origin" "-3184 840 48"
-"classname" "item_health25"
+"classname" "item_health_medium"
 }
 // entity 59
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-1968 952 48"
 }
 // entity 60
 {
 "origin" "-2016 824 48"
-"classname" "item_health25"
+"classname" "item_health_medium"
 }
 // entity 61
 {
@@ -2894,18 +2894,18 @@
 }
 // entity 65
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-1920 832 48"
 }
 // entity 66
 {
 "origin" "-3136 768 48"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 67
 {
 "origin" "-3424 -1152 48"
-"classname" "item_armor25"
+"classname" "item_armor_large"
 }
 // entity 68
 {

Modified: branches/nexuiz-2.0/data/maps/warfare.map
===================================================================
--- branches/nexuiz-2.0/data/maps/warfare.map	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/maps/warfare.map	2009-03-28 18:57:46 UTC (rev 6348)
@@ -25485,15 +25485,15 @@
 }
 }
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "-304.000000 -96.000000 336.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-336.000000 -1080.000000 88.000000"
 }
 {
-"classname" "item_armor1"
+"classname" "item_armor_small"
 "origin" "-440.000000 -976.000000 88.000000"
 }
 {
@@ -25508,7 +25508,7 @@
 }
 {
 "angle" "270"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "384.000000 224.000000 16.000000"
 }
 {
@@ -25516,12 +25516,12 @@
 "origin" "832.000000 64.000000 336.000000"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "800.000000 -1120.000000 408.000000"
 }
 {
 "angle" "180"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "1008.000000 -544.000000 336.000000"
 }
 {
@@ -25541,24 +25541,24 @@
 "origin" "-512.000000 -544.000000 184.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-72.000000 640.000000 176.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "8.000000 640.000000 176.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "48.000000 -648.000000 176.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "144.000000 -648.000000 176.000000"
 }
 {
 "angle" "270"
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "320.000000 224.000000 16.000000"
 }
 {
@@ -25572,11 +25572,11 @@
 "target" "int1"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-528.000000 -120.000000 496.000000"
 }
 {
-"classname" "item_health1"
+"classname" "item_health_small"
 "origin" "-528.000000 -40.000000 496.000000"
 }
 {
@@ -25609,11 +25609,11 @@
 "origin" "96.000000 -1152.000000 24.000000"
 }
 {
-"classname" "item_health25"
+"classname" "item_health_medium"
 "origin" "784.000000 672.000000 336.000000"
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "-704.000000 576.000000 176.000000"
 }
 {
@@ -25634,7 +25634,7 @@
 }
 }
 {
-"classname" "item_armor25"
+"classname" "item_armor_large"
 "origin" "528.000000 320.000000 496.000000"
 }
 {
@@ -25788,7 +25788,7 @@
 }
 }
 {
-"classname" "item_health100"
+"classname" "item_health_mega"
 "origin" "-376.000000 -1016.000000 88.000000"
 }
 {

Modified: branches/nexuiz-2.0/data/models/items/g_a1.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/items/g_a25.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/items/g_a50.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/items/g_armormedium.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/items/g_h1.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/items/g_h100.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/items/g_h25.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/items/g_h50.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-03-28 18:57:46 UTC (rev 6348)
@@ -622,7 +622,7 @@
 		}
 	}
 
-	if(self.modelindex == 0)
+	if(self.modelindex == 0 && self.deadflag == DEAD_NO)
 	{
 		if(self.model != "")
 			bprint("\{1}^1Player ", self.netname, "^1 has a zero modelindex, trying to fix...\n");

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-03-28 18:57:46 UTC (rev 6348)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "c57e95e5c45c75494b2b35e5edaad80c";
+string CVAR_CHECK_DEFAULT = "11669b91ec9e0214a0e0ac37a3573c1a";
 string CVAR_CHECK_WEAPONS = "6dd73b6c78519153d50f876be23bfe77";
 
 float	FALSE					= 0;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2009-03-28 18:57:46 UTC (rev 6348)
@@ -470,7 +470,7 @@
 	if(g_grappling_hook)
 		hook_shotorigin = '8 -8 -12';
 	else
-		hook_shotorigin = shotorg_adjust('26.2148 9.2059 -15.9772', FALSE, FALSE);
+		hook_shotorigin = shotorg_adjust('26.2148 9.2059 -15.9772', TRUE, FALSE);
 }
 
 void SetGrappleHookBindings()

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-03-28 18:57:46 UTC (rev 6348)
@@ -2042,6 +2042,8 @@
 
 vector shotorg_adjust(vector vecs, float y_is_right, float visual)
 {
+	string s;
+	vector v;
 	if (cvar("g_shootfromeye"))
 	{
 		if(visual)
@@ -2060,6 +2062,16 @@
 		vecs_y = 0;
 		vecs_z -= 4;
 	}
+	else if((s = cvar_string("g_shootfromfixedorigin")) != "")
+	{
+		v = stov(s);
+		if(y_is_right)
+			v_y = -v_y;
+		if(v_x != 0)
+			vecs_x = v_x;
+		vecs_y = v_y;
+		vecs_z = v_z;
+	}
 	return vecs;
 }
 

Deleted: branches/nexuiz-2.0/data/textures/50hpskin.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/50hpskin_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/50hpskin_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/50hpskin_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/bulletammoskin.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/electroskin.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/electroskin_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/electroskin_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/electroskin_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/electroskin_shirt.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/glaunch.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/glaunch_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/glaunch_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/glaunch_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/glaunch_pants.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/glaunch_shirt.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/grenskin.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hagar.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hagar_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hagar_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hagar_norm.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hagar_pants.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hagar_shirt.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hlac.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hlac_glass.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/hlac_plasma.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/laskin.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/laskin_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/laskin_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/laskin_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/lhskin.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/lhskin_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/lhskin_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/lhskin_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/mhskin.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/mhskin_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/mhskin_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/mhskin_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rocket1.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rocketam.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rocketam_bump.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrclip_d.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrclip_d_bump.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrclip_d_spec.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrfx_d.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrfx_d_norm.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrfx_d_spec.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrock_d.jpg
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrock_d_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrock_d_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/rrock_d_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/saskin.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/saskin_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/saskin_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/saskin_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shard.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shard_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shard_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shard_norm.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shellsamm.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shellsamm_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shotgun.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shotgun_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shotgun_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shotgun_glow.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shotgun_pants.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shotgun_shirt.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shskin.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shskin_bump.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shskin_gloss.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shskin_glow.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/misc/tools/makebuild.sh
===================================================================
--- branches/nexuiz-2.0/misc/tools/makebuild.sh	2009-03-28 17:51:54 UTC (rev 6347)
+++ branches/nexuiz-2.0/misc/tools/makebuild.sh	2009-03-28 18:57:46 UTC (rev 6348)
@@ -10,7 +10,7 @@
 base=`pwd`
 
 # customizable specific stuff
-netradiant_release=1.5.0-svn222
+netradiant_release=1.5.0-svn227
 basepk3=$base/data20080229.pk3 # 2.4
 hotbasepk3= # hotfix
 nexdir=$base/nexuiz
@@ -178,6 +178,7 @@
 cd "$tmpdir"
 cp "$nexdir/"nexuiz-*.sh "$tmpdir/"
 cp "$nexdir/gpl.txt" "$tmpdir/"
+cp "$nexdir/readme.html" "$tmpdir/"
 
 # prepare data
 cd "$nexdir/data"
@@ -260,10 +261,14 @@
 mkdir extra
 cd extra
 wget http://www.icculus.org/netradiant/files/netradiant-${netradiant_release}-win32.zip
+#echo "Downloading netradiant, press enter and type the PWs"
+#read -r DUMMY
+#scp divverent at icculus.org:netradiant-webspace/files/netradiant-${netradiant_release}-win32.zip .
 unzip netradiant-${netradiant_release}-win32.zip
 mv NetRadiant netradiant-${netradiant_release}-win32
 rm -f netradiant-${netradiant_release}-win32.zip
 wget http://www.icculus.org/netradiant/files/netradiant-${netradiant_release}-osxintel.zip
+#scp divverent at icculus.org:netradiant-webspace/files/netradiant-${netradiant_release}-osxintel.zip .
 unzip netradiant-${netradiant_release}-osxintel.zip
 mv NetRadiant.app NetRadiant-${netradiant_release}-osxintel.app
 rm -f netradiant-${netradiant_release}-osxintel.zip
@@ -284,7 +289,7 @@
 find . -name .svn -exec rm -rf {} \; -prune
 
 rm -f "$zipdir/nexuiz$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip"           Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/havoc/* Nexuiz/extra/*
+zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip"           Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/readme.html Nexuiz/server Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/havoc/* Nexuiz/extra/*
 ln -snf nexuiz$date$ext.zip "$zipdir/nexuiz-$newest.zip"
 
 rm -f "$zipdir/nexuizengineonly$date$ext.zip"
@@ -328,15 +333,15 @@
 fi
 
 rm -f "$zipdir/nexuizpatch$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/datapatch$tag$date.pk3 Nexuiz/havoc/*
+zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/readme.html Nexuiz/server Nexuiz/data/datapatch$tag$date.pk3 Nexuiz/havoc/*
 ln -snf nexuizpatch$date$ext.zip "$zipdir/nexuizpatch-$newest.zip"
 
 [ -n "$hotbasepk3" ] && rm -f "$zipdir/nexuizhotfix$date$ext.zip"
-[ -n "$hotbasepk3" ] && zip $zipflags -9yr "$zipdir/nexuizhotfix$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/datapatch$tag$date""hotfix.pk3 Nexuiz/havoc/*
+[ -n "$hotbasepk3" ] && zip $zipflags -9yr "$zipdir/nexuizhotfix$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/readme.html Nexuiz/server Nexuiz/data/datapatch$tag$date""hotfix.pk3 Nexuiz/havoc/*
 [ -n "$hotbasepk3" ] && ln -snf nexuizhotfix$date$ext.zip "$zipdir/nexuizhotfix-$newest.zip"
 
 rm -f "$zipdir/nexuizdocs$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizdocs$date$ext.zip"       Nexuiz/gpl.txt Nexuiz/Docs
+zip $zipflags -9yr "$zipdir/nexuizdocs$date$ext.zip"       Nexuiz/gpl.txt Nexuiz/Docs Nexuiz/readme.html
 ln -snf nexuizdocs$date$ext.zip "$zipdir/nexuizdocs-$newest.zip"
 
 rm -f "$zipdir/nexuizdebug$date$ext.zip"



More information about the nexuiz-commits mailing list