From: Mirio Date: Wed, 28 Dec 2016 19:58:15 +0000 (+0100) Subject: Update to new entity names and fix stuff X-Git-Tag: xonotic-v0.8.2~78^2~19 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=e1be03ce1d550d065b36fd872b4d8dcdf8772d22;p=xonotic%2Fxonotic-maps.pk3dir.git Update to new entity names and fix stuff --- diff --git a/maps/erbium.map b/maps/erbium.map index c6815250..195dc6ea 100644 --- a/maps/erbium.map +++ b/maps/erbium.map @@ -3778,7 +3778,7 @@ brushDef ( 2112 -832 704 ) ( 2112 -824 704 ) ( 1984 -832 704 ) ( ( 0 -0.0052083335 -0.140625 ) ( -0.0052083335 -0 0.87890625 ) ) trak4x/floor-tile1 0 0 0 ( 1760 -1576 728 ) ( 1760 -1704 712 ) ( 1760 -1704 728 ) ( ( -0.015625 0 230.375 ) ( 0 -0.015625 214.125 ) ) common/caulk 0 0 0 ( 1992 -984 712 ) ( 2120 -984 696 ) ( 2120 -984 712 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0 -( 2116 -1032 720 ) ( 2116 -1032 712 ) ( 1988 -1032 720 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 2116 -1040 720 ) ( 2116 -1040 712 ) ( 1988 -1040 720 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 ( 1280 -1008 -64 ) ( 1284 -1004 -64 ) ( 1280 -1008 64 ) ( ( 0.0156249972 0 255.4254760742 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 } } @@ -16692,7 +16692,7 @@ brushDef { brushDef { -( 2064 -872 692 ) ( 1856 -1080 692 ) ( 2040 -860 692 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0 +( 2064 -872 692 ) ( 1856 -1080 692 ) ( 2040 -860 692 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0 ( 2064 -872 676 ) ( 1844 -1056 676 ) ( 1856 -1080 676 ) ( ( 0 -0.00390625 53.703125 ) ( 0.00390625 0 251.484375 ) ) common/caulk 134217728 0 0 ( 2036 -856 692 ) ( 1840 -1052 676 ) ( 2036 -856 676 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0 ( 2044 -856 692 ) ( 2044 -856 676 ) ( 1836 -1064 676 ) ( ( 0.0156249953 0 0.0441941656 ) ( 0 0.015625 1.0625 ) ) common/caulk 134217728 0 0 @@ -19187,11 +19187,11 @@ brushDef brushDef { ( 1760 -1032 728 ) ( 1760 -1076 728 ) ( 1648 -1032 728 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 -( 1760 -1032 728 ) ( 1648 -1032 728 ) ( 1760 -1032 704 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 1760 -1040 728 ) ( 1648 -1040 728 ) ( 1760 -1040 704 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 ( 1704 -1036 728 ) ( 1704 -1036 704 ) ( 1704 -1080 728 ) ( ( 0.015625 0 0.0625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 ( 1648 -1076 704 ) ( 1760 -1076 704 ) ( 1648 -1032 704 ) ( ( 0 0.0178571437 30.4285736084 ) ( -0.0058139535 0 506 ) ) exx/panel-metal02 0 0 0 ( 1660 -1204 704 ) ( 1660 -1204 728 ) ( 1772 -1204 704 ) ( ( 0.015625 0 255.8125 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 -( 1648 -1076 704 ) ( 1648 -1032 704 ) ( 1648 -1076 728 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 1648 -1084 704 ) ( 1648 -1040 704 ) ( 1648 -1084 728 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 } } { @@ -19258,8 +19258,8 @@ brushDef brushDef { ( 1300 -1036 728 ) ( 1300 -1068 728 ) ( 1256 -1036 728 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 -( 1300 -1032 728 ) ( 1256 -1032 728 ) ( 1300 -1032 704 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 -( 1648 -1076 728 ) ( 1648 -1076 704 ) ( 1648 -1108 728 ) ( ( 0.015625 0 0.625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 +( 1300 -1040 728 ) ( 1256 -1040 728 ) ( 1300 -1040 704 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 +( 1648 -1084 728 ) ( 1648 -1084 704 ) ( 1648 -1116 728 ) ( ( 0.015625 0 0.75 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 ( 1256 -1068 704 ) ( 1300 -1068 704 ) ( 1256 -1036 704 ) ( ( -0.0058139535 0 506 ) ( 0 0.0051020412 8.4081640244 ) ) exx/panel-metal01c 0 0 0 ( 1264 -1204 704 ) ( 1264 -1204 728 ) ( 1308 -1204 704 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 ( 1256 -1068 704 ) ( 1256 -1036 704 ) ( 1256 -1068 728 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 @@ -20063,12 +20063,12 @@ brushDef ( 1797 -1029 676 ) ( 1765 -1029 676 ) ( 1797 -1029 672 ) ( ( 0.0625 0 111.25 ) ( 0 0.0625 42 ) ) phillipk2x/lights-pk02_light01b 134217728 0 0 ( 1740 -1036 656 ) ( 1772 -1036 656 ) ( 1740 -1032 656 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 255.625 ) ) common/nodrawnonsolid 134217728 0 0 ( 1740 -1032 672 ) ( 1740 -1032 676 ) ( 1772 -1032 672 ) ( ( 0.015625 0 0.375 ) ( 0 0.015625 0.125 ) ) common/nodrawnonsolid 134217728 0 0 -( 1764 60 668 ) ( 1768 60 672 ) ( 1764 -68 668 ) ( ( 0.015625 0 255.9375 ) ( 0 0.0156249991 0 ) ) common/nodrawnonsolid 134217728 0 0 +( 1764 60 668 ) ( 1768 60 672 ) ( 1764 -68 668 ) ( ( 0.015625 0 255.9375 ) ( 0 0.0156249972 0 ) ) common/nodrawnonsolid 134217728 0 0 ( 1768 60 672 ) ( 1772 60 672 ) ( 1768 -68 672 ) ( ( 0.015625 0 0.0625 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( 1776 60 672 ) ( 1780 60 668 ) ( 1776 -68 672 ) ( ( 0.015625 0 0.0625 ) ( 0 0.0156249991 0 ) ) common/nodrawnonsolid 134217728 0 0 +( 1776 60 672 ) ( 1780 60 668 ) ( 1776 -68 672 ) ( ( 0.015625 0 0.0625 ) ( 0 0.0156249972 0 ) ) common/nodrawnonsolid 134217728 0 0 ( 1780 60 664 ) ( 1780 60 660 ) ( 1780 -68 664 ) ( ( 0.015625 0 0.0625 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( 1780 60 660 ) ( 1776 60 656 ) ( 1780 -68 660 ) ( ( 0.015625 0 0.0625 ) ( 0 0.0156249981 0.0441941693 ) ) common/nodrawnonsolid 134217728 0 0 -( 1768 60 656 ) ( 1764 60 660 ) ( 1768 -68 656 ) ( ( 0.015625 0 255.9375 ) ( 0 0.0156249981 0.0441941693 ) ) common/nodrawnonsolid 134217728 0 0 +( 1780 60 660 ) ( 1776 60 656 ) ( 1780 -68 660 ) ( ( 0.015625 0 0.0625 ) ( 0 0.0156249963 0.0441894531 ) ) common/nodrawnonsolid 134217728 0 0 +( 1768 60 656 ) ( 1764 60 660 ) ( 1768 -68 656 ) ( ( 0.015625 0 255.9375 ) ( 0 0.0156249963 0.0441894531 ) ) common/nodrawnonsolid 134217728 0 0 ( 1764 60 656 ) ( 1764 60 660 ) ( 1764 -68 656 ) ( ( 0.015625 0 255.9375 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 } } @@ -20291,7 +20291,7 @@ brushDef ( 1760 -1032 856 ) ( 1760 -1032 840 ) ( 1760 -1224 856 ) ( ( -0.0056818184 0 505 ) ( 0 0.0055901702 1.0800000429 ) ) exx/panel-metal01c 0 0 0 ( 1760 -1224 544 ) ( 1020 -1056 544 ) ( 1020 -1224 544 ) ( ( -0.015625 0 249.125 ) ( 0 0.015625 19.3125 ) ) common/caulk 0 0 0 ( 1760 -976 704 ) ( 1020 -1224 704 ) ( 1020 -976 704 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0 -( 1272 -1032 -64 ) ( 1280 -1032 -64 ) ( 1272 -1032 64 ) ( ( -0.0178571437 0 225.5715942383 ) ( 0 0.0062500006 4.4000000954 ) ) exx/panel-metal02 0 0 0 +( 1272 -1040 -64 ) ( 1280 -1040 -64 ) ( 1272 -1040 64 ) ( ( -0.0178571437 0 225.5715942383 ) ( 0 0.0062500006 4.4000000954 ) ) exx/panel-metal02 0 0 0 ( 1704 -1056 -64 ) ( 1704 -1048 -64 ) ( 1704 -1056 64 ) ( ( -0.0058139535 0 7 ) ( 0 0.0062499987 4.3999996185 ) ) exx/panel-metal01c 0 0 0 } } @@ -20979,7 +20979,7 @@ brushDef "origin" "1960.000000 -272.000000 528.000000" } { -"classname" "item_armor_large" +"classname" "item_armor_mega" "origin" "1688.000000 192.000000 496.000000" "spawnflags" "1" } @@ -21060,12 +21060,12 @@ brushDef { brushDef { -( -28 256 240 ) ( -28 112 240 ) ( -92 256 240 ) ( ( 0.015625 0 255.375 ) ( 0 0.015625 254.0625 ) ) common/trigger 0 0 0 -( -92 112 48 ) ( -28 112 48 ) ( -92 256 48 ) ( ( 0.015625 0 255.375 ) ( 0 0.015625 1.9375 ) ) common/trigger 0 0 0 -( -164 208 -80 ) ( -156 216 -80 ) ( -164 208 48 ) ( ( 0.0156249963 0 254.4974060059 ) ( 0 0.015625 255.75 ) ) common/trigger 0 0 0 -( -28 148 -80 ) ( -36 140 -80 ) ( -28 148 48 ) ( ( 0.0156249972 0 1.5025939941 ) ( 0 0.015625 255.75 ) ) common/trigger 0 0 0 -( -96 120 -80 ) ( -112 136 -80 ) ( -96 120 48 ) ( ( 0.0156249972 0 1.2374367714 ) ( 0 0.015625 255.75 ) ) common/trigger 0 0 0 -( -136 272 -80 ) ( -132 268 -80 ) ( -136 272 48 ) ( ( 0.0156249972 0 254.7625732422 ) ( 0 0.015625 255.75 ) ) common/trigger 0 0 0 +( -28 256 256 ) ( -28 112 256 ) ( -92 256 256 ) ( ( 0.015625 0 255.375 ) ( 0 0.015625 254.0625 ) ) common/trigger 0 0 0 +( -92 112 64 ) ( -28 112 64 ) ( -92 256 64 ) ( ( 0.015625 0 255.375 ) ( 0 0.015625 1.9375 ) ) common/trigger 0 0 0 +( -164 208 -64 ) ( -156 216 -64 ) ( -164 208 64 ) ( ( 0.0156249953 0 254.4974060059 ) ( 0 0.015625 0 ) ) common/trigger 0 0 0 +( -28 148 -64 ) ( -36 140 -64 ) ( -28 148 64 ) ( ( 0.0156249963 0 1.5025939941 ) ( 0 0.015625 0 ) ) common/trigger 0 0 0 +( -96 120 -64 ) ( -112 136 -64 ) ( -96 120 64 ) ( ( 0.0156249963 0 1.2374367714 ) ( 0 0.015625 0 ) ) common/trigger 0 0 0 +( -136 272 -64 ) ( -132 268 -64 ) ( -136 272 64 ) ( ( 0.0156249963 0 254.7625732422 ) ( 0 0.015625 0 ) ) common/trigger 0 0 0 } } } @@ -21220,7 +21220,7 @@ brushDef "spawnflags" "4" } { -"classname" "item_health_large" +"classname" "item_health_big" "origin" "-108.000000 696.000000 72.000000" } { @@ -21375,7 +21375,7 @@ brushDef } { "classname" "misc_model" -"origin" "-289.994354 -715.850037 56.000000" +"origin" "-289.994354 -715.850037 64.000000" "model" "models/map_erbium/teleporter-old-school.ase" "angle" "135.000000" "spawnflags" "4" @@ -21392,12 +21392,12 @@ brushDef { brushDef { -( -200 -600 236 ) ( -200 -788 236 ) ( -376 -600 236 ) ( ( 0.015625 0 254.5625 ) ( 0 0.015625 1.25 ) ) common/trigger 0 0 0 -( -360 -788 56 ) ( -184 -788 56 ) ( -360 -600 56 ) ( ( 0.015625 0 254.5625 ) ( 0 0.015625 255 ) ) common/trigger 0 0 0 -( -232 -696 -60 ) ( -236 -700 -60 ) ( -232 -696 68 ) ( ( 0.0156249972 0 255.6906280518 ) ( 0 0.015625 0.0625 ) ) common/trigger 0 0 0 -( -244 -648 -60 ) ( -240 -652 -60 ) ( -244 -648 68 ) ( ( 0.0156249972 0 254.2764282227 ) ( 0 0.015625 0.0625 ) ) common/trigger 0 0 0 -( -304 -656 -60 ) ( -296 -648 -60 ) ( -304 -656 68 ) ( ( 0.0156249963 0 0.0441942215 ) ( 0 0.015625 0.0625 ) ) common/trigger 0 0 0 -( -356 -760 -60 ) ( -360 -756 -60 ) ( -356 -760 68 ) ( ( 0.0156249963 0 1.9887377024 ) ( 0 0.015625 0.0625 ) ) common/trigger 0 0 0 +( -200 -600 244 ) ( -200 -788 244 ) ( -376 -600 244 ) ( ( 0.015625 0 254.5625 ) ( 0 0.015625 1.25 ) ) common/trigger 0 0 0 +( -360 -788 64 ) ( -184 -788 64 ) ( -360 -600 64 ) ( ( 0.015625 0 254.5625 ) ( 0 0.015625 255 ) ) common/trigger 0 0 0 +( -232 -696 -52 ) ( -236 -700 -52 ) ( -232 -696 76 ) ( ( 0.0156249963 0 255.6906280518 ) ( 0 0.015625 0.1875 ) ) common/trigger 0 0 0 +( -244 -648 -52 ) ( -240 -652 -52 ) ( -244 -648 76 ) ( ( 0.0156249963 0 254.2764282227 ) ( 0 0.015625 0.1875 ) ) common/trigger 0 0 0 +( -304 -656 -52 ) ( -296 -648 -52 ) ( -304 -656 76 ) ( ( 0.0156249953 0 0.0441942215 ) ( 0 0.015625 0.1875 ) ) common/trigger 0 0 0 +( -356 -760 -52 ) ( -360 -756 -52 ) ( -356 -760 76 ) ( ( 0.0156249953 0 1.9887377024 ) ( 0 0.015625 0.1875 ) ) common/trigger 0 0 0 } } } @@ -22596,7 +22596,7 @@ brushDef } { "classname" "misc_model" -"origin" "-92.000122 182.000000 52.000000" +"origin" "-92.000122 182.000000 68.000000" "model" "models/map_erbium/teleporter-old-school.ase" "angle" "-133.197525" "spawnflags" "4" @@ -22664,14 +22664,14 @@ brushDef } { "classname" "misc_model" -"origin" "1949.192505 -287.374908 208.557129" +"origin" "1949.192505 -239.374908 208.557129" "model" "models/map_erbium/ivy-down.ase" "spawnflags" "4" "angles" "4.381683 -90.000000 0.000000" } { "classname" "misc_model" -"origin" "1972.300293 965.189758 493.839294" +"origin" "2028.300293 965.189758 493.839294" "model" "models/map_erbium/ivy-down.ase" "spawnflags" "4" "angles" "-18.066687 -0.644569 -0.028704" @@ -22684,14 +22684,6 @@ brushDef "angles" "-1.328981 -135.228500 0.027318" } { -"classname" "misc_model" -"origin" "1245.677002 322.483246 571.694031" -"model" "models/map_erbium/ivy-down.ase" -"spawnflags" "4" -"angles" "23.215782 -169.914124 0.641952" -"modelscale" "0.700000" -} -{ "classname" "item_armor_small" "origin" "388.000000 -176.000000 540.000000" "angle" "-90.000000" @@ -23274,7 +23266,7 @@ brushDef } { "classname" "misc_model" -"origin" "1949.192505 -339.828552 278.819580" +"origin" "1949.192505 -291.828552 278.819580" "model" "models/map_erbium/ivy-down.ase" "spawnflags" "4" "angles" "40.856499 -90.000000 0.000000" @@ -23567,7 +23559,7 @@ brushDef } { "classname" "target_speaker" -"origin" "-264.000000 -732.000000 128.000000" +"origin" "-264.000000 -732.000000 136.000000" "atten" "2" "noise" "sound/machines/Electrical_Machine.ogg" "spawnflags" "1" @@ -23601,14 +23593,6 @@ brushDef "angles" "-66.292198 -135.290054 0.067925" } { -"classname" "misc_model" -"origin" "1254.022583 322.535675 501.317596" -"model" "models/map_erbium/ivy-down.ase" -"spawnflags" "4" -"angles" "-16.201336 -170.814362 -2.958713" -"modelscale" "0.700000" -} -{ "classname" "target_speaker" "origin" "-352.000000 -780.000000 664.000000" "atten" "1.3" @@ -23971,7 +23955,7 @@ brushDef } { "classname" "light" -"origin" "-288.000000 -714.000000 144.000000" +"origin" "-288.000000 -714.000000 152.000000" "light" "68" "_color" "0.428717 0.756542 0.943633" } @@ -24001,7 +23985,7 @@ brushDef } { "classname" "light" -"origin" "-100.000000 182.000000 144.000000" +"origin" "-100.000000 182.000000 160.000000" "light" "50" "_color" "0.428717 0.756542 0.943633" } diff --git a/maps/erbium.map.options b/maps/erbium.map.options index 810ba875..7e7333c0 100644 --- a/maps/erbium.map.options +++ b/maps/erbium.map.options @@ -2,4 +2,4 @@ -light + -bounce 8 -dirtscale 2 -vis + -minimap + -Version: 3c \ No newline at end of file +Version: 4 \ No newline at end of file