From: Mirio Date: Fri, 3 Mar 2017 16:30:07 +0000 (+0100) Subject: Merge conflict X-Git-Tag: xonotic-v0.8.2~101^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7939f4a4b09255a4183ba7857644039c2d2a155;p=xonotic%2Fxonotic-maps.pk3dir.git Merge conflict --- d7939f4a4b09255a4183ba7857644039c2d2a155 diff --cc maps/darkzone.map index f0ff8cb1,a6a55d82..594da35a --- a/maps/darkzone.map +++ b/maps/darkzone.map @@@ -30127,340 -28521,94 +30127,343 @@@ exx/base-metal0 "_color" "1 0.879118 0.632197" } { -"classname" "light" -"origin" "64.000000 288.000000 288.000000" -"light" "50" -"_color" "1 0.879118 0.632197" -} +"classname" "light" +"origin" "64.000000 288.000000 288.000000" +"light" "50" +"_color" "1 0.879118 0.632197" +} +{ +"classname" "light" +"origin" "64.000000 232.000000 352.000000" +"light" "125" +"_color" "1 0.879118 0.632197" +} +{ +"classname" "light" +"origin" "64.000000 -424.000000 416.000000" +"light" "50" +"_color" "1 0.879118 0.632197" +} +{ +"classname" "light" +"origin" "64.000000 -424.000000 288.000000" +"light" "50" +"_color" "1 0.879118 0.632197" +} +{ +"classname" "item_health_large" +"origin" "1248.000000 64.000000 256.000000" +} +{ +"classname" "light" +"_color" "1 0.917632 0.747723" +"light" "50" +"origin" "64.000000 -736.000000 152.000000" +"target" "t19" +} +{ +"classname" "light" +"_color" "1 1 1" +"light" "40" +"origin" "-544.000000 -64.000000 312.000000" +} +{ +"classname" "light" +"_color" "1 1 1" +"light" "40" +"origin" "-544.000000 -416.000000 312.000000" +} +{ +"classname" "light" +"_color" "1 1 1" +"light" "40" +"origin" "-544.000000 -224.000000 312.000000" +} +{ +"classname" "light" +"_color" "1 1 1" +"light" "40" +"origin" "-416.000000 -64.000000 312.000000" +} +{ +"classname" "func_bobbing" +{ +( 200 -464 384 ) ( 176 -464 384 ) ( 176 -464 312 ) common/origin 112 48 0 0.5 0.5 0 0 0 +( 200 -472 384 ) ( 200 -464 384 ) ( 200 -464 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0 +( 176 -472 384 ) ( 200 -472 384 ) ( 200 -472 312 ) common/origin 112 48 0 0.5 0.5 0 0 0 +( 184 -464 384 ) ( 184 -472 384 ) ( 184 -472 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0 +( 176 -464 384 ) ( 200 -464 384 ) ( 200 -472 384 ) common/origin 208 144 -90 0.5 0.5 0 0 0 +( 200 -472 304 ) ( 200 -464 304 ) ( 176 -464 304 ) common/origin 208 144 -90 0.5 0.5 0 0 0 +} +{ +( 200 -456 312 ) ( 208 -464 312 ) ( 200 -456 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 176 -464 312 ) ( 184 -456 312 ) ( 176 -464 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 184 -480 312 ) ( 176 -472 312 ) ( 184 -480 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 208 -472 312 ) ( 200 -480 312 ) ( 208 -472 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 208 -464 312 ) ( 208 -456 320 ) ( 176 -464 312 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +( 208 -480 320 ) ( 208 -472 312 ) ( 176 -480 320 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +( 208 -472 376 ) ( 208 -480 368 ) ( 176 -472 376 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +( 208 -456 368 ) ( 208 -464 376 ) ( 176 -456 368 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +( 208 -456 472 ) ( 176 -456 472 ) ( 176 -456 240 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +( 208 -480 472 ) ( 208 -456 472 ) ( 208 -456 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 176 -480 472 ) ( 208 -480 472 ) ( 208 -480 240 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +( 176 -456 472 ) ( 176 -480 472 ) ( 176 -480 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 176 -464 376 ) ( 208 -464 376 ) ( 208 -488 376 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +( 208 -480 312 ) ( 208 -456 312 ) ( 176 -456 312 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0 +} +} +{ +"classname" "func_bobbing" +{ +( 264 -464 384 ) ( 240 -464 384 ) ( 240 -464 312 ) common/origin 240 48 0 0.5 0.5 0 0 0 +( 264 -472 384 ) ( 264 -464 384 ) ( 264 -464 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0 +( 240 -472 384 ) ( 264 -472 384 ) ( 264 -472 312 ) common/origin 240 48 0 0.5 0.5 0 0 0 +( 248 -464 384 ) ( 248 -472 384 ) ( 248 -472 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0 +( 240 -464 384 ) ( 264 -464 384 ) ( 264 -472 384 ) common/origin 208 16 -90 0.5 0.5 0 0 0 +( 264 -472 304 ) ( 264 -464 304 ) ( 240 -464 304 ) common/origin 208 16 -90 0.5 0.5 0 0 0 +} +{ +( 264 -456 296 ) ( 272 -464 296 ) ( 264 -456 360 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 240 -464 296 ) ( 248 -456 296 ) ( 240 -464 360 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 248 -480 296 ) ( 240 -472 296 ) ( 248 -480 360 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 272 -472 296 ) ( 264 -480 296 ) ( 272 -472 360 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 272 -464 296 ) ( 272 -456 304 ) ( 240 -464 296 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 272 -480 304 ) ( 272 -472 296 ) ( 240 -480 304 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 272 -472 360 ) ( 272 -480 352 ) ( 240 -472 360 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 272 -456 352 ) ( 272 -464 360 ) ( 240 -456 352 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 272 -456 456 ) ( 240 -456 456 ) ( 240 -456 224 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 272 -480 456 ) ( 272 -456 456 ) ( 272 -456 224 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 240 -480 456 ) ( 272 -480 456 ) ( 272 -480 224 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 240 -456 456 ) ( 240 -480 456 ) ( 240 -480 224 ) exx/wall-metalrib01 48 496 0 -0.25 0.25 0 0 0 +( 240 -464 360 ) ( 272 -464 360 ) ( 272 -488 360 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +( 272 -480 296 ) ( 272 -456 296 ) ( 240 -456 296 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +} +} +{ +"classname" "func_bobbing" +{ +( 248 336 384 ) ( 272 336 384 ) ( 272 336 312 ) common/origin 240 48 0 -0.5 0.5 0 0 0 +( 248 344 384 ) ( 248 336 384 ) ( 248 336 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( 272 344 384 ) ( 248 344 384 ) ( 248 344 312 ) common/origin 240 48 0 -0.5 0.5 0 0 0 +( 264 336 384 ) ( 264 344 384 ) ( 264 344 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( 272 336 384 ) ( 248 336 384 ) ( 248 344 384 ) common/origin 208 16 90 0.5 0.5 0 0 0 +( 248 344 304 ) ( 248 336 304 ) ( 272 336 304 ) common/origin 208 16 90 0.5 0.5 0 0 0 +} +{ +( 248 328 296 ) ( 240 336 296 ) ( 248 328 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 272 336 296 ) ( 264 328 296 ) ( 272 336 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 264 352 296 ) ( 272 344 296 ) ( 264 352 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 240 344 296 ) ( 248 352 296 ) ( 240 344 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 240 336 296 ) ( 240 328 304 ) ( 272 336 296 ) exx/wall-metalrib01 48 48 0 0.25 -0.25 0 0 0 +( 240 352 304 ) ( 240 344 296 ) ( 272 352 304 ) exx/wall-metalrib01 48 48 0 0.25 -0.25 0 0 0 +( 240 344 360 ) ( 240 352 352 ) ( 272 344 360 ) exx/wall-metalrib01 48 48 0 0.25 -0.25 0 0 0 +( 240 328 352 ) ( 240 336 360 ) ( 272 328 352 ) exx/wall-metalrib01 48 48 0 0.25 -0.25 0 0 0 +( 240 328 456 ) ( 272 328 456 ) ( 272 328 224 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 240 352 456 ) ( 240 328 456 ) ( 240 328 224 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 272 352 456 ) ( 240 352 456 ) ( 240 352 224 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 272 328 456 ) ( 272 352 456 ) ( 272 352 224 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 272 336 360 ) ( 240 336 360 ) ( 240 360 360 ) exx/wall-metalrib01 48 48 0 0.25 -0.25 0 0 0 +( 240 352 296 ) ( 240 328 296 ) ( 272 328 296 ) exx/wall-metalrib01 48 48 0 0.25 -0.25 0 0 0 +} +} +{ +"classname" "func_bobbing" +{ +( 184 336 384 ) ( 208 336 384 ) ( 208 336 312 ) common/origin 112 48 0 -0.5 0.5 0 0 0 +( 184 344 384 ) ( 184 336 384 ) ( 184 336 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( 208 344 384 ) ( 184 344 384 ) ( 184 344 312 ) common/origin 112 48 0 -0.5 0.5 0 0 0 +( 200 336 384 ) ( 200 344 384 ) ( 200 344 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( 208 336 384 ) ( 184 336 384 ) ( 184 344 384 ) common/origin 208 144 90 0.5 0.5 0 0 0 +( 184 344 304 ) ( 184 336 304 ) ( 208 336 304 ) common/origin 208 144 90 0.5 0.5 0 0 0 +} +{ +( 184 328 296 ) ( 176 336 296 ) ( 184 328 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 208 336 296 ) ( 200 328 296 ) ( 208 336 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 200 352 296 ) ( 208 344 296 ) ( 200 352 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 176 344 296 ) ( 184 352 296 ) ( 176 344 360 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 176 336 296 ) ( 176 328 304 ) ( 208 336 296 ) exx/wall-metalrib01 304 48 0 0.25 -0.25 0 0 0 +( 176 352 304 ) ( 176 344 296 ) ( 208 352 304 ) exx/wall-metalrib01 304 48 0 0.25 -0.25 0 0 0 +( 176 344 360 ) ( 176 352 352 ) ( 208 344 360 ) exx/wall-metalrib01 304 48 0 0.25 -0.25 0 0 0 +( 176 328 352 ) ( 176 336 360 ) ( 208 328 352 ) exx/wall-metalrib01 304 48 0 0.25 -0.25 0 0 0 +( 176 328 456 ) ( 208 328 456 ) ( 208 328 224 ) exx/wall-metalrib01 304 496 0 0.25 0.25 0 0 0 +( 176 352 456 ) ( 176 328 456 ) ( 176 328 224 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 208 352 456 ) ( 176 352 456 ) ( 176 352 224 ) exx/wall-metalrib01 304 496 0 0.25 0.25 0 0 0 +( 208 328 456 ) ( 208 352 456 ) ( 208 352 224 ) exx/wall-metalrib01 48 496 0 0.25 0.25 0 0 0 +( 208 336 360 ) ( 176 336 360 ) ( 176 360 360 ) exx/wall-metalrib01 304 48 0 0.25 -0.25 0 0 0 +( 176 352 296 ) ( 176 328 296 ) ( 208 328 296 ) exx/wall-metalrib01 304 48 0 0.25 -0.25 0 0 0 +} +} +{ +"classname" "func_bobbing" +{ +( -72 336 384 ) ( -48 336 384 ) ( -48 336 312 ) common/origin 112 48 0 -0.5 0.5 0 0 0 +( -72 344 384 ) ( -72 336 384 ) ( -72 336 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( -48 344 384 ) ( -72 344 384 ) ( -72 344 312 ) common/origin 112 48 0 -0.5 0.5 0 0 0 +( -56 336 384 ) ( -56 344 384 ) ( -56 344 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( -48 336 384 ) ( -72 336 384 ) ( -72 344 384 ) common/origin 208 144 90 0.5 0.5 0 0 0 +( -72 344 304 ) ( -72 336 304 ) ( -48 336 304 ) common/origin 208 144 90 0.5 0.5 0 0 0 +} +{ +( -72 328 312 ) ( -80 336 312 ) ( -72 328 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -48 336 312 ) ( -56 328 312 ) ( -48 336 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -56 352 312 ) ( -48 344 312 ) ( -56 352 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -80 344 312 ) ( -72 352 312 ) ( -80 344 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -80 336 312 ) ( -80 328 320 ) ( -48 336 312 ) exx/wall-metalrib01 304 48 -0 0.25 -0.25 0 0 0 +( -80 352 320 ) ( -80 344 312 ) ( -48 352 320 ) exx/wall-metalrib01 304 48 -0 0.25 -0.25 0 0 0 +( -80 344 376 ) ( -80 352 368 ) ( -48 344 376 ) exx/wall-metalrib01 304 48 -0 0.25 -0.25 0 0 0 +( -80 328 368 ) ( -80 336 376 ) ( -48 328 368 ) exx/wall-metalrib01 304 48 -0 0.25 -0.25 0 0 0 +( -80 328 472 ) ( -48 328 472 ) ( -48 328 240 ) exx/wall-metalrib01 304 48 0 0.25 0.25 0 0 0 +( -80 352 472 ) ( -80 328 472 ) ( -80 328 240 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -48 352 472 ) ( -80 352 472 ) ( -80 352 240 ) exx/wall-metalrib01 304 48 0 0.25 0.25 0 0 0 +( -48 328 472 ) ( -48 352 472 ) ( -48 352 240 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -48 336 376 ) ( -80 336 376 ) ( -80 360 376 ) exx/wall-metalrib01 304 48 -0 0.25 -0.25 0 0 0 +( -80 352 312 ) ( -80 328 312 ) ( -48 328 312 ) exx/wall-metalrib01 304 48 -0 0.25 -0.25 0 0 0 +} +} +{ +"classname" "func_bobbing" +{ +( -136 336 384 ) ( -112 336 384 ) ( -112 336 312 ) common/origin 240 48 0 -0.5 0.5 0 0 0 +( -136 344 384 ) ( -136 336 384 ) ( -136 336 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( -112 344 384 ) ( -136 344 384 ) ( -136 344 312 ) common/origin 240 48 0 -0.5 0.5 0 0 0 +( -120 336 384 ) ( -120 344 384 ) ( -120 344 312 ) common/origin 208 48 0 0.5 0.5 0 0 0 +( -112 336 384 ) ( -136 336 384 ) ( -136 344 384 ) common/origin 208 16 90 0.5 0.5 0 0 0 +( -136 344 304 ) ( -136 336 304 ) ( -112 336 304 ) common/origin 208 16 90 0.5 0.5 0 0 0 +} +{ +( -136 328 312 ) ( -144 336 312 ) ( -136 328 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -112 336 312 ) ( -120 328 312 ) ( -112 336 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -120 352 312 ) ( -112 344 312 ) ( -120 352 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -144 344 312 ) ( -136 352 312 ) ( -144 344 376 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -144 336 312 ) ( -144 328 320 ) ( -112 336 312 ) exx/wall-metalrib01 48 48 -0 0.25 -0.25 0 0 0 +( -144 352 320 ) ( -144 344 312 ) ( -112 352 320 ) exx/wall-metalrib01 48 48 -0 0.25 -0.25 0 0 0 +( -144 344 376 ) ( -144 352 368 ) ( -112 344 376 ) exx/wall-metalrib01 48 48 -0 0.25 -0.25 0 0 0 +( -144 328 368 ) ( -144 336 376 ) ( -112 328 368 ) exx/wall-metalrib01 48 48 -0 0.25 -0.25 0 0 0 +( -144 328 472 ) ( -112 328 472 ) ( -112 328 240 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -144 352 472 ) ( -144 328 472 ) ( -144 328 240 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -112 352 472 ) ( -144 352 472 ) ( -144 352 240 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -112 328 472 ) ( -112 352 472 ) ( -112 352 240 ) exx/wall-metalrib01 48 48 0 0.25 0.25 0 0 0 +( -112 336 376 ) ( -144 336 376 ) ( -144 360 376 ) exx/wall-metalrib01 48 48 -0 0.25 -0.25 0 0 0 +( -144 352 312 ) ( -144 328 312 ) ( -112 328 312 ) exx/wall-metalrib01 48 48 -0 0.25 -0.25 0 0 0 +} +} +{ +"classname" "func_group" +{ +( 422.25 175.375 111.75 ) ( 428.625 181.75 192.25 ) ( 422.25 175.375 192.25 ) liquids_lava/lava0_flow 285.625 377 0 -0.200000003 0.200000003 134217728 288 0 +( 435.375 181.75 111.75 ) ( 441.75 175.375 192.25 ) ( 435.375 181.75 192.25 ) liquids_lava/lava0_flow 482.375 377 0 0.200000003 0.200000003 134217728 288 0 +( 441.75 168.625 111.75 ) ( 435.375 162.25 192.25 ) ( 441.75 168.625 192.25 ) liquids_lava/lava0_flow 154.375 377 0 -0.200000003 0.200000003 134217728 288 0 +( 422.25 175.375 111.75 ) ( 435.375 162.25 111.75 ) ( 435.375 181.75 111.75 ) liquids_lava/lava0_flow 36 16 90 0.200000003 0.200000003 134217728 288 0 +( 428.625 181.75 192.25 ) ( 441.75 168.625 192.25 ) ( 422.25 168.625 192.25 ) liquids_lava/lava0_flow 36 16 90 0.200000003 0.200000003 134217728 288 0 +( 441.75 168.625 111.75 ) ( 441.75 168.625 192.25 ) ( 441.75 175.375 192.25 ) liquids_lava/lava0_flow 36 377 0 0.200000003 0.200000003 134217728 288 0 +( 435.375 181.75 111.75 ) ( 435.375 181.75 192.25 ) ( 428.625 181.75 192.25 ) liquids_lava/lava0_flow 496 377 0 -0.200000003 0.200000003 134217728 288 0 +( 422.25 168.625 111.75 ) ( 422.25 175.375 192.25 ) ( 422.25 168.625 192.25 ) liquids_lava/lava0_flow 36 377 0 0.200000003 0.200000003 134217728 288 0 +( 435.375 162.25 111.75 ) ( 428.625 162.25 192.25 ) ( 435.375 162.25 192.25 ) liquids_lava/lava0_flow 496 377 0 -0.200000003 0.200000003 134217728 288 0 +( 428.625 162.25 111.75 ) ( 422.25 168.625 192.25 ) ( 428.625 162.25 192.25 ) liquids_lava/lava0_flow 101.625 377 0 0.200000003 0.200000003 134217728 288 0 +} +{ +patchDef2 { -"classname" "light" -"origin" "64.000000 232.000000 352.000000" -"light" "125" -"_color" "1 0.879118 0.632197" +liquids_lava/lava0_flow_pipe +( 9 5 0 0 0 ) +( +( ( 432 -443 -56 0 0 ) ( 432 -439.8571166992 -54 0 -0.0349385627 ) ( 432 -439.8571166992 -36 0 -0.1755635589 ) ( 432 -439.8571166992 -18 0 -0.3161885738 ) ( 432 -439.8571166992 16.0000019073 0 -0.5818135738 ) ) +( ( 443 -443 -56 0.109375 0 ) ( 439.8571166992 -439.8571166992 -54 0.109375 -0.0349385627 ) ( 439.8571166992 -439.8571166992 -36 0.109375 -0.1755635589 ) ( 439.8571166992 -439.8571166992 -18 0.109375 -0.3161885738 ) ( 439.8571166992 -439.8571166992 16.0000019073 0.109375 -0.5818135738 ) ) +( ( 443 -432 -56 0.21875 0 ) ( 439.8571166992 -432 -54 0.21875 -0.0349385627 ) ( 439.8571166992 -432 -36 0.21875 -0.1755635589 ) ( 439.8571166992 -432 -18 0.21875 -0.3161885738 ) ( 439.8571166992 -432 16.0000019073 0.21875 -0.5818135738 ) ) +( ( 443 -421 -56 0.328125 0 ) ( 439.8571166992 -424.1428833008 -54 0.328125 -0.0349385627 ) ( 439.8571166992 -424.1428833008 -36 0.328125 -0.1755635589 ) ( 439.8571166992 -424.1428833008 -18 0.328125 -0.3161885738 ) ( 439.8571166992 -424.1428833008 16.0000019073 0.328125 -0.5818135738 ) ) +( ( 432 -421 -56 0.4375 0 ) ( 432 -424.1428833008 -54 0.4375 -0.0349385627 ) ( 432 -424.1428833008 -36 0.4375 -0.1755635589 ) ( 432 -424.1428833008 -18 0.4375 -0.3161885738 ) ( 432 -424.1428833008 16.0000019073 0.4375 -0.5818135738 ) ) +( ( 421 -421 -56 0.546875 0 ) ( 424.1428833008 -424.1428833008 -54 0.546875 -0.0349385627 ) ( 424.1428833008 -424.1428833008 -36 0.546875 -0.1755635589 ) ( 424.1428833008 -424.1428833008 -18 0.546875 -0.3161885738 ) ( 424.1428833008 -424.1428833008 16.0000019073 0.546875 -0.5818135738 ) ) +( ( 421 -432 -56 0.65625 0 ) ( 424.1428833008 -432 -54 0.65625 -0.0349385627 ) ( 424.1428833008 -432 -36 0.65625 -0.1755635589 ) ( 424.1428833008 -432 -18 0.65625 -0.3161885738 ) ( 424.1428833008 -432 16.0000019073 0.65625 -0.5818135738 ) ) +( ( 421 -443 -56 0.765625 0 ) ( 424.1428833008 -439.8571166992 -54 0.765625 -0.0349385627 ) ( 424.1428833008 -439.8571166992 -36 0.765625 -0.1755635589 ) ( 424.1428833008 -439.8571166992 -18 0.765625 -0.3161885738 ) ( 424.1428833008 -439.8571166992 16.0000019073 0.765625 -0.5818135738 ) ) +( ( 432 -443 -56 0.875 0 ) ( 432 -439.8571166992 -54 0.875 -0.0349385627 ) ( 432 -439.8571166992 -36 0.875 -0.1755635589 ) ( 432 -439.8571166992 -18 0.875 -0.3161885738 ) ( 432 -439.8571166992 16.0000019073 0.875 -0.5818135738 ) ) +) } -{ -"classname" "light" -"origin" "64.000000 -424.000000 416.000000" -"light" "50" -"_color" "1 0.879118 0.632197" } { -"classname" "light" -"origin" "64.000000 -424.000000 288.000000" -"light" "50" -"_color" "1 0.879118 0.632197" -} +patchDef2 { -"classname" "info_player_deathmatch" -"angle" "315" -"origin" "-152.000000 96.000000 64.000000" +trak5x/misc-glass +( 9 3 0 0 0 ) +( +( ( 432 184 184 0 0 ) ( 432 184 152 0 -0.5 ) ( 432 184 120 0 -1 ) ) +( ( 444 184 184 0.1875 0 ) ( 444 184 152 0.1875 -0.5 ) ( 444 184 120 0.1875 -1 ) ) +( ( 444 172 184 0.375 0 ) ( 444 172 152 0.375 -0.5 ) ( 444 172 120 0.375 -1 ) ) +( ( 444 160 184 0.5625 0 ) ( 444 160 152 0.5625 -0.5 ) ( 444 160 120 0.5625 -1 ) ) +( ( 432 160 184 0.75 0 ) ( 432 160 152 0.75 -0.5 ) ( 432 160 120 0.75 -1 ) ) +( ( 420 160 184 0.9375 0 ) ( 420 160 152 0.9375 -0.5 ) ( 420 160 120 0.9375 -1 ) ) +( ( 420 172 184 1.125 0 ) ( 420 172 152 1.125 -0.5 ) ( 420 172 120 1.125 -1 ) ) +( ( 420 184 184 1.3125 0 ) ( 420 184 152 1.3125 -0.5 ) ( 420 184 120 1.3125 -1 ) ) +( ( 432 184 184 1.5 0 ) ( 432 184 152 1.5 -0.5 ) ( 432 184 120 1.5 -1 ) ) +) } + { + "classname" "item_health_big" + "origin" "1248.000000 64.000000 256.000000" } { -"classname" "light" -"_color" "1 0.917632 0.747723" -"light" "50" -"origin" "64.000000 -736.000000 152.000000" -"target" "t19" -} +patchDef2 { -"classname" "light" -"_color" "1 1 1" -"light" "40" -"origin" "-544.000000 -64.000000 312.000000" +exx/base-metal06rust +( 9 3 0 0 0 ) +( +( ( 432 192 92 0 0 ) ( 432 244 92 0 -0.40625 ) ( 432 292 92 0 -0.78125 ) ) +( ( 444 192 92 0.1325825155 0 ) ( 444 244 92 0.1325825155 -0.40625 ) ( 444 304 92 0.1325825155 -0.78125 ) ) +( ( 444 192 80 0.2263325155 0 ) ( 444 244 80 0.2263325155 -0.40625 ) ( 444 304 80 0.2263325155 -0.78125 ) ) +( ( 444 192 68 0.3200825155 0 ) ( 444 244 68 0.3200825155 -0.40625 ) ( 444 304 68 0.3200825155 -0.78125 ) ) +( ( 432 192 68 0.452665031 0 ) ( 432 244 68 0.452665031 -0.40625 ) ( 432 292 68 0.452665031 -0.78125 ) ) +( ( 420 192 68 0.5852475762 0 ) ( 420 244 68 0.5852475762 -0.40625 ) ( 420 304 68 0.5852475762 -0.78125 ) ) +( ( 420 192 80 0.6789975762 0 ) ( 420 244 80 0.6789975762 -0.40625 ) ( 420 304 80 0.6789975762 -0.78125 ) ) +( ( 420 192 92 0.7727475762 0 ) ( 420 244 92 0.7727475762 -0.40625 ) ( 420 304 92 0.7727475762 -0.78125 ) ) +( ( 432 192 92 0.9053300619 0 ) ( 432 244 92 0.9053300619 -0.40625 ) ( 432 292 92 0.9053300619 -0.78125 ) ) +) } -{ -"classname" "light" -"_color" "1 1 1" -"light" "40" -"origin" "-544.000000 -416.000000 312.000000" } { -"classname" "light" -"_color" "1 1 1" -"light" "40" -"origin" "-544.000000 -224.000000 312.000000" -} +patchDef2 { -"classname" "light" -"_color" "1 1 1" -"light" "40" -"origin" "-416.000000 -64.000000 312.000000" +exx/base-metal06rust +( 9 3 0 0 0 ) +( +( ( 432 184 100 2.4375 -0.78125 ) ( 432 184 92 2.4375 -0.71875 ) ( 432 192 92 2.5 -0.71875 ) ) +( ( 444 184 100 2.4375 -0.78125 ) ( 444 184 92 2.4375 -0.71875 ) ( 444 192 92 2.5 -0.71875 ) ) +( ( 444 172 100 2.34375 -0.78125 ) ( 444 172 80 2.34375 -0.625 ) ( 444 192 80 2.5 -0.625 ) ) +( ( 444 160 100 2.25 -0.78125 ) ( 444 160 68 2.25 -0.53125 ) ( 444 192 68 2.5 -0.53125 ) ) +( ( 432 160 100 2.25 -0.78125 ) ( 432 160 68 2.25 -0.53125 ) ( 432 192 68 2.5 -0.53125 ) ) +( ( 420 160 100 2.25 -0.78125 ) ( 420 160 68 2.25 -0.53125 ) ( 420 192 68 2.5 -0.53125 ) ) +( ( 420 172 100 2.34375 -0.78125 ) ( 420 172 80 2.34375 -0.625 ) ( 420 192 80 2.5 -0.625 ) ) +( ( 420 184 100 2.4375 -0.78125 ) ( 420 184 92 2.4375 -0.71875 ) ( 420 192 92 2.5 -0.71875 ) ) +( ( 432 184 100 2.4375 -0.78125 ) ( 432 184 92 2.4375 -0.71875 ) ( 432 192 92 2.5 -0.71875 ) ) +) +} } { -"classname" "func_bobbing" +patchDef2 { -( -120 -464 384 ) ( -144 -464 384 ) ( -144 -464 312 ) common/origin 240 48 0 0.5 0.5 0 0 0 -( -120 -472 384 ) ( -120 -464 384 ) ( -120 -464 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0 -( -144 -472 384 ) ( -120 -472 384 ) ( -120 -472 312 ) common/origin 240 48 0 0.5 0.5 0 0 0 -( -136 -464 384 ) ( -136 -472 384 ) ( -136 -472 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0 -( -144 -464 384 ) ( -120 -464 384 ) ( -120 -472 384 ) common/origin 208 16 -90 0.5 0.5 0 0 0 -( -120 -472 304 ) ( -120 -464 304 ) ( -144 -464 304 ) common/origin 208 16 -90 0.5 0.5 0 0 0 +exx/base-metal06rust +( 9 3 0 0 0 ) +( +( ( 432 184 120 0 0 ) ( 432 184 112 0 -0.0625 ) ( 432 184 100 0 -0.15625 ) ) +( ( 444 184 120 0.09375 0 ) ( 444 184 112 0.09375 -0.0625 ) ( 444 184 100 0.09375 -0.15625 ) ) +( ( 444 172 120 0.1875 0 ) ( 444 172 112 0.1875 -0.0625 ) ( 444 172 100 0.1875 -0.15625 ) ) +( ( 444 160 120 0.28125 0 ) ( 444 160 112 0.28125 -0.0625 ) ( 444 160 100 0.28125 -0.15625 ) ) +( ( 432 160 120 0.375 0 ) ( 432 160 112 0.375 -0.0625 ) ( 432 160 100 0.375 -0.15625 ) ) +( ( 420 160 120 0.46875 0 ) ( 420 160 112 0.46875 -0.0625 ) ( 420 160 100 0.46875 -0.15625 ) ) +( ( 420 172 120 0.5625 0 ) ( 420 172 112 0.5625 -0.0625 ) ( 420 172 100 0.5625 -0.15625 ) ) +( ( 420 184 120 0.65625 0 ) ( 420 184 112 0.65625 -0.0625 ) ( 420 184 100 0.65625 -0.15625 ) ) +( ( 432 184 120 0.75 0 ) ( 432 184 112 0.75 -0.0625 ) ( 432 184 100 0.75 -0.15625 ) ) +) +} } { -( -120 -456 312 ) ( -112 -464 312 ) ( -120 -456 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -144 -464 312 ) ( -136 -456 312 ) ( -144 -464 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -136 -480 312 ) ( -144 -472 312 ) ( -136 -480 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -472 312 ) ( -120 -480 312 ) ( -112 -472 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -464 312 ) ( -112 -456 320 ) ( -144 -464 312 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -480 320 ) ( -112 -472 312 ) ( -144 -480 320 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -472 376 ) ( -112 -480 368 ) ( -144 -472 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -456 368 ) ( -112 -464 376 ) ( -144 -456 368 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -456 472 ) ( -144 -456 472 ) ( -144 -456 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -480 472 ) ( -112 -456 472 ) ( -112 -456 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -144 -480 472 ) ( -112 -480 472 ) ( -112 -480 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -144 -456 472 ) ( -144 -480 472 ) ( -144 -480 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -144 -464 376 ) ( -112 -464 376 ) ( -112 -488 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 -( -112 -480 312 ) ( -112 -456 312 ) ( -144 -456 312 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0 +patchDef2 +{ +exx/panel-q201 +( 3 3 0 0 0 ) +( +( ( 446 172 176 0 1 ) ( 446 186 176 0 0.5 ) ( 432 186 176 0 0 ) ) +( ( 446 158 176 0.5 1 ) ( 432 172 176 0.5 0.5 ) ( 418 186 176 0.5 0 ) ) +( ( 432 158 176 1 1 ) ( 418 158 176 1 0.5 ) ( 418 172 176 1 0 ) ) +) } } { diff --cc maps/darkzone.map.options index f65aeb2e,43dc12e2..a01432fe --- a/maps/darkzone.map.options +++ b/maps/darkzone.map.options @@@ -3,4 -3,4 +3,4 @@@ -vis + -minimap + -sRGB - Version: 10a -Version: 10 ++Version: 11