World updates, added missing jumpgates to Dagon space.

7 files changed, 85 insertions, 9 deletions

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 9f3995e..5d07536 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -64,7 +64,7 @@ label=praetoria
 name=House Praetoria
 color=217 131 0
 
-[reputation]
+	[reputation]
 	faction=default
 	reputation=0
 	
@@ -75,6 +75,7 @@ color=217 131 0
 [faction]
 label=courier
 name=PEX
+color=217 131 0
 
 info=The PEX courier service is probably the fastest and safest way to transport mail and small packages accross the galaxy.
 info=For Praetorian Express, safe transport is the corporate motto, and while the company usually delivers on its promises
@@ -105,18 +106,30 @@ name=House Dagon
 color=0.2 0.5 0.2
 colorsecond=0.2 0.8 0.2
 
+	[reputation]
+	faction=default
+	reputation=0
+
 [faction]
 label=miners
 name=JMA
 color=106 95 87
 colorsecond=152 166 169
 
+	[reputation]
+	faction=default
+	reputation=0
+
 [faction]
 label=research
 name=Universal Research
 colorsecond=152 166 169
 color=106 95 87
 
+	[reputation]
+	faction=default
+	reputation=0
+	
 [faction]
 label=mercenaries
 name=Mercenaries Guild
@@ -150,6 +163,10 @@ info=Pirates are bad guys who want to steal your cargo.
 	[reputation]
 	faction=militia
 	reputation=-100
+	
+	[reputation]
+	faction=courier
+	reputation=-100
 
 [faction]
 label=camorra
@@ -160,6 +177,10 @@ colorsecond=0.2 0.2 0.2
 	[reputation]
 	faction=default
 	reputation=-100
+	
+	[reputation]
+	faction=courier
+	reputation=-100
 
 ; tsu-khan factions
 [faction]
diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 7019359..35aa3c5 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -69,6 +69,8 @@ name=Improved laser cannon
 price=9000
 level=5
 model=models/weapons/laser/laser2
+; info text
+info=The improved laser laser cannon packs more punch than the standard variant.
 
 	[projectile]
 	; speed of a projectile generated by this weapon, in meters per second
@@ -161,9 +163,11 @@ level=15
 [cannon]
 label=blaster1
 name=Blaster cannon
-info=Basic pewpew
 price=5500
 level=1
+info=The blaster cannon is a fast-firing weapon 
+info=which uses photo-magnetic condensor coils the channel
+info=energy into compact bolts of energy.
 
 	[projectile]
 	; speed of a projectile generated by this weapon, in meters per second
@@ -184,7 +188,7 @@ level=1
 [cannon]
 label=blaster2
 name=Improved Blaster cannon
-info=Improved pewpew
+info=Improved version of the blaster cannon.
 price=14000
 level=8
 
@@ -207,7 +211,7 @@ level=8
 [turret]
 label=turretblaster1
 name=Blaster turret
-info=Basic pewpew
+info=Standard issue blaster turret.
 price=6500
 level=1
 
@@ -347,7 +351,7 @@ level=25
 
 [turret]
 label=turretneutron2
-name=Neutron turret
+name=Improved neutron turret
 price=150000
 level=25
 
diff --git a/base/ini/zones/ashran.ini b/base/ini/zones/ashran.ini
index 8d6b14a..c4a31f0 100644
--- a/base/ini/zones/ashran.ini
+++ b/base/ini/zones/ashran.ini
@@ -15,3 +15,18 @@ ambient=0.1 0.1 0.1
 faction=dagon
 
 info=The Ashran system.
+
+[jumpgate]
+label=jumpgate_dagon
+location=-1212 324 0
+angles=0 -5 0
+target=dagon:jumpgate_ashran
+faction=dagon
+
+[star]
+label=star
+name=class B star
+location=1584 1568 0
+angles=0 190 0
+radius=132
+color=210 246 255
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index d110827..6c8cb82 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -74,6 +74,7 @@ info=Planet Brogha is the largest exporter of agricultural products in the Indep
 
 	[cargo]
 	label=water
+	price=5
 	amount=-1
 	
 	[cargo]
diff --git a/base/ini/zones/dagon.ini b/base/ini/zones/dagon.ini
index 44295dd..682f937 100644
--- a/base/ini/zones/dagon.ini
+++ b/base/ini/zones/dagon.ini
@@ -27,12 +27,18 @@ dock=yes
 color=255 255 255
 infoname=House Dagon capital
 
+	[cargo]
+	label=water
+	price=5
+	amount=-1
+
 [jumpgate]
 label=jumpgate_rasheen
-location=-1096 612 0
-angles=0 -35 0
+location=-264 1420 0
+angles=0 -69 0
 target=rasheen:jumpgate_dagon
 faction=dagon
+
 [star]
 label=star
 name=class F star
@@ -40,3 +46,18 @@ location=-80 -1600 0
 angles=0 90 0
 radius=90
 color=255 255 255
+
+[jumpgate]
+label=jumpgate_ashran
+location=1464 -316 0
+angles=0 160 0
+target=ashran:jumpgate_dagon
+faction=dagon
+
+[jumpgate]
+label=jumpgate_xibalba
+location=-1096 -588 0
+angles=0 28 0
+target=xibalba:jumpgate_dagon
+faction=dagon
+
diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini
index e83f103..e0d44c6 100644
--- a/base/ini/zones/hellas.ini
+++ b/base/ini/zones/hellas.ini
@@ -49,7 +49,7 @@ radius=10
 model=maps/common/border_station_02
 faction=courier
 color=255 255 255
-
+colorsecond=217 131 0
 infoname=Praetorian Express headquarters
 info=After much debate, the senate gave its consent to the relocation of
 info=Praetorian Express' headquarters to the Hellas system in 535 A.E.
diff --git a/base/ini/zones/xibalba.ini b/base/ini/zones/xibalba.ini
index 24b7789..0fefdd4 100644
--- a/base/ini/zones/xibalba.ini
+++ b/base/ini/zones/xibalba.ini
@@ -18,8 +18,22 @@ info=The Xibalba system.
 
 [jumpgate]
 label=jumpgate_oran
-location=-60 960 0
+location=-340 1296 0
 angles=0 -75 0
 target=oran:jumpgate_xibalba
 faction=dagon
 
+[jumpgate]
+label=jumpgate_dagon
+location=1084 -384 0
+angles=0 160 0
+target=dagon:jumpgate_xibalba
+faction=dagon
+
+[star]
+label=star
+name=class O star
+location=-584 -1664 0
+angles=0 90 0
+radius=256
+color=210 246 255