From: cbrutail Date: Wed, 28 Dec 2011 23:22:06 +0000 (+0100) Subject: Fixed scale of forklifts on the map (0.65), and made a conveyor belt. X-Git-Tag: xonotic-v0.6.0~36^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e37134fba3ad64c154dccc1b1a55a03a52149ec;p=xonotic%2Fxonotic-maps.pk3dir.git Fixed scale of forklifts on the map (0.65), and made a conveyor belt. --- diff --git a/maps/g-23.map b/maps/g-23.map index d7b191a8..dbee246a 100644 --- a/maps/g-23.map +++ b/maps/g-23.map @@ -1123,17 +1123,15 @@ exx/base-metal03 ( -320 -320 64 ) ( -328 -328 -64 ) ( -320 -320 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { -( -192 -384 -480 ) ( -320 -296 -480 ) ( -192 -296 -480 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0 -( -320 -288 -488 ) ( -192 -288 -504 ) ( -192 -288 -488 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0 +( -192 -384 -480 ) ( -320 -296 -480 ) ( -192 -296 -480 ) map_g-23/conveyor_belt 128 120 180 0.5 0.5 134217728 0 0 ( -192 -336 -512 ) ( -192 -288 -488 ) ( -192 -288 -504 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( -320 -384 -512 ) ( -192 -296 -512 ) ( -320 -296 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( -320 -336 -480 ) ( -320 -288 -504 ) ( -320 -288 -488 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( -192 -384 -512 ) ( -320 -384 -480 ) ( -192 -384 -480 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 -( -192 -296 -480 ) ( -320 -288 -488 ) ( -192 -288 -488 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0 -( -320 -296 -512 ) ( -192 -288 -504 ) ( -320 -288 -504 ) exx/trim-psimple05 128 448 0 0.5 0.5 134217728 0 0 +( -64 -304 -480 ) ( -64 -304 -488 ) ( 64 -304 -480 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 } { -( -192 -448 -448 ) ( -320 -384 -480 ) ( -192 -384 -480 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0 +( -192 -448 -448 ) ( -320 -384 -480 ) ( -192 -384 -480 ) map_g-23/conveyor_belt 128 120 180 0.5 0.5 134217728 0 0 ( -192 -448 -448 ) ( -192 -384 -480 ) ( -192 -448 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( -320 -448 -512 ) ( -192 -448 -512 ) ( -320 -320 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( -320 -448 -512 ) ( -320 -448 -448 ) ( -192 -448 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 @@ -1181,14 +1179,6 @@ exx/base-metal03 ( 192 -960 -416 ) ( -192 -960 -416 ) ( -128 -896 -416 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { -( -320 -512 -320 ) ( -320 -960 -320 ) ( -384 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -320 -512 -384 ) ( -384 -512 -384 ) ( -320 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -320 -512 -320 ) ( -320 -960 -448 ) ( -320 -960 -320 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0 -( -320 -512 -448 ) ( -384 -896 -448 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -384 -512 -448 ) ( -384 -896 -320 ) ( -384 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -} -{ ( -320 -448 -416 ) ( -304 -944 -416 ) ( -320 -960 -416 ) exx/floor-wrn01 0 0 0 0.25 0.25 134217728 0 0 ( -320 -448 -416 ) ( -320 -960 -416 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( -320 -448 -448 ) ( -320 -960 -448 ) ( -304 -944 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 @@ -1205,14 +1195,6 @@ exx/base-metal03 ( -208 -944 -448 ) ( -192 -960 -416 ) ( -192 -960 -448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0 } { -( -192 -512 -320 ) ( -128 -896 -320 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -128 -512 -384 ) ( -192 -512 -384 ) ( -128 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -128 -512 -320 ) ( -128 -896 -448 ) ( -128 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -192 -512 -448 ) ( -192 -960 -448 ) ( -128 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0 -( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -} -{ ( 64 -960 -448 ) ( 192 -1088 -448 ) ( 64 -1088 -448 ) exx/floor-grate04 -0 0 0 0.5 0.5 134217728 0 0 ( 64 -960 -392 ) ( 192 -960 -456 ) ( 192 -960 -392 ) common/nodraw 0 224 0 0.25 0.25 134217728 0 0 ( 192 -960 -448 ) ( 192 -1088 -512 ) ( 192 -1088 -448 ) common/nodraw 0 0 0 0.25 0.25 134217728 0 0 @@ -1955,12 +1937,12 @@ exx/base-metal03 ( 704 1344 32 ) ( 704 704 32 ) ( 640 768 32 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { -( -63.4227600098 349.4939575195 -400 ) ( -112.4062652588 231.2373657227 -400 ) ( -181.6793823242 398.4773864746 -400 ) exx/panel-q201e 85.522277832 1.3617553711 67.5 0.2499999702 0.2499999702 134217728 0 0 -( -87.9145355225 290.3656616211 -240 ) ( -206.1710662842 339.3492126465 -240 ) ( -87.9145355225 290.3656616211 -528 ) exx/panel-q201e 131.3678894043 192 0 -0.2309698313 0.25 134217728 0 0 -( -119.4896392822 381.3767700195 -240 ) ( -119.4896392822 381.3767700195 -528 ) ( -168.4730834961 263.1201171875 -240 ) exx/panel-q201e 172.8045654297 192 0 0.2309701592 0.25 134217728 0 0 -( -223.2717895508 277.159362793 -464 ) ( -105.0151824951 228.1759185791 -464 ) ( -174.2883300781 395.416015625 -464 ) exx/panel-q201e 85.5236206055 1.3603515625 67.5 0.2500006258 0.2500003576 134217728 0 0 -( -230.6628723145 280.2208251953 -528 ) ( -230.6628723145 280.2208251953 -240 ) ( -112.4062652588 231.2373657227 -528 ) exx/panel-q201e 25.3301696777 192 0 -0.2309701443 0.25 134217728 0 0 -( -230.6628723145 280.2208251953 -528 ) ( -181.6793823242 398.4773864746 -528 ) ( -230.6628723145 280.2208251953 -240 ) exx/panel-q201e 66.7673339844 192 0 0.2309703827 0.25 134217728 0 0 +( -52.426864624 289.0081939697 -420 ) ( -143.4293518066 198.9940032959 -420 ) ( -142.441116333 380.0106048584 -420 ) exx/panel-q201e 104.1297149658 201.3624267578 44.6871986389 0.2500004768 0.2500001192 134217728 0 0 +( -97.9281311035 244.0011138916 -260 ) ( -187.9422454834 335.0036010742 -260 ) ( -97.9281311035 244.0011138916 -548 ) exx/panel-q201e 163.1962890625 112 0 0.1777392626 0.25 134217728 0 0 +( -91.7463531494 340.1353607178 -260 ) ( -91.7463531494 340.1353607178 -548 ) ( -182.7487945557 250.12109375 -260 ) exx/panel-q201e 36.1849365234 112 0 0.177739203 0.25 134217728 0 0 +( -227.8176422119 284.3087768555 -484 ) ( -137.8034057617 193.306350708 -484 ) ( -136.8151855469 374.3230438232 -484 ) exx/panel-q201e 104.129699707 201.3624267578 44.6871986389 0.250000447 0.2500001192 134217728 0 0 +( -233.443572998 289.9964447021 -548 ) ( -233.443572998 289.9964447021 -260 ) ( -143.4293518066 198.9940032959 -548 ) exx/panel-q201e 160.4155273438 112 0 0.1777391434 0.25 134217728 0 0 +( -233.443572998 289.9964447021 -548 ) ( -142.441116333 380.0106048584 -548 ) ( -233.443572998 289.9964447021 -260 ) exx/panel-q201e 33.4028320312 112 0 0.177739501 0.25 134217728 0 0 } { ( 768 184 -448 ) ( 520 328 -448 ) ( 768 328 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0 @@ -4453,10 +4435,10 @@ exx/base-metal03 } { ( -192 -448 -512 ) ( -320 -960 -512 ) ( -192 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -320 -448 -448 ) ( -192 -960 -448 ) ( -320 -960 -448 ) exx/trim-psimple05 128 0 0 0.5 0.5 0 0 0 +( -320 -448 -448 ) ( -192 -960 -448 ) ( -320 -960 -448 ) map_g-23/conveyor_belt 128 120 180 0.5 0.5 0 0 0 ( -512 -448 -448 ) ( 768 -448 -512 ) ( 768 -448 -448 ) common/caulk 0 0 180 0.25 0.25 0 0 0 ( -320 -448 -512 ) ( -320 -960 -448 ) ( -320 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -192 -960 -448 ) ( -320 -960 -512 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -950 -448 ) ( -320 -950 -512 ) ( -320 -950 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( -192 -448 -448 ) ( -192 -960 -512 ) ( -192 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { @@ -5969,12 +5951,12 @@ exx/floor-simplines ( -64 520 -480 ) ( -64 544 -480 ) ( 64 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0 } { -( 0 768 -552 ) ( 32 768 -488 ) ( 0 768 -488 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( 32 448 -480 ) ( 32 512 -544 ) ( 32 448 -544 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 -( -64 512 -512 ) ( 64 504 -512 ) ( 64 512 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -64 448 -512 ) ( 64 464 -504 ) ( 64 448 -512 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0 -( -64 520 -480 ) ( 64 544 -480 ) ( 64 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0 -( -32 448 -544 ) ( -32 512 -544 ) ( -32 448 -480 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 +( -32 768 -552 ) ( 0 768 -488 ) ( -32 768 -488 ) common/caulk 128 0 0 0.25 0.25 0 0 0 +( -96 512 -512 ) ( 32 504 -512 ) ( 32 512 -512 ) common/caulk 128 0 0 0.25 0.25 0 0 0 +( -96 448 -512 ) ( 32 464 -504 ) ( 32 448 -512 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0 +( -96 520 -480 ) ( 32 544 -480 ) ( 32 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0 +( -64 448 -544 ) ( -64 512 -544 ) ( -64 448 -480 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 +( -32 544 -64 ) ( -32 528 -64 ) ( -32 544 64 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 } { ( 1280 -1152 192 ) ( 1280 -1160 192 ) ( 1216 -1152 192 ) common/full_clip 0 0 0 0.25 0.25 134217728 0 0 @@ -8563,7 +8545,7 @@ exx/base-metal03 } { ( -704 -960 -512 ) ( -768 -1088 -512 ) ( -704 -1088 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 -( -704 -960 -448 ) ( -704 -1088 -448 ) ( -768 -1088 -448 ) exx/trim-psimple05 128 512 90 0.5 0.5 0 0 0 +( -704 -960 -448 ) ( -704 -1088 -448 ) ( -768 -1088 -448 ) map_g-23/conveyor_belt 128 512 90 0.5 0.5 0 0 0 ( -704 -1088 -448 ) ( -768 -1088 -512 ) ( -768 -1088 -448 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0 ( -704 -960 -512 ) ( -768 -960 -448 ) ( -768 -960 -512 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0 ( -704 -960 -448 ) ( -704 -1088 -512 ) ( -704 -1088 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 @@ -8571,10 +8553,10 @@ exx/base-metal03 } { ( -768 -960 -512 ) ( -832 -1088 -512 ) ( -768 -1088 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 -( -832 -960 -448 ) ( -768 -1088 -448 ) ( -832 -1088 -448 ) exx/trim-psimple05 128 512 90 0.5 0.5 0 0 0 +( -832 -960 -448 ) ( -768 -1088 -448 ) ( -832 -1088 -448 ) map_g-23/conveyor_belt 128 512 90 0.5 0.5 0 0 0 ( -832 -1088 -512 ) ( -768 -1088 -448 ) ( -768 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( -832 -960 -448 ) ( -768 -960 -512 ) ( -768 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -832 -960 -448 ) ( -832 -1088 -448 ) ( -832 -1088 -512 ) exx/floor-tile03 0 0 0 0.25 0.25 0 0 0 +( -814 -960 -448 ) ( -814 -1088 -448 ) ( -814 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( -768 -960 -448 ) ( -768 -1088 -512 ) ( -768 -1088 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { @@ -9339,10 +9321,10 @@ exx/base-metal03 } { ( -704 -960 -512 ) ( 64 -1088 -512 ) ( 64 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( -704 -1088 -448 ) ( 64 -960 -448 ) ( 64 -1088 -448 ) exx/trim-psimple05 128 0 90 0.5 0.5 0 0 0 -( -704 -960 -448 ) ( 64 -960 -512 ) ( 64 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -704 -1088 -448 ) ( 64 -960 -448 ) ( 64 -1088 -448 ) map_g-23/conveyor_belt 128 0 90 0.5 0.5 0 0 0 +( -704 -960 -448 ) ( 64 -960 -512 ) ( 64 -960 -448 ) map_g-23/conveyor_belt 128 0 90 0.5 0.5 0 0 0 ( -704 -1088 -448 ) ( 64 -1088 -448 ) ( 64 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( 64 -960 -448 ) ( 64 -1088 -512 ) ( 64 -1088 -448 ) exx/floor-tile03 0 0 0 0.25 0.25 0 0 0 +( 46 -960 -448 ) ( 46 -1088 -512 ) ( 46 -1088 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( -704 -960 -512 ) ( -704 -1088 -448 ) ( -704 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { @@ -11965,6 +11947,158 @@ exx/wall-metalrib01 ( 1280 -1184 -64 ) ( 1280 -1192 -64 ) ( 1280 -1184 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( 1224 -1184 64 ) ( 1232 -1184 -64 ) ( 1224 -1184 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } +{ +( 32 768 -552 ) ( 64 768 -488 ) ( 32 768 -488 ) common/caulk 128 0 0 0.25 0.25 0 0 0 +( 64 448 -480 ) ( 64 512 -544 ) ( 64 448 -544 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 +( -32 512 -512 ) ( 96 504 -512 ) ( 96 512 -512 ) common/caulk 128 0 0 0.25 0.25 0 0 0 +( -32 448 -512 ) ( 96 464 -504 ) ( 96 448 -512 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0 +( -32 520 -480 ) ( 96 544 -480 ) ( 96 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0 +( 32 544 64 ) ( 32 528 -64 ) ( 32 544 -64 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 +} +{ +patchDef2 +{ +map_g-23/conveyor_belt +( 3 3 0 0 0 ) +( +( ( -814 -1088 -448 0 -0.1796875 ) ( -834 -1088 -464 0 -0.3046875 ) ( -814 -1088 -480 0 -0.4296875 ) ) +( ( -814 -1024 -448 0.5 -0.1796875 ) ( -834 -1024 -464 0.5 -0.3046875 ) ( -814 -1024 -480 0.5 -0.4296875 ) ) +( ( -814 -960 -448 1 -0.1796875 ) ( -834 -960 -464 1 -0.3046875 ) ( -814 -960 -480 1 -0.4296875 ) ) +) +} +} +{ +patchDef2 +{ +map_g-23/conveyor_belt +( 3 3 0 0 0 ) +( +( ( -192 -304 -512 0 0.296875 ) ( -192 -284 -496 0 0.171875 ) ( -192 -304 -480 0 0.046875 ) ) +( ( -256 -304 -512 0.5 0.296875 ) ( -256 -284 -496 0.5 0.171875 ) ( -256 -304 -480 0.5 0.046875 ) ) +( ( -320 -304 -512 1 0.296875 ) ( -320 -284 -496 1 0.171875 ) ( -320 -304 -480 1 0.046875 ) ) +) +} +} +{ +( -192 -950 -480 ) ( -192 -960 -480 ) ( -320 -950 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -950 -448 ) ( -320 -950 -448 ) ( -192 -950 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -950 -448 ) ( -192 -950 -512 ) ( -192 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -320 -960 -512 ) ( -192 -960 -512 ) ( -320 -950 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -320 -960 -512 ) ( -320 -960 -448 ) ( -192 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -320 -960 -512 ) ( -320 -950 -512 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -320 -512 -320 ) ( -320 -960 -320 ) ( -384 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -320 -512 -384 ) ( -384 -512 -384 ) ( -320 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -320 -512 -352 ) ( -320 -960 -480 ) ( -320 -960 -352 ) exx/base-metal03 0 384 0 0.25 0.25 0 0 0 +( -384 -512 -448 ) ( -384 -896 -320 ) ( -384 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -64 -448 ) ( -160 64 -448 ) ( -192 64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -192 -512 -320 ) ( -128 -896 -320 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -128 -512 -384 ) ( -192 -512 -384 ) ( -128 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -128 -512 -320 ) ( -128 -896 -448 ) ( -128 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0 +( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -64 -448 ) ( -160 64 -448 ) ( -192 64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -192 -512 -480 ) ( -192 -960 -480 ) ( -128 -896 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) exx/base-metal03 0 384 0 0.25 0.25 0 0 0 +( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -304 -928 -64 ) ( -288 -928 -64 ) ( -304 -928 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -320 -512 -352 ) ( -320 -960 -480 ) ( -320 -960 -352 ) exx/base-metal03 0 384 0 0.25 0.25 0 0 0 +( -320 -512 -480 ) ( -384 -896 -480 ) ( -320 -960 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -304 -928 -64 ) ( -288 -928 -64 ) ( -304 -928 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -320 -512 -384 ) ( -384 -512 -384 ) ( -320 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -320 -512 -352 ) ( -320 -960 -480 ) ( -320 -960 -352 ) common/caulk 0 384 0 0.25 0.25 0 0 0 +( -320 -512 -480 ) ( -384 -896 -480 ) ( -320 -960 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -384 -512 -448 ) ( -384 -896 -320 ) ( -384 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -304 -928 64 ) ( -288 -928 -64 ) ( -304 -928 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -128 -512 -384 ) ( -192 -512 -384 ) ( -128 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -128 -512 -320 ) ( -128 -896 -448 ) ( -128 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -512 -480 ) ( -192 -960 -480 ) ( -128 -896 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( -304 -928 64 ) ( -288 -928 -64 ) ( -304 -928 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -832 -1088 -448 ) ( -832 -1064 -448 ) ( -824 -1088 -448 ) exx/trim-vert01 -0 256 180 0.25 0.25 0 0 0 +( -832 -1088 -448 ) ( -824 -1088 -448 ) ( -832 -1088 -456 ) common/caulk 0 0 0 -0.25 0.25 0 0 0 +( -832 -1088 -448 ) ( -832 -1088 -456 ) ( -832 -1064 -448 ) exx/floor-tile03 0 0 0 -0.25 0.25 0 0 0 +( -824 -1064 -512 ) ( -832 -1064 -512 ) ( -824 -1088 -512 ) common/caulk 256 0 180 0.25 0.25 0 0 0 +( -824 -960 -456 ) ( -824 -960 -448 ) ( -832 -960 -456 ) common/caulk 0 0 0 -0.25 0.25 0 0 0 +( -824 -1064 -456 ) ( -824 -1088 -456 ) ( -824 -1064 -448 ) exx/base-metal01 0 0 0 -0.25 0.25 0 0 0 +} +{ +patchDef2 +{ +map_g-23/conveyor_belt +( 3 3 0 0 0 ) +( +( ( -192 -950 -448 0 0.5234375 ) ( -192 -970 -464 0 0.3984375 ) ( -192 -950 -480 0 0.2734375 ) ) +( ( -256 -950 -448 0.5 0.5234375 ) ( -256 -970 -464 0.5 0.3984375 ) ( -256 -950 -480 0.5 0.2734375 ) ) +( ( -320 -950 -448 1 0.5234375 ) ( -320 -970 -464 1 0.3984375 ) ( -320 -950 -480 1 0.2734375 ) ) +) +} +} +{ +( 56 -1088 -448 ) ( 56 -1096 -448 ) ( 40 -1088 -448 ) common/caulk 0 224 0 0.25 0.25 0 0 0 +( 56 -1088 -448 ) ( 40 -1088 -448 ) ( 56 -1088 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 +( 56 -1088 -448 ) ( 56 -1088 -512 ) ( 56 -1096 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0 +( 40 -1096 -512 ) ( 56 -1096 -512 ) ( 40 -1088 -512 ) common/caulk 0 224 0 0.25 0.25 0 0 0 +( 40 -1096 -512 ) ( 40 -1096 -448 ) ( 56 -1096 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 40 -1096 -512 ) ( 40 -1088 -512 ) ( 40 -1096 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0 +} +{ +( 56 -952 -448 ) ( 56 -960 -448 ) ( 40 -952 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 56 -952 -448 ) ( 40 -952 -448 ) ( 56 -952 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 56 -952 -448 ) ( 56 -952 -512 ) ( 56 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 40 -960 -512 ) ( 56 -960 -512 ) ( 40 -952 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 40 -960 -512 ) ( 40 -960 -448 ) ( 56 -960 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 +( 40 -960 -512 ) ( 40 -952 -512 ) ( 40 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( 56 -1088 -512 ) ( 56 -1096 -512 ) ( 40 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 64 -960 -512 ) ( 48 -960 -512 ) ( 64 -960 -520 ) common/caulk 224 0 0 0.25 0.25 0 0 0 +( 56 -1088 -512 ) ( 56 -1088 -520 ) ( 56 -1096 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 40 -1096 -520 ) ( 56 -1096 -520 ) ( 40 -1088 -520 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 40 -1088 -520 ) ( 40 -1088 -512 ) ( 56 -1088 -520 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 40 -1096 -520 ) ( 40 -1088 -520 ) ( 40 -1096 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +patchDef2 +{ +map_g-23/conveyor_belt +( 3 3 0 0 0 ) +( +( ( 46 -1088 -480 0 1.4296875 ) ( 66 -1088 -464 0 1.3046875 ) ( 46 -1088 -448 0 1.1796875 ) ) +( ( 46 -1024 -480 0.5 1.4296875 ) ( 66 -1024 -464 0.5 1.3046875 ) ( 46 -1024 -448 0.5 1.1796875 ) ) +( ( 46 -960 -480 1 1.4296875 ) ( 66 -960 -464 1 1.3046875 ) ( 46 -960 -448 1 1.1796875 ) ) +) +} +} +{ +( 64 -960 -448 ) ( 64 -984 -448 ) ( 56 -960 -448 ) exx/trim-vert01 -0 256 0 0.25 0.25 0 0 0 +( 64 -960 -448 ) ( 56 -960 -448 ) ( 64 -960 -456 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 64 -960 -448 ) ( 64 -960 -456 ) ( 64 -984 -448 ) exx/floor-tile03 0 0 0 0.25 0.25 0 0 0 +( 56 -984 -512 ) ( 64 -984 -512 ) ( 56 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 56 -1088 -456 ) ( 56 -1088 -448 ) ( 64 -1088 -456 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +( 56 -984 -456 ) ( 56 -960 -456 ) ( 56 -984 -448 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0 +} } { "classname" "light" @@ -12134,10 +12268,11 @@ exx/wall-metalrib01 } { "classname" "misc_model" -"origin" "63.941071 649.941101 -479.999847" +"origin" "79.941071 649.941101 -479.999847" "model" "models/map/forklift.md3" "angle" "90.000000" "spawnflags" "2" +"modelscale" "0.650000" } { "classname" "func_plat" @@ -12686,10 +12821,11 @@ exx/wall-metalrib01 } { "classname" "misc_model" -"origin" "-70.058891 190.058929 -511.999847" +"origin" "-118.058891 214.058929 -511.999847" "model" "models/map/forklift.md3" "angle" "-45.000008" "spawnflags" "2" +"modelscale" "0.650000" } { "classname" "info_player_deathmatch" diff --git a/maps/g-23.map.options b/maps/g-23.map.options index c6e827b1..ecce2c7b 100644 --- a/maps/g-23.map.options +++ b/maps/g-23.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 6 +Version: 6.1 diff --git a/scripts/map_g-23.shader b/scripts/map_g-23.shader new file mode 100644 index 00000000..a2cbf507 --- /dev/null +++ b/scripts/map_g-23.shader @@ -0,0 +1,14 @@ +textures/map_g-23/conveyor_belt +{ + qer_editorimage textures/map_g-23/conveyorbelt/conveyorbelt.tga + surfaceparm metalsteps + q3map_bounceScale 1.5 + dpoffsetmapping - 2 match8 230 + dpglossintensitymod 3 + dpglossexponentmod 4 + + { + map textures/map_g-23/conveyorbelt/conveyorbelt.tga + tcMod scroll 0 0.25 + } +} \ No newline at end of file diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt.tga b/textures/map_g-23/conveyorbelt/conveyorbelt.tga new file mode 100644 index 00000000..0ec7bf12 Binary files /dev/null and b/textures/map_g-23/conveyorbelt/conveyorbelt.tga differ diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga new file mode 100644 index 00000000..75fcbaa6 Binary files /dev/null and b/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga differ diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga new file mode 100644 index 00000000..5a2d8eaa Binary files /dev/null and b/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga differ