Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-09-24 19:18:45 +0000
committerStijn Buys <ingar@osirion.org>2013-09-24 19:18:45 +0000
commit053ccd3071e5b9a6500568479d8333a49143fee6 (patch)
tree8349ecdd771e529b8e146f7cc006f136285b8150
parent39ccc601743d37bc61277e82bb4a69c04c8b299a (diff)
Improved particles on the Winsor and the Avatar,
adds weapon slots to the Avatar.
-rw-r--r--base/maps/lindblade/avatar.map87
-rw-r--r--base/maps/lindblade/winsor.map10
2 files changed, 81 insertions, 16 deletions
diff --git a/base/maps/lindblade/avatar.map b/base/maps/lindblade/avatar.map
index e69e630..ab84d8f 100644
--- a/base/maps/lindblade/avatar.map
+++ b/base/maps/lindblade/avatar.map
@@ -2883,29 +2883,30 @@ colors/grey50
// entity 1
{
"classname" "light"
-"origin" "0 -240 -24"
-"light" "9"
+"origin" "-88.000000 -232.000000 -24.000000"
+"light" "4"
"_color" "0.393027 1 0"
"time" "0.5"
-"offset" "0.5"
+"offset" "1.25"
"spawnflags" "1"
"frequency" "0.5"
}
// entity 2
{
"classname" "light"
-"origin" "0 240 -24"
-"light" "9"
+"origin" "-88.000000 232.000000 -24.000000"
+"light" "4"
"_color" "1 0 0.0567788"
"time" "0.5"
"spawnflags" "1"
"frequency" "0.5"
+"offset" "1.0"
}
// entity 3
{
"classname" "light"
-"origin" "0 0 -72"
-"light" "9"
+"origin" "0.000000 0.000000 -64.000000"
+"light" "4"
"_color" "1 1 1"
"time" "0.5"
"offset" "0.25"
@@ -2915,8 +2916,8 @@ colors/grey50
// entity 4
{
"classname" "light"
-"origin" "0 0 72"
-"light" "9"
+"origin" "0.000000 0.000000 52.000000"
+"light" "4"
"_color" "1 1 1"
"time" "0.5"
"offset" "0.25"
@@ -2928,7 +2929,8 @@ colors/grey50
"classname" "fx_particles"
"origin" "-220.000000 212.000000 -28.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "lindblade_engine"
+"scale" "8"
}
// entity 6
{
@@ -2985,7 +2987,8 @@ colors/grey50
"classname" "fx_particles"
"origin" "-220.000000 -212.000000 -28.000000"
"angle" "180.000000"
-"script" "engine_exhaust"
+"script" "lindblade_engine"
+"scale" "8"
}
// entity 14
{
@@ -3037,3 +3040,65 @@ colors/grey50
"light" "32"
"spawnflags" "4"
}
+// entity 21
+{
+"classname" "light"
+"origin" "56.000000 232.000000 -24.000000"
+"light" "4"
+"_color" "1 0 0.0567788"
+"time" "0.5"
+"spawnflags" "1"
+"frequency" "0.5"
+"offset" "0.0"
+}
+// entity 22
+{
+"classname" "light"
+"origin" "56.000000 -232.000000 -24.000000"
+"light" "4"
+"_color" "0.393027 1 0"
+"time" "0.5"
+"offset" "0.25"
+"spawnflags" "1"
+"frequency" "0.5"
+}
+// entity 23
+{
+"classname" "location_cannon"
+"origin" "336.000000 -96.000000 -16.000000"
+}
+// entity 24
+{
+"classname" "location_cannon"
+"origin" "336.000000 96.000000 -16.000000"
+}
+// entity 25
+{
+"classname" "location_cannon"
+"origin" "-168.000000 0.000000 -72.000000"
+"angle" "-179.999985"
+}
+// entity 26
+{
+"classname" "location_turret"
+"origin" "144.000000 256.000000 -32.000000"
+"angle" "89.999992"
+}
+// entity 27
+{
+"classname" "location_turret"
+"origin" "-176.000000 256.000000 -32.000000"
+"angle" "90.000000"
+}
+// entity 28
+{
+"classname" "location_turret"
+"origin" "-176.000000 -256.000000 -32.000000"
+"angle" "-90.000000"
+}
+// entity 29
+{
+"classname" "location_turret"
+"origin" "144.000000 -256.000000 -32.000000"
+"angle" "-90.000000"
+}
diff --git a/base/maps/lindblade/winsor.map b/base/maps/lindblade/winsor.map
index 17e5460..a6f6e26 100644
--- a/base/maps/lindblade/winsor.map
+++ b/base/maps/lindblade/winsor.map
@@ -3116,7 +3116,7 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-256.000000 -184.000000 -16.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "lindblade_engine"
"scale" "0.9"
}
// entity 3
@@ -3156,7 +3156,7 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-360.000000 0.000000 24.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "lindblade_engine"
"scale" "1.5"
}
// entity 8
@@ -3229,7 +3229,7 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-256.000000 184.000000 -16.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "lindblade_engine"
"scale" "0.9"
}
// entity 18
@@ -3237,7 +3237,7 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-360.000000 96.000000 24.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "lindblade_engine"
"scale" "0.5"
}
// entity 19
@@ -3245,7 +3245,7 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-360.000000 -96.000000 24.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "lindblade_engine"
"scale" "0.5"
}
// entity 20