X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=maps%2Ffuse.map;h=9dd2daa8793c42743ce541f2e32443d78c9c71a3;hp=00f6c44ec1cc9e3b3285f3dc995307f32e343596;hb=c9284c89ec92c9306a9e177300d155633da3d4f0;hpb=c35a168b4be94910d55750acd70787da0780377c

diff --git a/maps/fuse.map b/maps/fuse.map
index 00f6c44e..9dd2daa8 100644
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -1,7 +1,8 @@
 {
 "classname" "worldspawn"
 "author" "Ferdinand 'cityy' List"
-"message" "FUSE"
+"message" "Fuse"
+"_description" "Duel Mapping Contest Winner of 2012"
 {
 brushDef
 {
@@ -788,7 +789,7 @@ brushDef
 {
 patchDef2
 {
-ct_fuse/lava0_blue_flow_pipe
+liquids_lava/lava0_blue_flow_pipe
 ( 9 3 0 0 0 )
 (
 ( ( -1512 -288 -328 0 0 ) ( -1536 -288 -328 0 -0.1875 ) ( -1560 -288 -328 0 -0.375 ) )
@@ -4028,10 +4029,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 +4041,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
 }
 }
 {
@@ -14692,12 +14693,12 @@ brushDef
 {
 brushDef
 {
-( 584 -448 0 ) ( 520 -448 0 ) ( 584 -448 -160 ) ( ( 0.0004340278 0 0.0277777761 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0
-( 576 -576 0 ) ( 576 -576 -160 ) ( 576 -832 0 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0
-( 528 -832 0 ) ( 592 -832 0 ) ( 528 -576 0 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0.28125 ) ) ct_fuse/heaven 0 0 0
-( 528 -768 -160 ) ( 528 -768 0 ) ( 592 -768 -160 ) ( ( 0.0004340278 0 7.0798611641 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0
-( 512 -832 -160 ) ( 512 -576 -160 ) ( 512 -832 0 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0
-( 536 64 192 ) ( 544 64 192 ) ( 536 -64 192 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 63.75 ) ) ct_fuse/heaven 0 0 0
+( 584 -448 0 ) ( 520 -448 0 ) ( 584 -448 -160 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) skies/heaven 0 0 0
+( 576 -576 0 ) ( 576 -576 -160 ) ( 576 -832 0 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) skies/heaven 0 0 0
+( 528 -832 0 ) ( 592 -832 0 ) ( 528 -576 0 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) skies/heaven 0 0 0
+( 528 -768 -160 ) ( 528 -768 0 ) ( 592 -768 -160 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) skies/heaven 0 0 0
+( 512 -832 -160 ) ( 512 -576 -160 ) ( 512 -832 0 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) skies/heaven 0 0 0
+( 536 64 192 ) ( 544 64 192 ) ( 536 -64 192 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) skies/heaven 0 0 0
 }
 }
 {
@@ -28396,6 +28397,17 @@ brushDef
 ( 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"
@@ -37815,3 +37827,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"
+}