Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/ini/templates.ini12
-rw-r--r--base/maps/static/cargopod.map (renamed from base/maps/static/cargopod001.map)10
-rw-r--r--base/maps/static/spacemine.map (renamed from base/maps/cargo/pod.map)26
-rw-r--r--base/models/static/spacemine/spacemine.ase (renamed from base/models/cargo/pod/pod.ase)0
4 files changed, 28 insertions, 20 deletions
diff --git a/base/ini/templates.ini b/base/ini/templates.ini
index 8597c8e..652c261 100644
--- a/base/ini/templates.ini
+++ b/base/ini/templates.ini
@@ -13,7 +13,14 @@ radius=0.20
; the cargopod template is used by the game code
[template]
label=cargopod
-model=maps/cargo/pod
+model=maps/static/cargopod
+radius=0.1
+
+; the spacemine template is used by the game code
+[template]
+label=spacemine
+; default mine model
+model=maps/static/spacemine
radius=0.1
; the jumppoint template is used by the game code
@@ -26,5 +33,4 @@ colorsecond=0.6 0.6 0.6
[template]
label=jumpgate
model=maps/static/jumpgate
-radius=8
-
+radius=8 \ No newline at end of file
diff --git a/base/maps/static/cargopod001.map b/base/maps/static/cargopod.map
index c361010..27eb3ee 100644
--- a/base/maps/static/cargopod001.map
+++ b/base/maps/static/cargopod.map
@@ -1165,18 +1165,20 @@
// entity 1
{
"classname" "light"
-"origin" "0 0 -72"
-"light" "5"
+"origin" "0.000000 0.000000 -74.000000"
+"light" "10"
"spawnflags" "1"
"frequency" "0.5"
"offset" "0"
+"_color" "1 0 0"
}
// entity 2
{
"classname" "light"
-"origin" "0 0 72"
-"light" "5"
+"origin" "0.000000 0.000000 74.000000"
+"light" "10"
"spawnflags" "1"
"frequency" "0.5"
"offset" "1"
+"_color" "1 0 0"
}
diff --git a/base/maps/cargo/pod.map b/base/maps/static/spacemine.map
index 1d780b5..0d001d1 100644
--- a/base/maps/cargo/pod.map
+++ b/base/maps/static/spacemine.map
@@ -33,14 +33,14 @@
// entity 1
{
"classname" "misc_model"
-"model" "models/cargo/pod/pod.ase"
+"model" "models/static/spacemine/spacemine.ase"
"modelscale" "4"
}
// entity 2
{
"classname" "light"
"origin" "0.000000 0.000000 60.000000"
-"light" "10"
+"light" "5"
"spawnflags" "1"
"time" "0.2"
"_color" "1 0 0"
@@ -49,7 +49,7 @@
{
"classname" "light"
"origin" "0.000000 0.000000 -60.000000"
-"light" "10"
+"light" "5"
"spawnflags" "1"
"offset" "0.37"
"time" "0.2"
@@ -59,14 +59,14 @@
{
"classname" "light"
"origin" "-41.085648 13.349529 0.000000"
-"light" "5"
+"light" "2"
"offset" "0"
}
// entity 5
{
"classname" "light"
"origin" "34.238037 -11.124607 0.000000"
-"light" "5"
+"light" "2"
"spawnflags" "3"
"offset" "0"
"frequency" "0.5"
@@ -76,14 +76,14 @@
{
"classname" "light"
"origin" "-25.392326 -34.949535 0.000000"
-"light" "5"
+"light" "2"
"offset" "0"
}
// entity 7
{
"classname" "light"
"origin" "21.160271 29.124611 0.000000"
-"light" "5"
+"light" "2"
"spawnflags" "3"
"offset" "0"
"frequency" "0.5"
@@ -93,14 +93,14 @@
{
"classname" "light"
"origin" "25.392326 -34.949535 0.000000"
-"light" "5"
+"light" "2"
"offset" "0"
}
// entity 9
{
"classname" "light"
"origin" "-21.160271 29.124611 0.000000"
-"light" "5"
+"light" "2"
"spawnflags" "3"
"offset" "0"
"frequency" "0.5"
@@ -110,14 +110,14 @@
{
"classname" "light"
"origin" "41.085648 13.349529 0.000000"
-"light" "5"
+"light" "2"
"offset" "0"
}
// entity 11
{
"classname" "light"
"origin" "-34.238037 -11.124607 0.000000"
-"light" "5"
+"light" "2"
"spawnflags" "3"
"offset" "0"
"frequency" "0.5"
@@ -127,14 +127,14 @@
{
"classname" "light"
"origin" "0.000000 43.200001 0.000000"
-"light" "5"
+"light" "2"
"offset" "0"
}
// entity 13
{
"classname" "light"
"origin" "0.000000 -36.000000 0.000000"
-"light" "5"
+"light" "2"
"spawnflags" "3"
"offset" "0"
"frequency" "0.5"
diff --git a/base/models/cargo/pod/pod.ase b/base/models/static/spacemine/spacemine.ase
index 0946b3c..0946b3c 100644
--- a/base/models/cargo/pod/pod.ase
+++ b/base/models/static/spacemine/spacemine.ase