added Ikarus Satellite, update gtkradiant entities.def

2 files changed, 55 insertions, 49 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
diff --git a/gtkradiant/osirion.game/base/entities.def b/gtkradiant/osirion.game/base/entities.def
index 6f0f95b..322ce46 100644
--- a/gtkradiant/osirion.game/base/entities.def
+++ b/gtkradiant/osirion.game/base/entities.def
@@ -1,31 +1,34 @@
-/*QUAKED worldspawn (0 0 0) 
-"name"		name of the model
-"scale"		size divider, default is 64
+/*QUAKED worldspawn (0 0 0) ?
+The building blocks of the model
 
-the building blocks of the model
+"name"		name of the model
 */
 
-/*QUAKED target_engine (1 0 0) (-8 -8 -8) (8 8 8) engine exhaust
-"model"		name of the engine model, default is none
-
+/*QUAKED target_engine (1 0 0) (-8 -8 -8) (8 8 8) ?
 An engine exhaust attached to the model. In-game an exhaust plume 
 will be rendered if the entities engines are running
+
+"model"		name of the engine model, default is none
 */
 
-/*QUAKED target_cannon (0 0 1) (-8 -8 -8) (8 8 8) cannon attachment point
-"model"		name of the cannon model, default is none
+/*QUAKED target_cannon (0 0 1) (-8 -8 -8) (8 8 8) ?
+Provides the model with a cannon (not implemented)
 
-Provides the model with a cannon
+"model"		name of the cannon model, default is none
 */
 
-/*QUAKED target_turret (0.5 0.5 1) (-8 -8 -8) (8 8 8) turret attachment point
-"model"		name of the turret model, default is none
+/*QUAKED target_turret (0.5 0.5 1) (-8 -8 -8) (8 8 8) ?
+Provides the model with a turret (not implemented)
 
-Provides the model with a turret
+"model"		name of the turret model, default is none
 */
 
-/*QUAKED info_cockpit (0 1 0) (-8 -8 -8) (8 8 8)
-
-Location of the cockpit
+/*QUAKED info_cockpit (0 1 0) (-8 -8 -8) (8 8 8) ?
+Location of the cockpit (not implemented)
 */
 
+/*QUAKED light (1 1 1) (-8 -8 -8) (8 8 8) strobe
+A small exterior light
+
+strobe		make a strobe light
+*/
\ No newline at end of file