Updated ship trading definitions in throughout Lindblade space,

added rings to planet Antwerp,
updated corona  keys.

12 files changed, 39 insertions, 19 deletions

diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 3444d8c..5450903 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -55,6 +55,8 @@ level=1
 	damage=5
 	; projectile model
 	model=blaster1
+	; sound to play if the projectile is fired
+	sound=blaster
 
 [cannon]
 label=blaster2
@@ -76,6 +78,8 @@ level=8
 	damage=15
 	; projectile model
 	model=blaster2
+	; sound to play if the projectile is fired
+	sound=blaster
 
 ; ------------------------------------------------------------------
 ; lasers are used by Merchants
@@ -101,6 +105,8 @@ level=1
 	damage=10
 	; projectile model	
 	model=laser1
+	; sound to play if the projectile is fired
+	sound=laser
 
 [cannon]
 label=laser2
@@ -121,6 +127,8 @@ level=5
 	damage=15
 	; projectile model	
 	model=laser2
+	; sound to play if the projectile is fired
+	sound=laser
 	
 [cannon]
 label=laser3
@@ -141,6 +149,8 @@ level=15
 	damage=25
 	; projectile model	
 	model=laser2
+	; sound to play if the projectile is fired
+	sound=laser
 	
 [cannon]
 label=neutron1
@@ -161,6 +171,8 @@ level=25
 	damage=25
 	; projectile model	
 	model=neutron1
+	; sound to play if the projectile is fired
+	sound=neutron
 
 [cannon]
 label=metrion1
diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
index 708aa6c..0ef0964 100644
--- a/base/ini/zones/albion.ini
+++ b/base/ini/zones/albion.ini
@@ -35,6 +35,9 @@ dock=yes
 location=-224 0 0
 yaw=140
 
+	[ship]
+	label=winsor
+
 	[cargo]
 	label=water
 	price=5
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 01b01e1..2355c58 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -28,7 +28,7 @@ location=256 -1512 0
 color=248 248 255
 ; [float] entity radius (10 game units == 1km ingame)
 radius=88
-corona=plain
+corona=corona/plain
 
 ; ------------------------------------------------------------------ 
 ; STARBASE HELIANTHOS
@@ -43,9 +43,6 @@ colorsecond=0 1 0
 location=512 -512 0
 
 	[ship]
-	label=sharkan
-
-	[ship]
 	label=tiger
 
 	[cargo]
@@ -59,7 +56,7 @@ location=512 -512 0
 	amount=0
 	
 	[weapon]
-	label=laser2
+	label=blaster1
 	amount=-1
 
 ; ------------------------------------------------------------------ 
@@ -69,6 +66,7 @@ location=512 -512 0
 label=antwerp
 name=planet Antwerp
 texture=planets/antwerp
+;rings=planets/antwerp_rings
 info=Planet Antwerp is the headquarters of the colonial militia.
 location=-64 512 32
 yaw=45
@@ -92,13 +90,9 @@ dock=yes
 	label=medicines
 	price=215
 	amount=0
-
 	
 	; available ship types
 	[ship]
-	label=sharkan
-
-	[ship]
 	label=tiger
 	
 	[ship]
diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index 8936f56..cde31b7 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -39,6 +39,12 @@ showonmap=true
 faction=lindblade
 model=maps/lindblade/lindblade_drydock
 
+	[ship]
+	label=winsor
+	
+	[ship]
+	label=halcyon
+	
 	[cargo]
 	label=carbosteel
 	price=750
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index f9ca0c7..af75248 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -43,7 +43,7 @@ location=512 -512 0
 radius=90
 ; [r g b] entity primary color, values in the 0-255 range
 color=255 255 255
-corona=default
+corona=corona/default
 
 ; ------------------------------------------------------------------
 ; PLANET GHANT
@@ -237,9 +237,6 @@ angles=0 305 0
 faction=militia
 
 	[ship]
-	label=sharkan
-
-	[ship]
 	label=tiger
 
 	[cargo]
diff --git a/base/ini/zones/ground.ini b/base/ini/zones/ground.ini
index e1d5f92..bb0ae2f 100644
--- a/base/ini/zones/ground.ini
+++ b/base/ini/zones/ground.ini
@@ -8,6 +8,7 @@
 [zone]
 ; zone name
 name=Ground system
+sky=sky21
 ; ambient color
 ambient=.1 .1 .1
 ; [x y z] galactic location
diff --git a/base/ini/zones/karelia.ini b/base/ini/zones/karelia.ini
index 6ea9a4b..601743e 100644
--- a/base/ini/zones/karelia.ini
+++ b/base/ini/zones/karelia.ini
@@ -20,7 +20,7 @@ name=class A star
 location=0 0 0
 color=255 255 255
 radius=45
-corona=default
+corona=corona/default
 
 ; ------------------------------------------------------------------ 
 ; ANARA JUMPPOINT
diff --git a/base/ini/zones/kor_telos.ini b/base/ini/zones/kor_telos.ini
index cc66262..7ba3144 100644
--- a/base/ini/zones/kor_telos.ini
+++ b/base/ini/zones/kor_telos.ini
@@ -18,7 +18,7 @@ name=class A star
 location=4096 4096 0
 color=255 255 255
 radius=9
-corona=default
+corona=corona/default
 
 [planet]
 label=corthio
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index 8ba4d63..3f67312 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -52,10 +52,13 @@ model=maps/lindblade/lindblade_central
 faction=lindblade
 
 	[ship]
+	label=winsor
+
+	[ship]
 	label=halcyon
 
 	[ship]
-	label=avatar
+	label=supertanker
 
 	[cargo]
 	label=gold
@@ -90,8 +93,8 @@ model=maps/lindblade/station15
 faction=lindblade
 
 	[ship]
-	label=supertanker
-
+	label=winsor
+	
 	[cargo]
 	label=gold
 	price=1425
diff --git a/base/ini/zones/morrigan.ini b/base/ini/zones/morrigan.ini
index 6529a8c..35e740a 100644
--- a/base/ini/zones/morrigan.ini
+++ b/base/ini/zones/morrigan.ini
@@ -46,6 +46,9 @@ model=maps/lindblade/station15
 faction=lindblade
 showonmap=true
 
+	[ship]
+	label=winsor
+	
 	[cargo]
 	label=gold
 	amount=-1
diff --git a/base/ini/zones/yser.ini b/base/ini/zones/yser.ini
index c7e3cb2..9698faa 100644
--- a/base/ini/zones/yser.ini
+++ b/base/ini/zones/yser.ini
@@ -8,6 +8,7 @@
 [zone]
 ; zone name
 name=Yser system
+sky=sky22
 ; ambient color
 ambient=.15 .15 .2
 ; [x y z] galactic location
@@ -26,7 +27,7 @@ label=star
 name=O class star
 location=-1968 -568 24
 angles=0 15 0
-corona=default
+corona=corona/default
 color=.9 .9 1
 
 ; ------------------------------------------------------------------
diff --git a/base/textures/planets/antwerp_rings.png b/base/textures/planets/antwerp_rings.png
new file mode 100644
index 0000000..6e94a6e
--- /dev/null
+++ b/base/textures/planets/antwerp_rings.png