From: Mirio Date: Mon, 9 Feb 2015 23:07:45 +0000 (+0100) Subject: Update mapinfo, picture, DOM entities, add hagar, barrels go boom X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa64c85339aa9095aec6f14c80a7dbe4c53f5686;p=xonotic%2Fxonotic-maps.pk3dir.git Update mapinfo, picture, DOM entities, add hagar, barrels go boom --- diff --git a/maps/atomforge.jpg b/maps/atomforge.jpg deleted file mode 100644 index c0c2c406..00000000 Binary files a/maps/atomforge.jpg and /dev/null differ diff --git a/maps/atomforge.map b/maps/atomforge.map index 428d9fcf..06b3421e 100644 --- a/maps/atomforge.map +++ b/maps/atomforge.map @@ -19762,29 +19762,6 @@ exomorphx/wall-metal_panel04 "light" "70" } { -"classname" "misc_gamemodel" -"origin" "-608.000000 -256.000000 32.000000" -"model" "models/containers/barrel01.md3" -} -{ -"classname" "misc_gamemodel" -"origin" "-784.000000 -220.000076 16.000046" -"model" "models/containers/barrel01.md3" -"angles" "90.000000 0.000000 -52.000000" -} -{ -"classname" "misc_gamemodel" -"origin" "-704.000000 -247.999908 32.000000" -"model" "models/containers/barrel01.md3" -"angle" "-148.000000" -} -{ -"classname" "misc_gamemodel" -"origin" "-744.000000 -255.999985 32.000000" -"model" "models/containers/barrel01.md3" -"angle" "-34.999996" -} -{ "classname" "light" "origin" "-616.000000 -240.000000 88.000000" "light" "20" @@ -19976,16 +19953,6 @@ exomorphx/wall-metal_panel04 "light" "70" } { -"classname" "misc_gamemodel" -"origin" "-1320.000000 -456.000000 160.000000" -"model" "models/containers/barrel01.md3" -} -{ -"classname" "misc_gamemodel" -"origin" "-1280.000000 -464.000000 160.000000" -"model" "models/containers/barrel01.md3" -} -{ "classname" "light" "origin" "-1472.000000 -192.000000 -88.000000" "light" "70" @@ -20850,30 +20817,6 @@ facility114invx/base-baseblack "light" "70" } { -"classname" "misc_gamemodel" -"origin" "-1112.000244 984.000305 384.000000" -"model" "models/containers/barrel01.md3" -"angle" "-179.999985" -} -{ -"classname" "misc_gamemodel" -"origin" "-1152.000244 992.000305 384.000000" -"model" "models/containers/barrel01.md3" -"angle" "-179.999985" -} -{ -"classname" "misc_gamemodel" -"origin" "-1207.999756 1216.000488 384.000000" -"model" "models/containers/barrel01.md3" -"angle" "90.000008" -} -{ -"classname" "misc_gamemodel" -"origin" "-1199.999634 1256.000244 384.000000" -"model" "models/containers/barrel01.md3" -"angle" "90.000008" -} -{ "classname" "light" "origin" "512.000000 960.000000 312.000000" "light" "70" @@ -20920,24 +20863,6 @@ facility114invx/base-baseblack "angle" "90.000008" } { -"classname" "misc_gamemodel" -"origin" "-543.999756 1216.000488 160.000000" -"model" "models/containers/barrel01.md3" -"angle" "90.000008" -} -{ -"classname" "misc_gamemodel" -"origin" "-535.999634 1256.000244 160.000000" -"model" "models/containers/barrel01.md3" -"angle" "90.000008" -} -{ -"classname" "misc_gamemodel" -"origin" "-592.000000 779.999939 176.000046" -"model" "models/containers/barrel01.md3" -"angles" "90.000000 0.000000 -52.000000" -} -{ "classname" "light" "origin" "512.000000 -64.000000 312.000000" "light" "70" @@ -21065,7 +20990,7 @@ facility114invx/base-baseblack } { "classname" "item_cells" -"origin" "-1376.000000 1312.000000 408.000000" +"origin" "-1376.000000 1312.000000 400.000000" "angle" "-90.000000" } { @@ -21352,47 +21277,379 @@ facility114invx/base-baseblack "origin" "-1248.000000 -640.000000 -64.000000" } { +"classname" "dom_controlpoint" +"origin" "640.000000 -1224.000000 144.000000" +"angle" "90.000000" +"message" " has captured the ^2Broken teleporter ^3control point" +} +{ +"classname" "dom_controlpoint" +"origin" "-1280.000000 1024.000000 176.000000" +"message" " has captured the ^2Side corridor ^3control point" +} +{ +"classname" "dom_controlpoint" +"origin" "-320.000000 -256.000000 400.000000" +"angle" "179.999985" +"message" " has captured the ^2Highest floor ^3control point" +} +{ +"classname" "misc_breakablemodel" +"origin" "-608.000000 -256.000000 32.000000" +"model" "models/containers/barrel01.md3" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-784.000000 -220.000076 16.000046" +"model" "models/containers/barrel01.md3" +"angles" "90.000000 0.000000 -52.000000" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-704.000000 -247.999908 32.000000" +"model" "models/containers/barrel01.md3" +"angle" "-148.000000" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-744.000000 -255.999985 32.000000" +"model" "models/containers/barrel01.md3" +"angle" "-34.999996" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-1320.000000 -456.000000 160.000000" +"model" "models/containers/barrel01.md3" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-1280.000000 -464.000000 160.000000" +"model" "models/containers/barrel01.md3" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-1112.000244 984.000305 384.000000" +"model" "models/containers/barrel01.md3" +"angle" "-179.999985" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-1152.000244 992.000305 384.000000" +"model" "models/containers/barrel01.md3" +"angle" "-179.999985" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-1207.999756 1216.000488 384.000000" +"model" "models/containers/barrel01.md3" +"angle" "90.000008" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-1199.999634 1256.000244 384.000000" +"model" "models/containers/barrel01.md3" +"angle" "90.000008" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-543.999756 1216.000488 160.000000" +"model" "models/containers/barrel01.md3" +"angle" "90.000008" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-535.999634 1256.000244 160.000000" +"model" "models/containers/barrel01.md3" +"angle" "90.000008" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "misc_breakablemodel" +"origin" "-592.000000 779.999939 176.000046" +"model" "models/containers/barrel01.md3" +"angles" "90.000000 0.000000 -52.000000" +"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" +"noise" "sound/weapons/rocket_impact.ogg" +"respawntime" "35" +"respawntimejitter" "10" +} +{ +"classname" "weapon_hagar" +"origin" "-1472.000000 576.000000 -176.000000" +} +{ "classname" "dom_team" -"origin" "-1088.000000 552.000000 96.000000" -"message" "Blue team has captured a control point" -"model" "models/domination/dom_blue.md3" +"origin" "-864.000000 1048.000000 528.000000" "netname" "^4Blue Team^3" +"model" "models/domination/dom_blue.md3" +"message" "Blue Team has captured a control point" "noise" "domination/claim.wav" "noise1" "domination/claim.wav" "cnt" "13" -"angle" "-90.000000" } { "classname" "dom_team" -"origin" "-1040.000000 552.000000 96.000000" -"message" "Red team has captured a control point" +"origin" "-864.000000 984.000000 528.000000" +"cnt" "4" +"message" "Red Team has captured a control point" "model" "models/domination/dom_red.md3" "netname" "^1Red Team^3" "noise" "domination/claim.wav" "noise1" "domination/claim.wav" -"cnt" "13" -"angle" "-90.000000" } { "classname" "dom_team" -"origin" "-992.000000 552.000000 96.000000" +"origin" "-864.000000 920.000000 528.000000" "model" "models/domination/dom_unclaimed.md3" -"angle" "-90.000000" } { -"classname" "dom_controlpoint" -"origin" "640.000000 -1224.000000 144.000000" -"angle" "90.000000" -"message" "has captured BROKEN TELEPORT" +"classname" "dom_team" +"origin" "-864.000000 1016.000000 528.000000" +"netname" "^3Yellow Team^3" +"model" "models/domination/dom_yellow.md3" +"message" "Yellow Team has captured a control point" +"noise" "domination/claim.wav" +"noise1" "domination/claim.wav" +"cnt" "12" } { -"classname" "dom_controlpoint" -"origin" "-1280.000000 1024.000000 176.000000" -"message" "has captured SIDE CORRIDOR" +"classname" "dom_team" +"origin" "-864.000000 952.000000 528.000000" +"netname" "^6Pink Team^3" +"model" "models/domination/dom_pink.md3" +"message" "Pink Team has captured a control point" +"noise" "domination/claim.wav" +"noise1" "domination/claim.wav" +"cnt" "9" } { -"classname" "dom_controlpoint" -"origin" "-320.000000 -256.000000 400.000000" -"angle" "179.999985" -"message" "has captured HIGHEST FLOOR" +"classname" "info_autoscreenshot" +"origin" "-1187.99597 -595.702087 408.564514" +"angles" "14.9139404 -51.0369873 0" +} +{ +"classname" "info_autoscreenshot" +"origin" "-528.03125 1160.01245 416.067963" +"angles" "11.4862061 -154.429321 0" +} +{ +"classname" "info_autoscreenshot" +"origin" "717.937988 308.998749 259.562347" +"angles" "4.22424316 117.262573 0" } diff --git a/maps/atomforge.map.options b/maps/atomforge.map.options index b64f09ed..c084e2fe 100644 --- a/maps/atomforge.map.options +++ b/maps/atomforge.map.options @@ -3,5 +3,5 @@ -vis + -minimap + -sRGB -Version: 5 +Version: 5b diff --git a/maps/atomforge.mapinfo b/maps/atomforge.mapinfo index 19b062a7..22d6a280 100644 --- a/maps/atomforge.mapinfo +++ b/maps/atomforge.mapinfo @@ -1,14 +1,13 @@ title Atomforge -description Medium size, fast indoors map. +description Medium size, fast indoors map author kuniu the frogg -cdtrack 12 +cdtrack 18 has weapons gametype dm gametype tdm gametype lms gametype ca -gametype arena -gametype rune -gametype freezetag +gametype ft gametype kh gametype dom +gametype ka \ No newline at end of file diff --git a/maps/atomforge.tga b/maps/atomforge.tga new file mode 100644 index 00000000..6932cfdd Binary files /dev/null and b/maps/atomforge.tga differ