Patches #1648

Merge in xonotic/xonotic-maps.pk3dir.git: matthiaskrgr/exploding_barrels

Added by git-manager about 1 year ago. Updated 11 months ago.

Status:ClosedStart date:06/09/2013
Priority:NormalDue date:
Assignee:Samual% Done:

100%

Category:-
Target version:Xonotic - 0.8

Description

Purpose of the branch:

Make remaining barrels explodable on darkzone, lightspeed and runningmanctf.

23:01 <@Samual> basically my rule is going to be
23:01 <@Samual> if it uses the same model
23:01 <@Samual> it has to explode
23:01 <@Samual> if it shouldn't be something that explodes in X place, it should be a different model

Repository: xonotic/xonotic-maps.pk3dir.git
Commit: 656b362aea3087b84d4b9c10923da4baf7032d9a
Branch: matthiaskrgr/exploding_barrels

Merge commands:

cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '656b362aea3087b84d4b9c10923da4baf7032d9a'..'origin/matthiaskrgr/exploding_barrels'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --no-ff 'origin/matthiaskrgr/exploding_barrels'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'matthiaskrgr/exploding_barrels'

Diffstat:

 maps/darkzone.map      |  192 +++++++++++++++++++++++++++++++++++++++++-------
 maps/lightspeed.map    |   20 +++++-
 maps/runningmanctf.map |   42 ++++++++++-
 3 files changed, 221 insertions(+), 33 deletions(-)

Revision log:

commit 656b362aea3087b84d4b9c10923da4baf7032d9a
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    map: darkzone: make 7 barrels explosive.

commit e8c58bf2987c29a2ac601747cdca743b4b6d2682
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    maps: lightspeed: make one barrel explodable.

commit e9aaceba1ce5e1ad16e843dbd8211ceb558c224f
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    map: runningmanctf: make two more barrels explodable.

User agreed to the GPLv2+.

Diff:

diff --git a/maps/darkzone.map b/maps/darkzone.map
index 4efebfd..a163f42 100644
--- 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 01dbb2d..fba008c 100644
--- 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 356c640..efb2b50 100644
--- 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" 

History

#1 Updated by matthiaskrgr about 1 year ago

  • Assignee set to Samual
  • Target version set to 0.7

#2 Updated by Mirio about 1 year ago

Remove darkzone and it's ok

#3 Updated by Mirio about 1 year ago

  • Target version changed from 0.7 to 0.8

#4 Updated by matthiaskrgr 11 months ago

  • Status changed from New to Closed
  • % Done changed from 0 to 100

Also available in: Atom PDF