2 files changed, 20 insertions, 25 deletions
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index 0972572..f42d26d 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -5917,12 +5917,12 @@ colors/grey25_shiny
 // entity 42
 {
 "classname" "location_cannon"
-"origin" "480.000000 200.000000 0.000000"
+"origin" "384.000000 248.000000 0.000000"
 }
 // entity 43
 {
 "classname" "location_cannon"
-"origin" "480.000000 -200.000000 0.000000"
+"origin" "384.000000 -248.000000 0.000000"
 }
 // entity 44
 {
@@ -5946,13 +5946,13 @@ colors/grey25_shiny
 // entity 46
 {
 "classname" "location_turret"
-"origin" "0.000000 0.000000 -136.000000"
+"origin" "0.000000 0.000000 -184.000000"
 "angles" "90.000000 0.000000 -0.000000"
 }
 // entity 47
 {
 "classname" "location_turret"
-"origin" "0.000000 0.000000 136.000000"
+"origin" "0.000000 0.000000 184.000000"
 "angles" "-90.000000 0.000000 -0.000000"
 }
 // entity 48
diff --git a/base/maps/pirate/raider.map b/base/maps/pirate/raider.map
index 7950607..cd959f6 100644
--- a/base/maps/pirate/raider.map
+++ b/base/maps/pirate/raider.map
@@ -3016,83 +3016,78 @@ detail/tigerstripe_decal_entitysecond
 // entity 1
 {
 "classname" "location_cannon"
-"origin" "450.000000 70.000000 -4.000000"
+"origin" "504.000000 120.000000 0.000000"
 }
 // entity 2
 {
-"classname" "location_cannon"
-"origin" "144.000000 -150.000000 -12.000000"
-}
-// entity 3
-{
-"classname" "location_cannon"
-"origin" "152.000000 -150.000000 12.000000"
-}
-// entity 4
-{
 "classname" "light"
 "origin" "240.000000 -40.000000 66.000000"
 "light" "24"
 "_color" "1 0 0"
 "flare" "4"
 }
-// entity 5
+// entity 3
 {
 "classname" "misc_model"
 "origin" "-16.000000 26.000000 26.000000"
 "model" "maps/pirate/sections/engine_small"
 }
-// entity 6
+// entity 4
 {
 "classname" "misc_model"
 "origin" "-16.000000 92.000000 4.000000"
 "model" "maps/pirate/sections/engine_small"
 }
-// entity 7
+// entity 5
 {
 "classname" "misc_model"
 "origin" "-16.000000 44.000000 -14.000000"
 "model" "maps/pirate/sections/engine_small"
 }
-// entity 8
+// entity 6
 {
 "classname" "misc_model"
 "origin" "-16.000000 -20.000000 -12.000000"
 "model" "maps/pirate/sections/engine_large"
 }
-// entity 9
+// entity 7
 {
 "classname" "fx_particles"
 "origin" "24.000000 184.000000 32.000000"
 "script" "dust_trail"
 }
-// entity 10
+// entity 8
 {
 "classname" "fx_particles"
 "origin" "4.000000 -168.000000 -24.000000"
 "script" "dust_trail"
 }
-// entity 11
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-64.000000 96.000000 56.000000"
 "script" "dust_trail"
 }
-// entity 12
+// entity 10
 {
 "classname" "fx_particles"
 "origin" "-64.000000 -124.000000 61.000000"
 "script" "dust_trail"
 }
-// entity 13
+// entity 11
 {
 "classname" "fx_particles"
 "origin" "4.000000 -168.000000 24.000000"
 "script" "dust_trail"
 }
-// entity 14
+// entity 12
 {
 "classname" "fx_particles"
 "origin" "24.000000 184.000000 -32.000000"
 "script" "dust_trail"
 }
+// entity 13
+{
+"classname" "location_cannon"
+"origin" "504.000000 -184.000000 0.000000"
+}