Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-03-09 18:39:19 +0000
committerStijn Buys <ingar@osirion.org>2008-03-09 18:39:19 +0000
commit351c1d6377741b78d6bb8429143b9e049d689d7f (patch)
tree704e02f77a7d62dfe530981f1a21885950a9e846 /base
parentf1eef748e3f1ba63f851731ef37ce287d13509c1 (diff)
added Ikarus Satellite, update gtkradiant entities.def
Diffstat (limited to 'base')
-rw-r--r--base/ini/world.ini69
1 files changed, 36 insertions, 33 deletions
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 28945be..fd7cc42 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -11,7 +11,6 @@ color=255 255 255
;
; ALEXANDRIA STATION
-;
[entity]
name=station: Alexandria
@@ -20,37 +19,18 @@ location=0 -64 0
;color=.9 .75 .55
color=222 192 145
-[entity]
-name=cube: Borg Cube Green
-shape=cube
-radius=1
-location=24 24 0
-color=0 255 0
-
-[entity]
-name=cube: Borg Cube Red
-shape=cube
-radius=1
-location=16 16 0
-color=255 0 0
-
-[entity]
-name=sphere: The Yellow Sphere
-shape=sphere
-radius=1
-location=0 32 0
-color=0.8 0.8 0
+;
+; IKARUS SATELLITE
[entity]
-name=axis: Galactic Origin
-shape=axis
-radius=1
-location=0 0 0
-color=1 1 0
+name=satellite: Ikarus
+model=satellites/ikarus
+location=-32 0 0
+color=0.4 0.4 0.9
+direction=30
;
; SHIPYARD
-;
[entity]
name=ship: Canasta
@@ -109,10 +89,33 @@ location=18.5 18.5 0
color=0.0 0.7 0.2
direction=90
-;[entity]
-;name=Spam
-;model=spam
-;location=-32 0 0
-;color=0.7 0.0 0.0
-;direction=90
+;
+; TEST ENTITIES
+
+[entity]
+name=cube: Borg Cube Green
+shape=cube
+radius=1
+location=24 24 0
+color=0 255 0
+
+[entity]
+name=cube: Borg Cube Red
+shape=cube
+radius=1
+location=16 16 0
+color=255 0 0
+
+[entity]
+name=sphere: The Yellow Sphere
+shape=sphere
+radius=1
+location=0 32 0
+color=0.8 0.8 0
+[entity]
+name=axis: Galactic Origin
+shape=axis
+radius=1
+location=0 0 0
+color=1 1 0