add some ammo and health, fix floating brushes I introduced last commit

[xonotic/xonotic-maps.pk3dir.git] / maps / stormkeep.map

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 69152beb3e2d078c9e756f1d39db54b9f9fbfe17..cf8ffce1dc6dec86901f66ba45c4317d21089e0e 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -12131,15 +12131,15 @@ 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 ) )
+( ( 976 1296 -32 0 0 ) ( 976 1296 -8 -0 -0.5 ) ( 976 1296 16 -0 -1 ) )
+( ( 992 1296 -32 -0.125 0 ) ( 992 1296 -8 -0.125 -0.5 ) ( 992 1296 16 -0.125 -1 ) )
+( ( 992 1312 -32 -0.25 0 ) ( 992 1312 -8 -0.25 -0.5 ) ( 992 1312 16 -0.25 -1 ) )
+( ( 992 1328 -32 -0.375 0 ) ( 992 1328 -8 -0.375 -0.5 ) ( 992 1328 16 -0.375 -1 ) )
+( ( 976 1328 -32 -0.5 0 ) ( 976 1328 -8 -0.5 -0.5 ) ( 976 1328 16 -0.5 -1 ) )
+( ( 960 1328 -32 -0.625 0 ) ( 960 1328 -8 -0.625 -0.5 ) ( 960 1328 16 -0.625 -1 ) )
+( ( 960 1312 -32 -0.75 0 ) ( 960 1312 -8 -0.75 -0.5 ) ( 960 1312 16 -0.75 -1 ) )
+( ( 960 1296 -32 -0.875 0 ) ( 960 1296 -8 -0.875 -0.5 ) ( 960 1296 16 -0.875 -1 ) )
+( ( 976 1296 -32 -1 0 ) ( 976 1296 -8 -1 -0.5 ) ( 976 1296 16 -1 -1 ) )
 )
 }
 }
@@ -12280,9 +12280,9 @@ effects_jumppad/jumppadfx1_b
 ( 32 1472 -34 ) ( 32 1152 -34 ) ( -384 1472 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( 32 1408 -32 ) ( -384 1408 -32 ) ( 32 1408 -64 ) exx/base-metal03 128 192 0 0.25 0.25 134217728 0 0
 ( -256 1472 -32 ) ( -256 1472 -64 ) ( -256 1152 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -48 ) ( 32 1152 -48 ) ( -384 1472 -48 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -40 ) ( 32 1152 -40 ) ( -384 1472 -40 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
 ( -384 1152 -64 ) ( -384 1152 -32 ) ( 32 1152 -64 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -64 ) ( -384 1472 -64 ) ( -384 1152 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -56 ) ( -384 1472 -56 ) ( -384 1152 -24 ) common/caulk 0 32 0 0.25 0.25 134217728 0 0
 }
 {
 ( -576 448 -64 ) ( -576 432 -64 ) ( -1088 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -12521,9 +12521,9 @@ effects_jumppad/jumppadfx1_b
 ( -256 1152 -34 ) ( -256 1024 -34 ) ( -528 1152 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -528 1152 -32 ) ( -256 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -256 1152 -64 ) ( -256 1024 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -528 1024 -48 ) ( -256 1024 -48 ) ( -528 1152 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -528 1024 -40 ) ( -256 1024 -40 ) ( -528 1152 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -528 1024 -64 ) ( -528 1024 -32 ) ( -256 1024 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1024 -66 ) ( -832 1152 -66 ) ( -832 1024 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
+( -832 1024 -58 ) ( -832 1152 -58 ) ( -832 1024 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
 }
 {
 ( -840 448 -32 ) ( -840 432 -32 ) ( -896 448 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -13002,8 +13002,8 @@ exx/base-metal03
 {
 ( -320 1600 -34 ) ( -320 1472 -34 ) ( -592 1600 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -320 1152 -32 ) ( -592 1152 -32 ) ( -320 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1600 -34 ) ( -832 1600 -66 ) ( -832 1472 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
-( -592 1472 -48 ) ( -320 1472 -48 ) ( -592 1600 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -832 1600 -26 ) ( -832 1600 -58 ) ( -832 1472 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
+( -592 1472 -40 ) ( -320 1472 -40 ) ( -592 1600 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -592 448 -64 ) ( -592 448 -32 ) ( -320 448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -896 1472 -64 ) ( -896 1600 -64 ) ( -896 1472 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 }
@@ -13411,6 +13411,14 @@ exx/base-metal03
 ( 832 832 512 ) ( 912 960 512 ) ( 960 832 512 ) common/caulk 156.4449462891 213.3328857422 -90 0.1875 -0.1875 134217728 0 0
 ( 864 64 576 ) ( 976 64 464 ) ( 864 -64 576 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0
 }
+{
+( -256 1552 128 ) ( -256 1472 128 ) ( -384 1552 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -256 1600 128 ) ( -384 1600 128 ) ( -256 1600 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -224 1552 128 ) ( -224 1552 96 ) ( -224 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -256 1472 96 ) ( -384 1552 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -384 1472 128 ) ( -256 1472 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -416 1472 96 ) ( -416 1552 96 ) ( -416 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"
@@ -14285,56 +14293,6 @@ exx/base-metal03
 }
 }
 {
-"classname" "func_group"
-"type" "patchCapped"
-{
-patchDef2
-{
-exx/trim-01
-( 5 3 0 0 0 )
-(
-( ( -32 704 128 0 1 ) ( -32 704 128 0 0.5 ) ( -32 704 128 0 0 ) )
-( ( -32 768 128 0.4375 1 ) ( -32 768 128 0.4375 0.5 ) ( -32 768 128 0.4375 0 ) )
-( ( 32 768 128 0.875 1 ) ( 32 768 128 0.875 0.5 ) ( 32 768 128 0.875 0 ) )
-( ( 96 768 128 1.3125 1 ) ( 96 768 128 1.3125 0.5 ) ( 96 768 128 1.3125 0 ) )
-( ( 96 704 128 1.75 1 ) ( 96 704 128 1.75 0.5 ) ( 96 704 128 1.75 0 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-"type" "patchCapped"
-{
-patchDef2
-{
-exx/trim-01
-( 3 3 0 0 0 )
-(
-( ( 96 704 128 0 1 ) ( 96 704 128 0 0.5 ) ( 96 704 128 0 0 ) )
-( ( 96 640 128 0.5 1 ) ( 96 640 128 0.5 0.5 ) ( 96 640 128 0.5 0 ) )
-( ( 160 640 128 1 1 ) ( 160 640 128 1 0.5 ) ( 160 640 128 1 0 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-"type" "patchCapped"
-{
-patchDef2
-{
-exx/trim-01
-( 3 3 0 0 0 )
-(
-( ( -96 640 128 0 1 ) ( -96 640 128 0 0.5 ) ( -96 640 128 0 0 ) )
-( ( -32 640 128 0.5 1 ) ( -32 640 128 0.5 0.5 ) ( -32 640 128 0.5 0 ) )
-( ( -32 704 128 1 1 ) ( -32 704 128 1 0.5 ) ( -32 704 128 1 0 ) )
-)
-}
-}
-}
-{
 "classname" "item_health_mega"
 "origin" "1696.000000 -256.000000 -32.000000"
 "angle" "90.000000"
@@ -23248,7 +23206,7 @@ exx/trim-01
 }
 {
 "classname" "misc_model"
-"origin" "960.000000 1312.000000 -32.000000"
+"origin" "976.000000 1312.000000 -32.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
 "_receiveshadows" "1"
 "_castshadows" "1"