1 files changed, 39 insertions, 102 deletions
diff --git a/maps/p10_nexus.map b/maps/p10_nexus.map
index 08c188d..81ad289 100644
--- a/maps/p10_nexus.map
+++ b/maps/p10_nexus.map
@@ -7234,53 +7234,25 @@ nexus6/pipe02_64
 // entity 47
 {
 "classname" "target_speaker"
-"origin" "856.000000 -560.000000 -16.000000"
-"spawnflags" "1"
-"noise" "sound/analmango/ambient_1.wav"
-}
-// entity 48
-{
-"classname" "target_speaker"
 "origin" "992.000000 496.000000 -184.000000"
 "spawnflags" "1"
 "noise" "sound/ambient/water_rush.wav"
 }
-// entity 49
+// entity 48
 {
 "classname" "target_speaker"
 "origin" "864.000000 96.000000 144.000000"
 "spawnflags" "1"
 "noise" "sound/analmango/ambient_1.wav"
 }
-// entity 50
-{
-"classname" "target_speaker"
-"origin" "1104.000000 -264.000000 144.000000"
-"spawnflags" "1"
-"noise" "sound/analmango/ambient_1.wav"
-}
-// entity 51
-{
-"classname" "target_speaker"
-"origin" "1120.000000 -608.000000 -152.000000"
-"spawnflags" "1"
-"noise" "sound/ambient/water_rush.wav"
-}
-// entity 52
+// entity 49
 {
 "classname" "target_speaker"
 "origin" "816.000000 -408.000000 -152.000000"
 "spawnflags" "1"
 "noise" "sound/ambient/water_rush.wav"
 }
