Improved list_zone, list_ships

Ship price and cargo size

2 files changed, 37 insertions, 9 deletions

diff --git a/doc/STORYLINE b/doc/STORYLINE
index 06de127..06831a2 100644
--- a/doc/STORYLINE
+++ b/doc/STORYLINE
@@ -42,7 +42,7 @@
 		planet Brogha
 		Cantor observatory
 
-	- Whendune system
+	- Antwerp system
 
 
 	HOUSE LINDBLADE
@@ -89,8 +89,8 @@
   ------------------------------------------------------------------
 	TIMELINE
 
-	Exodus			-5000 years
-	Great War		 -300 years
+	Exodus					-5300 years
+	Great War		 		 -300 years
 	The Karelian Incident	  -50 years
 
   ------------------------------------------------------------------
@@ -210,11 +210,20 @@ The Alliance
 	through the Emperial forces like a knight with his spear, gave birth to the name 
 	"Battle of The Lance".
 	
-Turning of the Tide
+Wrath of the Fallen
 
+	The death of their Supreme Commander came as a shock to the Tsu-Khan. No one had expected
+	any serious level of resistance from tehese primitive humands, and a succesfull attack on
+	their fleet had been considered extremely unlikely. A wave of wrath and bloodlust swept
+	through the Empire, and left it with only one purpose: the total annihilation of mankind.
+
+	Their wrath was brutal.
+
+	// explain it took another 4 years of messing around to finish the war
 
 Project Osirion
 
+	 
 
 The Karelian Incident
 
diff --git a/doc/models.html b/doc/models.html
index 28ba9c7..740bc3d 100644
--- a/doc/models.html
+++ b/doc/models.html
@@ -224,11 +224,19 @@
 	small diference: the size of the flare is set through the radius
 	value. The default flare radius is 100. Rotate the entity or set the
 	angle value to point the flare in a different direction.
-<p>
-	Use the <i>engine</i> option (spawnflag 4) To create a flare that
+</p><p>
+	Setting the <i>entity</i> option (spawnflag 2) will assign the entities
+	primary colour as flare colour.
+</p><p>
+	Use the <i>engine</i> option (spawnflag 4) to create a flare that
 	lights up depending on engine power.
-<p>
-	<i>fx_flare</i> entities can only be rotated in the XY-plane.
+</p><p>
+	The direction of the flare can be set with the <i>direction</i>,
+	<i>pitch</i> and <i>roll</i> keys. <i>angle</i> is an alias for
+	<i>direction</i>.
+</p><p>
+	Flares will only be rendered if the entity is within detail range.
+</p>
 
 <h2 id="particles">
 	Particles
@@ -240,7 +248,17 @@
 </p><p>
 	The <i>script</i> value must be set to the label of the particles script.
 </p><p>
-	Particles will only be rendered if the model is within detail range.
+	Setting the <i>entity</i> option (spawnflag 2) will assign the entities
+	primary colour as particle system colour.
+</p><p>
+	Use the <i>engine</i> option (spawnflag 4) will assign the models engine colour
+	as particle system colour.
+</p><p>
+	The direction of the particle system can be set with the <i>direction</i>,
+	<i>pitch</i> and <i>roll</i> keys. <i>angle</i> is an alias for
+	<i>direction</i>.
+</p><p>
+	Particles will only be rendered if the entity is within detail range.
 </p>
 <h2 id="groups">
 	Function groups
@@ -258,6 +276,7 @@
 <p>
 	<i>func_rotate</i> will create a rotating set of brushes. The center of the rotation
 	is automaticly calculated as the geometrical center of the group.
+	The rotation axis can be set with the <i>direction</i>,	<i>pitch</i> and <i>roll</i> keys. <i>angle</i> is an alias for <i>direction</i>.
 </p>
 <h2 id="other_entities">
 	Other entities