Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/ini/ships.ini48
-rw-r--r--base/ini/weapons.ini82
-rw-r--r--base/ini/zones/antwerp.ini5
-rw-r--r--base/ini/zones/ghant.ini2
-rw-r--r--base/maps/colonial/custodian.map40
-rw-r--r--base/maps/merchant/matrix.map61
-rw-r--r--base/maps/merchant/scalar.map27
7 files changed, 195 insertions, 70 deletions
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 6861793..6fba725 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -159,7 +159,29 @@ strafe = 0.3
turn = 15
roll = 15
-info=Known for its speed and maneuverability, the Tiger class interceptor was selected by the Colonial Militia as its primary light figher.
+info=Known for its speed and maneuverability, the Tiger class interceptor was selected by the Colonial Militia as its primary interceptor.
+
+
+; ---- Lancer mark II ---------------------------------------------- ;
+
+[ship]
+label=lancer
+name=Lancer mkII
+template=ship_medium
+model=maps/colonial/lancer
+jumpdrive=no
+price=54000
+cargo=16
+
+thrust = 4.1
+impulse = 20
+strafe = 0.3
+turn = 60
+roll = 60
+
+info=The 'Lancer mkII' strike fighter is an overhaul of the original design,
+info=built with dual energy cannons standard,
+info=and a beam cannon mount to fight frigates and other small capital ships.
; ---- Custodian --------------------------------------------------- ;
@@ -230,30 +252,6 @@ roll = 12
info=
info=
-; ---- Lancer mark II ---------------------------------------------- ;
-; TODO retire or move to different faction
-
-[ship]
-label=lancer
-name=Lancer mkII
-template=ship_medium
-model=maps/colonial/lancer
-jumpdrive=no
-price=54000
-cargo=16
-
-thrust = 4.1
-impulse = 20
-strafe = 0.3
-turn = 60
-roll = 60
-
-info=The 'Lancer mkII' is the primary Colonial strike fighter.
-info=It is built with quad energy cannons standard, and an optional light beam cannon can be mounted to the underside.
-info=
-info=The mark II is an overhaul of the original design, including a beam cannon mount point for fighting frigates and other small capital ships.
-info=It also includes an improved power plant and better handling.
-
; ------------------------------------------------------------------ ;
; TRAINS
; ------------------------------------------------------------------ ;
diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 6025f97..b968309 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -28,11 +28,9 @@ name=Smart mine
price=15000
damage=250
-; ------------------------------------------------------------------
-; CANNONS
-;
; ------------------------------------------------------------------
+; BLASTERS
; blasters are used by the Colonial Militia
[cannon]
@@ -46,7 +44,7 @@ level=1
; speed of a projectile generated by this weapon, in meters per second
speed=2000
; interval between two consecutive shots, in milliseconds
- interval=100
+ interval=200
; range is the distance a projectile can travel before it dies, in meters
range=9000
; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
@@ -69,19 +67,20 @@ level=8
; speed of a projectile generated by this weapon, in meters per second
speed=2000
; interval between two consecutive shots, in milliseconds
- interval=100
+ interval=200
; range is the distance a projectile can travel before it dies, in meters
range=9000
; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
; lifespan=5000
; damage done by the projectile
- damage=15
+ damage=10
; projectile model
model=blaster2
; sound to play if the projectile is fired
sound=blaster
; ------------------------------------------------------------------
+; LASERS
; lasers are used by Merchants
[cannon]
@@ -151,7 +150,56 @@ level=15
model=laser2
; sound to play if the projectile is fired
sound=laser
+
+
+[turret]
+label=turretlaser1
+name=Laser turret
+price=25000
+level=5
+
+ [projectile]
+ ; speed of a projectile generated by this weapon, in meters per second
+ speed=1500
+ ; interval between two consecutive shots, in milliseconds
+ interval=500
+ ; range is the distance a projectile can travel before it dies, in meters
+ range=7500
+ ; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+ ; lifespan=5000
+ ; damage done by the projectile
+ damage=10
+ ; projectile model
+ model=laser1
+ ; sound to play if the projectile is fired
+ sound=laser
+[turret]
+label=turretlaser2
+name=Improved laser turret
+price=50000
+level=15
+
+ [projectile]
+ ; speed of a projectile generated by this weapon, in meters per second
+ speed=1500
+ ; interval between two consecutive shots, in milliseconds
+ interval=500
+ ; range is the distance a projectile can travel before it dies, in meters
+ range=7500
+ ; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+ ; lifespan=5000
+ ; damage done by the projectile
+ damage=15
+ ; projectile model
+ model=laser2
+ ; sound to play if the projectile is fired
+ sound=laser
+
+; ------------------------------------------------------------------
+; NEUTRON
+; Neutron-based weapons are used by ?
+
[cannon]
label=neutron1
name=Neutron Cannon
@@ -174,11 +222,15 @@ level=25
; sound to play if the projectile is fired
sound=neutron
+; ------------------------------------------------------------------
+; METRION
+; Metrion-based weapons are overpowered
+
[cannon]
label=metrion1
name=Metrion Accelerator
price=150000
-level=20
+level=45
[projectile]
; speed of a projectile generated by this weapon, in meters per second
@@ -195,19 +247,3 @@ level=20
model=metrion1
; sound to play if the projectile is fired
sound=metrion
-
-; ------------------------------------------------------------------
-; TURRETS
-;
-
-[turret]
-label=defenselaser1
-name=Defense laser
-price=25000
-level=5
-
-[turret]
-label=defenselaser2
-name=Advanced Defense laser
-price=50000
-level=15
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 2f6be63..4ce8ac8 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -45,6 +45,9 @@ location=512 -512 0
[ship]
label=tiger
+ [ship]
+ label=lancer
+
[cargo]
label=liquor
price=425
@@ -93,7 +96,7 @@ dock=yes
; available ship types
[ship]
- label=tiger
+ label=lancer
[ship]
label=custodian
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index af75248..43a3fda 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -129,7 +129,7 @@ info=fiscal climate of the Independent Colonies.
amount=-1
[weapon]
- label=laser2
+ label=turretlaser1
amount=-1
; ------------------------------------------------------------------
diff --git a/base/maps/colonial/custodian.map b/base/maps/colonial/custodian.map
index 5e5de8e..2b07934 100644
--- a/base/maps/colonial/custodian.map
+++ b/base/maps/colonial/custodian.map
@@ -7747,3 +7747,43 @@
"model" "maps/colonial/sections/colonial_window_medium"
"angles" "44.999996 90.000000 0.000000"
}
+// entity 169
+{
+"classname" "location_turret"
+"origin" "-192.000000 -1032.000000 128.000000"
+"angle" "-89.999992"
+}
+// entity 170
+{
+"classname" "location_turret"
+"origin" "1792.000000 -1032.000000 128.000000"
+"angle" "-89.999992"
+}
+// entity 171
+{
+"classname" "location_turret"
+"origin" "-192.000000 1032.000000 128.000000"
+"angle" "90.000000"
+}
+// entity 172
+{
+"classname" "location_turret"
+"origin" "1792.000000 1032.000000 128.000000"
+"angle" "90.000000"
+}
+// entity 173
+{
+"classname" "location_cannon"
+"origin" "4104.000000 -288.000000 -448.000000"
+}
+// entity 174
+{
+"classname" "location_cannon"
+"origin" "4104.000000 -736.000000 -448.000000"
+}
+// entity 175
+{
+"classname" "location_turret"
+"origin" "-1024.000000 -16.000000 -584.000000"
+"angles" "90.000000 0.000000 -0.000000"
+}
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index 29a1233..8787bbe 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -4264,11 +4264,11 @@ colors/grey25_shiny
// entity 13
{
"classname" "light"
-"origin" "192.000000 0.000000 136.000000"
+"origin" "-384.000000 0.000000 -88.000000"
"light" "8"
"spawnflags" "9"
"time" ".1"
-"offset" ".25"
+"offset" ".35"
"frequency" ".5"
}
// entity 14
@@ -5917,19 +5917,14 @@ colors/grey25_shiny
// entity 42
{
"classname" "location_cannon"
-"origin" "264.000000 0.000000 152.000000"
-}
-// entity 43
-{
-"classname" "location_cannon"
"origin" "480.000000 200.000000 0.000000"
}
-// entity 44
+// entity 43
{
"classname" "location_cannon"
"origin" "480.000000 -200.000000 0.000000"
}
-// entity 45
+// entity 44
{
"classname" "light"
"origin" "-96.000000 0.000000 136.000000"
@@ -5938,8 +5933,40 @@ colors/grey25_shiny
"time" ".2"
"offset" ".7"
}
+// entity 45
+{
+"classname" "light"
+"origin" "-192.000000 0.000000 -88.000000"
+"light" "8"
+"spawnflags" "9"
+"time" ".1"
+"offset" ".1"
+"frequency" ".5"
+}
// entity 46
{
+"classname" "location_turret"
+"origin" "0.000000 0.000000 -136.000000"
+"angles" "90.000000 0.000000 -0.000000"
+}
+// entity 47
+{
+"classname" "location_turret"
+"origin" "0.000000 0.000000 136.000000"
+"angles" "-90.000000 0.000000 -0.000000"
+}
+// entity 48
+{
+"classname" "light"
+"origin" "192.000000 0.000000 136.000000"
+"light" "8"
+"spawnflags" "9"
+"time" ".1"
+"offset" ".25"
+"frequency" ".5"
+}
+// entity 49
+{
"classname" "light"
"origin" "-192.000000 0.000000 136.000000"
"light" "8"
@@ -5948,13 +5975,23 @@ colors/grey25_shiny
"offset" "1.25"
"frequency" ".5"
}
-// entity 47
+// entity 50
{
"classname" "light"
-"origin" "0.000000 0.000000 136.000000"
+"origin" "192.000000 0.000000 -88.000000"
+"light" "8"
+"spawnflags" "9"
+"time" ".1"
+"offset" ".1"
+"frequency" ".5"
+}
+// entity 51
+{
+"classname" "light"
+"origin" "384.000000 0.000000 -88.000000"
"light" "8"
"spawnflags" "9"
"time" ".1"
-"offset" ".75"
+"offset" ".35"
"frequency" ".5"
}
diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map
index b39a82b..f21c177 100644
--- a/base/maps/merchant/scalar.map
+++ b/base/maps/merchant/scalar.map
@@ -2007,10 +2007,11 @@ colors/grey75
// entity 9
{
"classname" "light"
-"origin" "-176.000000 0.000000 -26.000000"
+"origin" "-176.000000 -32.000000 -26.000000"
"light" "4"
"time" "0.1"
"spawnflags" "1"
+"offset" ".15"
}
// entity 10
{
@@ -2122,24 +2123,34 @@ colors/grey75
// entity 24
{
"classname" "location_cannon"
-"origin" "64.000000 72.000000 16.000000"
+"origin" "168.000000 0.000000 -8.000000"
}
// entity 25
{
-"classname" "location_cannon"
-"origin" "64.000000 -72.000000 16.000000"
-}
-// entity 26
-{
"classname" "fx_flare"
"origin" "-66.000000 -72.000000 -24.000000"
"spawnflags" "2"
"radius" "16"
}
-// entity 27
+// entity 26
{
"classname" "fx_flare"
"origin" "-66.000000 72.000000 -24.000000"
"spawnflags" "2"
"radius" "16"
}
+// entity 27
+{
+"classname" "light"
+"origin" "-176.000000 32.000000 -26.000000"
+"light" "4"
+"time" "0.1"
+"spawnflags" "1"
+"offset" ".65"
+}
+// entity 28
+{
+"classname" "location_turret"
+"origin" "-176.000000 0.000000 -32.000000"
+"angles" "90.000000 0.000000 -0.000000"
+}