From afae15c6f948e4d5ef816ba409d0307bf49c399e Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 30 Mar 2011 12:29:09 +0000
Subject: Restored PNG planet textures, added Kor Glaven, Kor Telos and
 Kronenbaden systems. Removed Jolly Roger from the Antwerp system.

---
 base/ini/world.ini                  |   3 +++
 base/ini/zones/antwerp.ini          |  20 ++++++++++----------
 base/ini/zones/kor_glaven.ini       |   7 +++++++
 base/ini/zones/kor_telos.ini        |  19 +++++++++++++++++++
 base/ini/zones/kronenbaden.ini      |  18 ++++++++++++++++++
 base/textures/planets/antwerp.jpg   | Bin 930680 -> 0 bytes
 base/textures/planets/antwerp.png   | Bin 0 -> 4571845 bytes
 base/textures/planets/baden.png     | Bin 0 -> 3140550 bytes
 base/textures/planets/brogha.jpg    | Bin 455357 -> 0 bytes
 base/textures/planets/brogha.png    | Bin 0 -> 2709794 bytes
 base/textures/planets/finnmark.jpg  | Bin 862194 -> 0 bytes
 base/textures/planets/finnmark.png  | Bin 0 -> 3832988 bytes
 base/textures/planets/ghant.jpg     | Bin 637945 -> 0 bytes
 base/textures/planets/ghant.png     | Bin 0 -> 4088182 bytes
 base/textures/planets/kiana.jpg     | Bin 190594 -> 0 bytes
 base/textures/planets/kiana.png     | Bin 0 -> 1609940 bytes
 base/textures/planets/lindblade.jpg | Bin 523427 -> 0 bytes
 base/textures/planets/lindblade.png | Bin 0 -> 1640170 bytes
 base/textures/planets/neutron.jpg   | Bin 117715 -> 0 bytes
 base/textures/planets/neutron.png   | Bin 0 -> 64030 bytes
 base/textures/planets/seymour.jpg   | Bin 559535 -> 0 bytes
 base/textures/planets/seymour.png   | Bin 0 -> 2931263 bytes
 22 files changed, 57 insertions(+), 10 deletions(-)
 create mode 100644 base/ini/zones/kor_glaven.ini
 create mode 100644 base/ini/zones/kor_telos.ini
 create mode 100644 base/ini/zones/kronenbaden.ini
 delete mode 100644 base/textures/planets/antwerp.jpg
 create mode 100644 base/textures/planets/antwerp.png
 create mode 100644 base/textures/planets/baden.png
 delete mode 100644 base/textures/planets/brogha.jpg
 create mode 100644 base/textures/planets/brogha.png
 delete mode 100644 base/textures/planets/finnmark.jpg
 create mode 100644 base/textures/planets/finnmark.png
 delete mode 100644 base/textures/planets/ghant.jpg
 create mode 100644 base/textures/planets/ghant.png
 delete mode 100644 base/textures/planets/kiana.jpg
 create mode 100644 base/textures/planets/kiana.png
 delete mode 100644 base/textures/planets/lindblade.jpg
 create mode 100644 base/textures/planets/lindblade.png
 delete mode 100644 base/textures/planets/neutron.jpg
 create mode 100644 base/textures/planets/neutron.png
 delete mode 100644 base/textures/planets/seymour.jpg
 create mode 100644 base/textures/planets/seymour.png

diff --git a/base/ini/world.ini b/base/ini/world.ini
index 21f3169..c79b233 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -13,6 +13,7 @@
 zone=ghant
 zone=brogha
 zone=antwerp
+zone=kronenbaden
 
 ; neutral systems
 zone=eastend
@@ -21,6 +22,8 @@ zone=finnmark
 ; borderworlds
 zone=karelia
 zone=anara
+zone=kor_glaven
+zone=kor_telos
 
 ; lindblade space
 zone=lindblade
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 69a5bef..2ac05fb 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -86,20 +86,20 @@ radius=20
 	[cargo]
 	label=liquor
 	price=450
-	amount=-1
+	amount=0
 
 	[cargo]
 	label=carbosteel
 	price=500
 	amount=0
 
-[station]
-ship=juggernaut
-label=jollyroger
-name=Jolly Roger
-faction=pirates
-location=-768 1260 4
-yaw=5
+;[station]
+;ship=juggernaut
+;label=jollyroger
+;name=Jolly Roger
+;faction=pirates
+;location=-768 1260 4
+;yaw=5
 
 ; ------------------------------------------------------------------ 
 ; GHANT JUMPGATE
@@ -107,7 +107,7 @@ yaw=5
 [navpoint]
 label=navpoint_south
 name=Navigation point South
-location=-1024 0 0
+location=-932 128 0
 
 [jumpgate]
 label=jumpgate_ghant
@@ -115,7 +115,7 @@ label=jumpgate_ghant
 model=maps/pirate/jumpgate
 target=ghant:jumpgate_antwerp
 faction=pirates
-location=-1048 0 8
+location=-950 128 8
 yaw=0
 
 ; ------------------------------------------------------------------ 
