From: Mirio Date: Tue, 23 Oct 2018 23:33:43 +0000 (+0200) Subject: Geoplanetary: Fix jumppads, some patches and tunnel texture X-Git-Tag: xonotic-v0.8.5~90 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae3ce4a547be3d053c5c3832ed590fed6f0cc252;p=xonotic%2Fxonotic-maps.pk3dir.git Geoplanetary: Fix jumppads, some patches and tunnel texture --- diff --git a/maps/geoplanetary.map b/maps/geoplanetary.map index 6623769b..b997f80a 100644 --- a/maps/geoplanetary.map +++ b/maps/geoplanetary.map @@ -8322,42 +8322,6 @@ patchDef2 map_geoplanetary/wiz1_4_mesh ( 3 3 0 0 0 ) ( -( ( 27.2500038147 -2302.875 253.375 -0.0234375 0 ) ( 27.2500038147 -2302.875 279.5 -0.0234375 -0.0510253906 ) ( 27.2500038147 -2302.875 305.625 -0.0234375 -0.1020507813 ) ) -( ( -82.25 -2302.875 253.375 0.3194580078 0 ) ( -82.25 -2302.875 279.5 0.3194580078 -0.0510253906 ) ( -82.25 -2302.875 305.625 0.3194580078 -0.1020507813 ) ) -( ( -191.75 -2302.875 253.375 0.6623535156 0 ) ( -191.75 -2302.875 279.5 0.6623535156 -0.0510253906 ) ( -191.75 -2302.875 305.625 0.6623535156 -0.1020507813 ) ) -) -} -} -{ -patchDef2 -{ -map_geoplanetary/wiz1_4_mesh -( 3 3 0 0 0 ) -( -( ( -89.625 -2302.875 305.875 -0.1984863281 -0.5974121094 ) ( -89.625 -2302.875 332 -0.1984863281 -0.6484375 ) ( -89.625 -2302.875 358.125 -0.1984863281 -0.6994628906 ) ) -( ( -209.25 -2302.875 305.875 -0.4321289063 -0.5974121094 ) ( -209.25 -2302.875 332 -0.4321289063 -0.6484375 ) ( -209.25 -2302.875 358.125 -0.4321289063 -0.6994628906 ) ) -( ( -328.875 -2302.875 305.875 -0.6657714844 -0.5974121094 ) ( -328.875 -2302.875 332 -0.6657714844 -0.6484375 ) ( -328.875 -2302.875 358.125 -0.6657714844 -0.6994628906 ) ) -) -} -} -{ -patchDef2 -{ -map_geoplanetary/wiz1_4_mesh -( 3 3 0 0 0 ) -( -( ( -270.875 -2302.875 358.375 -0.1984863281 -0.5974121094 ) ( -270.875 -2302.875 384.5 -0.1984863281 -0.6484375 ) ( -270.875 -2302.875 410.625 -0.1984863281 -0.6994628906 ) ) -( ( -350.6875 -2302.875 358.375 -0.4321289063 -0.5974121094 ) ( -350.6875 -2302.875 384.5 -0.4321289063 -0.6484375 ) ( -350.6875 -2302.875 410.625 -0.4321289063 -0.6994628906 ) ) -( ( -430.5 -2302.875 358.375 -0.6657714844 -0.5974121094 ) ( -430.5 -2302.875 384.5 -0.6657714844 -0.6484375 ) ( -430.5 -2302.875 410.625 -0.6657714844 -0.6994628906 ) ) -) -} -} -{ -patchDef2 -{ -map_geoplanetary/wiz1_4_mesh -( 3 3 0 0 0 ) -( ( ( -391.1249389648 -2302.875 405.8750305176 -0.0234375 0 ) ( -391.1249389648 -2302.875 488.7500610352 -0.0234375 -0.161865294 ) ( -391.1249389648 -2302.875 571.625 -0.0234375 -0.3237304091 ) ) ( ( -928.375 -2302.875 405.8750305176 1.0258790255 0 ) ( -928.375 -2302.875 488.7500610352 1.0258790255 -0.161865294 ) ( -928.375 -2302.875 571.625 1.0258790255 -0.3237304091 ) ) ( ( -1465.625 -2302.875 405.8750305176 2.0751953125 0 ) ( -1465.625 -2302.875 488.7500610352 2.0751953125 -0.161865294 ) ( -1465.625 -2302.875 571.625 2.0751953125 -0.3237304091 ) ) @@ -11495,9 +11459,9 @@ patchDef2 map_geoplanetary/wiz1_4_mesh ( 3 3 0 0 0 ) ( -( ( 0.3750083148 -445.875 25.7500247955 -0.0234375 0 ) ( 0.3750083148 -445.875 297.875 -0.0234375 0.5 ) ( 0.3750083148 -445.875 570 -0.0234375 1 ) ) -( ( -334.25 -445.875 25.7500247955 0.4765625 0 ) ( -334.25 -445.875 297.875 0.4765625 0.5 ) ( -334.25 -445.875 570 0.4765625 1 ) ) -( ( -668.875 -445.875 25.7500247955 0.9765625 0 ) ( -668.875 -445.875 297.875 0.9765625 0.5 ) ( -668.875 -445.875 570 0.9765625 1 ) ) +( ( 0.3750083148 -445.875 25.7500247955 0 0 ) ( 0.3750083148 -445.875 297.875 0 0.5 ) ( 0.3750083148 -445.875 570 0 1 ) ) +( ( -334.25 -445.875 25.7500247955 0.5 0 ) ( -334.25 -445.875 297.875 0.5 0.5 ) ( -334.25 -445.875 570 0.5 1 ) ) +( ( -668.875 -445.875 25.7500247955 1 0 ) ( -668.875 -445.875 297.875 1 0.5 ) ( -668.875 -445.875 570 1 1 ) ) ) } } @@ -11507,9 +11471,9 @@ patchDef2 map_geoplanetary/wiz1_4_mesh ( 3 3 0 0 0 ) ( -( ( -671.625 -445.875 321.7500305176 -0.0234375 0 ) ( -671.625 -445.875 445.875 -0.0234375 -0.242431581 ) ( -671.625 -445.875 570 -0.0234375 -0.4848632216 ) ) -( ( -718.25 -445.875 321.7500305176 0.0676269531 0 ) ( -718.25 -445.875 445.875 0.0676269531 -0.242431581 ) ( -718.25 -445.875 570 0.0676269531 -0.4848632216 ) ) -( ( -764.875 -445.875 321.7500305176 0.1586914063 0 ) ( -764.875 -445.875 445.875 0.1586914063 -0.242431581 ) ( -764.875 -445.875 570 0.1586914063 -0.4848632216 ) ) +( ( -668.875 -445.875 321.75 0.046875 0 ) ( -668.875 -445.875 445.875 -0.0078125 -0.242431581 ) ( -668.875 -445.875 570 -0.0078125 -0.4848632216 ) ) +( ( -718.4375 -445.875 321.7500305176 0.0832519531 0 ) ( -718.4375 -445.875 445.875 0.0832519531 -0.242431581 ) ( -718.4375 -445.875 570 0.0832519531 -0.4848632216 ) ) +( ( -768 -445.875 321.7500305176 0.1743164063 0 ) ( -768 -445.875 445.875 0.1743164063 -0.242431581 ) ( -768 -445.875 570 0.1743164063 -0.4848632216 ) ) ) } } @@ -28545,42 +28509,6 @@ patchDef2 map_geoplanetary/wiz1_4_mesh ( 3 3 0 0 0 ) ( -( ( 484.75 5886.875 253.375 0 0 ) ( 484.75 5886.875 279.5 0 -0.0510253906 ) ( 484.75 5886.875 305.625 0 -0.1020507813 ) ) -( ( 594.25 5886.875 253.375 0.3428955078 0 ) ( 594.25 5886.875 279.5 0.3428955078 -0.0510253906 ) ( 594.25 5886.875 305.625 0.3428955078 -0.1020507813 ) ) -( ( 703.75 5886.875 253.375 0.6857910156 0 ) ( 703.75 5886.875 279.5 0.6857910156 -0.0510253906 ) ( 703.75 5886.875 305.625 0.6857910156 -0.1020507813 ) ) -) -} -} -{ -patchDef2 -{ -map_geoplanetary/wiz1_4_mesh -( 3 3 0 0 0 ) -( -( ( 601.625 5886.875 305.875 -0.1750488281 -0.5974121094 ) ( 601.625 5886.875 332 -0.1750488281 -0.6484375 ) ( 601.625 5886.875 358.125 -0.1750488281 -0.6994628906 ) ) -( ( 721.25 5886.875 305.875 -0.4086914063 -0.5974121094 ) ( 721.25 5886.875 332 -0.4086914063 -0.6484375 ) ( 721.25 5886.875 358.125 -0.4086914063 -0.6994628906 ) ) -( ( 840.875 5886.875 305.875 -0.6423339844 -0.5974121094 ) ( 840.875 5886.875 332 -0.6423339844 -0.6484375 ) ( 840.875 5886.875 358.125 -0.6423339844 -0.6994628906 ) ) -) -} -} -{ -patchDef2 -{ -map_geoplanetary/wiz1_4_mesh -( 3 3 0 0 0 ) -( -( ( 782.875 5886.875 358.375 -0.1750488281 -0.5974121094 ) ( 782.875 5886.875 384.5 -0.1750488281 -0.6484375 ) ( 782.875 5886.875 410.625 -0.1750488281 -0.6994628906 ) ) -( ( 862.6875 5886.875 358.375 -0.4086914063 -0.5974121094 ) ( 862.6875 5886.875 384.5 -0.4086914063 -0.6484375 ) ( 862.6875 5886.875 410.625 -0.4086914063 -0.6994628906 ) ) -( ( 942.5 5886.875 358.375 -0.6423339844 -0.5974121094 ) ( 942.5 5886.875 384.5 -0.6423339844 -0.6484375 ) ( 942.5 5886.875 410.625 -0.6423339844 -0.6994628906 ) ) -) -} -} -{ -patchDef2 -{ -map_geoplanetary/wiz1_4_mesh -( 3 3 0 0 0 ) -( ( ( 903.125 5886.875 405.8750305176 0 0 ) ( 903.125 5886.875 488.7500610352 0 -0.161865294 ) ( 903.125 5886.875 571.625 0 -0.3237304091 ) ) ( ( 1440.375 5886.875 405.8750305176 1.0493165255 0 ) ( 1440.375 5886.875 488.7500610352 1.0493165255 -0.161865294 ) ( 1440.375 5886.875 571.625 1.0493165255 -0.3237304091 ) ) ( ( 1977.625 5886.875 405.8750305176 2.0986328125 0 ) ( 1977.625 5886.875 488.7500610352 2.0986328125 -0.161865294 ) ( 1977.625 5886.875 571.625 2.0986328125 -0.3237304091 ) ) @@ -29824,7 +29752,7 @@ map_geoplanetary/wiz1_4_mesh ( 248 3968 -344 ) ( 224 3968 -328 ) ( 248 3968 -328 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0 } { -( 104 1744 -320 ) ( 104 1792 -320 ) ( 256 1744 -320 ) trak5x/floor-tile2b -0 0 0 0.25 0.25 0 0 0 +( 104 1744 -320 ) ( 104 1792 -320 ) ( 256 1744 -320 ) trak5x/floor-tile2d -0 0 0 0.25 0.25 0 0 0 ( 0 1744 -192 ) ( 0 1744 -224 ) ( 0 1792 -192 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0 ( 248 1792 -352 ) ( 96 1792 -352 ) ( 248 1744 -352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0 ( 256 1792 -224 ) ( 256 1744 -224 ) ( 256 1792 -192 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0 @@ -31702,7 +31630,7 @@ patchDef2 map_geoplanetary/wiz1_4_mesh ( 3 3 0 0 0 ) ( -( ( 511.625 4030.875 25.7500247955 0 0 ) ( 511.625 4030.875 297.875 0 0.5 ) ( 511.625 4030.875 570 0 1 ) ) +( ( 511.625 4030.8798828125 25.75 0 0 ) ( 511.625 4030.875 297.875 0 0.5 ) ( 511.625 4030.875 570 0 1 ) ) ( ( 846.25 4030.875 25.7500247955 0.5 0 ) ( 846.25 4030.875 297.875 0.5 0.5 ) ( 846.25 4030.875 570 0.5 1 ) ) ( ( 1180.875 4030.875 25.7500247955 1 0 ) ( 1180.875 4030.875 297.875 1 0.5 ) ( 1180.875 4030.875 570 1 1 ) ) ) @@ -31714,9 +31642,9 @@ patchDef2 map_geoplanetary/wiz1_4_mesh ( 3 3 0 0 0 ) ( -( ( 1183.625 4030.875 321.7500305176 0 0 ) ( 1183.625 4030.875 445.875 0 -0.242431581 ) ( 1183.625 4030.875 570 0 -0.4848632216 ) ) -( ( 1230.25 4030.875 321.7500305176 0.0910644531 0 ) ( 1230.25 4030.875 445.875 0.0910644531 -0.242431581 ) ( 1230.25 4030.875 570 0.0910644531 -0.4848632216 ) ) -( ( 1276.875 4030.875 321.7500305176 0.1821289063 0 ) ( 1276.875 4030.875 445.875 0.1821289063 -0.242431581 ) ( 1276.875 4030.875 570 0.1821289063 -0.4848632216 ) ) +( ( 1180.875 4030.875 321.7500305176 0 0 ) ( 1180.875 4030.875 445.875 0 -0.242431581 ) ( 1180.875 4030.875 570 0 -0.4848632216 ) ) +( ( 1230.4375 4030.875 321.7500305176 0.0910644531 0 ) ( 1230.4375 4030.875 445.875 0.0910644531 -0.242431581 ) ( 1230.4375 4030.875 570 0.0910644531 -0.4848632216 ) ) +( ( 1280 4030.875 321.7500305176 0.1821289063 0 ) ( 1280 4030.875 445.875 0.1821289063 -0.242431581 ) ( 1280 4030.875 570 0.1821289063 -0.4848632216 ) ) ) } } @@ -42757,24 +42685,24 @@ effects_warpzone/rededge "speed" "85" "target" "target_position12" { -( -968 -512 400 ) ( -712 -512 400 ) ( -968 -704 400 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -888 -520 392 ) ( -888 -712 392 ) ( -888 -520 376 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -960 -584 392 ) ( -960 -584 376 ) ( -704 -584 392 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -712 -704 384 ) ( -712 -512 384 ) ( -968 -704 384 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -776 -704 376 ) ( -776 -704 392 ) ( -776 -512 376 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -712 -696 376 ) ( -968 -696 376 ) ( -712 -696 392 ) common/trigger 0 0 0 0.5 0.5 0 0 0 +( -968 -512 400 ) ( -712 -512 400 ) ( -968 -704 400 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -888 -520 392 ) ( -888 -712 392 ) ( -888 -520 376 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -960 -584 392 ) ( -960 -584 376 ) ( -704 -584 392 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -712 -704 384 ) ( -712 -512 384 ) ( -968 -704 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -776 -704 376 ) ( -776 -704 392 ) ( -776 -512 376 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -712 -696 376 ) ( -968 -696 376 ) ( -712 -696 392 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { "classname" "trigger_hurt" "dmg" "999" { -( -2544 -1776 -920 ) ( 2080 -1784 -920 ) ( 2080 1272 -920 ) common/trigger 48 0 0 0.5 0.5 0 0 0 -( -2544 1248 -904 ) ( 2080 1240 -904 ) ( 2080 -1816 -904 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -2512 -2888 -616 ) ( 2112 -2896 -616 ) ( 2112 -2896 -920 ) common/trigger 48 0 0 0.5 0.5 0 0 0 -( 2464 1240 -616 ) ( 2464 -1816 -920 ) ( 2464 -1816 -616 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -2504 6488 -616 ) ( 2120 6480 -920 ) ( 2120 6480 -616 ) common/trigger 48 0 0 0.5 0.5 0 0 0 -( -2352 1264 -616 ) ( -2352 -1792 -616 ) ( -2352 -1792 -920 ) common/trigger 0 0 0 0.5 0.5 0 0 0 +( -2544 -1776 -920 ) ( 2080 -1784 -920 ) ( 2080 1272 -920 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -2544 1248 -904 ) ( 2080 1240 -904 ) ( 2080 -1816 -904 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -2512 -2888 -616 ) ( 2112 -2896 -616 ) ( 2112 -2896 -920 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 2464 1240 -616 ) ( 2464 -1816 -920 ) ( 2464 -1816 -616 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -2504 6488 -616 ) ( 2120 6480 -920 ) ( 2120 6480 -616 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -2352 1264 -616 ) ( -2352 -1792 -616 ) ( -2352 -1792 -920 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -43085,12 +43013,12 @@ effects_warpzone/rededge "speed" "80" "target" "target_position9" { -( 248 -384 -304 ) ( 504 -384 -304 ) ( 248 -576 -304 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 328 -392 -312 ) ( 328 -584 -312 ) ( 328 -392 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 256 -456 -312 ) ( 256 -456 -328 ) ( 512 -456 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 504 -576 -320 ) ( 504 -384 -320 ) ( 248 -576 -320 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 440 -576 -328 ) ( 440 -576 -312 ) ( 440 -384 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 504 -568 -328 ) ( 248 -568 -328 ) ( 504 -568 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 +( 248 -384 -304 ) ( 504 -384 -304 ) ( 248 -576 -304 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 328 -392 -312 ) ( 328 -584 -312 ) ( 328 -392 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 256 -456 -312 ) ( 256 -456 -328 ) ( 512 -456 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 504 -576 -320 ) ( 504 -384 -320 ) ( 248 -576 -320 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 440 -576 -328 ) ( 440 -576 -312 ) ( 440 -384 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 504 -568 -328 ) ( 248 -568 -328 ) ( 504 -568 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -43099,12 +43027,12 @@ effects_warpzone/rededge "speed" "70" "target" "target_position7" { -( 248 1792 -304 ) ( 504 1792 -304 ) ( 248 1600 -304 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 328 1784 -312 ) ( 328 1592 -312 ) ( 328 1784 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 256 1720 -312 ) ( 256 1720 -328 ) ( 512 1720 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 504 1600 -320 ) ( 504 1792 -320 ) ( 248 1600 -320 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 440 1600 -328 ) ( 440 1600 -312 ) ( 440 1792 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 504 1608 -328 ) ( 248 1608 -328 ) ( 504 1608 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 +( 248 1792 -304 ) ( 504 1792 -304 ) ( 248 1600 -304 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 328 1784 -312 ) ( 328 1592 -312 ) ( 328 1784 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 256 1720 -312 ) ( 256 1720 -328 ) ( 512 1720 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 504 1600 -320 ) ( 504 1792 -320 ) ( 248 1600 -320 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 440 1600 -328 ) ( 440 1600 -312 ) ( 440 1792 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 504 1608 -328 ) ( 248 1608 -328 ) ( 504 1608 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -43308,50 +43236,22 @@ effects_warpzone/rededge "targetname" "target_position6" } { -"classname" "trigger_push" -"target" "target_position6" -{ -( 1397 983 -76 ) ( 1405 966 -70 ) ( 1531 964 -71 ) common/trigger 32 0 0 0.5 0.5 0 0 0 -( 1389 996 -70 ) ( 1411 965 -70 ) ( 1421 1014 -82 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( 1408 1048 -70 ) ( 1418 1065 -78 ) ( 1408 1087 -70 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( 1418 1065 -78 ) ( 1408 1048 -70 ) ( 1410 966 -70 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( 1392 1053 -82 ) ( 1478 1057 -81 ) ( 1430 1089 -70 ) common/trigger 16 16 0 -0.5 0.5 0 0 0 -( 1532 996 -71 ) ( 1533 1088 -71 ) ( 1501 999 -81 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( 1400 1047 -70 ) ( 1422 1152 -70 ) ( 1531 964 -71 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 1478 1057 -81 ) ( 1392 1053 -82 ) ( 1501 995 -81 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -} -} -{ "classname" "target_position" "origin" "-348.000000 -944.000000 850.000000" "targetname" "target_position3" } { -"classname" "trigger_push" -"target" "target_position3" -{ -( -75 -1961 116 ) ( -67 -1978 122 ) ( 59 -1980 121 ) common/trigger 32 0 0 0.5 0.5 0 0 0 -( -83 -1948 122 ) ( -61 -1979 122 ) ( -51 -1930 110 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -64 -1896 122 ) ( -54 -1879 114 ) ( -64 -1857 122 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -54 -1879 114 ) ( -64 -1896 122 ) ( -62 -1978 122 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -80 -1891 110 ) ( 6 -1887 111 ) ( -42 -1855 122 ) common/trigger 16 16 0 -0.5 0.5 0 0 0 -( 60 -1948 121 ) ( 61 -1856 121 ) ( 29 -1945 111 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -72 -1897 122 ) ( -50 -1792 122 ) ( 59 -1980 121 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 6 -1887 111 ) ( -80 -1891 110 ) ( 29 -1949 111 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -} -} -{ "classname" "trigger_warpzone" "targetname" "warpzone1" "warpzone_fadeend" "1600" "warpzone_fadestart" "1400" { -( -1032 -768 640 ) ( -1032 -800 640 ) ( -1224 -768 640 ) common/trigger 8 8 0 0.25 0.25 0 0 0 +( -1032 -768 640 ) ( -1032 -800 640 ) ( -1224 -768 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0 ( -1040 -788 544 ) ( -1232 -788 544 ) ( -1040 -788 384 ) common/warpzone 0 0 0 0.25 0.25 0 0 0 -( -920 -768 760 ) ( -920 -768 600 ) ( -920 -800 760 ) common/trigger 8 8 0 0.25 0.25 0 0 0 -( -1232 -792 384 ) ( -1040 -792 384 ) ( -1232 -760 384 ) common/trigger 8 8 0 0.25 0.25 0 0 0 -( -1232 -824 598 ) ( -1232 -824 758 ) ( -1040 -824 598 ) common/trigger 8 8 0 0.25 0.25 0 0 0 -( -1176 -800 591 ) ( -1176 -768 591 ) ( -1176 -800 751 ) common/trigger 8 8 0 0.25 0.25 0 0 0 +( -920 -768 760 ) ( -920 -768 600 ) ( -920 -800 760 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -1232 -792 384 ) ( -1040 -792 384 ) ( -1232 -760 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -1232 -824 598 ) ( -1232 -824 758 ) ( -1040 -824 598 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -1176 -800 591 ) ( -1176 -768 591 ) ( -1176 -800 751 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -43361,12 +43261,12 @@ effects_warpzone/rededge "warpzone_fadeend" "1600" "warpzone_fadestart" "1400" { -( -1112 -1120 320 ) ( -1144 -1120 320 ) ( -1112 -928 320 ) common/trigger 8 0 0 0.25 0.25 0 0 0 +( -1112 -1120 320 ) ( -1144 -1120 320 ) ( -1112 -928 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0 ( -1168 -1112 192 ) ( -1168 -920 192 ) ( -1168 -1112 32 ) common/warpzone 0 0 0 0.25 0.25 0 0 0 -( -1112 -1216 192 ) ( -1112 -1216 32 ) ( -1144 -1216 192 ) common/trigger 8 0 0 0.25 0.25 0 0 0 -( -1144 -920 64 ) ( -1144 -1112 64 ) ( -1112 -920 64 ) common/trigger 8 0 0 0.25 0.25 0 0 0 -( -1208 -920 32 ) ( -1208 -920 192 ) ( -1208 -1112 32 ) common/trigger 8 0 0 0.25 0.25 0 0 0 -( -1144 -960 120 ) ( -1112 -960 120 ) ( -1144 -960 280 ) common/trigger 8 0 0 0.25 0.25 0 0 0 +( -1112 -1216 192 ) ( -1112 -1216 32 ) ( -1144 -1216 192 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -1144 -920 64 ) ( -1144 -1112 64 ) ( -1112 -920 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -1208 -920 32 ) ( -1208 -920 192 ) ( -1208 -1112 32 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -1144 -960 120 ) ( -1112 -960 120 ) ( -1144 -960 280 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -43886,12 +43786,12 @@ effects_warpzone/rededge "speed" "85" "target" "target_position11" { -( 1480 4096 400 ) ( 1224 4096 400 ) ( 1480 4288 400 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 1400 4104 392 ) ( 1400 4296 392 ) ( 1400 4104 376 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 1472 4168 392 ) ( 1472 4168 376 ) ( 1216 4168 392 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 1224 4288 384 ) ( 1224 4096 384 ) ( 1480 4288 384 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 1288 4288 376 ) ( 1288 4288 392 ) ( 1288 4096 376 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 1224 4280 376 ) ( 1480 4280 376 ) ( 1224 4280 392 ) common/trigger 0 0 0 0.5 0.5 0 0 0 +( 1480 4096 400 ) ( 1224 4096 400 ) ( 1480 4288 400 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1400 4104 392 ) ( 1400 4296 392 ) ( 1400 4104 376 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1472 4168 392 ) ( 1472 4168 376 ) ( 1216 4168 392 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1224 4288 384 ) ( 1224 4096 384 ) ( 1480 4288 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1288 4288 376 ) ( 1288 4288 392 ) ( 1288 4096 376 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1224 4280 376 ) ( 1480 4280 376 ) ( 1224 4280 392 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -44136,12 +44036,12 @@ effects_warpzone/rededge "speed" "80" "target" "target_position10" { -( 264 3968 -304 ) ( 8 3968 -304 ) ( 264 4160 -304 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 184 3976 -312 ) ( 184 4168 -312 ) ( 184 3976 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 256 4040 -312 ) ( 256 4040 -328 ) ( 0 4040 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 8 4160 -320 ) ( 8 3968 -320 ) ( 264 4160 -320 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 72 4160 -328 ) ( 72 4160 -312 ) ( 72 3968 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 8 4152 -328 ) ( 264 4152 -328 ) ( 8 4152 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 +( 264 3968 -304 ) ( 8 3968 -304 ) ( 264 4160 -304 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 184 3976 -312 ) ( 184 4168 -312 ) ( 184 3976 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 256 4040 -312 ) ( 256 4040 -328 ) ( 0 4040 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 8 4160 -320 ) ( 8 3968 -320 ) ( 264 4160 -320 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 72 4160 -328 ) ( 72 4160 -312 ) ( 72 3968 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 8 4152 -328 ) ( 264 4152 -328 ) ( 8 4152 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -44150,12 +44050,12 @@ effects_warpzone/rededge "speed" "70" "target" "target_position8" { -( 264 1792 -304 ) ( 8 1792 -304 ) ( 264 1984 -304 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 184 1800 -312 ) ( 184 1992 -312 ) ( 184 1800 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 256 1864 -312 ) ( 256 1864 -328 ) ( 0 1864 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 8 1984 -320 ) ( 8 1792 -320 ) ( 264 1984 -320 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 72 1984 -328 ) ( 72 1984 -312 ) ( 72 1792 -328 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 8 1976 -328 ) ( 264 1976 -328 ) ( 8 1976 -312 ) common/trigger 0 0 0 0.5 0.5 0 0 0 +( 264 1792 -304 ) ( 8 1792 -304 ) ( 264 1984 -304 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 184 1800 -312 ) ( 184 1992 -312 ) ( 184 1800 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 256 1864 -312 ) ( 256 1864 -328 ) ( 0 1864 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 8 1984 -320 ) ( 8 1792 -320 ) ( 264 1984 -320 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 72 1984 -328 ) ( 72 1984 -312 ) ( 72 1792 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 8 1976 -328 ) ( 264 1976 -328 ) ( 8 1976 -312 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -44259,40 +44159,12 @@ effects_warpzone/rededge "angle" "180.000000" } { -"classname" "trigger_push" -"target" "target_position2" -{ -( -885 2601 -76 ) ( -893 2618 -70 ) ( -1019 2620 -71 ) common/trigger 32 0 0 0.5 0.5 0 0 0 -( -877 2588 -70 ) ( -899 2619 -70 ) ( -909 2570 -82 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -896 2536 -70 ) ( -906 2519 -78 ) ( -896 2497 -70 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -906 2519 -78 ) ( -896 2536 -70 ) ( -898 2618 -70 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -880 2531 -82 ) ( -966 2527 -81 ) ( -918 2495 -70 ) common/trigger 16 16 0 -0.5 0.5 0 0 0 -( -1020 2588 -71 ) ( -1021 2496 -71 ) ( -989 2585 -81 ) common/trigger 48 16 0 -0.5 0.5 0 0 0 -( -888 2537 -70 ) ( -910 2432 -70 ) ( -1019 2620 -71 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( -966 2527 -81 ) ( -880 2531 -82 ) ( -989 2589 -81 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -} -} -{ "classname" "target_position" "origin" "860.000000 4528.000000 850.000000" "targetname" "target_position1" "angle" "180.000000" } { -"classname" "trigger_push" -"target" "target_position1" -{ -( 587 5545 116 ) ( 579 5562 122 ) ( 453 5564 121 ) common/trigger 32 0 0 0.5 0.5 0 0 0 -( 595 5524 122 ) ( 573 5555 122 ) ( 563 5506 110 ) common/trigger 48 0 0 -0.5 0.5 0 0 0 -( 576 5472 122 ) ( 566 5455 114 ) ( 576 5433 122 ) common/trigger 48 0 0 -0.5 0.5 0 0 0 -( 566 5455 114 ) ( 576 5472 122 ) ( 574 5554 122 ) common/trigger 48 0 0 -0.5 0.5 0 0 0 -( 592 5475 110 ) ( 506 5471 111 ) ( 554 5439 122 ) common/trigger 16 16 0 -0.5 0.5 0 0 0 -( 452 5524 121 ) ( 451 5432 121 ) ( 483 5521 111 ) common/trigger 48 0 0 -0.5 0.5 0 0 0 -( 584 5481 122 ) ( 562 5376 122 ) ( 453 5564 121 ) common/trigger 0 0 0 0.5 0.5 0 0 0 -( 506 5463 111 ) ( 592 5467 110 ) ( 483 5525 111 ) common/trigger 0 240 0 0.5 0.5 0 0 0 -} -} -{ "classname" "trigger_warpzone" "targetname" "warpzone3" "warpzone_fadeend" "1600" @@ -44302,7 +44174,7 @@ effects_warpzone/rededge ( 1552 4372 544 ) ( 1744 4372 544 ) ( 1552 4372 384 ) common/warpzone 0 0 0 0.25 0.25 0 0 0 ( 1432 4352 760 ) ( 1432 4352 600 ) ( 1432 4384 760 ) common/trigger 0 0 0 0.25 0.25 0 0 0 ( 1744 4376 384 ) ( 1552 4376 384 ) ( 1744 4344 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 -( 1737 4408 598 ) ( 1737 4408 758 ) ( 1545 4408 598 ) common/trigger 252 0 0 0.25 0.25 0 0 0 +( 1737 4408 598 ) ( 1737 4408 758 ) ( 1545 4408 598 ) common/trigger 0 0 0 0.25 0.25 0 0 0 ( 1688 4384 591 ) ( 1688 4352 591 ) ( 1688 4384 751 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } @@ -44313,12 +44185,12 @@ effects_warpzone/rededge "warpzone_fadeend" "1600" "warpzone_fadestart" "1400" { -( 1624 4704 320 ) ( 1656 4704 320 ) ( 1624 4512 320 ) common/trigger -8 8 0 0.25 0.25 0 0 0 +( 1624 4704 320 ) ( 1656 4704 320 ) ( 1624 4512 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0 ( 1680 4696 192 ) ( 1680 4504 192 ) ( 1680 4696 32 ) common/warpzone 0 0 0 0.25 0.25 0 0 0 -( 1624 4800 192 ) ( 1624 4800 32 ) ( 1656 4800 192 ) common/trigger -8 8 0 0.25 0.25 0 0 0 -( 1656 4504 64 ) ( 1656 4696 64 ) ( 1624 4504 64 ) common/trigger -8 8 0 0.25 0.25 0 0 0 -( 1720 4504 32 ) ( 1720 4504 192 ) ( 1720 4696 32 ) common/trigger 248 8 0 0.25 0.25 0 0 0 -( 1656 4544 120 ) ( 1624 4544 120 ) ( 1656 4544 280 ) common/trigger -8 8 0 0.25 0.25 0 0 0 +( 1624 4800 192 ) ( 1624 4800 32 ) ( 1656 4800 192 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1656 4504 64 ) ( 1656 4696 64 ) ( 1624 4504 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1720 4504 32 ) ( 1720 4504 192 ) ( 1720 4696 32 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 1656 4544 120 ) ( 1624 4544 120 ) ( 1656 4544 280 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -44769,7 +44641,7 @@ effects_warpzone/rededge } { "classname" "item_rockets" -"origin" "392.000000 480.000000 -320.000000" +"origin" "384.000000 480.000000 -320.000000" } { "classname" "item_cells" @@ -44777,8 +44649,8 @@ effects_warpzone/rededge } { "classname" "item_rockets" -"origin" "120.000000 3104.000000 -320.000000" -"angle" "180.000000" +"origin" "128.000000 3104.000000 -320.000000" +"angle" "-179.999985" } { "classname" "item_cells" @@ -44896,10 +44768,10 @@ effects_warpzone/rededge "target" "target_position4" { ( -40 1812 408 ) ( -64 1812 408 ) ( -40 1812 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 -( -64 1772 384 ) ( -40 1772 384 ) ( -64 1812 384 ) common/trigger 0 240 0 0.25 0.25 0 0 0 +( -64 1772 384 ) ( -40 1772 384 ) ( -64 1812 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 ( -64 1772 384 ) ( -64 1772 408 ) ( -40 1772 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 -( -62.5 1772 383.5 ) ( -62.5 1812 383.5 ) ( -62.5 1772 407.5 ) common/trigger 16 254 0 0.25 0.25 0 0 0 -( -64 60 408 ) ( -32 60 384 ) ( -64 -68 408 ) common/trigger 0 240 0 0.25 0.25 0 0 0 +( -62.5 1772 383.5 ) ( -62.5 1812 383.5 ) ( -62.5 1772 407.5 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( -64 60 408 ) ( -32 60 384 ) ( -64 -68 408 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -44911,11 +44783,11 @@ effects_warpzone/rededge "classname" "trigger_push" "target" "target_position5" { -( 552 1772 408 ) ( 576 1772 408 ) ( 552 1772 384 ) common/trigger 0 0 0 -0.25 0.25 0 0 0 -( 576 1812 384 ) ( 552 1812 384 ) ( 576 1772 384 ) common/trigger 0 240 180 0.25 0.25 0 0 0 -( 576 1812 384 ) ( 576 1812 408 ) ( 552 1812 384 ) common/trigger 0 0 0 -0.25 0.25 0 0 0 -( 574.5 1812 383.5 ) ( 574.5 1772 383.5 ) ( 574.5 1812 407.5 ) common/trigger 16 254 0 -0.25 0.25 0 0 0 -( 576 3524 408 ) ( 544 3524 384 ) ( 576 3652 408 ) common/trigger 0 240 180 0.25 0.25 0 0 0 +( 552 1772 408 ) ( 576 1772 408 ) ( 552 1772 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 576 1812 384 ) ( 552 1812 384 ) ( 576 1772 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 576 1812 384 ) ( 576 1812 408 ) ( 552 1812 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 574.5 1812 383.5 ) ( 574.5 1772 383.5 ) ( 574.5 1812 407.5 ) common/trigger 0 0 0 0.25 0.25 0 0 0 +( 576 3524 408 ) ( 544 3524 384 ) ( 576 3652 408 ) common/trigger 0 0 0 0.25 0.25 0 0 0 } } { @@ -45073,3 +44945,51 @@ effects_warpzone/rededge "origin" "-708.000000 -640.000000 850.000000" "targetname" "target_position12" } +{ +"classname" "trigger_push" +"target" "target_position3" +{ +( 56 -1856 120 ) ( 56 -2048 120 ) ( -8 -1856 120 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 48 -1864 152 ) ( -16 -1864 152 ) ( 48 -1864 88 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 56 -1856 152 ) ( 56 -1856 88 ) ( 56 -2048 152 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -8 -2048 104 ) ( 56 -2048 104 ) ( -8 -1856 104 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -8 -1976 88 ) ( -8 -1976 152 ) ( 56 -1976 88 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -56 -2048 88 ) ( -56 -1856 88 ) ( -56 -2048 152 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +} +} +{ +"classname" "trigger_push" +"target" "target_position1" +{ +( 456 5440 120 ) ( 456 5632 120 ) ( 520 5440 120 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 464 5448 152 ) ( 528 5448 152 ) ( 464 5448 88 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 456 5440 152 ) ( 456 5440 88 ) ( 456 5632 152 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 520 5640 104 ) ( 456 5640 104 ) ( 520 5448 104 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 520 5560 88 ) ( 520 5560 152 ) ( 456 5560 88 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 568 5632 88 ) ( 568 5440 88 ) ( 568 5632 152 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +} +} +{ +"classname" "trigger_push" +"target" "target_position2" +{ +( -1016 2496 -72 ) ( -1016 2688 -72 ) ( -952 2496 -72 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -1008 2504 -48 ) ( -944 2504 -48 ) ( -1008 2504 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -1016 2496 -48 ) ( -1016 2496 -112 ) ( -1016 2688 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -952 2688 -88 ) ( -1016 2688 -88 ) ( -952 2496 -88 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -952 2616 -112 ) ( -952 2616 -48 ) ( -1016 2616 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( -904 2688 -112 ) ( -904 2496 -112 ) ( -904 2688 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +} +} +{ +"classname" "trigger_push" +"target" "target_position6" +{ +( 1416 960 -72 ) ( 1416 1152 -72 ) ( 1480 960 -72 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 1424 968 -48 ) ( 1488 968 -48 ) ( 1424 968 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 1416 960 -48 ) ( 1416 960 -112 ) ( 1416 1152 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 1480 1152 -88 ) ( 1416 1152 -88 ) ( 1480 960 -88 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 1480 1080 -112 ) ( 1480 1080 -48 ) ( 1416 1080 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +( 1528 1152 -112 ) ( 1528 960 -112 ) ( 1528 1152 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0 +} +} diff --git a/maps/geoplanetary.map.options b/maps/geoplanetary.map.options index 7e7333c0..3b3145fd 100644 --- a/maps/geoplanetary.map.options +++ b/maps/geoplanetary.map.options @@ -2,4 +2,4 @@ -light + -bounce 8 -dirtscale 2 -vis + -minimap + -Version: 4 \ No newline at end of file +Version: 4a \ No newline at end of file