Merge remote-tracking branch 'origin/master' into matthiaskrgr/hudsetup

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

diff --git a/maps/fuse.map b/maps/fuse.map
index 63539d3e783cf850527c7f04c66051eba88414d1..2ae023a497c723018703692bcf89216176f08aaa 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -4028,10 +4028,10 @@ brushDef
 {
 ( -380 320 320 ) ( -380 319 320 ) ( -392 320 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
 ( -380 320 320 ) ( -392 320 320 ) ( -380 320 8 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
-( -384 320 320 ) ( -384 320 8 ) ( -384 319 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
+( -384 320 320 ) ( -384 320 8 ) ( -384 319 320 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
 ( -392 319 -56 ) ( -380 319 -56 ) ( -392 320 -56 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
 ( -396 319 8 ) ( -396 319 320 ) ( -384 319 8 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( -392 319 8 ) ( -392 320 8 ) ( -392 319 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
+( -392 319 8 ) ( -392 320 8 ) ( -392 319 320 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
 ( -276 64 8 ) ( -388 64 -56 ) ( -276 -64 8 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
 }
 }
@@ -4040,10 +4040,10 @@ brushDef
 {
 ( -264 320 320 ) ( -264 319 320 ) ( -276 320 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
 ( -264 320 320 ) ( -276 320 320 ) ( -264 320 8 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
-( -268 320 320 ) ( -268 320 8 ) ( -268 319 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
+( -268 320 320 ) ( -268 320 8 ) ( -268 319 320 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
 ( -276 319 8 ) ( -264 319 8 ) ( -276 320 8 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
 ( -280 319 8 ) ( -280 319 320 ) ( -268 319 8 ) ( ( 0.125 0 -0.4375 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( -276 319 8 ) ( -276 320 8 ) ( -276 319 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0
+( -276 319 8 ) ( -276 320 8 ) ( -276 319 320 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
 }
 }
 {
@@ -23466,13 +23466,13 @@ brushDef
 ( 192 -520 160 ) ( 320 -520 160 ) ( 192 -512 160 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
 ( 200 -520 160 ) ( 200 -520 168 ) ( 316 -520 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 200 -520 168 ) ( 200 -520 160 ) ( 192 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 200 64 168 ) ( 224 64 168 ) ( 200 -64 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 200 64 168 ) ( 224 64 168 ) ( 200 -64 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 }
 }
 {
 brushDef
 {
-( 200 -520 168 ) ( 200 -564 168 ) ( 188 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 200 -520 168 ) ( 200 -564 168 ) ( 188 -520 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 192 -512 168 ) ( 192 -512 160 ) ( 200 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 200 -760 160 ) ( 200 -760 168 ) ( 200 -520 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 188 -564 160 ) ( 200 -564 160 ) ( 188 -520 160 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
@@ -23483,7 +23483,7 @@ brushDef
 {
 brushDef
 {
-( 280 -760 168 ) ( 280 -768 168 ) ( 200 -760 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 280 -760 168 ) ( 280 -768 168 ) ( 200 -760 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 376 -760 160 ) ( 376 -760 168 ) ( 200 -760 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 376 -760 168 ) ( 376 -760 160 ) ( 384 -768 160 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 200 -768 160 ) ( 280 -768 160 ) ( 200 -760 160 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
@@ -23494,7 +23494,7 @@ brushDef
 {
 brushDef
 {
-( 384 -680 168 ) ( 384 -760 168 ) ( 376 -680 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 384 -680 168 ) ( 384 -760 168 ) ( 376 -680 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 376 -580 168 ) ( 376 -580 160 ) ( 384 -576 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 384 -768 160 ) ( 384 -768 168 ) ( 384 -680 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 376 -760 160 ) ( 384 -760 160 ) ( 376 -680 160 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
@@ -23505,7 +23505,7 @@ brushDef
 {
 brushDef
 {
-( 332 -520 168 ) ( 332 -544 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 332 -520 168 ) ( 332 -544 168 ) ( 316 -520 168 ) ( ( 0.0078125 0 -0 ) ( -0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 320 -512 160 ) ( 320 -512 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 384 -576 160 ) ( 384 -576 168 ) ( 320 -512 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 316 -544 160 ) ( 332 -544 160 ) ( 316 -520 160 ) ( ( 0.0883883461 -0.0883883461 0 ) ( 0.0055242716 0.0055242716 0 ) ) exx/trim-vert01 134217728 0 0
@@ -26726,7 +26726,7 @@ exx/wall-metal01
 {
 patchDef2
 {
-ct_fuse/floor-simplines
+exx/wall-bigrib02
 ( 9 3 0 0 0 )
 (
 ( ( -576.1665039063 -564.8527832031 -400 0 0 ) ( -485.6568603516 -474.3431396484 -400 0.9999999404 0 ) ( -395.1471862793 -383.8334960938 -400 1.9999998808 0 ) )
@@ -28341,6 +28341,72 @@ brushDef
 ( 432 -816 -64 ) ( 440 -808 -64 ) ( 432 -816 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 }
 }
+{
+brushDef
+{
+( 384 -680 384 ) ( 384 -760 384 ) ( 376 -680 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -580 168 ) ( 376 -580 160 ) ( 384 -576 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 384 -768 160 ) ( 384 -768 168 ) ( 384 -680 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -760 160 ) ( 384 -760 160 ) ( 376 -680 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 4 ) ) common/clip 134217728 0 0
+( 384 -768 168 ) ( 384 -768 160 ) ( 376 -760 168 ) ( ( 0.0156249981 0 0.0000000075 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -580 160 ) ( 376 -580 168 ) ( 376 -760 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 280 -760 384 ) ( 280 -768 384 ) ( 200 -760 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -760 320 ) ( 376 -760 328 ) ( 200 -760 328 ) ( ( 0.015625 0 0 ) ( 0 0.015625 2.5 ) ) common/clip 134217728 0 0
+( 376 -760 328 ) ( 376 -760 320 ) ( 384 -768 320 ) ( ( 0.0156249981 0 0.125 ) ( 0 0.015625 2.5 ) ) common/clip 134217728 0 0
+( 200 -768 160 ) ( 280 -768 160 ) ( 200 -760 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -768 160 ) ( 192 -768 168 ) ( 280 -768 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -768 328 ) ( 192 -768 320 ) ( 200 -760 320 ) ( ( 0.0156249981 0 0 ) ( 0 0.015625 2.5 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 200 -512 384 ) ( 200 -556 384 ) ( 188 -512 384 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -512 168 ) ( 192 -512 160 ) ( 200 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -760 160 ) ( 200 -760 168 ) ( 200 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 188 -564 160 ) ( 200 -564 160 ) ( 188 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -760 168 ) ( 200 -760 160 ) ( 192 -768 168 ) ( ( 0.015625 0 0.5625 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -512 160 ) ( 192 -512 168 ) ( 192 -564 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 320 -512 384 ) ( 192 -512 384 ) ( 320 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 316 -520 160 ) ( 316 -520 168 ) ( 320 -512 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -520 160 ) ( 320 -520 160 ) ( 192 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -520 160 ) ( 200 -520 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -520 168 ) ( 200 -520 160 ) ( 192 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 64 384 ) ( 224 64 384 ) ( 200 -64 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 332 -520 384 ) ( 332 -544 384 ) ( 316 -520 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 320 -512 160 ) ( 320 -512 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 384 -576 160 ) ( 384 -576 168 ) ( 320 -512 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 316 -544 160 ) ( 332 -544 160 ) ( 316 -520 160 ) ( ( 0.0110485433 -0.0110485433 0 ) ( 0.0110485433 0.0110485433 0 ) ) common/clip 134217728 0 0
+( 376 -580 160 ) ( 376 -580 168 ) ( 384 -576 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -580 168 ) ( 376 -580 160 ) ( 316 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 184 320 288 ) ( 64 320 288 ) ( 184 320 128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 184 320 288 ) ( 184 320 128 ) ( 184 128 288 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 64 128 128 ) ( 184 128 128 ) ( 64 320 128 ) ( ( 0.015625 0 254 ) ( 0 0.0166666675 3.0666668415 ) ) common/clip 134217728 0 0
+( 64 128 128 ) ( 64 128 288 ) ( 184 128 128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 64 128 128 ) ( 64 320 128 ) ( 64 128 288 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 80 64 136 ) ( 112 64 136 ) ( 80 -64 136 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
 }
 {
 "classname" "func_group"
@@ -35996,7 +36062,7 @@ brushDef
 ( -1311.7106781006 -1074.661895752 -184 ) ( -1303.2253875732 -1083.1471710205 -184 ) ( -1311.7106781006 -1074.661895752 -280 ) ( ( 0.0078124972 0 124.4032821655 ) ( 0 0.0078125 0.625 ) ) exx/base-metal01 134217728 0 0
 ( -1314.5390930176 -1071.8334655762 -184 ) ( -1314.5390930176 -1071.8334655762 -280 ) ( -1311.7106781006 -1069.0050354004 -184 ) ( ( 0.0156250019 0 235.1340484619 ) ( 0 0.015625 1.25 ) ) common/caulk 134217728 0 0
 ( -1300.3969573975 -1080.3187561035 -288 ) ( -1308.8822479248 -1071.8334655762 -288 ) ( -1303.2253875732 -1083.1471710205 -288 ) ( ( -0.0110485433 0.0110485433 235.1340637207 ) ( -0.0110485433 -0.0110485433 248.8065490723 ) ) common/caulk 134217728 0 0
-( -1297.5685424805 -1083.1471710205 -280 ) ( -1297.5685424805 -1083.1471710205 -184 ) ( -1306.053817749 -1074.661895752 -280 ) ( ( 0.0010416664 0 0.0712304488 ) ( 0 0.002232143 127.6071395874 ) ) common/caulk 134217728 0 0
+( -1297.5685424805 -1083.1471710205 -280 ) ( -1297.5685424805 -1083.1471710205 -184 ) ( -1306.053817749 -1074.661895752 -280 ) ( ( 0.0005208332 0 0.0356152244 ) ( 0 0.0011160715 63.8035697937 ) ) exx/base-metal01 134217728 0 0
 ( -1142.0050506592 -1238.7106628418 -272 ) ( -1144.833480835 -1241.5390930176 -272 ) ( -1142.0050506592 -1238.7106628418 -176 ) ( ( 0.0156250019 0 20.8659648895 ) ( 0 0.015625 1.25 ) ) common/caulk 134217728 0 0
 }
 }
@@ -36379,7 +36445,7 @@ brushDef
 brushDef
 {
 ( 392 352 -264 ) ( 392 344 -264 ) ( 384 352 -264 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 392 352 -248 ) ( 384 352 -248 ) ( 392 352 -280 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/caulk 134217728 0 0
+( 392 352 -248 ) ( 384 352 -248 ) ( 392 352 -280 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.125 ) ) exx/base-metal01 134217728 0 0
 ( 392 352 -280 ) ( 392 352 -312 ) ( 392 344 -280 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
 ( 384 344 -360 ) ( 392 344 -360 ) ( 384 352 -360 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 384 344 -280 ) ( 384 344 -248 ) ( 392 344 -280 ) ( ( 0 0.0078125 0 ) ( -0.125 0 2 ) ) exx/trim-horz01 134217728 0 0
@@ -37760,3 +37826,7 @@ brushDef
 "origin" "-1668.90649 3.70419025 38.9989548"
 "angles" "18.7426758 -48.9605713 0"
 }
+{
+"classname" "item_strength"
+"origin" "-256.000000 -1272.000000 -296.000000"
+}