Merge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'

diff --git a/maps/darkzone.map b/maps/darkzone.map
index 4efebfd9aa5479e3cb01a14d62ee6b760684eb2b..a163f426a5553272dc81a89dbfe6ef702ca88cbc 100644 (file)
--- a/maps/darkzone.map
+++ b/maps/darkzone.map
@@ -24787,25 +24787,76 @@ exx/trim-01
 "angle" "-2.000607"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_breakablemodel"
 "origin" "417.999969 636.000061 117.999977"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angles" "90.000000 0.000000 0.000003"
-}
-{
-"classname" "misc_gamemodel"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
 "origin" "519.999939 632.000000 32.000000"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angle" "90.000000"
-}
-{
-"classname" "misc_gamemodel"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
 "origin" "487.999939 640.000000 32.000000"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angle" "90.000000"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
 }
 {
 "classname" "misc_gamemodel"
@@ -24817,39 +24868,124 @@ exx/trim-01
 "angle" "-2.000607"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_breakablemodel"
 "origin" "503.999939 640.000000 80.000000"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angle" "90.000000"
-}
-{
-"classname" "misc_gamemodel"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
 "origin" "407.999939 608.000000 102.000000"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angle" "90.000000"
-}
-{
-"classname" "misc_gamemodel"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
 "origin" "493.999939 508.000000 102.000000"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angle" "90.000000"
-}
-{
-"classname" "misc_gamemodel"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
 "origin" "527.999939 496.000000 102.000000"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angle" "90.000000"
-}
-{
-"classname" "misc_gamemodel"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
 "origin" "499.999939 474.000000 102.000000"
 "model" "models/containers/barrel01.md3"
-"_castShadows" "1"
 "angle" "90.000000"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
 }
 {
 "classname" "light"

diff --git a/maps/lightspeed.map b/maps/lightspeed.map
index 01dbb2d325f50e5d4964fb046716d739a1e94bdf..fba008cca6a859ad1d125e6018ed4302fb002f0a 100644 (file)
--- a/maps/lightspeed.map
+++ b/maps/lightspeed.map
@@ -9549,9 +9549,27 @@ ex2x/light-1
 "targetname" "target_position5"
 }
 {
-"classname" "misc_model"
+"classname" "misc_breakablemodel"
 "origin" "-596.000000 1532.000000 320.000000"
 "model" "models/containers/barrel01.md3"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
 }
 {
 "classname" "misc_model"

diff --git a/maps/runningmanctf.map b/maps/runningmanctf.map
index 356c6405dea0919c69170097475fc11e316e214d..efb2b50c998a8f9b5149fa58fb6a8847ffe117e0 100644 (file)
--- a/maps/runningmanctf.map
+++ b/maps/runningmanctf.map
@@ -36375,11 +36375,28 @@ exx/base-metal03
 "angle" "88.396439"
 }
 {
-"classname" "misc_model"
+"classname" "misc_breakablemodel"
 "origin" "-544.000000 -488.000031 0.000000"
 "model" "models/containers/barrel01.md3"
-"spawnflags" "2"
 "angle" "0.000003"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
 }
 {
 "classname" "misc_model"
@@ -36544,11 +36561,28 @@ effects_healpod/healpod1_d
 "origin" "784.000000 64.000000 -160.000000"
 }
 {
-"classname" "misc_model"
+"classname" "misc_breakablemodel"
 "origin" "-2152.000000 1120.000000 0.000000"
 "model" "models/containers/barrel01.md3"
-"spawnflags" "2"
 "angle" "90.000000"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"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"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
 }
 {
 "classname" "item_armor_large"

diff --git a/maps/runningmanctf.map.options b/maps/runningmanctf.map.options
index 936167dc06f547f1158da0b8857866eb301c129d..e3a5ed22873bdad32c9d636ad027c9c290608f70 100644 (file)
--- a/maps/runningmanctf.map.options
+++ b/maps/runningmanctf.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 9
+Version: 10