Merge branch 'master' into maddin/shader-weapclip

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

diff --git a/maps/drain.map b/maps/drain.map
index 974bfc1a5ecd18e8f43115f3536c609c3ea5d08c..8837784ca8b8fd93b65046fa663d8e02d9bd1bf3 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -8058,12 +8058,12 @@
 ( -424 112 -312 ) ( -424 144 -312 ) ( -424 112 -248 ) phillipk1x/floors-pk01_gra_floor02 128 32 0 0.25 0.25 134217728 0 0
 }
 {
-( -264 -968 352 ) ( -264 -1088 352 ) ( -280 -968 352 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -264 -960 120 ) ( -280 -960 120 ) ( -264 -960 112 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -264 -968 120 ) ( -264 -968 112 ) ( -264 -1088 120 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -280 -1088 112 ) ( -264 -1088 112 ) ( -280 -968 112 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -280 -1088 112 ) ( -280 -1088 120 ) ( -264 -1088 112 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -280 -1088 112 ) ( -280 -968 112 ) ( -280 -1088 120 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -168 -968 352 ) ( -168 -1088 352 ) ( -184 -968 352 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -168 -960 120 ) ( -184 -960 120 ) ( -168 -960 112 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -168 -968 120 ) ( -168 -968 112 ) ( -168 -1088 120 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -184 -1088 112 ) ( -168 -1088 112 ) ( -184 -968 112 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -184 -1088 112 ) ( -184 -1088 120 ) ( -168 -1088 112 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -184 -1088 112 ) ( -184 -968 112 ) ( -184 -1088 120 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -592 -1088 352 ) ( -592 -1104 352 ) ( -656 -1088 352 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -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"
@@ -11725,7 +11733,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.953918 -185.306213 -255.896118"
+"origin" "-84.000000 -156.000183 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -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"
@@ -11746,11 +11754,10 @@ trak5x/base-pipe1d
 "noise" "sound/weapons/rocket_impact.ogg"
 "respawntime" "35"
 "respawntimejitter" "10"
-"angles" "4.870223 136.066513 -11.980032"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-116.000000 -228.000183 -256.000000"
+"origin" "-592.000000 -1240.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11760,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"
@@ -11774,7 +11781,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-93.158936 -267.833984 -261.061523"
+"origin" "-632.000000 -1240.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11784,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"
@@ -11795,11 +11802,10 @@ trak5x/base-pipe1d
 "noise" "sound/weapons/rocket_impact.ogg"
 "respawntime" "35"
 "respawntimejitter" "10"
-"angles" "-2.919404 101.826599 3.361983"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.866486 -230.319901 -259.142639"
+"origin" "524.000122 -539.999878 -64.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11809,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"
@@ -11820,59 +11826,18 @@ trak5x/base-pipe1d
 "noise" "sound/weapons/rocket_impact.ogg"
 "respawntime" "35"
 "respawntimejitter" "10"
-"angles" "-2.255236 -110.983025 4.840920"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-592.000000 -1240.000000 -256.000000"
-"model" "models/containers/barrel01.md3"
-"modelscale" "1.200000"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"debrisdamageforcescale" "1"
-"debrisfadetime" "1"
-"debrissolid" "0"
-"debristime" "5"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "190"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "35"
-"respawntimejitter" "10"
+"classname" "item_shells"
+"origin" "-436.000000 -824.000000 -64.000000"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-632.000000 -1240.000000 -256.000000"
-"model" "models/containers/barrel01.md3"
-"modelscale" "1.200000"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"debrisdamageforcescale" "1"
-"debrisfadetime" "1"
-"debrissolid" "0"
-"debristime" "5"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "190"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "35"
-"respawntimejitter" "10"
+"classname" "item_strength"
+"origin" "318.000000 -826.000000 -62.000000"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "524.000122 -539.999878 -64.000000"
+"origin" "-68.000000 -212.000183 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11882,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"
@@ -11894,11 +11859,3 @@ trak5x/base-pipe1d
 "respawntime" "35"
 "respawntimejitter" "10"
 }
-{
-"classname" "item_shells"
-"origin" "-436.000000 -824.000000 -64.000000"
-}
-{
-"classname" "item_strength"
-"origin" "318.000000 -826.000000 -62.000000"
-}