From: kuniuthefrogg <ekuniu@gmail.com>
Date: Tue, 7 May 2013 21:52:10 +0000 (+0200)
Subject: bugfix
X-Git-Tag: xonotic-v0.7.0~32^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff29d489c39659f10ead06247904b59ef5b4ea6a;p=xonotic%2Fxonotic-maps.pk3dir.git

bugfix
---

diff --git a/maps/drain.map b/maps/drain.map
index c4a4a06c..3d13728c 100644
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -4753,19 +4753,6 @@
 ( -224 607 0 ) ( -288 640 64 ) ( -288 639 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -208 640 74.5 ) ( -352 640 74.5 ) ( -352 640 0 ) common/weapclip 64 0 0 0.25 0.25 0 0 0
-( -208 640 74.5 ) ( -208 563.375 0 ) ( -208 563.375 70.375 ) common/weapclip 224 0 0 0.25 0.25 0 0 0
-( -208 640 0 ) ( -352 560 0 ) ( -349.75 537.5 0 ) common/weapclip 64 32 0 0.25 0.25 0 0 0
-( -278.125 516 48.75 ) ( -291 516 0 ) ( -291 516 48.75 ) common/weapclip 64 0 0 0.25 0.25 0 0 0
-( -349.75 537.5 68.625 ) ( -352 560 0 ) ( -352 560 70.125 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( -291 516 48.75 ) ( -349.75 537.5 0 ) ( -349.75 537.5 68.625 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( -216.875 531.125 0 ) ( -278.125 516 0 ) ( -278.125 516 48.75 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( -215 537.875 69 ) ( -349.75 537.5 68.625 ) ( -349.875 537.875 69 ) common/weapclip 0 240 0 0.25 0.25 0 0 0
-( -208 640 74.5 ) ( -349.875 537.875 69 ) ( -352 560 70.125 ) common/weapclip 0 240 0 0.25 0.25 0 0 0
-( -216.875 531.125 0 ) ( -208 563.375 70.375 ) ( -208 563.375 0 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( -352 640 0 ) ( -352 560 70.125 ) ( -352 560 0 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( -64 128 -128 ) ( -64 -192 -128 ) ( -128 128 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 128 -128 ) ( -128 128 -128 ) ( -64 128 -256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 128 -128 ) ( -64 128 -256 ) ( -64 -192 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -8810,6 +8797,16 @@ trak5x/base-pipe1d
 ( 204 -56 -64 ) ( 216 -44 -64 ) ( 204 -56 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 ( 224 -44 -64 ) ( 236 -56 -64 ) ( 224 -44 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( -192 592 128 ) ( -448 592 128 ) ( -192 592 -32 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -224 584 128 ) ( -224 584 -32 ) ( -224 552 128 ) common/weapclip 32 0 0 0.25 0.25 0 0 0
+( -448 560 -32 ) ( -192 560 -32 ) ( -448 592 -32 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -448 560 -32 ) ( -448 560 128 ) ( -192 560 -32 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -352 560 -32 ) ( -352 592 -32 ) ( -352 560 128 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -64 560 32 ) ( -64 592 64 ) ( 64 560 32 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -336 560 -64 ) ( -352 576 -64 ) ( -336 560 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -224 576 -64 ) ( -240 560 -64 ) ( -224 576 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"
@@ -11670,7 +11667,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "-967.792480 -836.231323 5.212501"
+"origin" "-967.792480 -836.231323 -26.787498"
 "angles" "9.239502 -41.110847 0.000000"
 }
 {
@@ -11746,102 +11743,6 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-265.206573 557.047668 16.000000"
-"model" "models/containers/barrel01.md3"
-"angles" "90.000000 0.000000 15.598165"
-"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" "6"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "150"
-"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" "40"
-"respawntimejitter" "10"
-}
-{
-"classname" "misc_breakablemodel"
-"origin" "-348.000000 555.999939 16.000000"
-"model" "models/containers/barrel01.md3"
-"angles" "90.000000 0.000000 9.033588"
-"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" "6"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "150"
-"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" "40"
-"respawntimejitter" "10"
-}
-{
-"classname" "misc_breakablemodel"
-"origin" "-275.182648 591.845947 15.548075"
-"model" "models/containers/barrel01.md3"
-"angles" "18.824091 90.000000 92.602684"
-"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" "6"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "150"
-"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" "40"
-"respawntimejitter" "10"
-}
-{
-"classname" "misc_breakablemodel"
-"origin" "-300.000000 592.999939 7.999985"
-"model" "models/containers/barrel01.md3"
-"angles" "-16.489870 -7.665538 34.164230"
-"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" "6"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "150"
-"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" "40"
-"respawntimejitter" "10"
-}
-{
-"classname" "misc_breakablemodel"
 "origin" "220.000061 -60.000061 16.000000"
 "model" "models/containers/barrel01.md3"
 "angle" "-125.322510"
@@ -11866,30 +11767,6 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-336.000000 603.999512 8.000013"
-"model" "models/containers/barrel01.md3"
-"angles" "11.936135 -26.898367 4.978120"
-"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" "6"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "150"
-"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" "40"
-"respawntimejitter" "10"
-}
-{
-"classname" "misc_breakablemodel"
 "origin" "-75.648743 -219.866943 -206.721786"
 "model" "models/containers/barrel01.md3"
 "angles" "80.273994 -81.205994 29.943542"
@@ -12031,9 +11908,9 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-283.999939 547.999939 0.000000"
+"origin" "-332.000122 587.999939 0.000000"
 "model" "models/containers/barrel01.md3"
-"angle" "-125.322510"
+"angle" "144.677490"
 "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"
@@ -12063,3 +11940,51 @@ trak5x/base-pipe1d
 "origin" "-191.908432 83.3172836 -238.772797"
 "angles" "3.82873535 -144.766846 0"
 }
+{
+"classname" "misc_breakablemodel"
+"origin" "-243.999939 579.999939 0.000000"
+"model" "models/containers/barrel01.md3"
+"angle" "-125.322510"
+"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" "6"
+"debristimejitter" "2"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"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" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "-276.000122 587.999939 0.000000"
+"model" "models/containers/barrel01.md3"
+"angle" "144.677490"
+"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" "6"
+"debristimejitter" "2"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"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" "40"
+"respawntimejitter" "10"
+}
diff --git a/maps/drain.map.options b/maps/drain.map.options
index 426fadbc..10685baa 100644
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 8
+Version: 9