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>2008-05-04 12:02:53 +0000
committerStijn Buys <ingar@osirion.org>2008-05-04 12:02:53 +0000
commite0d59c9b92af6ad1ce32a1ee6cded66ab01e50de (patch)
tree7a2da8edbcaf08ba2ee84b0a7f9afba91afbcae7
parent716b8801866e0c489003fcaa05fb65fef2973d17 (diff)
engine updates
-rw-r--r--base/maps/ships/canasta.map12
-rw-r--r--base/maps/ships/custodian.map66
-rw-r--r--base/maps/ships/orion.map8
-rw-r--r--base/maps/ships/sharkan.map23
-rw-r--r--base/maps/ships/shuttle.map12
-rw-r--r--base/maps/ships/vector.map2
6 files changed, 61 insertions, 62 deletions
diff --git a/base/maps/ships/canasta.map b/base/maps/ships/canasta.map
index 207b010..c3c1d21 100644
--- a/base/maps/ships/canasta.map
+++ b/base/maps/ships/canasta.map
@@ -732,24 +732,28 @@
// entity 1
{
"classname" "target_engine"
-"origin" "-160 -24 0"
+"origin" "-156 -24 0"
"angle" "180"
+"radius" "40"
}
// entity 2
{
"classname" "target_engine"
-"origin" "-160 24 0"
+"origin" "-156 24 0"
"angle" "180"
+"radius" "40"
}
// entity 3
{
"classname" "target_engine"
-"origin" "-64 -80 -8"
+"origin" "-60 -80 -8"
"angle" "180"
+"radius" "40"
}
// entity 4
{
"classname" "target_engine"
-"origin" "-64 80 -8"
+"origin" "-60 80 -8"
"angle" "180"
+"radius" "40"
}
diff --git a/base/maps/ships/custodian.map b/base/maps/ships/custodian.map
index 992b804..4d366df 100644
--- a/base/maps/ships/custodian.map
+++ b/base/maps/ships/custodian.map
@@ -2698,69 +2698,41 @@
// entity 1
{
"classname" "target_engine"
-"origin" "-2912 -160 128"
+"origin" "-2848 -160 128"
"angle" "180"
+"radius" "200"
}
// entity 2
{
"classname" "target_engine"
-"origin" "-2912 160 128"
+"origin" "-2848 160 128"
"angle" "180"
+"radius" "200"
}
// entity 3
{
"classname" "target_engine"
-"origin" "-2912 160 384"
+"origin" "-2848 160 384"
"angle" "180"
+"radius" "200"
}
// entity 4
{
"classname" "target_engine"
-"origin" "-2912 -160 384"
+"origin" "-2848 -160 384"
"angle" "180"
+"radius" "200"
}
// entity 5
{
"classname" "light"
-"origin" "-2848 -160 128"
-"light" "150"
-"_color" "1 0 0"
-"flare" "1"
-}
-// entity 6
-{
-"classname" "light"
-"origin" "-2848 160 128"
-"light" "150"
-"_color" "1 0 0"
-"flare" "1"
-}
-// entity 7
-{
-"classname" "light"
-"origin" "-2848 -160 384"
-"light" "150"
-"_color" "1 0 0"
-"flare" "1"
-}
-// entity 8
-{
-"classname" "light"
-"origin" "-2848 160 384"
-"light" "150"
-"_color" "1 0 0"
-"flare" "1"
-}
-// entity 9
-{
-"classname" "light"
"origin" "16 560 96"
"light" "25"
"spawnflags" "1"
"time" "0.25"
"offset" "0.75"
}
-// entity 10
+// entity 6
{
"classname" "light"
"origin" "16 976 96"
@@ -2770,7 +2742,7 @@
"time" "0.25"
"offset" "0.5"
}
-// entity 11
+// entity 7
{
"classname" "light"
"origin" "-2048 0 624"
@@ -2781,7 +2753,7 @@
"_color" "1 0 0"
"offset" ".75"
}
-// entity 12
+// entity 8
{
"classname" "light"
"origin" "16 -976 96"
@@ -2791,7 +2763,7 @@
"time" "0.25"
"offset" "0.5"
}
-// entity 13
+// entity 9
{
"classname" "light"
"origin" "16 976 -96"
@@ -2801,7 +2773,7 @@
"time" "0.25"
"offset" "0.25"
}
-// entity 14
+// entity 10
{
"classname" "light"
"origin" "16 560 -96"
@@ -2810,7 +2782,7 @@
"frequency" "1"
"time" "0.25"
}
-// entity 15
+// entity 11
{
"classname" "light"
"origin" "16 -976 -96"
@@ -2819,7 +2791,7 @@
"time" "0.25"
"offset" "0.25"
}
-// entity 16
+// entity 12
{
"classname" "light"
"origin" "16 -560 -96"
@@ -2828,7 +2800,7 @@
"frequency" "1.001"
"time" "0.25"
}
-// entity 17
+// entity 13
{
"classname" "light"
"origin" "16 -560 96"
@@ -2838,7 +2810,7 @@
"time" "0.25"
"offset" "0.75"
}
-// entity 18
+// entity 14
{
"classname" "light"
"origin" "64 0 560"
@@ -2847,7 +2819,7 @@
"time" "0.15"
"frequency" "1"
}
-// entity 19
+// entity 15
{
"classname" "light"
"origin" "320 0 544"
@@ -2858,7 +2830,7 @@
"_color" "1 0 0"
"offset" ".5"
}
-// entity 20
+// entity 16
{
"classname" "target_cockpit"
"origin" "-1728 0 640"
diff --git a/base/maps/ships/orion.map b/base/maps/ships/orion.map
index cbb5ff4..6551d4a 100644
--- a/base/maps/ships/orion.map
+++ b/base/maps/ships/orion.map
@@ -646,14 +646,16 @@
// entity 1
{
"classname" "target_engine"
-"origin" "-152 -64 0"
+"origin" "-156 -64 0"
"angle" "180"
+"radius" "50"
}
// entity 2
{
"classname" "target_engine"
-"origin" "-152 64 0"
+"origin" "-156 64 0"
"angle" "180"
+"radius" "50"
}
// entity 3
{
@@ -662,6 +664,7 @@
"light" "20"
"spawnflags" "1"
"offset" "0.5"
+"time" ".2"
}
// entity 4
{
@@ -681,4 +684,5 @@
"origin" "56 0 52"
"light" "20"
"spawnflags" "1"
+"time" ".2"
}
diff --git a/base/maps/ships/sharkan.map b/base/maps/ships/sharkan.map
index 421c95e..c8e8c71 100644
--- a/base/maps/ships/sharkan.map
+++ b/base/maps/ships/sharkan.map
@@ -188,6 +188,7 @@
"classname" "target_engine"
"origin" "-78 0 0"
"angle" "180"
+"radius" "40"
}
// entity 2
{
@@ -198,16 +199,28 @@
// entity 3
{
"classname" "light"
-"origin" "-64 -96 0"
-"light" "25"
+"origin" "-60 -92 14"
+"light" "20"
"_color" "1 0 0"
"spawnflags" "1"
+"time" ".2"
}
// entity 4
{
"classname" "light"
-"origin" "-64 96 0"
-"light" "25"
-"_color" "1 0 0"
+"origin" "-60 92 14"
+"light" "20"
+"_color" "0 1 0"
+"spawnflags" "1"
+"time" ".2"
+}
+// entity 5
+{
+"classname" "light"
+"origin" "-60 0 80"
+"light" "15"
+"time" ".1"
+"offset" ".5"
+"frequency" "1.3"
"spawnflags" "1"
}
diff --git a/base/maps/ships/shuttle.map b/base/maps/ships/shuttle.map
index 3fc425a..b844146 100644
--- a/base/maps/ships/shuttle.map
+++ b/base/maps/ships/shuttle.map
@@ -618,24 +618,28 @@
// entity 1
{
"classname" "target_engine"
-"origin" "-192 -48 -32"
+"origin" "-184 -48 -32"
"angle" "180"
+"radius" "30"
}
// entity 2
{
"classname" "target_engine"
-"origin" "-192 48 -32"
+"origin" "-184 48 -32"
"angle" "180"
+"radius" "30"
}
// entity 3
{
"classname" "target_engine"
-"origin" "-192 -40 32"
+"origin" "-184 -40 32"
"angle" "180"
+"radius" "30"
}
// entity 4
{
"classname" "target_engine"
-"origin" "-192 40 32"
+"origin" "-184 40 32"
"angle" "180"
+"radius" "30"
}
diff --git a/base/maps/ships/vector.map b/base/maps/ships/vector.map
index aaca984..b79d24c 100644
--- a/base/maps/ships/vector.map
+++ b/base/maps/ships/vector.map
@@ -966,12 +966,14 @@
"classname" "target_engine"
"origin" "-176 72 -8"
"angle" "180"
+"radius" "25"
}
// entity 2
{
"classname" "target_engine"
"origin" "-176 -72 -8"
"angle" "180"
+"radius" "25"
}
// entity 3
{