diff --git a/base/ini/zones/kor_glaven.ini b/base/ini/zones/kor_glaven.ini
new file mode 100644
index 0000000..5211708
--- /dev/null
+++ b/base/ini/zones/kor_glaven.ini
@@ -0,0 +1,7 @@
+;
+; kor_glaven.ini
+; world description for Kor Glaven
+;
+
+[zone]
+name=Kor Glaven
diff --git a/base/ini/zones/kor_telos.ini b/base/ini/zones/kor_telos.ini
new file mode 100644
index 0000000..3c133de
--- /dev/null
+++ b/base/ini/zones/kor_telos.ini
@@ -0,0 +1,19 @@
+;
+; kor_telos.ini
+; world description for Kor Telos
+;
+
+[zone]
+name=Kor Telos
+
+[planet]
+label=corthio
+name=planet Corthio
+location=-600 456 65
+
+[planet]
+label=andros
+name=planet Andros
+location=789 -800 -96
+
+
diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini
new file mode 100644
index 0000000..0422a37
--- /dev/null
+++ b/base/ini/zones/kronenbaden.ini
@@ -0,0 +1,18 @@
+;
+; kronenbaden.ini
+; world description for the Kronenbaden System
+;
+
+[zone]
+name=Kronenbaden system
+
+[planet]
+label=Baden
+name=planet Baden
+location=600 -400 -64
+texture=planets/baden
+
+[planet]
+label=krone
+name=planet Krone
+location=-800 512 128
\ No newline at end of file
diff --git a/base/textures/planets/antwerp.jpg b/base/textures/planets/antwerp.jpg
deleted file mode 100644
index 5fd8348..0000000
Binary files a/base/textures/planets/antwerp.jpg and /dev/null differ
diff --git a/base/textures/planets/antwerp.png b/base/textures/planets/antwerp.png
new file mode 100644
index 0000000..d6e0856
Binary files /dev/null and b/base/textures/planets/antwerp.png differ
diff --git a/base/textures/planets/baden.png b/base/textures/planets/baden.png
new file mode 100644
index 0000000..518252f
Binary files /dev/null and b/base/textures/planets/baden.png differ
diff --git a/base/textures/planets/brogha.jpg b/base/textures/planets/brogha.jpg
deleted file mode 100644
index bde518e..0000000
Binary files a/base/textures/planets/brogha.jpg and /dev/null differ
diff --git a/base/textures/planets/brogha.png b/base/textures/planets/brogha.png
new file mode 100644
index 0000000..489b5e9
Binary files /dev/null and b/base/textures/planets/brogha.png differ
diff --git a/base/textures/planets/finnmark.jpg b/base/textures/planets/finnmark.jpg
deleted file mode 100644
index bc7b834..0000000
Binary files a/base/textures/planets/finnmark.jpg and /dev/null differ
diff --git a/base/textures/planets/finnmark.png b/base/textures/planets/finnmark.png
new file mode 100644
index 0000000..7d773b7
Binary files /dev/null and b/base/textures/planets/finnmark.png differ
diff --git a/base/textures/planets/ghant.jpg b/base/textures/planets/ghant.jpg
deleted file mode 100644
index 7e31954..0000000
Binary files a/base/textures/planets/ghant.jpg and /dev/null differ
diff --git a/base/textures/planets/ghant.png b/base/textures/planets/ghant.png
new file mode 100644
index 0000000..0c238b0
Binary files /dev/null and b/base/textures/planets/ghant.png differ
diff --git a/base/textures/planets/kiana.jpg b/base/textures/planets/kiana.jpg
deleted file mode 100644
index 0a8fc74..0000000
Binary files a/base/textures/planets/kiana.jpg and /dev/null differ
diff --git a/base/textures/planets/kiana.png b/base/textures/planets/kiana.png
new file mode 100644
index 0000000..c08bfb4
Binary files /dev/null and b/base/textures/planets/kiana.png differ
diff --git a/base/textures/planets/lindblade.jpg b/base/textures/planets/lindblade.jpg
deleted file mode 100644
index 675411f..0000000
Binary files a/base/textures/planets/lindblade.jpg and /dev/null differ
diff --git a/base/textures/planets/lindblade.png b/base/textures/planets/lindblade.png
new file mode 100644
index 0000000..bd4cdb8
Binary files /dev/null and b/base/textures/planets/lindblade.png differ
diff --git a/base/textures/planets/neutron.jpg b/base/textures/planets/neutron.jpg
deleted file mode 100644
index 1b67b86..0000000
Binary files a/base/textures/planets/neutron.jpg and /dev/null differ
diff --git a/base/textures/planets/neutron.png b/base/textures/planets/neutron.png
new file mode 100644
index 0000000..055396e
Binary files /dev/null and b/base/textures/planets/neutron.png differ
diff --git a/base/textures/planets/seymour.jpg b/base/textures/planets/seymour.jpg
deleted file mode 100644
index ad09f42..0000000
Binary files a/base/textures/planets/seymour.jpg and /dev/null differ
diff --git a/base/textures/planets/seymour.png b/base/textures/planets/seymour.png
new file mode 100644
index 0000000..f8fc0ef
Binary files /dev/null and b/base/textures/planets/seymour.png differ
-- 
cgit v1.2.3