Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/ini/weapons.ini10
-rw-r--r--base/maps/projectiles/laser3.map29
2 files changed, 37 insertions, 2 deletions
diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 3b098aa..ea8ea90 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -81,7 +81,8 @@ level=8
; ------------------------------------------------------------------
; LASERS
-; lasers are used by Merchants
+; faction Merchants
+; color 255, 0, 0 (red)
[cannon]
label=laser1
@@ -92,6 +93,11 @@ price=1500
level=1
; store/inventory model
model=models/weapons/laser/laser1
+; info text
+info=Laser cannon is probably one of the largest misnomers of recent history.
+info=The photo-magnetic generators used in these kinds of cannons do produce
+info=light flashes similar to the ancient laser technology,
+info=but the impact of a projectile has far more dramatic results.
[projectile]
; speed of a projectile generated by this weapon, in meters per second
@@ -151,7 +157,7 @@ model=models/weapons/laser/laser3
; damage done by the projectile
damage=25
; projectile model
- model=laser2
+ model=laser3
; sound to play if the projectile is fired
sound=laser
diff --git a/base/maps/projectiles/laser3.map b/base/maps/projectiles/laser3.map
new file mode 100644
index 0000000..c8cdc44
--- /dev/null
+++ b/base/maps/projectiles/laser3.map
@@ -0,0 +1,29 @@
+
+// entity 0
+{
+"classname" "worldspawn"
+}
+// entity 1
+{
+"classname" "light"
+"origin" "0.000000 0.000000 0.000000"
+"light" "8"
+"flare" "2"
+"_color" "1 0 0"
+}
+// entity 2
+{
+"classname" "fx_particles"
+"origin" "-8.000000 -2.000000 0.000000"
+"angle" "-179.999985"
+"script" "laser_trail"
+"_color" "1 0 0"
+}
+// entity 3
+{
+"classname" "fx_particles"
+"origin" "-8.000000 2.000000 0.000000"
+"angle" "-179.999985"
+"script" "laser_trail"
+"_color" "1 0 0"
+}