From: Mirio Date: Fri, 15 Jun 2018 21:19:59 +0000 (+0200) Subject: Fix some inconsistency with barrels X-Git-Tag: xonotic-v0.8.5~111 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8af1c7bc68da16f2d42b9439f8f593b0a8a765ad;p=xonotic%2Fxonotic-maps.pk3dir.git Fix some inconsistency with barrels --- diff --git a/maps/catharsis.map b/maps/catharsis.map index 962e9021..b06bdfd7 100644 --- a/maps/catharsis.map +++ b/maps/catharsis.map @@ -41785,6 +41785,8 @@ brushDef "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" "misc_breakablemodel" @@ -41809,6 +41811,8 @@ brushDef "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" "misc_breakablemodel" @@ -41833,6 +41837,8 @@ brushDef "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" "misc_breakablemodel" @@ -41858,6 +41864,8 @@ brushDef "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" "misc_breakablemodel" @@ -41883,6 +41891,8 @@ brushDef "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" "misc_breakablemodel" @@ -41908,6 +41918,8 @@ brushDef "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" "misc_model" diff --git a/maps/catharsis.map.options b/maps/catharsis.map.options index 5b8f4118..e47f470a 100644 --- a/maps/catharsis.map.options +++ b/maps/catharsis.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -scale 0.9 -sRGB -Version: 5 \ No newline at end of file +Version: 5a \ No newline at end of file diff --git a/maps/glowplant.map b/maps/glowplant.map index e704ade9..da403a3e 100644 --- a/maps/glowplant.map +++ b/maps/glowplant.map @@ -44619,7 +44619,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime" "35" "respawntimejitter" "10" } { @@ -44644,7 +44644,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime" "35" "respawntimejitter" "10" } { @@ -44669,7 +44669,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime" "35" "respawntimejitter" "10" } { @@ -44694,7 +44694,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime" "35" "respawntimejitter" "10" } { @@ -44719,7 +44719,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime" "35" "respawntimejitter" "10" } { @@ -44744,7 +44744,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime" "35" "respawntimejitter" "10" } { diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options index f8364e9a..c639448a 100644 --- a/maps/glowplant.map.options +++ b/maps/glowplant.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 17 \ No newline at end of file +Version: 17a \ No newline at end of file diff --git a/maps/vorix.map b/maps/vorix.map index f414eb00..b05efa48 100644 --- a/maps/vorix.map +++ b/maps/vorix.map @@ -76849,7 +76849,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" } { @@ -76872,7 +76872,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" } { @@ -76913,7 +76913,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" } { @@ -76936,7 +76936,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-118.413910" } @@ -76960,7 +76960,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-90.000000" } @@ -76984,7 +76984,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-118.413910" } @@ -77009,7 +77009,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" } { @@ -77031,7 +77031,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "model" "models/containers/barrel01.md3" "angle" "129.533691" @@ -77056,7 +77056,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "61.586086" } @@ -77080,7 +77080,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "21.523926" } @@ -77104,7 +77104,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-109.989319" } @@ -77128,7 +77128,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "19.165916" } @@ -77152,7 +77152,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "42.696407" } @@ -77185,7 +77185,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-39.780403" } @@ -77209,7 +77209,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-66.897697" } @@ -77463,7 +77463,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-179.999985" } @@ -77487,7 +77487,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-179.999985" } @@ -77527,7 +77527,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "origin" "-17.000122 748.000000 192.000000" "model" "models/containers/barrel01.md3" @@ -77553,7 +77553,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "61.586086" } @@ -77577,7 +77577,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "89.999992" } @@ -77600,7 +77600,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "model" "models/containers/barrel01.md3" "angle" "61.586086" @@ -77625,7 +77625,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-28.413904" } @@ -77649,7 +77649,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-50.466316" } @@ -77673,7 +77673,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-118.413910" } @@ -77697,7 +77697,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-158.476089" } @@ -77721,7 +77721,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "70.010674" } @@ -77745,7 +77745,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-160.834091" } @@ -77769,7 +77769,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-137.303589" } @@ -77802,7 +77802,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "140.219589" } @@ -77826,7 +77826,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "42.696411" } @@ -77850,7 +77850,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "113.102310" } @@ -78085,7 +78085,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "151.586090" } @@ -78109,7 +78109,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-28.413904" } @@ -78133,7 +78133,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "47.318550" } @@ -78157,7 +78157,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-132.681473" } @@ -78181,7 +78181,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-36.024269" } @@ -78205,7 +78205,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-36.024269" } @@ -78229,7 +78229,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "143.975723" } @@ -78253,7 +78253,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "143.975723" } @@ -78454,7 +78454,7 @@ trak5x/base-pipe1a "message" "was killed by an explosive barrel" "message2" "was killed with an explosive barrel by" "noise" "sound/weapons/rocket_impact.ogg" -"respawntime" "40" +"respawntime "35" "respawntimejitter" "10" "angle" "-137.303589" } diff --git a/maps/vorix.map.options b/maps/vorix.map.options index 0af2ab5e..c87767b2 100644 --- a/maps/vorix.map.options +++ b/maps/vorix.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 13 +Version: 13a