Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/ini/weapons.ini39
-rw-r--r--base/maps/projectiles/blaster1.map2
-rw-r--r--base/maps/projectiles/blaster2.map21
-rw-r--r--base/maps/projectiles/metrion1.map27
4 files changed, 85 insertions, 4 deletions
diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 02d9fa5..910c356 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -34,9 +34,9 @@ damage=250
[cannon]
label=blaster1
name=Blaster cannon
-info=Basic pewpew test
+info=Basic pewpew
price=2500
-level=1
+level=2
[projectile]
speed=2000
@@ -44,6 +44,21 @@ level=1
damage=5
interval=100
model=blaster1
+
+[cannon]
+label=blaster2
+name=Improved Blaster cannon
+info=Improved pewpew
+price=10000
+level=8
+
+ [projectile]
+ speed=2000
+ lifespan=4500
+ damage=15
+ interval=100
+ model=blaster2
+
[cannon]
label=laser1
name=Laser cannon
@@ -117,7 +132,25 @@ level=25
damage=25
; projectile model
model=neutron1
-
+
+[cannon]
+label=metrion1
+name=Metrion Accelerator
+price=150000
+level=20
+
+ [projectile]
+ ; speed of a projectile generated by this weapon, in meters per second
+ speed=1300
+ ; interval between two consecutive shots, in milliseconds
+ interval=800
+ ; lifespan of a single projectile, in milliseconds
+ lifespan=7000
+ ; damage done by the projectile
+ damage=200
+ ; projectile model
+ model=metrion1
+
; ------------------------------------------------------------------
; TURRETS
;
diff --git a/base/maps/projectiles/blaster1.map b/base/maps/projectiles/blaster1.map
index b668cd3..72b8d97 100644
--- a/base/maps/projectiles/blaster1.map
+++ b/base/maps/projectiles/blaster1.map
@@ -7,7 +7,7 @@
{
"classname" "light"
"origin" "0.000000 0.000000 0.000000"
-"light" "4"
+"light" "2"
"flare" "2"
"_color" "1 0 0"
}
diff --git a/base/maps/projectiles/blaster2.map b/base/maps/projectiles/blaster2.map
new file mode 100644
index 0000000..6c5eba0
--- /dev/null
+++ b/base/maps/projectiles/blaster2.map
@@ -0,0 +1,21 @@
+
+// entity 0
+{
+"classname" "worldspawn"
+}
+// entity 1
+{
+"classname" "light"
+"origin" "0.000000 0.000000 0.000000"
+"light" "4"
+"flare" "2"
+"_color" "1 0.172656 0"
+}
+// entity 2
+{
+"classname" "light"
+"origin" "-4.000000 0.000000 0.000000"
+"light" "2"
+"flare" "2"
+"_color" "1 0 0"
+}
diff --git a/base/maps/projectiles/metrion1.map b/base/maps/projectiles/metrion1.map
new file mode 100644
index 0000000..fb8a9d6
--- /dev/null
+++ b/base/maps/projectiles/metrion1.map
@@ -0,0 +1,27 @@
+
+// entity 0
+{
+"classname" "worldspawn"
+}
+// entity 1
+{
+"classname" "fx_particles"
+"origin" "0.000000 0.000000 0.000000"
+"angle" "-179.999985"
+"script" "metrion1"
+}
+// entity 2
+{
+"classname" "light"
+"origin" "0.000000 0.000000 0.000000"
+"light" "16"
+"flare" "4"
+"spawnflags" "2"
+}
+// entity 3
+{
+"classname" "light"
+"origin" "0.000000 0.000000 0.000000"
+"light" "4"
+"flare" "3"
+}