From 8443ed0674a04f7d925bb9c3695c47b6649d785b Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Fri, 6 Jan 2017 13:15:41 +0100 Subject: Fix some buildings not being discarded in p9. --- maps/p9_reactor.map | 240 +++++++++++++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 116 deletions(-) diff --git a/maps/p9_reactor.map b/maps/p9_reactor.map index f3f52c3..7c30fb8 100644 --- a/maps/p9_reactor.map +++ b/maps/p9_reactor.map @@ -6354,35 +6354,23 @@ arachnid2/flat_dk } // entity 12 { -"classname" "team_human_spawn" -"origin" "1504.000000 -680.000000 120.000000" -"mapcat_discard" " " -} -// entity 13 -{ -"classname" "team_alien_spawn" -"origin" "1504.000000 0.000000 32.000000" -"mapcat_discard" " " -} -// entity 14 -{ "classname" "info_alien_intermission" "origin" "768.000000 -640.000000 144.000000" "mapcat_discard" " " } -// entity 15 +// entity 13 { "classname" "info_human_intermission" "origin" "768.000000 -600.000000 144.000000" "mapcat_discard" " " } -// entity 16 +// entity 14 { "classname" "info_player_intermission" "origin" "768.000000 -560.000000 144.000000" "mapcat_discard" " " } -// entity 17 +// entity 15 { "classname" "misc_model" "origin" "927.999939 -344.000000 80.000000" @@ -6390,7 +6378,7 @@ arachnid2/flat_dk "angle" "90.000008" "spawnflags" "4" } -// entity 18 +// entity 16 { "classname" "func_group" // brush 0 @@ -6574,7 +6562,7 @@ arachnid2/flat_dk ( 1038 -418 72 ) ( 1038 -418 224 ) ( 964 -344 224 ) common/clip 0 0 0 0.5 0.5 134217728 0 0 } } -// entity 19 +// entity 17 { "classname" "misc_model" "origin" "1304.000000 -528.000000 80.000000" @@ -6582,7 +6570,7 @@ arachnid2/flat_dk "angle" "0.000009" "spawnflags" "4" } -// entity 20 +// entity 18 { "classname" "misc_model" "origin" "1687.999878 472.000000 8.000000" @@ -6590,7 +6578,7 @@ arachnid2/flat_dk "angle" "0.000003" "spawnflags" "4" } -// entity 21 +// entity 19 { "classname" "misc_model" "origin" "1504.000000 224.000000 8.000000" @@ -6598,14 +6586,14 @@ arachnid2/flat_dk "angle" "-90.000000" "spawnflags" "4" } -// entity 22 +// entity 20 { "classname" "misc_model" "origin" "1688.000000 472.000000 8.000000" "model" "models/mapobjects/analmango/railing_rail.md3" "angle" "-179.999985" } -// entity 23 +// entity 21 { "classname" "misc_model" "origin" "1752.000000 472.000000 8.000000" @@ -6613,7 +6601,7 @@ arachnid2/flat_dk "angle" "0.000003" "spawnflags" "4" } -// entity 24 +// entity 22 { "classname" "misc_model" "origin" "1504.000000 -880.000122 80.000000" @@ -6621,7 +6609,7 @@ arachnid2/flat_dk "angle" "90.000000" "spawnflags" "4" } -// entity 25 +// entity 23 { "classname" "misc_model" "origin" "1752.000000 -1064.000000 80.000000" @@ -6629,14 +6617,14 @@ arachnid2/flat_dk "angle" "0.000003" "spawnflags" "4" } -// entity 26 +// entity 24 { "classname" "misc_model" "origin" "1504.000000 -880.000000 80.000000" "model" "models/mapobjects/analmango/railing_rail.md3" "angle" "-90.000000" } -// entity 27 +// entity 25 { "classname" "misc_model" "origin" "1504.000000 -816.000000 80.000000" @@ -6644,7 +6632,7 @@ arachnid2/flat_dk "angle" "90.000000" "spawnflags" "4" } -// entity 28 +// entity 26 { "classname" "misc_model" "origin" "928.000000 -216.000000 80.000000" @@ -6652,189 +6640,189 @@ arachnid2/flat_dk "angle" "90.000000" "spawnflags" "4" } -// entity 29 +// entity 27 { "classname" "light" "origin" "1160.000000 -296.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 30 +// entity 28 { "classname" "light" "origin" "1216.000000 -240.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 31 +// entity 29 { "classname" "light" "origin" "1272.000000 -296.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 32 +// entity 30 { "classname" "light" "origin" "1216.000000 -352.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 33 +// entity 31 { "classname" "light" "origin" "1216.000000 -632.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 34 +// entity 32 { "classname" "light" "origin" "1160.000000 -688.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 35 +// entity 33 { "classname" "light" "origin" "1272.000000 -688.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 36 +// entity 34 { "classname" "light" "origin" "1216.000000 -744.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 37 +// entity 35 { "classname" "light" "origin" "768.000000 -632.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 38 +// entity 36 { "classname" "light" "origin" "712.000000 -688.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 39 +// entity 37 { "classname" "light" "origin" "824.000000 -688.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 40 +// entity 38 { "classname" "light" "origin" "768.000000 -744.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 41 +// entity 39 { "classname" "light" "origin" "768.000000 -240.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 42 +// entity 40 { "classname" "light" "origin" "712.000000 -296.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 43 +// entity 41 { "classname" "light" "origin" "824.000000 -296.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 44 +// entity 42 { "classname" "light" "origin" "768.000000 -352.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 45 +// entity 43 { "classname" "light" "origin" "768.000000 152.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 46 +// entity 44 { "classname" "light" "origin" "712.000000 96.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 47 +// entity 45 { "classname" "light" "origin" "824.000000 96.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 48 +// entity 46 { "classname" "light" "origin" "768.000000 40.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 49 +// entity 47 { "classname" "light" "origin" "1216.000000 152.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 50 +// entity 48 { "classname" "light" "origin" "1160.000000 96.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 51 +// entity 49 { "classname" "light" "origin" "1272.000000 96.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 52 +// entity 50 { "classname" "light" "origin" "1216.000000 40.000000 -256.000000" "light" "25" "_color" "1 0.498726 0.168597" } -// entity 53 +// entity 51 { "classname" "misc_model" "origin" "1912.000000 392.000000 8.000000" "model" "models/mapobjects/analmango/railing_barrier.md3" "spawnflags" "4" } -// entity 54 +// entity 52 { "classname" "misc_model" "origin" "1848.000000 392.000000 8.000000" "model" "models/mapobjects/analmango/railing_barrier.md3" "spawnflags" "4" } -// entity 55 +// entity 53 { "classname" "misc_model" "origin" "1952.000000 288.000000 8.000000" @@ -6842,28 +6830,28 @@ arachnid2/flat_dk "spawnflags" "4" "angle" "-90.000000" } -// entity 56 +// entity 54 { "classname" "misc_model" "origin" "1848.000000 552.000000 8.000000" "model" "models/mapobjects/analmango/railing_barrier.md3" "spawnflags" "4" } -// entity 57 +// entity 55 { "classname" "misc_model" "origin" "1912.000000 552.000000 8.000000" "model" "models/mapobjects/analmango/railing_barrier.md3" "spawnflags" "4" } -// entity 58 +// entity 56 { "classname" "misc_model" "origin" "1976.000000 552.000000 8.000000" "model" "models/mapobjects/analmango/railing_barrier.md3" "spawnflags" "4" } -// entity 59 +// entity 57 { "classname" "misc_model" "origin" "2032.000000 496.000000 8.000000" @@ -6871,7 +6859,7 @@ arachnid2/flat_dk "spawnflags" "4" "angle" "-90.000000" } -// entity 60 +// entity 58 { "classname" "misc_model" "origin" "2032.000000 432.000000 8.000000" @@ -6879,7 +6867,7 @@ arachnid2/flat_dk "spawnflags" "4" "angle" "-90.000000" } -// entity 61 +// entity 59 { "classname" "misc_model" "origin" "2032.000000 368.000000 8.000000" @@ -6887,7 +6875,7 @@ arachnid2/flat_dk "spawnflags" "4" "angle" "-90.000000" } -// entity 62 +// entity 60 { "classname" "misc_model" "origin" "2032.000000 304.000000 8.000000" @@ -6895,7 +6883,7 @@ arachnid2/flat_dk "spawnflags" "4" "angle" "-90.000000" } -// entity 63 +// entity 61 { "classname" "misc_model" "origin" "1952.000000 352.000000 8.000000" @@ -6903,12 +6891,14 @@ arachnid2/flat_dk "spawnflags" "4" "angle" "-90.000000" } -// entity 64 +// entity 62 { "classname" "team_alien_overmind" -"origin" "1968.000000 -760.000000 152.000000" +"origin" "1976.000000 -1112.000000 152.000000" +"angle" "-90.000000" +"mapcat_discard" " " } -// entity 65 +// entity 63 { "classname" "trigger_hurt" "dmg" "15" @@ -6922,7 +6912,7 @@ arachnid2/flat_dk ( 1376 640 2120 ) ( 1376 -1216 892 ) ( 1376 640 892 ) common/trigger 0 32 0 0.5 0.5 0 0 0 } } -// entity 66 +// entity 64 { "classname" "trigger_hurt" "dmg" "3" @@ -6936,7 +6926,7 @@ arachnid2/flat_dk ( 1376 640 892 ) ( 1376 -1216 700 ) ( 1376 640 700 ) common/trigger 0 32 0 0.5 0.5 0 0 0 } } -// entity 67 +// entity 65 { "classname" "trigger_hurt" "dmg" "1" @@ -6950,7 +6940,7 @@ arachnid2/flat_dk ( 1376 640 572 ) ( 1376 640 700 ) ( 1376 -1216 700 ) common/trigger 0 32 0 0.5 0.5 0 0 0 } } -// entity 68 +// entity 66 { "classname" "trigger_hurt" "dmg" "1" @@ -6965,7 +6955,7 @@ arachnid2/flat_dk ( 1376 640 444 ) ( 1376 640 572 ) ( 1376 -1216 572 ) common/trigger 0 16 0 0.5 0.5 0 0 0 } } -// entity 69 +// entity 67 { "classname" "func_door" "angle" "9.46" @@ -6979,141 +6969,141 @@ arachnid2/flat_dk ( 1944 236 8 ) ( 1944 236 128 ) ( 1944 228 128 ) nexus6/mt-blnk_l1_1a 48 48 90 0.5 0.5 134217728 0 0 } } -// entity 70 +// entity 68 { "classname" "misc_model" "origin" "1792.000000 -300.000000 -192.000000" "model" "models/mapobjects/analmango/reactor.obj" "spawnflags" "4" } -// entity 71 +// entity 69 { "classname" "misc_light_flare" "origin" "1792.000000 -300.000000 -36.000000" "radius" "1.6 0 1" "targetShaderName" "textures/nexus6/flare_01" } -// entity 72 +// entity 70 { "classname" "light" "origin" "1792.000000 -304.000000 -64.000000" "light" "500" } -// entity 73 +// entity 71 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 1344.000000" "noise" "sound/analmango/reactor.wav" "spawnflags" "1" } -// entity 74 +// entity 72 { "classname" "light" "origin" "1792.000000 -304.000000 1216.000000" "light" "500" } -// entity 75 +// entity 73 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 1088.000000" "noise" "sound/analmango/reactor.wav" "spawnflags" "1" } -// entity 76 +// entity 74 { "classname" "light" "origin" "1792.000000 -304.000000 960.000000" "light" "500" } -// entity 77 +// entity 75 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 16.000000" "noise" "sound/ambient/quickpulse.wav" "spawnflags" "1" } -// entity 78 +// entity 76 { "classname" "light" "origin" "1792.000000 -304.000000 192.000000" "light" "500" } -// entity 79 +// entity 77 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 320.000000" "noise" "sound/analmango/reactor.wav" "spawnflags" "1" } -// entity 80 +// entity 78 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 576.000000" "noise" "sound/analmango/reactor.wav" "spawnflags" "1" } -// entity 81 +// entity 79 { "classname" "light" "origin" "1792.000000 -304.000000 448.000000" "light" "500" } -// entity 82 +// entity 80 { "classname" "light" "origin" "1792.000000 -304.000000 704.000000" "light" "500" } -// entity 83 +// entity 81 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 832.000000" "noise" "sound/analmango/reactor.wav" "spawnflags" "1" } -// entity 84 +// entity 82 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 64.000000" "noise" "sound/analmango/reactor.wav" "spawnflags" "1" } -// entity 85 +// entity 83 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 -8.000000" "noise" "sound/ambient/slowpulse2.wav" "spawnflags" "1" } -// entity 86 +// entity 84 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 16.000000" "noise" "sound/ambient/quickpulse.wav" "spawnflags" "1" } -// entity 87 +// entity 85 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 -8.000000" "noise" "sound/ambient/slowpulse2.wav" "spawnflags" "1" } -// entity 88 +// entity 86 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 16.000000" "noise" "sound/ambient/quickpulse.wav" "spawnflags" "1" } -// entity 89 +// entity 87 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 -8.000000" "noise" "sound/ambient/slowpulse2.wav" "spawnflags" "1" } -// entity 90 +// entity 88 { "classname" "trigger_multiple" "wait" "0.001" @@ -7136,7 +7126,7 @@ arachnid2/flat_dk ( 1887.2000732422 -327.6000061035 -80 ) ( 1862 -371 2120 ) ( 1887.2000732422 -327.6000061035 2120 ) common/trigger 24 0 0 0.4000000358 0.5 0 0 0 } } -// entity 91 +// entity 89 { "classname" "target_relay" "origin" "1984.000000 -448.000000 40.000000" @@ -7144,7 +7134,7 @@ arachnid2/flat_dk "target" "thunder_2" "spawnflags" "4" } -// entity 92 +// entity 90 { "classname" "target_push" "origin" "2048.000000 -512.000000 40.000000" @@ -7152,7 +7142,7 @@ arachnid2/flat_dk "spawnflags" "2" "target" "thunder_3d" } -// entity 93 +// entity 91 { "classname" "target_push" "origin" "1856.000000 -512.000000 40.000000" @@ -7160,7 +7150,7 @@ arachnid2/flat_dk "spawnflags" "2" "target" "thunder_3a" } -// entity 94 +// entity 92 { "classname" "target_push" "origin" "1984.000000 -512.000000 40.000000" @@ -7168,7 +7158,7 @@ arachnid2/flat_dk "spawnflags" "2" "target" "thunder_3c" } -// entity 95 +// entity 93 { "classname" "target_push" "origin" "1920.000000 -512.000000 40.000000" @@ -7176,7 +7166,7 @@ arachnid2/flat_dk "spawnflags" "2" "target" "thunder_3b" } -// entity 96 +// entity 94 { "classname" "target_speaker" "origin" "1984.000000 -376.000000 144.000000" @@ -7184,44 +7174,44 @@ arachnid2/flat_dk "targetname" "thunder_1" "spawnflags" "4" } -// entity 97 +// entity 95 { "classname" "target_speaker" "origin" "1792.000000 -304.000000 120.000000" "noise" "sound/analmango/thunder_strike.wav" "targetname" "thunder_1" } -// entity 98 +// entity 96 { "classname" "target_position" "origin" "2048.000000 584.000000 1448.000000" "targetname" "thunder_3d" } -// entity 99 +// entity 97 { "classname" "target_position" "origin" "1480.000000 -1128.000000 664.000000" "targetname" "thunder_3a" } -// entity 100 +// entity 98 { "classname" "target_position" "origin" "1504.000000 520.000000 840.000000" "targetname" "thunder_3b" } -// entity 101 +// entity 99 { "classname" "target_position" "origin" "2064.000000 -1152.000000 1280.000000" "targetname" "thunder_3c" } -// entity 102 +// entity 100 { "classname" "target_kill" "origin" "2056.000000 -448.000000 40.000000" "targetname" "thunder_1" } -// entity 103 +// entity 101 { "classname" "func_door" "spawnflags" "1" @@ -7309,7 +7299,7 @@ analmango/reactor_beam } } } -// entity 104 +// entity 102 { "classname" "target_speaker" "origin" "2088.000000 -408.000000 144.000000" @@ -7317,14 +7307,14 @@ analmango/reactor_beam "targetname" "thunder_1b" "spawnflags" "8" } -// entity 105 +// entity 103 { "classname" "target_speaker" "origin" "2184.000000 -344.000000 52.000000" "noise" "sound/analmango/computer2.wav" "spawnflags" "1" } -// entity 106 +// entity 104 { "classname" "target_speaker" "origin" "1964.000000 -96.000000 20.000000" @@ -7332,21 +7322,21 @@ analmango/reactor_beam "wait" "9" "random" "4" } -// entity 107 +// entity 105 { "classname" "target_speaker" "origin" "2020.000000 -176.000000 16.000000" "noise" "sound/analmango/computer2.wav" "spawnflags" "1" } -// entity 108 +// entity 106 { "classname" "light" "origin" "1992.000000 264.000000 112.000000" "light" "35" "_color" "1 0.911254 0.5785" } -// entity 109 +// entity 107 { "classname" "target_speaker" "origin" "2408.000000 -432.000000 52.000000" @@ -7354,14 +7344,14 @@ analmango/reactor_beam "spawnflags" "1" "angle" "-179.999985" } -// entity 110 +// entity 108 { "classname" "target_speaker" "origin" "2184.000000 -144.000000 52.000000" "noise" "sound/analmango/computer3.wav" "spawnflags" "1" } -// entity 111 +// entity 109 { "classname" "target_speaker" "origin" "2408.000000 -40.000000 52.000000" @@ -7369,7 +7359,7 @@ analmango/reactor_beam "spawnflags" "1" "angle" "-179.999985" } -// entity 112 +// entity 110 { "classname" "target_speaker" "origin" "2576.000000 -184.000000 52.000000" @@ -7377,7 +7367,7 @@ analmango/reactor_beam "spawnflags" "1" "angle" "-179.999985" } -// entity 113 +// entity 111 { "classname" "target_speaker" "origin" "1984.000000 -408.000000 144.000000" @@ -7385,7 +7375,7 @@ analmango/reactor_beam "targetname" "thunder_1" "spawnflags" "8" } -// entity 114 +// entity 112 { "classname" "target_delay" "origin" "2088.000000 -376.000000 144.000000" @@ -7393,21 +7383,39 @@ analmango/reactor_beam "target" "thunder_1b" "delay" "0.7" } -// entity 115 +// entity 113 { "classname" "target_location" "origin" "1792.000000 -300.000000 432.000000" "message" "Reactor" } -// entity 116 +// entity 114 { "classname" "target_location" "origin" "2296.000000 -240.000000 64.000000" "message" "Reactor computers" } -// entity 117 +// entity 115 { "classname" "target_location" "origin" "1024.000000 -288.000000 144.000000" "message" "Reactor nexus" } +// entity 116 +{ +"classname" "team_alien_spawn" +"origin" "1976.000000 -912.000000 152.000000" +"mapcat_discard" " " +} +// entity 117 +{ +"classname" "team_human_reactor" +"origin" "1912.000000 136.000000 240.000000" +"mapcat_discard" " " +} +// entity 118 +{ +"classname" "team_human_spawn" +"origin" "2016.000000 216.000000 240.000000" +"mapcat_discard" " " +} -- cgit