-// entity 53
-{
-"classname" "target_speaker"
-"origin" "976.000000 16.000000 -152.000000"
-"spawnflags" "1"
-"noise" "sound/ambient/water_rush.wav"
-}
-// entity 54
+// entity 50
 {
 "classname" "func_door"
 "angle" "-2"
@@ -7304,7 +7276,7 @@ nexus6/pipe02_64
 ( 1408 1048 -128 ) ( 1408 1088 -128 ) ( 1408 1048 88 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 55
+// entity 51
 {
 "classname" "misc_particle_system"
 "origin" "1536.000000 1968.000000 -56.000000"
@@ -7312,14 +7284,14 @@ nexus6/pipe02_64
 "psName" "analmango_rocket"
 "targetname" "rocket_ps"
 }
-// entity 56
+// entity 52
 {
 "classname" "target_relay"
 "origin" "1472.000000 1224.000000 -16.000000"
 "target" "explosion_ps"
 "targetname" "explosion"
 }
-// entity 57
+// entity 53
 {
 "classname" "target_delay"
 "origin" "1472.000000 1176.000000 -16.000000"
@@ -7327,7 +7299,7 @@ nexus6/pipe02_64
 "target" "explosion_ps"
 "wait" "1"
 }
-// entity 58
+// entity 54
 {
 "classname" "misc_particle_system"
 "origin" "1536.000000 1096.000000 -56.000000"
@@ -7335,7 +7307,7 @@ nexus6/pipe02_64
 "psName" "analmango_explosion"
 "targetname" "explosion_ps"
 }
-// entity 59
+// entity 55
 {
 "classname" "target_delay"
 "origin" "1504.000000 1832.000000 -56.000000"
@@ -7343,14 +7315,14 @@ nexus6/pipe02_64
 "target" "rocket_ps"
 "targetname" "rocket"
 }
-// entity 60
+// entity 56
 {
 "classname" "target_relay"
 "origin" "1504.000000 1800.000000 -56.000000"
 "targetname" "rocket"
 "target" "rocket_ps"
 }
-// entity 61
+// entity 57
 {
 "classname" "target_delay"
 "origin" "1472.000000 1760.000000 -56.000000"
@@ -7358,7 +7330,7 @@ nexus6/pipe02_64
 "target" "explosion"
 "wait" "0.4"
 }
-// entity 62
+// entity 58
 {
 "classname" "target_speaker"
 "origin" "1760.000000 1216.000000 -216.000000"
@@ -7366,14 +7338,14 @@ nexus6/pipe02_64
 "noise" "sound/ambient/water_rush.wav"
 "spawnflags" "2"
 }
-// entity 63
+// entity 59
 {
 "classname" "target_speaker"
 "origin" "1536.000000 1968.000000 -56.000000"
 "targetname" "rocket"
 "noise" "sound/analmango/cannon.wav"
 }
-// entity 64
+// entity 60
 {
 "classname" "func_door"
 "targetname" "rocket"
@@ -7471,7 +7443,7 @@ nexus6/pipe02_64
 ( 1526.75 1920 -56 ) ( 1531.25 1984 -48 ) ( 1526.75 1984 -56 ) nexus6/e8_base1b 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 65
+// entity 61
 {
 "classname" "target_speaker"
 "origin" "1432.000000 1936.000000 -56.000000"
@@ -7479,7 +7451,7 @@ nexus6/pipe02_64
 "targetname" "spell"
 "spawnflags" "8"
 }
-// entity 66
+// entity 62
 {
 "classname" "target_delay"
 "origin" "1472.000000 1936.000000 -56.000000"
@@ -7487,7 +7459,7 @@ nexus6/pipe02_64
 "target" "rocket"
 "wait" "4"
 }
-// entity 67
+// entity 63
 {
 "classname" "trigger_multiple"
 "wait" "-1"
@@ -7502,7 +7474,7 @@ nexus6/pipe02_64
 ( 1534 1992 8 ) ( 1534 2013 -8 ) ( 1534 2013 8 ) common/trigger 48 20 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 68
+// entity 64
 {
 "classname" "target_speaker"
 "origin" "1440.000000 1016.000000 -168.000000"
@@ -7510,120 +7482,92 @@ nexus6/pipe02_64
 "noise" "sound/analmango/thunder_strike_far.wav"
 "spawnflags" "4"
 }
-// entity 69
-{
-"classname" "target_speaker"
-"origin" "1600.000000 1000.000000 -168.000000"
-"targetname" "speaker"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 70
-{
-"classname" "target_speaker"
-"origin" "1480.000000 1000.000000 -168.000000"
-"targetname" "speaker"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 71
-{
-"classname" "target_speaker"
-"origin" "1600.000000 1000.000000 -168.000000"
-"targetname" "speaker"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 72
+// entity 65
 {
 "classname" "target_speaker"
-"origin" "1480.000000 1000.000000 -168.000000"
+"origin" "1536.000000 1032.000000 -168.000000"
 "targetname" "speaker"
 "noise" "sound/analmango/explosion.wav"
 }
-// entity 73
+// entity 66
 {
 "classname" "light"
 "origin" "1288.000000 1032.000000 96.000000"
 "light" "1000"
 }
-// entity 74
+// entity 67
 {
 "classname" "light"
 "origin" "1288.000000 1032.000000 -168.000000"
 "light" "1000"
 }
-// entity 75
+// entity 68
 {
 "classname" "light"
 "origin" "1288.000000 1032.000000 -40.000000"
 "light" "1000"
 }
-// entity 76
+// entity 69
 {
 "classname" "light"
 "origin" "1744.000000 1328.000000 96.000000"
 "light" "1000"
 }
-// entity 77
+// entity 70
 {
 "classname" "light"
 "origin" "1744.000000 1328.000000 -40.000000"
 "light" "1000"
 }
-// entity 78
+// entity 71
 {
 "classname" "light"
 "origin" "1744.000000 1328.000000 -168.000000"
 "light" "1000"
 }
-// entity 79
+// entity 72
 {
 "classname" "light"
 "origin" "1800.000000 1328.000000 96.000000"
 "light" "1000"
 }
-// entity 80
+// entity 73
 {
 "classname" "light"
 "origin" "1800.000000 1328.000000 -40.000000"
 "light" "1000"
 }
-// entity 81
+// entity 74
 {
 "classname" "light"
 "origin" "1800.000000 1328.000000 -168.000000"
 "light" "1000"
 }
-// entity 82
+// entity 75
 {
 "classname" "light"
 "origin" "1288.000000 976.000000 96.000000"
 "light" "1000"
 }
-// entity 83
+// entity 76
 {
 "classname" "light"
 "origin" "1288.000000 976.000000 -40.000000"
 "light" "1000"
 }
-// entity 84
+// entity 77
 {
 "classname" "light"
 "origin" "1288.000000 976.000000 -168.000000"
 "light" "1000"
 }
-// entity 85
+// entity 78
 {
 "classname" "target_location"
 "origin" "1512.000000 1472.000000 40.000000"
 "message" "Cannon room"
 }
-// entity 86
-{
-"classname" "target_speaker"
-"origin" "1600.000000 1000.000000 -168.000000"
-"targetname" "explosion"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 87
+// entity 79
 {
 "classname" "target_speaker"
 "origin" "1408.000000 992.000000 -216.000000"
@@ -7631,7 +7575,7 @@ nexus6/pipe02_64
 "noise" "sound/ambient/water_rush.wav"
 "spawnflags" "2"
 }
-// entity 88
+// entity 80
 {
 "classname" "target_speaker"
 "origin" "1704.000000 984.000000 -216.000000"
@@ -7639,7 +7583,7 @@ nexus6/pipe02_64
 "noise" "sound/ambient/water_rush.wav"
 "spawnflags" "2"
 }
-// entity 89
+// entity 81
 {
 "classname" "target_rumble"
 "origin" "1608.000000 1984.000000 -48.000000"
@@ -7647,14 +7591,7 @@ nexus6/pipe02_64
 "count" "1"
 "targetname" "explosion"
 }
-// entity 90
-{
-"classname" "target_speaker"
-"origin" "1480.000000 1000.000000 -168.000000"
-"targetname" "explosion"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 91
+// entity 82
 {
 "classname" "target_speaker"
 "origin" "1318.000000 2074.000000 -18.000000"
@@ -7662,13 +7599,13 @@ nexus6/pipe02_64
 "noise" "sound/analmango/computer2.wav"
 "angle" "-24.582417"
 }
-// entity 92
+// entity 83
 {
 "classname" "light"
 "origin" "1390.000000 2018.000000 -10.000000"
 "light" "30"
 }
-// entity 93
+// entity 84
 {
 "classname" "target_speaker"
 "origin" "1400.000000 2018.000000 -10.000000"
@@ -7676,7 +7613,7 @@ nexus6/pipe02_64
 "noise" "sound/analmango/computer6.wav"
 "angle" "-24.582417"
 }
-// entity 94
+// entity 85
 {
 "classname" "target_speaker"
 "origin" "1536.000000 2168.000000 -56.000000"