From: Maik Merten <maikmerten@googlemail>
Date: Mon, 1 Nov 2010 17:44:54 +0000 (+0100)
Subject: I OBEY THE FRUITIEX (and put a fancy jumppad near the rocketlauncher)
X-Git-Tag: xonotic-v0.1.0preview~51^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2500c4f8b9b209d3569caca505164ec5d4c3894;p=xonotic%2Fxonotic-maps.pk3dir.git

I OBEY THE FRUITIEX (and put a fancy jumppad near the rocketlauncher)
---

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index c60f8256..65f16b11 100644
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -731,7 +731,7 @@
 ( -64 192 -64 ) ( -80 200 -64 ) ( -144 136 -64 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
 {
-( 888 1248 -32 ) ( 888 1376 -32 ) ( 1016 1376 -32 ) trak5x/misc-thingy1a 237.7145996094 54.8557128906 0 0.4375000596 0.4375002086 0 0 0
+( 888 1248 -32 ) ( 888 1376 -32 ) ( 1016 1376 -32 ) trak5x/base-base1b 237.7145996094 54.8557128906 0 0.4375000596 0.4375002086 0 0 0
 ( 896 1256 80 ) ( 1024 1256 80 ) ( 1024 1256 -56 ) common/caulk 0 32 0 0.25 0.25 0 4 0
 ( 1016 1248 88 ) ( 1016 1376 88 ) ( 1016 1376 -48 ) common/caulk 32 32 0 0.25 0.25 0 4 0
 ( 1024 1368 80 ) ( 896 1368 80 ) ( 896 1368 -56 ) common/caulk 0 32 0 0.25 0.25 0 4 0
@@ -11815,6 +11815,24 @@ effects_jumppad/jumppadfx1_b
 ( -524 -64 96 ) ( -520 64 96 ) ( -524 64 96 ) map_stormkeep/sand1a 0 0 0 0.5 0.5 0 0 0
 ( -704 1216 -64 ) ( -672 1216 -64 ) ( -704 1216 64 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
 }
+{
+patchDef2
+{
+effects_jumppad/jumppadfx1_b
+( 9 3 0 0 0 )
+(
+( ( 960 1296 -32 0 0 ) ( 960 1296 -8 -0 -0.5 ) ( 960 1296 16 -0 -1 ) )
+( ( 976 1296 -32 -0.125 0 ) ( 976 1296 -8 -0.125 -0.5 ) ( 976 1296 16 -0.125 -1 ) )
+( ( 976 1312 -32 -0.25 0 ) ( 976 1312 -8 -0.25 -0.5 ) ( 976 1312 16 -0.25 -1 ) )
+( ( 976 1328 -32 -0.375 0 ) ( 976 1328 -8 -0.375 -0.5 ) ( 976 1328 16 -0.375 -1 ) )
+( ( 960 1328 -32 -0.5 0 ) ( 960 1328 -8 -0.5 -0.5 ) ( 960 1328 16 -0.5 -1 ) )
+( ( 944 1328 -32 -0.625 0 ) ( 944 1328 -8 -0.625 -0.5 ) ( 944 1328 16 -0.625 -1 ) )
+( ( 944 1312 -32 -0.75 0 ) ( 944 1312 -8 -0.75 -0.5 ) ( 944 1312 16 -0.75 -1 ) )
+( ( 944 1296 -32 -0.875 0 ) ( 944 1296 -8 -0.875 -0.5 ) ( 944 1296 16 -0.875 -1 ) )
+( ( 960 1296 -32 -1 0 ) ( 960 1296 -8 -1 -0.5 ) ( 960 1296 16 -1 -1 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"
@@ -20106,11 +20124,6 @@ exx/trim-01
 }
 {
 "classname" "light"
-"origin" "952.000000 1312.000000 0.000000"
-"light" "200"
-}
-{
-"classname" "light"
 "origin" "-1152.000000 1584.000000 32.000000"
 "light" "200"
 }
@@ -21447,3 +21460,16 @@ exx/trim-01
 ( -544 1200 64 ) ( -544 1208 -64 ) ( -544 1200 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
+{
+"classname" "light"
+"origin" "960.000000 1312.000000 0.000000"
+"light" "200"
+}
+{
+"classname" "misc_model"
+"origin" "960.000000 1312.000000 -32.000000"
+"model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"_receiveshadows" "1"
+"_castshadows" "1"
+"angle" "90.000000"
+}