From: FruitieX Date: Fri, 29 Oct 2010 16:54:39 +0000 (+0300) Subject: replace last jumppad on stormkeep that i somehow missed :O X-Git-Tag: xonotic-v0.1.0preview~68^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4fb77a198b9dfe7d90ae14366579dd29d8a619e5;p=xonotic%2Fxonotic-maps.pk3dir.git replace last jumppad on stormkeep that i somehow missed :O --- diff --git a/maps/stormkeep.map b/maps/stormkeep.map index 43b8890d..7feee127 100644 --- a/maps/stormkeep.map +++ b/maps/stormkeep.map @@ -9883,7 +9883,7 @@ exx/panel-rs01 ( 0 152 -64 ) ( 16 280 -64 ) ( 0 280 -64 ) common/caulk 48 48 0 0.5 0.5 0 0 0 } { -( -32 784 -32 ) ( 96 784 -32 ) ( 96 656 -32 ) trak5x/misc-thingy1a 54.8571472168 219.427734375 0 0.4375000596 0.4375002086 0 0 0 +( -32 784 -32 ) ( 96 784 -32 ) ( 96 656 -32 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0 ( -24 776 80 ) ( -24 648 80 ) ( -24 648 -56 ) common/caulk 0 32 0 0.25 0.25 0 4 0 ( -32 656 88 ) ( 96 656 88 ) ( 96 656 -48 ) common/caulk 32 32 0 0.25 0.25 0 4 0 ( 88 648 80 ) ( 88 776 80 ) ( 88 776 -56 ) common/caulk 0 32 0 0.25 0.25 0 4 0 @@ -11647,15 +11647,15 @@ patchDef2 effects_jumppad/jumppadfx1_b ( 9 3 0 0 0 ) ( -( ( -504 -848 -192 0 0 ) ( -504 -848 -168 -0 -0.5 ) ( -504 -848 -144 -0 -1 ) ) -( ( -504 -864 -192 -0.125 0 ) ( -504 -864 -168 -0.125 -0.5 ) ( -504 -864 -144 -0.125 -1 ) ) -( ( -488 -864 -192 -0.25 0 ) ( -488 -864 -168 -0.25 -0.5 ) ( -488 -864 -144 -0.25 -1 ) ) -( ( -472 -864 -192 -0.375 0 ) ( -472 -864 -168 -0.375 -0.5 ) ( -472 -864 -144 -0.375 -1 ) ) -( ( -472 -848 -192 -0.5 0 ) ( -472 -848 -168 -0.5 -0.5 ) ( -472 -848 -144 -0.5 -1 ) ) -( ( -472 -832 -192 -0.625 0 ) ( -472 -832 -168 -0.625 -0.5 ) ( -472 -832 -144 -0.625 -1 ) ) -( ( -488 -832 -192 -0.75 0 ) ( -488 -832 -168 -0.75 -0.5 ) ( -488 -832 -144 -0.75 -1 ) ) -( ( -504 -832 -192 -0.875 0 ) ( -504 -832 -168 -0.875 -0.5 ) ( -504 -832 -144 -0.875 -1 ) ) -( ( -504 -848 -192 -1 0 ) ( -504 -848 -168 -1 -0.5 ) ( -504 -848 -144 -1 -1 ) ) +( ( 32 688 -32 0 0 ) ( 32 688 -8 -0 -0.5 ) ( 32 688 16 -0 -1 ) ) +( ( 48 688 -32 -0.125 0 ) ( 48 688 -8 -0.125 -0.5 ) ( 48 688 16 -0.125 -1 ) ) +( ( 48 704 -32 -0.25 0 ) ( 48 704 -8 -0.25 -0.5 ) ( 48 704 16 -0.25 -1 ) ) +( ( 48 720 -32 -0.375 0 ) ( 48 720 -8 -0.375 -0.5 ) ( 48 720 16 -0.375 -1 ) ) +( ( 32 720 -32 -0.5 0 ) ( 32 720 -8 -0.5 -0.5 ) ( 32 720 16 -0.5 -1 ) ) +( ( 16 720 -32 -0.625 0 ) ( 16 720 -8 -0.625 -0.5 ) ( 16 720 16 -0.625 -1 ) ) +( ( 16 704 -32 -0.75 0 ) ( 16 704 -8 -0.75 -0.5 ) ( 16 704 16 -0.75 -1 ) ) +( ( 16 688 -32 -0.875 0 ) ( 16 688 -8 -0.875 -0.5 ) ( 16 688 16 -0.875 -1 ) ) +( ( 32 688 -32 -1 0 ) ( 32 688 -8 -1 -0.5 ) ( 32 688 16 -1 -1 ) ) ) } } @@ -11677,6 +11677,24 @@ effects_jumppad/jumppadfx1_b ) } } +{ +patchDef2 +{ +effects_jumppad/jumppadfx1_b +( 9 3 0 0 0 ) +( +( ( -504 -848 -192 0 0 ) ( -504 -848 -168 -0 -0.5 ) ( -504 -848 -144 -0 -1 ) ) +( ( -504 -864 -192 -0.125 0 ) ( -504 -864 -168 -0.125 -0.5 ) ( -504 -864 -144 -0.125 -1 ) ) +( ( -488 -864 -192 -0.25 0 ) ( -488 -864 -168 -0.25 -0.5 ) ( -488 -864 -144 -0.25 -1 ) ) +( ( -472 -864 -192 -0.375 0 ) ( -472 -864 -168 -0.375 -0.5 ) ( -472 -864 -144 -0.375 -1 ) ) +( ( -472 -848 -192 -0.5 0 ) ( -472 -848 -168 -0.5 -0.5 ) ( -472 -848 -144 -0.5 -1 ) ) +( ( -472 -832 -192 -0.625 0 ) ( -472 -832 -168 -0.625 -0.5 ) ( -472 -832 -144 -0.625 -1 ) ) +( ( -488 -832 -192 -0.75 0 ) ( -488 -832 -168 -0.75 -0.5 ) ( -488 -832 -144 -0.75 -1 ) ) +( ( -504 -832 -192 -0.875 0 ) ( -504 -832 -168 -0.875 -0.5 ) ( -504 -832 -144 -0.875 -1 ) ) +( ( -504 -848 -192 -1 0 ) ( -504 -848 -168 -1 -0.5 ) ( -504 -848 -144 -1 -1 ) ) +) +} +} } { "classname" "func_group" @@ -20876,44 +20894,44 @@ exx/trim-01 { "classname" "func_group" { -( 56 744 128 ) ( 8 744 128 ) ( 56 768 128 ) common/clip 64 192 -90 0.25 0.25 0 0 0 -( 56 744 128 ) ( 56 768 128 ) ( 56 744 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( 56 744 96 ) ( 56 744 -32 ) ( 8 744 96 ) common/clip 64 0 0 0.25 0.25 0 0 0 +( 56 800 128 ) ( 56 776 128 ) ( 8 776 128 ) common/clip 64 192 -90 0.25 0.25 0 0 0 +( 56 744 -32 ) ( 56 776 128 ) ( 56 800 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( 8 744 -32 ) ( 8 776 128 ) ( 56 776 128 ) common/clip 64 0 0 0.25 0.25 0 0 0 ( 8 768 -32 ) ( 8 744 -32 ) ( 56 768 -32 ) common/clip 64 192 -90 0.25 0.25 0 0 0 -( 8 768 0 ) ( 8 768 128 ) ( 8 744 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( 8 768 -32 ) ( 56 768 -32 ) ( 8 768 96 ) common/clip 64 0 0 0.25 0.25 0 0 0 +( 8 744 -32 ) ( 8 800 128 ) ( 8 776 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( 56 768 -32 ) ( 56 800 128 ) ( 8 800 128 ) common/clip 64 0 0 0.25 0.25 0 0 0 } { -( 8 744 128 ) ( -16 768 128 ) ( 8 768 128 ) common/clip 64 128 -90 0.25 -0.25 0 0 0 -( -16 768 0 ) ( -16 768 128 ) ( -16 728 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( -16 728 0 ) ( -16 728 128 ) ( 8 744 0 ) common/clip 128 128 0 -0.25 0.25 0 0 0 +( -16 800 128 ) ( 8 776 128 ) ( -16 760 128 ) common/clip 64 128 -90 0.25 -0.25 0 0 0 +( -16 728 -32 ) ( -16 800 128 ) ( -16 760 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( -16 728 -32 ) ( -16 760 128 ) ( 8 776 128 ) common/clip 128 128 0 -0.25 0.25 0 0 0 ( 8 744 -32 ) ( -16 768 -32 ) ( -16 728 -32 ) common/clip 64 128 -90 0.25 -0.25 0 0 0 -( 8 744 0 ) ( 8 768 128 ) ( 8 768 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( -16 768 96 ) ( -16 768 -32 ) ( 8 768 96 ) common/clip 128 0 0 -0.25 0.25 0 0 0 +( 8 744 -32 ) ( 8 776 128 ) ( 8 800 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( -16 768 -32 ) ( 8 800 128 ) ( -16 800 128 ) common/clip 128 0 0 -0.25 0.25 0 0 0 } { -( -16 768 128 ) ( -48 664 128 ) ( -48 768 128 ) common/clip 64 224 -90 0.25 -0.25 0 0 0 -( -48 768 128 ) ( -48 664 128 ) ( -48 664 -32 ) common/clip 64 0 0 -0.25 0.25 0 0 0 -( -16 728 128 ) ( -48 664 -32 ) ( -48 664 128 ) common/clip 32 128 0 -0.25 0.25 0 0 0 +( -48 696 128 ) ( -16 800 128 ) ( -16 760 128 ) common/clip 64 224 -90 0.25 -0.25 0 0 0 +( -48 664 -32 ) ( -48 800 128 ) ( -48 696 128 ) common/clip 64 0 0 -0.25 0.25 0 0 0 +( -48 664 -32 ) ( -48 696 128 ) ( -16 760 128 ) common/clip 32 128 0 -0.25 0.25 0 0 0 ( -48 768 -32 ) ( -48 664 -32 ) ( -16 768 -32 ) common/clip 64 224 -90 0.25 -0.25 0 0 0 -( -16 728 0 ) ( -16 728 128 ) ( -16 768 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( -32 768 96 ) ( -32 768 -32 ) ( -16 768 96 ) common/clip 32 0 0 -0.25 0.25 0 0 0 +( -16 728 -32 ) ( -16 760 128 ) ( -16 800 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( -48 768 -32 ) ( -16 800 128 ) ( -48 800 128 ) common/clip 32 0 0 -0.25 0.25 0 0 0 } { -( 56 768 128 ) ( 80 768 128 ) ( 56 744 128 ) common/clip 64 128 -90 0.25 0.25 0 0 0 -( 80 728 0 ) ( 80 768 128 ) ( 80 768 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( 56 744 0 ) ( 80 728 128 ) ( 80 728 0 ) common/clip 128 128 0 0.25 0.25 0 0 0 +( 80 800 128 ) ( 80 760 128 ) ( 56 776 128 ) common/clip 64 128 -90 0.25 0.25 0 0 0 +( 80 728 -32 ) ( 80 760 128 ) ( 80 800 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( 56 744 -32 ) ( 56 776 128 ) ( 80 760 128 ) common/clip 128 128 0 0.25 0.25 0 0 0 ( 80 728 -32 ) ( 80 768 -32 ) ( 56 744 -32 ) common/clip 64 128 -90 0.25 0.25 0 0 0 -( 56 768 0 ) ( 56 768 128 ) ( 56 744 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( 56 768 96 ) ( 80 768 -32 ) ( 80 768 96 ) common/clip 128 0 0 0.25 0.25 0 0 0 +( 56 744 -32 ) ( 56 800 128 ) ( 56 776 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( 56 768 -32 ) ( 80 800 128 ) ( 56 800 128 ) common/clip 128 0 0 0.25 0.25 0 0 0 } { -( 112 768 128 ) ( 112 664 128 ) ( 80 768 128 ) common/clip 64 224 -90 0.25 0.25 0 0 0 -( 112 768 128 ) ( 112 664 -32 ) ( 112 664 128 ) common/clip 64 0 0 -0.25 0.25 0 0 0 -( 80 728 -32 ) ( 112 664 128 ) ( 112 664 -32 ) common/clip 32 128 0 -0.25 0.25 0 0 0 +( 112 696 128 ) ( 80 760 128 ) ( 112 800 128 ) common/clip 64 224 -90 0.25 0.25 0 0 0 +( 112 664 -32 ) ( 112 696 128 ) ( 112 800 128 ) common/clip 64 0 0 -0.25 0.25 0 0 0 +( 80 728 -32 ) ( 80 760 128 ) ( 112 696 128 ) common/clip 32 128 0 -0.25 0.25 0 0 0 ( 80 728 -32 ) ( 112 664 -32 ) ( 80 768 -32 ) common/clip 64 224 -90 0.25 0.25 0 0 0 -( 80 768 128 ) ( 80 728 128 ) ( 80 728 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0 -( 80 768 96 ) ( 96 768 -32 ) ( 96 768 96 ) common/clip 32 0 0 0.25 0.25 0 0 0 +( 80 728 -32 ) ( 80 800 128 ) ( 80 760 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0 +( 80 768 -32 ) ( 112 800 128 ) ( 80 800 128 ) common/clip 32 0 0 0.25 0.25 0 0 0 } } { @@ -20974,6 +20992,14 @@ exx/trim-01 } { "classname" "misc_model" +"origin" "32.000000 704.000000 -32.000000" +"model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" +"_receiveshadows" "1" +"_castshadows" "1" +"angle" "90.000000" +} +{ +"classname" "misc_model" "origin" "-488.000000 -848.000000 -192.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "_receiveshadows" "1"