X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=maps%2Fsilentsiege.map;h=18adbc83e179643b5ccc8d563e933c891501678e;hb=238b35f0848bffeafc1b66f5280930e6e4e2c649;hp=6f2d8f0ee5568fe3bda8d58d0427030d68285a67;hpb=4880fab294a84ae88c4b36ccfe5da149bdf594e5;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/maps/silentsiege.map b/maps/silentsiege.map
index 6f2d8f0e..18adbc83 100644
--- a/maps/silentsiege.map
+++ b/maps/silentsiege.map
@@ -1,6 +1,6 @@
 {
 "classname" "worldspawn"
-"author" "Justin"
+"author" "Justin, kuniu the frogg"
 "message" "Silent Siege"
 "_description" "Medium size Duel/TDM map"
 {
@@ -2335,7 +2335,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -496 384 640 ) ( -496 384 0 ) ( -496 128 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -1152 128 0 ) ( -1152 128 640 ) ( -384 128 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 384 64 ) ( -544 352 -64 ) ( -544 384 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 352 -64 ) ( -512 352 -64 ) ( -544 352 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -2368,7 +2368,7 @@ phillipk2x/base-pk02_generic01b
 {
 patchDef2
 {
-trak5x/floor-floor2a
+phillipk2x/base-pk02_generic01b
 ( 3 3 0 0 0 )
 (
 ( ( -496 352 608 -3.875 -2.75 ) ( -496 400 608 -3.875 -3.125 ) ( -544 400 608 -4.25 -3.125 ) )
@@ -6210,7 +6210,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -384 400 640 ) ( -1152 400 640 ) ( -384 400 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -544 384 -64 ) ( -544 352 -64 ) ( -544 384 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 352 64 ) ( -512 352 -64 ) ( -544 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -848 352 -64 ) ( -848 368 -64 ) ( -848 352 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -10353,7 +10353,7 @@ brushDef
 ( -1792 -320 0 ) ( -1536 -320 0 ) ( -1792 128 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1544 -32 -64 ) ( -1552 -32 -64 ) ( -1544 -32 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1552 64 64 ) ( -1552 32 -64 ) ( -1552 64 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1552 112 -64 ) ( -1536 112 -64 ) ( -1552 112 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -1552 112 -64 ) ( -1536 112 -64 ) ( -1552 112 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -64 112 48 ) ( -64 128 48 ) ( 64 112 48 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
@@ -22163,7 +22163,7 @@ phillipk2x/base-pk02_generic01b
 {
 patchDef2
 {
-trak5x/base-base1c
+phillipk2x/base-pk02_generic01b
 ( 3 3 0 0 0 )
 (
 ( ( 864 480 960 5.25 -6 ) ( 864 480 1120 5.25 -7.25 ) ( 736 480 1120 4.25 -7.25 ) )
@@ -24633,7 +24633,7 @@ brushDef
 brushDef
 {
 ( -736 -736 736 ) ( -736 -736 992 ) ( -320 -736 736 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -384 -736 -64 ) ( -416 -704 -64 ) ( -384 -736 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal04 0 0 0
+( -384 -736 -64 ) ( -416 -704 -64 ) ( -384 -736 64 ) ( ( 0 0.015625 0 ) ( -0.0052083335 0 0.5 ) ) exx/trim-metalsupp01 0 0 0
 ( -384 -672 0 ) ( -320 -736 0 ) ( -384 -672 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/base-base1c 0 0 0
 ( -416 -704 0 ) ( -384 -672 0 ) ( -416 -704 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 64 -672 896 ) ( -64 -640 896 ) ( -64 -672 896 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -35187,7 +35187,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-crete01 0 0 0
 ( -384 400 640 ) ( -1152 400 640 ) ( -384 400 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -544 352 64 ) ( -512 352 -64 ) ( -544 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -848 352 64 ) ( -848 368 -64 ) ( -848 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -896 128 -64 ) ( -896 144 -64 ) ( -896 128 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -36686,7 +36686,7 @@ brushDef
 ( -1536 128 320 ) ( -1792 128 320 ) ( -1536 128 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -1792 -320 0 ) ( -1536 -320 0 ) ( -1792 128 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1792 -320 0 ) ( -1792 128 0 ) ( -1792 -320 320 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1552 128 -64 ) ( -1552 96 -64 ) ( -1552 128 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -1552 128 -64 ) ( -1552 96 -64 ) ( -1552 128 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -1552 112 64 ) ( -1536 112 -64 ) ( -1552 112 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -64 320 48 ) ( -64 336 48 ) ( 64 320 48 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
@@ -37837,30 +37837,6 @@ patchDef2
 phillipk2x/base-pk02_generic01b
 ( 3 3 0 0 0 )
 (
-( ( -1528 96 -0.0000007153 0 0 ) ( -1528 96 24 0 -0.1875 ) ( -1528 96 48 0 -0.375 ) )
-( ( -1528 136 -0.0000007153 0.125 0 ) ( -1528 136 24 0.125 -0.1875 ) ( -1528 136 48 0.125 -0.375 ) )
-( ( -1568 136 -0.0000007153 0.25 0 ) ( -1568 136 24 0.25 -0.1875 ) ( -1568 136 48 0.25 -0.375 ) )
-)
-}
-}
-{
-patchDef2
-{
-phillipk2x/base-pk02_generic01b
-( 3 3 0 0 0 )
-(
-( ( -1568 128 48 0 0 ) ( -1568 132 48 0 -0.03125 ) ( -1568 136 48 0 -0.0625 ) )
-( ( -1536 128 48 0.3125 0 ) ( -1532 132 48 0.3125 -0.03125 ) ( -1528 136 48 0.3125 -0.0625 ) )
-( ( -1536 96 48 0.625 0 ) ( -1532 96 48 0.625 -0.03125 ) ( -1528 96 48 0.625 -0.0625 ) )
-)
-}
-}
-{
-patchDef2
-{
-phillipk2x/base-pk02_generic01b
-( 3 3 0 0 0 )
-(
 ( ( -1568 128 256 0 0 ) ( -1568 132 256 0 -0.03125 ) ( -1568 136 256 0 -0.0625 ) )
 ( ( -1536 128 256 0.3125 0 ) ( -1532 132 256 0.3125 -0.03125 ) ( -1528 136 256 0.3125 -0.0625 ) )
 ( ( -1536 96 256 0.625 0 ) ( -1532 96 256 0.625 -0.03125 ) ( -1528 96 256 0.625 -0.0625 ) )
@@ -48542,28 +48518,6 @@ brushDef
 {
 brushDef
 {
-( -1517 68.875 48 ) ( -1357 324.875 48 ) ( -1357 68.875 48 ) ( ( -0.0078125 0 2.5380859375 ) ( 0 0.0078125 10.6015625 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1357 96.875 -416 ) ( -1517 96.875 32 ) ( -1357 96.875 32 ) ( ( -0.0078125 0 501.3984375 ) ( 0 0.0078125 507.25 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1529 448.875 -51 ) ( -1529 192.875 -499 ) ( -1529 192.875 -51 ) ( ( -0.0078125 0 3.5068359375 ) ( 0 0.0078125 506.6015625 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1165 100.875 -544 ) ( -1229 100.875 -672 ) ( -1165 100.875 -672 ) ( ( -0.0078125 0 10.6015625 ) ( 0 0.0078125 507.25 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1293 260.875 0 ) ( -1197 260.875 0 ) ( -1293 388.875 0 ) ( ( -0.0078125 0 2.5380859375 ) ( 0 0.0078125 501.3984375 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1533 84.875 -672 ) ( -1533 100.875 -672 ) ( -1533 84.875 -544 ) ( ( -0.0078125 0 509.4619140625 ) ( 0 0.0078125 507.25 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-}
-}
-{
-brushDef
-{
-( -1552 99.625 48 ) ( -1392 355.625 48 ) ( -1392 99.625 48 ) ( ( -0.0078125 0 2.7783203125 ) ( 0 0.0078125 10.875 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1392 127.625 -416 ) ( -1552 127.625 32 ) ( -1392 127.625 32 ) ( ( -0.0078125 0 501.125 ) ( 0 0.0078125 507.25 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1564 479.625 -51 ) ( -1564 223.625 -499 ) ( -1564 223.625 -51 ) ( ( -0.0078125 0 3.7470703125 ) ( 0 0.0078125 506.6015625 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1200 135.375 -544 ) ( -1264 135.375 -672 ) ( -1200 135.375 -672 ) ( ( -0.0078125 0 10.875 ) ( 0 0.0078125 507.25 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1328 291.625 0 ) ( -1232 291.625 0 ) ( -1328 419.625 0 ) ( ( -0.0078125 0 2.7783203125 ) ( 0 0.0078125 501.125 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1568 115.625 -672 ) ( -1568 131.625 -672 ) ( -1568 115.625 -544 ) ( ( -0.0078125 0 509.2216796875 ) ( 0 0.0078125 507.25 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-}
-}
-{
-brushDef
-{
 ( 898.1976318359 -1309.4777832031 268 ) ( 917.3371582031 -1315.0158691406 268 ) ( 916.6815185547 -1317.2816162109 268 ) ( ( 0.0043429253 -0.0150093175 254.7803955078 ) ( 0.0150093175 0.0043429253 29.7671146393 ) ) common/clip 0 0 0
 ( 909.9546508789 -1322.9985351563 -1.375 ) ( 912.1192016602 -1322.0612792969 -1.375 ) ( 904.2013549805 -1303.7774658203 -1.375 ) ( ( 0.0143382791 0.0062092179 3.9204101563 ) ( -0.0062092179 0.0143382791 246.8556976318 ) ) common/clip 0 0 0
 ( 909.75 -1272.625 268 ) ( 909.75 -1272.625 -1.375 ) ( 918.75 -1304.875 268 ) ( ( 0.015625 0 3.9184007645 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
@@ -49080,6 +49034,63 @@ brushDef
 ( 608 896 64 ) ( 608 888 -64 ) ( 608 896 -64 ) ( ( 0.0625 -0 -0 ) ( 0 0.0625 0 ) ) trak5x/light-light2a 134217728 0 0
 }
 }
+{
+patchDef2
+{
+phillipk2x/base-pk02_generic01b
+( 3 3 0 0 0 )
+(
+( ( -1536 96 16.0000038147 0 0 ) ( -1536 96 32 0 -0.1249999702 ) ( -1536 96 48 0 -0.2499999702 ) )
+( ( -1536 128 16.0000038147 0.25 0 ) ( -1536 128 32 0.25 -0.1249999702 ) ( -1536 128 48 0.25 -0.2499999702 ) )
+( ( -1568 128 16.0000038147 0.5 0 ) ( -1568 128 32 0.5 -0.1249999702 ) ( -1568 128 48 0.5 -0.2499999702 ) )
+)
+}
+}
+{
+patchDef2
+{
+phillipk2x/base-pk02_generic01b
+( 3 3 0 0 0 )
+(
+( ( -1536 96 0.0000038147 0 0 ) ( -1536 96 8.0000009537 0 -0.1249999702 ) ( -1536 96 16 0 -0.2499999702 ) )
+( ( -1536 128 0.0000038147 0.25 0 ) ( -1536 128 8.0000009537 0.25 -0.1249999702 ) ( -1536 128 16 0.25 -0.2499999702 ) )
+( ( -1568 128 0.0000038147 0.5 0 ) ( -1568 128 8.0000009537 0.5 -0.1249999702 ) ( -1568 128 16 0.5 -0.2499999702 ) )
+)
+}
+}
+{
+brushDef
+{
+( -1168 48 64 ) ( -1152 48 64 ) ( -1168 -32 64 ) ( ( 0 -0.015625 1004 ) ( 0.015625 0 1000.75 ) ) common/clip 0 0 0
+( -1168 48 -40 ) ( -1168 -32 -40 ) ( -1168 48 -48 ) ( ( 0.015625 0 23.25 ) ( 0 0.015625 1023.25 ) ) common/clip 0 0 0
+( -1160 128 64 ) ( -1160 128 56 ) ( -1144 128 64 ) ( ( 0.015625 0 1004.125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -1152 -32 -48 ) ( -1152 48 -48 ) ( -1168 -32 -48 ) ( ( 0 0.015625 236 ) ( -0.015625 0 23.25 ) ) common/clip 0 0 0
+( -1152 -32 56 ) ( -1152 -32 64 ) ( -1152 48 56 ) ( ( 0.015625 0 232.75 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+( -1152 -32 56 ) ( -1168 -32 56 ) ( -1152 -32 64 ) ( ( 0.015625 0 20 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( -1520 64 64 ) ( -1520 -32 64 ) ( -1536 64 64 ) ( ( 0.015625 0 1022.5 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -1520 112 64 ) ( -1536 112 64 ) ( -1520 112 56 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -1520 64 64 ) ( -1520 64 56 ) ( -1520 -32 64 ) ( ( 0.015625 0 254.5 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+( -1536 -32 -48 ) ( -1520 -32 -48 ) ( -1536 64 -48 ) ( ( 0.015625 0 254.5 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -1536 -32 56 ) ( -1536 -32 64 ) ( -1520 -32 56 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+( -1536 -32 56 ) ( -1536 64 56 ) ( -1536 -32 64 ) ( ( 0.015625 0 1.5 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( -1344 -112 64 ) ( -1248 -112 64 ) ( -1344 -128 64 ) ( ( 0 -0.015625 1002.5 ) ( 0.015625 0 1002 ) ) common/clip 0 0 0
+( -1440 -112 64 ) ( -1440 -128 64 ) ( -1440 -112 56 ) ( ( 0.015625 0 22 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -1344 -112 64 ) ( -1344 -112 56 ) ( -1248 -112 64 ) ( ( 0.015625 0 234.5 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+( -1248 -128 -48 ) ( -1248 -112 -48 ) ( -1344 -128 -48 ) ( ( 0 0.015625 234.5 ) ( -0.015625 0 22 ) ) common/clip 0 0 0
+( -1248 -128 56 ) ( -1248 -128 64 ) ( -1248 -112 56 ) ( ( 0.015625 0 234 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+( -1248 -128 56 ) ( -1344 -128 56 ) ( -1248 -128 64 ) ( ( 0.015625 0 21.5 ) ( 0 0.015625 255.875 ) ) common/clip 0 0 0
+}
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -49116,9 +49127,10 @@ brushDef
 "light" "80"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "-1416.000000 -272.000000 320.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "trigger_push"
@@ -49164,7 +49176,7 @@ brushDef
 "_color" "1 0.579751 0.199634"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "1128.000000 -1384.000000 344.000000"
 }
 {
@@ -49181,7 +49193,7 @@ brushDef
 "target" "info_null1"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "1064.000000 -752.000000 656.000000"
 }
 {
@@ -49189,7 +49201,7 @@ brushDef
 "origin" "-1348.000000 0.000000 60.000000"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "-288.000000 -400.000000 652.000000"
 }
 {
@@ -49207,7 +49219,7 @@ brushDef
 "_color" "0.950973 0.72636 0.25362"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "200.000000 786.000000 335.000000"
 }
 {
@@ -54095,7 +54107,7 @@ exx/floor-simple05
 }
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-488.000000 -1248.000000 320.000000"
 }
 {
@@ -55743,7 +55755,7 @@ brushDef
 }
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "-192.000000 576.000000 80.000000"
 }
 {
@@ -57298,9 +57310,10 @@ exx/base-metal04
 "_color" "0.970672 0.401389 0.0448463"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "-320.000000 64.000000 320.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "light"