Move away from legacy item names, fix 2 misplaced health entities, fix nonsolid grates

diff --git a/maps/monstrosity.map b/maps/monstrosity.map
index 5ae70568981830f1f5df9c5b74fb61c5284ce919..a38d649d00f68557fdac824a2ba9f8d81166f1b8 100644 (file)
--- a/maps/monstrosity.map
+++ b/maps/monstrosity.map
@@ -5044,11 +5044,11 @@ brushDef
 brushDef
 {
 ( 1432 -864 574 ) ( 1368 -864 574 ) ( 1432 -160 574 ) ( ( 0 0.0078125 496.8125 ) ( -0.0078125 0 497.75 ) ) exx/floor-grate01-cull 134217728 0 0
-( 1432 -934.375 576 ) ( 1432 -230.375 576 ) ( 1432 -934.375 560 ) ( ( 0.015625 0 29.599609375 ) ( 0 0.015625 8 ) ) common/nodrawnonsolid 134217728 0 0
+( 1432 -934.375 576 ) ( 1432 -230.375 576 ) ( 1432 -934.375 560 ) ( ( 0.015625 0 29.599609375 ) ( 0 0.015625 8 ) ) common/weapclip 134217728 0 0
 ( 1368 -160 562 ) ( 1368 -864 562 ) ( 1432 -160 562 ) ( ( 0 -0.0078125 496.8125 ) ( 0.0078125 0 14.25 ) ) exx/floor-grate01-cull 134217728 0 0
-( 1368 -160 560 ) ( 1368 -160 576 ) ( 1368 -864 560 ) ( ( 0.015625 0 227.5 ) ( 0 0.015625 8 ) ) common/nodrawnonsolid 134217728 0 0
-( 1448 -102.375 64 ) ( 1368 -38.375 -64 ) ( 1448 -102.375 -64 ) ( ( 0.015625 0 0.0622062832 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 1368 -576 64 ) ( 1448 -512 -64 ) ( 1368 -576 -64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1368 -160 560 ) ( 1368 -160 576 ) ( 1368 -864 560 ) ( ( 0.015625 0 227.5 ) ( 0 0.015625 8 ) ) common/weapclip 134217728 0 0
+( 1448 -102.375 64 ) ( 1368 -38.375 -64 ) ( 1448 -102.375 -64 ) ( ( 0.015625 0 0.0622062832 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
+( 1368 -576 64 ) ( 1448 -512 -64 ) ( 1368 -576 -64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
 }
 }
 {
@@ -5243,11 +5243,11 @@ brushDef
 brushDef
 {
 ( 1072 -576 574 ) ( 1072 -640 574 ) ( 368 -576 574 ) ( ( 0.0078125 0 0.5 ) ( 0 0.0078125 496.125 ) ) exx/floor-grate01-cull 134217728 0 0
-( 1136 -576 576 ) ( 432 -576 576 ) ( 1136 -576 560 ) ( ( 0.015625 0 32.75 ) ( 0 0.015625 8 ) ) common/nodrawnonsolid 134217728 0 0
+( 1136 -576 576 ) ( 432 -576 576 ) ( 1136 -576 560 ) ( ( 0.015625 0 32.75 ) ( 0 0.015625 8 ) ) common/weapclip 134217728 0 0
 ( 368 -640 562 ) ( 1072 -640 562 ) ( 368 -576 562 ) ( ( 0.0078125 0 0.5 ) ( 0 0.0078125 15.875 ) ) exx/floor-grate01-cull 134217728 0 0
-( 368 -640 560 ) ( 368 -640 576 ) ( 1072 -640 560 ) ( ( 0.015625 0 224.25 ) ( 0 0.015625 8 ) ) common/nodrawnonsolid 134217728 0 0
-( 304 -560 64 ) ( 240 -640 -64 ) ( 304 -560 -64 ) ( ( 0.015625 0 233.5304870605 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 784 -640 64 ) ( 720 -560 -64 ) ( 784 -640 -64 ) ( ( 0.015625 0 26.5300197601 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 368 -640 560 ) ( 368 -640 576 ) ( 1072 -640 560 ) ( ( 0.015625 0 224.25 ) ( 0 0.015625 8 ) ) common/weapclip 134217728 0 0
+( 304 -560 64 ) ( 240 -640 -64 ) ( 304 -560 -64 ) ( ( 0.015625 0 233.5304870605 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
+( 784 -640 64 ) ( 720 -560 -64 ) ( 784 -640 -64 ) ( ( 0.015625 0 26.5300197601 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
 }
 }
 {
@@ -36934,10 +36934,6 @@ brushDef
 "origin" "264.000000 96.000000 64.000000"
 }
 {
-"classname" "item_health_large"
-"origin" "824.000000 272.000000 160.000000"
-}
-{
 "classname" "trigger_push"
 "target" "bounce1"
 {
@@ -36964,16 +36960,12 @@ brushDef
 "skin" "3"
 }
 {
-"classname" "weapon_rocketlauncher"
-"origin" "-1128.000000 -1160.000000 336.000000"
-}
-{
 "classname" "item_health_medium"
-"origin" "-816.000000 -464.000000 32.000000"
+"origin" "-816 -464 40"
 }
 {
 "classname" "item_health_medium"
-"origin" "-936.000000 -464.000000 32.000000"
+"origin" "-936 -464 40"
 }
 {
 "classname" "item_shells"
@@ -36993,14 +36985,6 @@ brushDef
 "origin" "-248.000000 -832.000000 584.000000"
 }
 {
-"classname" "item_armor_large"
-"origin" "-1457.000000 -72.000000 464.000000"
-}
-{
-"classname" "weapon_uzi"
-"origin" "-1960.000000 264.000000 120.000000"
-}
-{
 "classname" "item_rockets"
 "origin" "-1600.000000 -1192.000000 120.000000"
 }
@@ -37038,10 +37022,6 @@ brushDef
 "origin" "128.000000 -1112.000000 584.000000"
 }
 {
-"classname" "weapon_grenadelauncher"
-"origin" "240.000000 -776.000000 584.000000"
-}
-{
 "classname" "info_player_deathmatch"
 "origin" "712.000000 -856.000000 608.000000"
 "angle" "-180.000000"
@@ -37265,10 +37245,6 @@ brushDef
 "origin" "1472.000000 -296.000000 296.000000"
 }
 {
-"classname" "weapon_rocketlauncher"
-"origin" "1552.000000 1744.000000 192.000000"
-}
-{
 "classname" "info_player_deathmatch"
 "origin" "1176.000000 1648.000000 64.000000"
 "angle" "-180.000000"
@@ -37279,10 +37255,6 @@ brushDef
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_nex"
-"origin" "1904.000000 1008.000000 40.000000"
-}
-{
 "classname" "info_player_deathmatch"
 "origin" "752.000000 744.000000 64.000000"
 "angle" "-134.999985"
@@ -38156,3 +38128,31 @@ brushDef
 "origin" "-2112.000000 112.000000 212.000000"
 "light" "30"
 }
+{
+"classname" "weapon_mortar"
+"origin" "240.000000 -776.000000 584.000000"
+}
+{
+"classname" "weapon_devastator"
+"origin" "-1128.000000 -1160.000000 336.000000"
+}
+{
+"classname" "weapon_machinegun"
+"origin" "-1960.000000 264.000000 120.000000"
+}
+{
+"classname" "item_armor_mega"
+"origin" "-1457.000000 -72.000000 464.000000"
+}
+{
+"classname" "weapon_vortex"
+"origin" "1904.000000 1008.000000 40.000000"
+}
+{
+"classname" "weapon_devastator"
+"origin" "1552.000000 1744.000000 192.000000"
+}
+{
+"classname" "item_health_big"
+"origin" "824.000000 272.000000 160.000000"
+}