Merge branch 'master' into pending-release

[xonotic/xonotic-maps.pk3dir.git] / maps / techassault.map

diff --git a/maps/techassault.map b/maps/techassault.map
index aacc5745456c577341e95e193adeda40df1cc259..e1c98cf8844a2a15d4bfc8120a37cd55c3b098b9 100644 (file)
--- a/maps/techassault.map
+++ b/maps/techassault.map
@@ -1,8 +1,9 @@
 {
 "classname" "worldspawn"
-"message" "techassault"
-"author" "SavageX and Cortez666"
+"message" "Techassault"
+"author" "SavageX, Cortez"
 "license" "GPL"
+"_description" "A medium-sized assault map"
 {
 ( -1344 -128 0 ) ( -768 -64 0 ) ( -832 -128 0 ) exx/floor-metal02 0 0 0 0.25 0.25 0 0 0
 ( -832 -128 0 ) ( -768 -64 0 ) ( -768 -64 -16 ) common/caulk 32 0 0 0.25 0.25 0 0 0
@@ -11153,12 +11154,12 @@ exx/base-metal04
 }
 }
 {
-( -328 488 552 ) ( -328 480 552 ) ( -512 488 552 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( -328 576 552 ) ( -512 576 552 ) ( -328 576 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( -320 488 552 ) ( -320 488 544 ) ( -320 480 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( -328 488 552 ) ( -328 480 552 ) ( -512 488 552 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -328 576 552 ) ( -512 576 552 ) ( -328 576 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( -320 488 552 ) ( -320 488 544 ) ( -320 480 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 ( -512 480 544 ) ( -328 480 544 ) ( -512 488 544 ) exx/floor-grate01 -86 0 0 0.75 0.75 0 0 0
-( -512 384 544 ) ( -512 384 552 ) ( -328 384 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( -512 480 544 ) ( -512 488 544 ) ( -512 480 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( -512 384 544 ) ( -512 384 552 ) ( -328 384 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( -512 480 544 ) ( -512 488 544 ) ( -512 480 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 }
 {
 ( -280 -384 584 ) ( -288 -384 584 ) ( -280 -384 576 ) common/caulk 96 224 0 0.25 0.25 0 0 0
@@ -11347,12 +11348,12 @@ exx/base-metal04
 }
 }
 {
-( -328 -472 552 ) ( -328 -480 552 ) ( -512 -472 552 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( -328 -384 552 ) ( -512 -384 552 ) ( -328 -384 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( -320 -472 552 ) ( -320 -472 544 ) ( -320 -480 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( -328 -472 552 ) ( -328 -480 552 ) ( -512 -472 552 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -328 -384 552 ) ( -512 -384 552 ) ( -328 -384 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( -320 -472 552 ) ( -320 -472 544 ) ( -320 -480 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 ( -512 -480 544 ) ( -328 -480 544 ) ( -512 -472 544 ) exx/floor-grate01 -86 0 0 0.75 0.75 0 0 0
-( -512 -576 544 ) ( -512 -576 552 ) ( -328 -576 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( -512 -480 544 ) ( -512 -472 544 ) ( -512 -480 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( -512 -576 544 ) ( -512 -576 552 ) ( -328 -576 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( -512 -480 544 ) ( -512 -472 544 ) ( -512 -480 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 }
 {
 ( 4872 1792 544 ) ( 4872 2240 544 ) ( 4352 1792 544 ) exx/floor-rnd01 0 0 0 0.25 0.25 0 0 0
@@ -11573,12 +11574,12 @@ exx/base-metal04
 }
 }
 {
-( 4568 1768 552 ) ( 4568 1760 552 ) ( 4384 1768 552 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 4568 1856 552 ) ( 4384 1856 552 ) ( 4568 1856 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( 4576 1768 552 ) ( 4576 1768 544 ) ( 4576 1760 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( 4568 1768 552 ) ( 4568 1760 552 ) ( 4384 1768 552 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 4568 1856 552 ) ( 4384 1856 552 ) ( 4568 1856 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( 4576 1768 552 ) ( 4576 1768 544 ) ( 4576 1760 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 ( 4384 1760 544 ) ( 4568 1760 544 ) ( 4384 1768 544 ) exx/floor-grate01 43 -84 0 0.75 0.75 0 0 0
-( 4384 1664 544 ) ( 4384 1664 552 ) ( 4568 1664 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( 4384 1760 544 ) ( 4384 1768 544 ) ( 4384 1760 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( 4384 1664 544 ) ( 4384 1664 552 ) ( 4568 1664 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( 4384 1760 544 ) ( 4384 1768 544 ) ( 4384 1760 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 }
 {
 ( 5352 1856 584 ) ( 5344 1856 584 ) ( 5352 1856 576 ) common/caulk 96 224 0 0.25 0.25 0 0 0
@@ -11767,12 +11768,12 @@ exx/base-metal04
 }
 }
 {
-( 5304 1768 552 ) ( 5304 1760 552 ) ( 5120 1768 552 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 5304 1856 552 ) ( 5120 1856 552 ) ( 5304 1856 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( 5312 1768 552 ) ( 5312 1768 544 ) ( 5312 1760 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( 5304 1768 552 ) ( 5304 1760 552 ) ( 5120 1768 552 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 5304 1856 552 ) ( 5120 1856 552 ) ( 5304 1856 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( 5312 1768 552 ) ( 5312 1768 544 ) ( 5312 1760 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 ( 5120 1760 544 ) ( 5304 1760 544 ) ( 5120 1768 544 ) exx/floor-grate01 85 -84 0 0.75 0.75 0 0 0
-( 5120 1664 544 ) ( 5120 1664 552 ) ( 5304 1664 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( 5120 1760 544 ) ( 5120 1768 544 ) ( 5120 1760 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( 5120 1664 544 ) ( 5120 1664 552 ) ( 5304 1664 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( 5120 1760 544 ) ( 5120 1768 544 ) ( 5120 1760 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 }
 {
 ( -280 96 584 ) ( -288 96 584 ) ( -280 96 576 ) common/caulk 96 224 0 0.25 0.25 0 0 0
@@ -11961,12 +11962,12 @@ exx/base-metal04
 }
 }
 {
-( -328 8 552 ) ( -328 0 552 ) ( -512 8 552 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( -328 96 552 ) ( -512 96 552 ) ( -328 96 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( -320 8 552 ) ( -320 8 544 ) ( -320 0 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( -328 8 552 ) ( -328 0 552 ) ( -512 8 552 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -328 96 552 ) ( -512 96 552 ) ( -328 96 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( -320 8 552 ) ( -320 8 544 ) ( -320 0 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 ( -512 0 544 ) ( -328 0 544 ) ( -512 8 544 ) exx/floor-grate01 169 128 0 0.75 0.75 0 0 0
-( -512 -96 544 ) ( -512 -96 552 ) ( -328 -96 544 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
-( -512 0 544 ) ( -512 8 544 ) ( -512 0 552 ) common/nodraw 0 128 0 0.25 0.25 0 0 0
+( -512 -96 544 ) ( -512 -96 552 ) ( -328 -96 544 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
+( -512 0 544 ) ( -512 8 544 ) ( -512 0 552 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 }
 {
 ( -3904 896 64 ) ( -4096 512 64 ) ( -4096 896 64 ) map_techassault/container_blue -165 336 90 0.75 0.75 0 0 0
@@ -24060,7 +24061,7 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "-1120.000000 -320.000000 352.000000"
 "respawntime" "1"
 }
@@ -24090,7 +24091,7 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "4896.000000 2168.000000 352.000000"
 "respawntime" "1"
 }
@@ -24105,7 +24106,7 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "4512.000000 2160.000000 352.000000"
 "respawntime" "1"
 }
@@ -24402,12 +24403,12 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "-4480.000000 -64.000000 -32.000000"
 "respawntime" "1"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "-4160.000000 704.000000 -32.000000"
 "respawntime" "1"
 }
@@ -24422,7 +24423,7 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "-4160.000000 -704.000000 -32.000000"
 "respawntime" "1"
 }
@@ -24437,7 +24438,7 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "-3904.000000 0.000000 -32.000000"
 "respawntime" "1"
 }
@@ -26218,11 +26219,11 @@ exx/base-crete03
 "origin" "-2720.000000 48.000000 -96.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-2392.000000 784.000000 -96.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-3104.000000 -688.000000 -96.000000"
 }
 {
@@ -26393,7 +26394,7 @@ exx/base-crete03
 "light" "31.25"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "-24.000000 512.000000 352.000000"
 "respawntime" "1"
 }
@@ -26408,7 +26409,7 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "-24.000000 -512.000000 352.000000"
 "respawntime" "1"
 }
@@ -26425,7 +26426,7 @@ exx/base-crete03
 "angle" "159.843292"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "-32.000000 192.000000 352.000000"
 "respawntime" "1"
 }
@@ -26604,7 +26605,7 @@ exx/base-crete03
 "light" "31.25"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "5280.000000 1584.000000 352.000000"
 "respawntime" "1"
 }
@@ -26722,7 +26723,7 @@ exx/base-crete03
 "respawntime" "5"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "4704.000000 1608.000000 352.000000"
 "respawntime" "1"
 }
@@ -26743,7 +26744,7 @@ exx/base-crete03
 "origin" "1984.000000 -48.000000 352.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1984.000000 96.000000 352.000000"
 }
 {
@@ -27727,11 +27728,11 @@ exx/trim-baseboard
 "dmg" "51"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1984.000000 -960.000000 40.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1984.000000 960.000000 40.000000"
 }
 {
@@ -27861,12 +27862,12 @@ exx/trim-baseboard
 "respawntime" "5"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-2176.000000 352.000000 80.000000"
 "respawntime" "5"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-1920.000000 0.000000 80.000000"
 "respawntime" "5"
 }
@@ -28345,7 +28346,7 @@ exx/trim-baseboard
 }
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-2176.000000 -352.000000 80.000000"
 "respawntime" "5"
 }
@@ -28737,9 +28738,6 @@ exx/trim-baseboard
 "angle" "90.000000"
 }
 {
-"classname" "trigger_push"
-}
-{
 "classname" "light"
 "origin" "1472.000000 2864.000000 24.000000"
 "light" "81.25"
@@ -28990,9 +28988,6 @@ exx/trim-baseboard
 "angles" "-0.000000 0.000000 -2.721137"
 }
 {
-"classname" "func_group"
-}
-{
 "classname" "func_assault_destructible"
 "targetname" "destructible_reactordoor"
 "target" "decrease_reactordoor"
@@ -29070,10 +29065,6 @@ exx/trim-baseboard
 "target" "objective_reactordoor"
 }
 {
-"classname" "func_wall"
-"_cs" "1"
-}
-{
 "classname" "func_pointparticles"
 "mdl" "TE_EXPLOSION"
 "spawnflags" "2"
@@ -29090,14 +29081,6 @@ exx/trim-baseboard
 }
 {
 "classname" "func_wall"
-"_cs" "1"
-}
-{
-"classname" "func_wall"
-"_cs" "1"
-}
-{
-"classname" "func_wall"
 "_castshadows" "2"
 {
 ( 5162 -32 320 ) ( 5162 -288 320 ) ( 5138 -32 320 ) exx/base-metal01 248 224 0 0.25 0.25 0 0 0