From 300a47793fc11a63c21339c2c47bc2002e0116a8 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 1 Jan 2013 15:20:57 +0000 Subject: Ship updates, support for turrets, welcomed the Lancer as Colonial medium fighter. --- base/maps/colonial/custodian.map | 40 ++++++++++++++++++++++++++ base/maps/merchant/matrix.map | 61 ++++++++++++++++++++++++++++++++-------- base/maps/merchant/scalar.map | 27 ++++++++++++------ 3 files changed, 108 insertions(+), 20 deletions(-) (limited to 'base/maps') diff --git a/base/maps/colonial/custodian.map b/base/maps/colonial/custodian.map index 5e5de8e..2b07934 100644 --- a/base/maps/colonial/custodian.map +++ b/base/maps/colonial/custodian.map @@ -7747,3 +7747,43 @@ "model" "maps/colonial/sections/colonial_window_medium" "angles" "44.999996 90.000000 0.000000" } +// entity 169 +{ +"classname" "location_turret" +"origin" "-192.000000 -1032.000000 128.000000" +"angle" "-89.999992" +} +// entity 170 +{ +"classname" "location_turret" +"origin" "1792.000000 -1032.000000 128.000000" +"angle" "-89.999992" +} +// entity 171 +{ +"classname" "location_turret" +"origin" "-192.000000 1032.000000 128.000000" +"angle" "90.000000" +} +// entity 172 +{ +"classname" "location_turret" +"origin" "1792.000000 1032.000000 128.000000" +"angle" "90.000000" +} +// entity 173 +{ +"classname" "location_cannon" +"origin" "4104.000000 -288.000000 -448.000000" +} +// entity 174 +{ +"classname" "location_cannon" +"origin" "4104.000000 -736.000000 -448.000000" +} +// entity 175 +{ +"classname" "location_turret" +"origin" "-1024.000000 -16.000000 -584.000000" +"angles" "90.000000 0.000000 -0.000000" +} diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map index 29a1233..8787bbe 100644 --- a/base/maps/merchant/matrix.map +++ b/base/maps/merchant/matrix.map @@ -4264,11 +4264,11 @@ colors/grey25_shiny // entity 13 { "classname" "light" -"origin" "192.000000 0.000000 136.000000" +"origin" "-384.000000 0.000000 -88.000000" "light" "8" "spawnflags" "9" "time" ".1" -"offset" ".25" +"offset" ".35" "frequency" ".5" } // entity 14 @@ -5917,19 +5917,14 @@ colors/grey25_shiny // entity 42 { "classname" "location_cannon" -"origin" "264.000000 0.000000 152.000000" -} -// entity 43 -{ -"classname" "location_cannon" "origin" "480.000000 200.000000 0.000000" } -// entity 44 +// entity 43 { "classname" "location_cannon" "origin" "480.000000 -200.000000 0.000000" } -// entity 45 +// entity 44 { "classname" "light" "origin" "-96.000000 0.000000 136.000000" @@ -5938,8 +5933,40 @@ colors/grey25_shiny "time" ".2" "offset" ".7" } +// entity 45 +{ +"classname" "light" +"origin" "-192.000000 0.000000 -88.000000" +"light" "8" +"spawnflags" "9" +"time" ".1" +"offset" ".1" +"frequency" ".5" +} // entity 46 { +"classname" "location_turret" +"origin" "0.000000 0.000000 -136.000000" +"angles" "90.000000 0.000000 -0.000000" +} +// entity 47 +{ +"classname" "location_turret" +"origin" "0.000000 0.000000 136.000000" +"angles" "-90.000000 0.000000 -0.000000" +} +// entity 48 +{ +"classname" "light" +"origin" "192.000000 0.000000 136.000000" +"light" "8" +"spawnflags" "9" +"time" ".1" +"offset" ".25" +"frequency" ".5" +} +// entity 49 +{ "classname" "light" "origin" "-192.000000 0.000000 136.000000" "light" "8" @@ -5948,13 +5975,23 @@ colors/grey25_shiny "offset" "1.25" "frequency" ".5" } -// entity 47 +// entity 50 { "classname" "light" -"origin" "0.000000 0.000000 136.000000" +"origin" "192.000000 0.000000 -88.000000" +"light" "8" +"spawnflags" "9" +"time" ".1" +"offset" ".1" +"frequency" ".5" +} +// entity 51 +{ +"classname" "light" +"origin" "384.000000 0.000000 -88.000000" "light" "8" "spawnflags" "9" "time" ".1" -"offset" ".75" +"offset" ".35" "frequency" ".5" } diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map index b39a82b..f21c177 100644 --- a/base/maps/merchant/scalar.map +++ b/base/maps/merchant/scalar.map @@ -2007,10 +2007,11 @@ colors/grey75 // entity 9 { "classname" "light" -"origin" "-176.000000 0.000000 -26.000000" +"origin" "-176.000000 -32.000000 -26.000000" "light" "4" "time" "0.1" "spawnflags" "1" +"offset" ".15" } // entity 10 { @@ -2122,24 +2123,34 @@ colors/grey75 // entity 24 { "classname" "location_cannon" -"origin" "64.000000 72.000000 16.000000" +"origin" "168.000000 0.000000 -8.000000" } // entity 25 { -"classname" "location_cannon" -"origin" "64.000000 -72.000000 16.000000" -} -// entity 26 -{ "classname" "fx_flare" "origin" "-66.000000 -72.000000 -24.000000" "spawnflags" "2" "radius" "16" } -// entity 27 +// entity 26 { "classname" "fx_flare" "origin" "-66.000000 72.000000 -24.000000" "spawnflags" "2" "radius" "16" } +// entity 27 +{ +"classname" "light" +"origin" "-176.000000 32.000000 -26.000000" +"light" "4" +"time" "0.1" +"spawnflags" "1" +"offset" ".65" +} +// entity 28 +{ +"classname" "location_turret" +"origin" "-176.000000 0.000000 -32.000000" +"angles" "90.000000 0.000000 -0.000000" +} -- cgit v1.2.3