Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-10-19 21:18:06 +0000
committerStijn Buys <ingar@osirion.org>2010-10-19 21:18:06 +0000
commit9a0b1b020537236a87b404269cba9f906545a015 (patch)
tree9b19f42d1ede35962fa641c931a01a6bbb62da96 /base
parentde21ffa4a0c5e38a33c5c6a77a532ebabf304c92 (diff)
adds planet finnmark texture, ship.ini updates by Thorn
Diffstat (limited to 'base')
-rw-r--r--base/ini/ships.ini87
-rw-r--r--base/ini/zones/finnmark.ini4
-rw-r--r--base/textures/planets/finnmark.jpgbin0 -> 862194 bytes
3 files changed, 63 insertions, 28 deletions
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index e4ef962..1c8ac90 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -31,17 +31,6 @@ cargo=20
; empty lines are allowed
info=Micron Corporation's entry-level model has been a hit sale for many decades. Despite the moderate size of its cargo hold, this ship offers a fast and reliable means of transport, capable of outrunning many larger ships.
-;[ship]
-;label=tensor
-;name=Micron Tensor
-;model=maps/merchant/tensor
-;acceleration=1.25
-;maxspeed=2.9
-;turnspeed=35
-;price=30000
-;cargo=100
-;info=This ship is to be removed.
-
[ship]
label=scalar
name=Micron Scalar
@@ -64,8 +53,8 @@ acceleration=1.0
maxspeed=2.8
turnspeed=30
jumpdrive=yes
-price=50000
-cargo=150
+price=95000
+cargo=175
info=The unprecedented success of the Vector had stimulated the market for cheap transport vessels and prompted Micron Corporations to develop the larger Matrix, with an increased cargo hold at the cost of speed and maneuverability.
; ------------------------------------------------------------------ ;
@@ -80,7 +69,7 @@ acceleration=2.5
maxspeed=3.6
turnspeed=60
cargo=10
-price=17500
+price=15000
info=The P.O.D. was originally designed as a racing vehicle, but the sturdy design placed it at a considerable weight disadvantage against its competitors. The ship fell out of grace on the race circuit, but was picked up by scouts and couriers in need for a small and fast vessel.
info=
info=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
@@ -93,8 +82,10 @@ acceleration=2.4
maxspeed=3.7
turnspeed=60
cargo=15
-price=19000
-info=TODO
+price=20000
+info=The Archer was considered to be leap in technology by the Joint Miners Association, allowing for rapid exploration of mineral deposits. Featuring high maneuverability the Archer was capable of outrunning any threat, while having enough cargo-space to return with mineral samples.
+info=
+info=Unfortunately, the Archer was not equipped with adequately ranged sensors. As a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the range since.
[ship]
label=longbow
@@ -104,8 +95,8 @@ acceleration=2.4
maxspeed=3.7
turnspeed=60
cargo=30
-price=60000
-info=TODO
+price=45000
+info=The replacement for the Archer scout ship. After the first costly mistake, the Joint Miners Association decided to outsource development to a trusted third-party contractor. As a result, the flaws in the ship design were fixed.
[ship]
label=talon
@@ -115,7 +106,7 @@ acceleration=2.6
maxspeed=3.8
turnspeed=55
cargo=10
-price=24000
+price=22500
info=TODO
[ship]
@@ -142,8 +133,8 @@ maxspeed=2.5
turnspeed=20
jumpdrive=yes
dock=yes
-cargo=150
-price=500000
+cargo=2500
+price=750000
info=The Custodian class battleship is the Independent Colonies most valued long-range fighter carrier. Equipped with a jumpdrive and a sizeable launch bay, this battleship is a force to be reckoned with.
[ship]
@@ -171,8 +162,8 @@ maxspeed=2.25
turnspeed=5
jumpdrive=yes
dock=yes
-price=250000
-cargo=250
+price=325000
+cargo=400
[ship]
label=horizon
@@ -181,7 +172,7 @@ model=maps/independent/horizon
acceleration=1.5
maxspeed=3.0
turnspeed=35
-price=75000
+price=60000
cargo=70
[ship]
@@ -191,6 +182,8 @@ model=maps/independent/orion
acceleration=1.5
maxspeed=3.5
turnspeed=30
+cargo=80
+price=65000
[ship]
label=bumblebee
@@ -199,14 +192,18 @@ model=maps/independent/bumblebee
acceleration=1.5
maxspeed=3.5
turnspeed=30
+cargo=65
+price=50000
[ship]
label=jupiter
name=Jupiter
model=maps/independent/jupiter
-acceleration=1.5
-maxspeed=2.5
+acceleration=1.6
+maxspeed=2.8
turnspeed=40
+cargo=55
+price=67500
[ship]
label=avenger
@@ -215,6 +212,8 @@ model=maps/independent/avenger
acceleration=2
maxspeed=3
turnspeed=55
+cargo=5
+price=11500
[ship]
label=shootingstar
@@ -223,6 +222,9 @@ model=maps/independent/shootingstar
acceleration=1.8
maxspeed=3
turnspeed=50
+cargo=30
+price=35000
+
[ship]
label=galaxy
@@ -232,6 +234,8 @@ acceleration=0.75
maxspeed=2.0
turnspeed=15
jumpdrive=yes
+cargo=120
+price=82500
; ------------------------------------------------------------------ ;
; LINDBLADE
@@ -245,6 +249,8 @@ acceleration=1.2
maxspeed=3.25
turnspeed=20
jumpdrive=yes
+cargo=85
+price=80000
[ship]
label=supertanker
@@ -254,6 +260,8 @@ acceleration=0.5
maxspeed=2.5
turnspeed=20
jumpdrive=yes
+cargo=685
+price=515000
[ship]
label=halcyon
@@ -263,6 +271,8 @@ acceleration=0.6
maxspeed=2.5
turnspeed=20
jumpdrive=yes
+cargo=625
+price=515000
info=^1CLASSIFIED^N
info=
info=For authorized personnel only.
@@ -279,6 +289,9 @@ acceleration=0.65
maxspeed=2.5
turnspeed=2.5
jumpdrive=yes
+cargo=50000
+price=10000000
+;If only there was room for a >9000 remark.
info=^1CLASSIFIED^N
info=
info=For authorized personnel only.
@@ -291,6 +304,8 @@ acceleration=1.5
maxspeed=3.7
turnspeed=60
jumpdrive=no
+price=22500
+cargo=30
; ---- maximal width ------------------------|
info=The 'Imp' scout fighter was
info=designed to be cheap, and have a
@@ -316,6 +331,8 @@ acceleration=1.2
maxspeed=3.5
turnspeed=50
jumpdrive=no
+price=60000
+cargo=60
; ---- maximal width ------------------------|
info=The 'Inquisitor' Interceptor is the main
info=strike fighter of the Tsu-Khan navy. It
@@ -338,6 +355,8 @@ acceleration=0.5
maxspeed=2.5
turnspeed=25
jumpdrive=yes
+price=750000
+cargo=615
; ---- maximal width ------------------------|
info=The 'Panzer'-class Tsu-Khan destroyer
info=is a recent design with the hopes of
@@ -354,6 +373,8 @@ acceleration=1.1
maxspeed=2.6
turnspeed=20
jumpdrive=yes
+price=600000
+cargo=400
; ---- maximal width ------------------------|
info=Anticipating a war with an alien race on
info=the horizon, Tsu-Khan engineers designed
@@ -375,6 +396,8 @@ acceleration=1
maxspeed=2.7
turnspeed=30
jumpdrive=yes
+cargo=850
+price=575000
; ---- maximal width ------------------------|
info=The Tsu-Khan Camel is the main work-
info=horse of the fleet and is used mainly to
@@ -395,6 +418,8 @@ model=maps/tsukhan/obliterator
acceleration=1
maxspeed=2.5
turnspeed=30
+cargo=50
+price=50000
; ---- maximal width ------------------------|
info=The Tsu-Khan 'Obliterator' bomber is
info=most effective against frigates and
@@ -413,6 +438,8 @@ model=maps/tsukhan/ravager
turnspeed=10
maxspeed=2.25
jumpdrive=yes
+cargo=25000
+price=17500000
; ---- maximal width ------------------------|
info=The Ravager is the main heavy assault
info=ship of the Tsu-Khan fleet.
@@ -453,7 +480,7 @@ maxspeed=2.5
turnspeed=20
jumpdrive=yes
price=1500000
-cargo=1500
+cargo=7000
; ---- maximal width ------------------------|
info=The pirate Juggernaut is a flying
info=fortress designed to serve as support
@@ -476,6 +503,8 @@ acceleration=0.45
maxspeed=2.75
turnspeed=10
jumpdrive=yes
+cargo=6000
+price=2000000
; ---- maximal width ------------------------|
info=^1CLASSIFIED^N
info=
@@ -489,6 +518,8 @@ acceleration=0.50
maxspeed=2.70
turnspeed=10
jumpdrive=yes
+cargo=10000
+price=2750000
; ---- maximal width ------------------------|
info=^1CLASSIFIED^N
info=
@@ -502,6 +533,8 @@ acceleration=0.50
maxspeed=2.70
turnspeed=10
jumpdrive=yes
+cargo=1000
+price=800000
; ---- maximal width ------------------------|
info=
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 0cb57c3..dccdb16 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -30,8 +30,10 @@ radius=90
[planet]
label=finnmark
name=planet Finnmark
+texture=planets/finnmark
default=yes
-color=192 88 -64
+;color=192 88 -64
+color=1.0 1.0 1.0
location=128 64 0
radius=70
dock=yes
diff --git a/base/textures/planets/finnmark.jpg b/base/textures/planets/finnmark.jpg
new file mode 100644
index 0000000..bc7b834
--- /dev/null
+++ b/base/textures/planets/finnmark.jpg
Binary files differ