Merge branch 'Spike29/implosion_fixes' into 'master'

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

diff --git a/maps/drain.map b/maps/drain.map
index 70751fc7563b5e113a4509ee0f0713cead7e6cac..8837784ca8b8fd93b65046fa663d8e02d9bd1bf3 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -8713,6 +8713,14 @@ trak5x/base-pipe1d
 ( 296 -848 -64 ) ( 296 -848 -62 ) ( 338 -848 -64 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
 ( 296 -848 -64 ) ( 296 -808 -64 ) ( 296 -848 -62 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
 }
+{
+( -448 -416 -128 ) ( -448 -512 -128 ) ( -576 -416 -128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -480 -416 -128 ) ( -480 -416 -256 ) ( -480 -512 -128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -576 -512 -256 ) ( -448 -512 -256 ) ( -576 -416 -256 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -512 -512 -256 ) ( -512 -416 -256 ) ( -512 -512 -128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -576 -448 -64 ) ( -512 -448 -64 ) ( -576 -448 64 ) common/clip 128 0 0 0.25 0.25 0 0 0
+( -544 -952 64 ) ( -480 -952 -64 ) ( -544 -952 -64 ) common/clip 128 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"
@@ -11639,9 +11647,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11663,9 +11671,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11687,9 +11695,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11711,9 +11719,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11735,9 +11743,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11759,9 +11767,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11783,9 +11791,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11807,9 +11815,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"
@@ -11839,9 +11847,9 @@ trak5x/base-pipe1d
 "debrissolid" "0"
 "debristime" "5"
 "debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
+"dmg" "40"
+"dmg_edge" "30"
+"dmg_force" "200"
 "dmg_radius" "190"
 "health" "25"
 "mdl" "TE_TEI_BIGEXPLOSION"