X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=maps%2Fstormkeep.map;h=43b8890d5db8640cc0e674508e9b5f327d21e7ac;hp=df966111d9e4942cd57b877d8acb17968912dbf8;hb=1c83cb0803ff3be96b7f85cdcd68240e7ac3f438;hpb=20c4a5b7b1d120db06e28c8577d0e2273fa7969b

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index df966111..43b8890d 100644
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -3361,7 +3361,7 @@ map_stormkeep/largebrick1a
 ( -1080 1656 0 ) ( -1080 1656 -32 ) ( -1080 1528 0 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( -1208 1528 -32 ) ( -1048 1528 -32 ) ( -1208 1656 -32 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -1208 1528 -32 ) ( -1208 1656 -32 ) ( -1208 1528 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 72 1656 0 ) ( -56 1592 -16 ) ( -56 1656 0 ) trak5x/misc-thingy1a 112 240 0 0.5 0.5 0 0 0
+( 72 1656 0 ) ( -56 1592 -16 ) ( -56 1656 0 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -1216 1728 128 ) ( -952 1728 128 ) ( -952 1664 128 ) common/caulk 0 0 0 0.25 0.25 0 4 0
@@ -6057,16 +6057,16 @@ map_stormkeep/largebrick1a
 ( -16 -352 72 ) ( 32 -352 -56 ) ( -16 -352 -56 ) common/caulk 0 16 0 0.5 0.5 0 0 0
 }
 {
-( 96 576 -16 ) ( -32 576 -16 ) ( 96 576 -32 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 96 576 -16 ) ( 96 576 -32 ) ( 96 448 -16 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 448 -32 ) ( 96 448 -32 ) ( -32 576 -32 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -32 448 -32 ) ( -32 448 -16 ) ( 96 448 -32 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 448 -32 ) ( -32 576 -32 ) ( -32 448 -16 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 64 448 48 ) ( 80 464 -80 ) ( 64 448 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 96 544 48 ) ( 80 560 -80 ) ( 96 544 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 0 576 48 ) ( -16 560 -80 ) ( 0 576 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 480 48 ) ( -16 464 -80 ) ( -32 480 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -26 64 -26 ) ( -20 64 -26 ) ( -26 -64 -26 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 96 576 -16 ) ( -32 576 -16 ) ( 96 576 -32 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 96 576 -16 ) ( 96 576 -32 ) ( 96 448 -16 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 448 -32 ) ( 96 448 -32 ) ( -32 576 -32 ) exx/floor-wrn01-blue 0 0 0 0.5 0.5 134217728 0 0
+( -32 448 -32 ) ( -32 448 -16 ) ( 96 448 -32 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 448 -32 ) ( -32 576 -32 ) ( -32 448 -16 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 64 448 48 ) ( 80 464 -80 ) ( 64 448 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 96 544 48 ) ( 80 560 -80 ) ( 96 544 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 0 576 48 ) ( -16 560 -80 ) ( 0 576 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 480 48 ) ( -16 464 -80 ) ( -32 480 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -26 64 -26 ) ( -20 64 -26 ) ( -26 -64 -26 ) exx/floor-wrn01-blue 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 96 576 -24 ) ( 96 448 -24 ) ( -32 576 -24 ) exx/floor-clang01 0 0 0 0.25 0.25 134217728 0 0
@@ -8754,7 +8754,7 @@ exx/base-metal01
 ( 72 -880 -224 ) ( -56 -864 -224 ) ( -56 -880 -224 ) common/caulk 48 48 0 0.5 0.5 0 0 0
 }
 {
-( -560 -912 -192 ) ( -560 -784 -192 ) ( -432 -784 -192 ) trak5x/misc-thingy1a 219.4285888672 237.7142333984 0 0.4374999702 0.4374999702 0 0 0
+( -560 -912 -192 ) ( -560 -784 -192 ) ( -432 -784 -192 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( -568 -904 -80 ) ( -440 -904 -80 ) ( -440 -904 -216 ) common/caulk 0 32 0 0.25 0.25 0 4 0
 ( -432 -912 -72 ) ( -432 -784 -72 ) ( -432 -784 -208 ) common/caulk 32 32 0 0.25 0.25 0 4 0
 ( -440 -792 -80 ) ( -568 -792 -80 ) ( -568 -792 -216 ) common/caulk 0 32 0 0.25 0.25 0 4 0
@@ -11641,6 +11641,42 @@ exx/floor-metal02
 ( 896 1408 -64 ) ( 912 1392 -64 ) ( 896 1408 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 896 1216 64 ) ( 928 1248 -64 ) ( 896 1216 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
+{
+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 ) )
+)
+}
+}
+{
+patchDef2
+{
+effects_jumppad/jumppadfx1_b
+( 9 3 0 0 0 )
+(
+( ( -1160 1590.1029052734 -10.1343383789 0 0 ) ( -1160 1583.8623046875 13.0401000977 -0 -0.5 ) ( -1160 1577.6215820312 36.2145080566 -0 -1 ) )
+( ( -1160 1570.7908935547 -15.3348999023 -0.125 0 ) ( -1160 1564.5502929688 7.8395385742 -0.125 -0.5 ) ( -1160 1558.3095703125 31.0139465332 -0.125 -1 ) )
+( ( -1144 1570.7908935547 -15.3348999023 -0.25 0 ) ( -1144 1564.5502929688 7.8395385742 -0.25 -0.5 ) ( -1144 1558.3095703125 31.0139465332 -0.25 -1 ) )
+( ( -1128 1570.7908935547 -15.3348999023 -0.375 0 ) ( -1128 1564.5502929688 7.8395385742 -0.375 -0.5 ) ( -1128 1558.3095703125 31.0139465332 -0.375 -1 ) )
+( ( -1128 1590.1029052734 -10.1343383789 -0.5 0 ) ( -1128 1583.8623046875 13.0401000977 -0.5 -0.5 ) ( -1128 1577.6215820312 36.2145080566 -0.5 -1 ) )
+( ( -1128 1609.4149169922 -4.9337768555 -0.625 0 ) ( -1128 1603.1743164062 18.2406616211 -0.625 -0.5 ) ( -1128 1596.93359375 41.4150695801 -0.625 -1 ) )
+( ( -1144 1609.4149169922 -4.9337768555 -0.75 0 ) ( -1144 1603.1743164062 18.2406616211 -0.75 -0.5 ) ( -1144 1596.93359375 41.4150695801 -0.75 -1 ) )
+( ( -1160 1609.4149169922 -4.9337768555 -0.875 0 ) ( -1160 1603.1743164062 18.2406616211 -0.875 -0.5 ) ( -1160 1596.93359375 41.4150695801 -0.875 -1 ) )
+( ( -1160 1590.1029052734 -10.1343383789 -1 0 ) ( -1160 1583.8623046875 13.0401000977 -1 -0.5 ) ( -1160 1577.6215820312 36.2145080566 -1 -1 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"
@@ -20201,7 +20237,7 @@ exx/trim-01
 {
 "classname" "target_speaker"
 "origin" "480.000000 -576.000000 336.000000"
-"noise" "sound/desertfactory/windoutside_loop.wav"
+"noise" "sound/wind/windoutside_loop.wav"
 }
 {
 "classname" "target_speaker"
@@ -20293,14 +20329,14 @@ exx/trim-01
 }
 {
 "classname" "misc_model"
-"origin" "1216.000000 177.000000 32.000000"
+"origin" "1216.000000 192.000000 32.000000"
 "model" "models/effects_warpzone/blueedge.md3"
 "modelscale" "4.000000"
 "angle" "-90.000000"
 }
 {
 "classname" "misc_model"
-"origin" "-561.000000 224.000000 80.000000"
+"origin" "-576.000000 224.000000 80.000000"
 "model" "models/effects_warpzone/blueedge.md3"
 "modelscale" "4.000000"
 }
@@ -20928,3 +20964,18 @@ exx/trim-01
 "origin" "1600.000000 -1920.000000 192.000000"
 "noise" "sound/supernatural/space-loop.wav"
 }
+{
+"classname" "misc_model"
+"origin" "-1143.999878 1592.000000 -15.999968"
+"model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"angles" "-0.000000 0.000000 14.075265"
+"_castshadows" "1"
+"_receiveshadows" "1"
+}
+{
+"classname" "misc_model"
+"origin" "-488.000000 -848.000000 -192.000000"
+"model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"_receiveshadows" "1"
+"_castshadows" "1"
+}