minor fixes/tweaks to darkzone. Fix rocket-swallowing glass corridor, one minor textu...

diff --git a/maps/darkzone.map b/maps/darkzone.map
index 84f6a3a6158f547e0b177961d63214e2a25d8f88..1d1347b0fe06d6dcde4adbf53f4c85df4580058e 100644 (file)
--- a/maps/darkzone.map
+++ b/maps/darkzone.map
@@ -274,7 +274,7 @@ exx/panel-metal04
 ( 32 896 192 ) ( -32 896 160 ) ( 32 256 192 ) exx/panel-q201e 128 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 832 64 208 ) ( 896 -16 208 ) ( 896 0 208 ) trak6x/trim-trim3b 1023.9998168945 0 0 0.1875 0.125 0 0 0
+( 832 64 208 ) ( 896 -16 208 ) ( 896 0 208 ) trak6x/trim-trim3b 341.3359375 0.02734375 135 0.0994368568 0.0883886814 0 0 0
 ( 832 48 224 ) ( 896 0 224 ) ( 896 -16 224 ) trak6x/trim-trim3b 341.333984375 -0 135 0.0994368866 0.0883883536 0 0 0
 ( 832 64 224 ) ( 896 0 208 ) ( 896 0 224 ) trak5x/trim-trim1a 0 384 90 0.125 0.125 0 0 0
 ( 832 64 224 ) ( 832 -128 224 ) ( 832 -128 208 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -13495,7 +13495,7 @@ trak5x/base-pipe1b
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 5 0 0 0 )
 (
 ( ( 1344 928 272 0 0 ) ( 1344 928 376 0 -1.75 ) ( 1408 864 376 0 -3.3409903049 ) ( 1472 800 376 0 -4.9319806099 ) ( 1472 800 272 0 -6.6819806099 ) )
@@ -13507,7 +13507,7 @@ common/clip
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 5 0 0 0 )
 (
 ( ( 1344 1344 272 0 0 ) ( 1344 1344 376 0 -1.75 ) ( 1408 1408 376 0 -3.3409903049 ) ( 1472 1472 376 0 -4.9319806099 ) ( 1472 1472 272 0 -6.6819806099 ) )
@@ -13519,7 +13519,7 @@ common/clip
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 5 0 0 0 )
 (
 ( ( 928 1344 272 0 0 ) ( 928 1344 376 0 -1.75 ) ( 864 1408 376 0 -2.875 ) ( 800 1472 376 0 -4 ) ( 800 1472 272 0 -5.75 ) )
@@ -13531,7 +13531,7 @@ common/clip
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 5 0 0 0 )
 (
 ( ( 1280 928 272 0 0 ) ( 1280 928 376 0 -1.75 ) ( 1280 864 376 0 -2.875 ) ( 1280 800 376 0 -4 ) ( 1280 800 272 0 -5.75 ) )
@@ -14080,12 +14080,12 @@ trak5x/base-pipe1b
 }
 }
 {
-( -293.0705871582 -710.0428924561 40 ) ( -281.9570922852 -773.0705871582 32 ) ( -293.0705871582 -710.0428924561 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
-( -230.0428924561 -698.9294128418 40 ) ( -293.0705871582 -710.0428924561 32 ) ( -230.0428924561 -698.9294128418 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
-( -218.9294128418 -761.9571075439 40 ) ( -230.0428924561 -698.9294128418 32 ) ( -218.9294128418 -761.9571075439 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
-( -281.9570922852 -773.0705871582 40 ) ( -218.9294128418 -761.9571075439 32 ) ( -281.9570922852 -773.0705871582 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
-( -293.0705871582 -710.0428924561 40 ) ( -218.9294128418 -761.9571075439 40 ) ( -281.9570922852 -773.0705871582 40 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
-( -281.9570922852 -773.0705871582 32 ) ( -218.9294128418 -761.9571075439 32 ) ( -230.0428924561 -698.9294128418 32 ) common/caulk 109.6634521484 223.5416564941 10.0000009537 0.2499999851 0.2499999851 134217728 0 0
+( -293.0705871582 -710.0429077148 40 ) ( -281.9570922852 -773.0705566406 32 ) ( -293.0705871582 -710.0429077148 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
+( -230.0428924561 -698.9294433594 40 ) ( -293.0705871582 -710.0429077148 32 ) ( -230.0428924561 -698.9294433594 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
+( -218.9294128418 -761.9570922852 40 ) ( -230.0428924561 -698.9294433594 32 ) ( -218.9294128418 -761.9570922852 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
+( -281.9570922852 -773.0705566406 40 ) ( -218.9294128418 -761.9570922852 32 ) ( -281.9570922852 -773.0705566406 32 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
+( -293.0705871582 -710.0429077148 40 ) ( -218.9294128418 -761.9570922852 40 ) ( -281.9570922852 -773.0705566406 40 ) exx/base-metal06rust 112.7291717529 113 0 0.25 0.25 134217728 0 0
+( -281.9570922852 -773.0705566406 32 ) ( -218.9294128418 -761.9570922852 32 ) ( -230.0428924561 -698.9294433594 32 ) common/caulk 109.6634521484 223.5416564941 10.0000009537 0.2499999851 0.2499999851 134217728 0 0
 }
 {
 ( 0 -480 448 ) ( -32 -480 256 ) ( -32 -480 448 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
@@ -16725,7 +16725,7 @@ trak5x/base-pipe1b
 ( 992 64 24 ) ( 992 448 24 ) ( 960 448 24 ) common/caulk 96 -0 90 0.25 0.25 0 0 0
 }
 {
-( 464 64 240 ) ( 648 -192 224 ) ( 648 64 224 ) exx/floor-rnd01 -12 1 0 0.25 0.25 0 0 0
+( 464 64 240 ) ( 648 -192 224 ) ( 648 64 224 ) trak6x/trim-trim3b 1012 1 0 0.125 0.125 0 0 0
 ( 464 -192 256 ) ( 648 64 240 ) ( 648 -192 240 ) trak6x/trim-trim3b 682.6665039062 0 0 0.1875 0.125 0 0 0
 ( 464 0 224 ) ( 464 -192 224 ) ( 464 -192 208 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 464 64 256 ) ( 648 64 224 ) ( 648 64 240 ) common/caulk 0 -128 0 0.25 0.25 0 0 0
@@ -16741,7 +16741,7 @@ trak5x/base-pipe1b
 ( 832 -192 224 ) ( 648 -192 224 ) ( 648 -192 240 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 832 0 208 ) ( 832 64 208 ) ( 648 64 224 ) exx/floor-rnd01 500 257 0 0.25 0.25 0 0 0
+( 832 0 208 ) ( 832 64 208 ) ( 648 64 224 ) trak6x/trim-trim3b 1012 1 0 0.125 0.125 0 0 0
 ( 832 0 224 ) ( 648 64 240 ) ( 832 64 224 ) trak6x/trim-trim3b 682.6665039062 0 0 0.1875 0.125 0 0 0
 ( 648 0 240 ) ( 648 64 224 ) ( 648 64 240 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 ( 832 64 224 ) ( 648 64 240 ) ( 648 64 224 ) common/caulk 0 128 0 0.25 0.25 0 0 0
@@ -17398,12 +17398,12 @@ exx/floor-simplines
 ( 160 320 192 ) ( 464 336 192 ) ( 448 320 192 ) exx/trim-support03 0 320 -90 0.25 0.25 0 0 0
 }
 {
-( 1157.2548370361 247.9999694824 40 ) ( 1112 202.7451324463 32 ) ( 1112 202.7451324463 40 ) exx/base-metal06rust 157.2882995605 32 0 -0.3535533845 0.25 134217728 0 0
-( 1112 202.7451324463 40 ) ( 1066.7451629639 247.9999694824 32 ) ( 1066.7451629639 247.9999694824 40 ) exx/base-metal06rust 130.3883972168 32 0 0.3535533845 0.25 134217728 0 0
-( 1066.7451629639 247.9999694824 40 ) ( 1112 293.2548065186 32 ) ( 1112 293.2548065186 40 ) exx/base-metal06rust 157.2882995605 32 0 -0.3535533845 0.25 134217728 0 0
-( 1157.2548370361 247.9999694824 40 ) ( 1112 293.2548065186 40 ) ( 1112 293.2548065186 32 ) exx/base-metal06rust 130.3883972168 32 0 0.3535533845 0.25 134217728 0 0
-( 1157.2548370361 247.9999694824 40 ) ( 1066.7451629639 247.9999694824 40 ) ( 1112 293.2548065186 40 ) exx/panel-rs01 268.7609863281 379.3391113281 135 0.25 0.25 134217728 0 0
-( 1157.2548370361 247.9999694824 32 ) ( 1112 293.2548065186 32 ) ( 1066.7451629639 247.9999694824 32 ) exx/base-metal06rust 107.7609863281 121.3391265869 135 0.25 0.25 134217728 0 0
+( 1157.2548828125 247.9999694824 40 ) ( 1112 202.7451324463 32 ) ( 1112 202.7451324463 40 ) exx/base-metal06rust 157.2882995605 32 0 -0.3535533845 0.25 134217728 0 0
+( 1112 202.7451324463 40 ) ( 1066.7451171875 247.9999694824 32 ) ( 1066.7451171875 247.9999694824 40 ) exx/base-metal06rust 130.3883972168 32 0 0.3535533845 0.25 134217728 0 0
+( 1066.7451171875 247.9999694824 40 ) ( 1112 293.2548217773 32 ) ( 1112 293.2548217773 40 ) exx/base-metal06rust 157.2882995605 32 0 -0.3535533845 0.25 134217728 0 0
+( 1157.2548828125 247.9999694824 40 ) ( 1112 293.2548217773 40 ) ( 1112 293.2548217773 32 ) exx/base-metal06rust 130.3883972168 32 0 0.3535533845 0.25 134217728 0 0
+( 1157.2548828125 247.9999694824 40 ) ( 1066.7451171875 247.9999694824 40 ) ( 1112 293.2548217773 40 ) exx/panel-rs01 268.7609863281 379.3391113281 135 0.25 0.25 134217728 0 0
+( 1157.2548828125 247.9999694824 32 ) ( 1112 293.2548217773 32 ) ( 1066.7451171875 247.9999694824 32 ) exx/base-metal06rust 107.7609863281 121.3391265869 135 0.25 0.25 134217728 0 0
 }
 {
 ( 1152 224 24 ) ( 1088 224 28 ) ( 1152 224 28 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -23849,7 +23849,7 @@ trak5x/trim-trim1a
 {
 "classname" "light"
 "_color" "1.000000 0.994522 0.822583"
-"light" "1000"
+"light" "300"
 "origin" "64 -64 304"
 }
 {
@@ -23874,7 +23874,7 @@ trak5x/trim-trim1a
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "75"
+"light" "18"
 "origin" "-640 -1152 312"
 }
 {
@@ -23904,7 +23904,7 @@ trak5x/trim-trim1a
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "75"
+"light" "18"
 "origin" "-960 -1152 312"
 }
 {
@@ -23917,7 +23917,7 @@ trak5x/trim-trim1a
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "75"
+"light" "18"
 "origin" "-1088 -1024 312"
 }
 {
@@ -23930,7 +23930,7 @@ trak5x/trim-trim1a
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "75"
+"light" "18"
 "origin" "-1088 -768 312"
 }
 {
@@ -23943,12 +23943,12 @@ trak5x/trim-trim1a
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "75"
+"light" "18"
 "origin" "-960 -640 312"
 }
 {
 "classname" "light"
-"light" "1500"
+"light" "750"
 "origin" "808 832 352"
 "_color" "1 0.880461 0.636286"
 }
@@ -24461,32 +24461,20 @@ exx/trim-baseboard02
 }
 {
 "classname" "light"
-"origin" "-728.000000 -154.000000 -284.000000"
-"light" "30"
-"_color" "1 1 1"
-}
-{
-"classname" "light"
 "origin" "-480.000000 -154.000000 -284.000000"
-"light" "30"
+"light" "50"
 "_color" "1 1 1"
 }
 {
 "classname" "light"
 "origin" "-616.000000 -162.000000 -284.000000"
-"light" "30"
-"_color" "1 1 1"
-}
-{
-"classname" "light"
-"origin" "-728.000000 30.000000 -284.000000"
-"light" "30"
+"light" "10"
 "_color" "1 1 1"
 }
 {
 "classname" "light"
 "origin" "-600.000000 30.000000 -284.000000"
-"light" "30"
+"light" "10"
 "_color" "1 1 1"
 }
 {
@@ -24498,7 +24486,7 @@ exx/trim-baseboard02
 {
 "classname" "light"
 "origin" "-480.000000 30.000000 -284.000000"
-"light" "30"
+"light" "50"
 "_color" "1 1 1"
 }
 {
@@ -24580,47 +24568,47 @@ exx/trim-01
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-960.000000 -64.000000 440.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-1080.000000 48.000000 440.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-960.000000 48.000000 440.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-1080.000000 136.000000 440.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-960.000000 136.000000 440.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-1080.000000 -64.000000 440.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-1016.000000 -64.000000 520.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-1016.000000 48.000000 520.000000"
 }
 {
 "classname" "light"
-"light" "35"
+"light" "25"
 "origin" "-1016.000000 136.000000 520.000000"
 }
 {
@@ -24756,19 +24744,19 @@ exx/trim-01
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "64.000000 416.000000 104.000000"
 }
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "64.000000 608.000000 104.000000"
 }
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "64.000000 800.000000 104.000000"
 }
 {
@@ -24872,7 +24860,7 @@ exx/trim-01
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "288.000000 800.000000 104.000000"
 }
 {
@@ -24927,7 +24915,7 @@ exx/trim-01
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "64.000000 -544.000000 104.000000"
 }
 {
@@ -24938,7 +24926,7 @@ exx/trim-01
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "64.000000 -736.000000 104.000000"
 }
 {
@@ -24961,7 +24949,7 @@ exx/trim-01
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "-128.000000 -736.000000 104.000000"
 }
 {
@@ -24979,7 +24967,7 @@ exx/trim-01
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "-352.000000 -736.000000 104.000000"
 }
 {
@@ -27050,7 +27038,7 @@ liquids_lava/lava0_blue_flow
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "75"
+"light" "18"
 "origin" "-720.000000 -640.000000 312.000000"
 }
 {
@@ -27763,7 +27751,7 @@ exx/base-metal04
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "75"
+"light" "18"
 "origin" "-512 -1024 312"
 }
 {
@@ -28501,31 +28489,31 @@ exx/base-metal04
 {
 "classname" "light"
 "_color" "1.000000 0.977752 0.821393"
-"light" "35"
+"light" "18"
 "origin" "-504.000000 -704.000000 352.000000"
 }
 {
 "classname" "light"
 "origin" "-192.000000 -320.000000 96.000000"
-"light" "150"
+"light" "100"
 "_color" "1 0.879118 0.632197"
 }
 {
 "classname" "light"
 "origin" "-192.000000 192.000000 96.000000"
-"light" "150"
+"light" "100"
 "_color" "1 0.879118 0.632197"
 }
 {
 "classname" "light"
 "origin" "320.000000 192.000000 96.000000"
-"light" "150"
+"light" "100"
 "_color" "1 0.879118 0.632197"
 }
 {
 "classname" "light"
 "origin" "320.000000 -320.000000 96.000000"
-"light" "150"
+"light" "100"
 "_color" "1 0.879118 0.632197"
 }
 {
@@ -28543,13 +28531,13 @@ exx/base-metal04
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "504.000000 -64.000000 304.000000"
 }
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "768.000000 -64.000000 296.000000"
 }
 {
@@ -28579,7 +28567,7 @@ exx/base-metal04
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "1088.000000 240.000000 296.000000"
 }
 {
@@ -28631,25 +28619,25 @@ exx/base-metal04
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "60"
+"light" "40"
 "origin" "-544.000000 -64.000000 312.000000"
 }
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "60"
+"light" "40"
 "origin" "-544.000000 -416.000000 312.000000"
 }
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "60"
+"light" "40"
 "origin" "-544.000000 -224.000000 312.000000"
 }
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "60"
+"light" "40"
 "origin" "-416.000000 -64.000000 312.000000"
 }
 {
@@ -30143,7 +30131,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "_color" "1 1 1"
-"light" "75"
+"light" "40"
 "origin" "1120.000000 -64.000000 296.000000"
 }
 {