summaryrefslogtreecommitdiff
path: root/src/game/g_csw.h
diff options
context:
space:
mode:
authorenneract <trem.redman@gmail.com>2014-12-20 20:07:54 +0100
committerenneract <trem.redman@gmail.com>2014-12-20 20:07:54 +0100
commit74be23bb4d9e5fe441ce25008281e4cfc387185e (patch)
tree5af9e0f2016f9cf81948224108934ea1ae4abbfe /src/game/g_csw.h
parentf5c4bc00cf6307c14a6037a1f0a68259e4fe2ac8 (diff)
Add logging of weapon settings at game init.
Also adds a few missing weapons and hardcodes Lightning Gun's settings.
Diffstat (limited to 'src/game/g_csw.h')
-rw-r--r--src/game/g_csw.h54
1 files changed, 28 insertions, 26 deletions
diff --git a/src/game/g_csw.h b/src/game/g_csw.h
index 4f3cdf2..e37313b 100644
--- a/src/game/g_csw.h
+++ b/src/game/g_csw.h
@@ -1,30 +1,32 @@
-CSW( CSW_UNKNOWN, NULL ),
+CSW( CSW_UNKNOWN, NULL, 0 ),
-CSW( CSW_BLASTER, "Blaster" ),
-CSW( CSW_MACHINEGUN, "Rifle" ),
-CSW( CSW_PAINSAW, "Pain Saw" ),
-CSW( CSW_PAINSAW_ALT, "Pain Saw Blade" ),
-CSW( CSW_SHOTGUN, "Shotgun" ),
-CSW( CSW_LASGUN, "Las Gun" ),
-CSW( CSW_MDRIVER, "Mass Driver" ),
-CSW( CSW_CHAINGUN, "Chaingun" ),
-CSW( CSW_PRIFLE, "Pulse Rifle" ),
-CSW( CSW_FLAMER, "Flame Thrower" ),
-CSW( CSW_LIGHTNING, "Lightning Gun" ),
-CSW( CSW_LCANNON, "Lucifer Cannon" ),
-CSW( CSW_ROCKETL, "Rocket Launcher" ),
-CSW( CSW_GRENADE, "Grenade" ),
+CSW( CSW_BLASTER, "Blaster", BLASTER_DMG ),
+CSW( CSW_MACHINEGUN, "Rifle", RIFLE_DMG ),
+CSW( CSW_PAINSAW, "Pain Saw", PAINSAW_DAMAGE ),
+CSW( CSW_PAINSAW_ALT, "Pain Saw Blade", PAINSAW_DAMAGE2 ),
+CSW( CSW_SHOTGUN, "Shotgun", SHOTGUN_DMG * SHOTGUN_PELLETS ),
+CSW( CSW_LASGUN, "Las Gun", LASGUN_DAMAGE ),
+CSW( CSW_MDRIVER, "Mass Driver", MDRIVER_DMG ),
+CSW( CSW_CHAINGUN, "Chaingun", CHAINGUN_DMG ),
+CSW( CSW_PRIFLE, "Pulse Rifle", PRIFLE_DMG ),
+CSW( CSW_FLAMER, "Flame Thrower", FLAMER_DMG ),
+CSW( CSW_LIGHTNING, "Lightning Gun", LIGHTNING_DAMAGE ),
+CSW( CSW_LCANNON, "Lucifer Cannon", LCANNON_DAMAGE ),
+CSW( CSW_LCANNON_ALT, "Lucifer Alt.", LCANNON_SECONDARY_DAMAGE ),
+CSW( CSW_ROCKETL, "Rocket Launcher", ROCKETL_DAMAGE ),
+CSW( CSW_GRENADE, "Grenade", GRENADE_DAMAGE ),
-CSW( CSW_ABUILDER, "Granger" ),
-CSW( CSW_ABUILDER_ALT, "Granger Spit" ),
-CSW( CSW_LEVEL1, "Basilisk" ),
-CSW( CSW_LEVEL2, "Marauder" ),
-CSW( CSW_LEVEL2_ALT, "Marauder Zap" ),
-CSW( CSW_LEVEL3, "Dragoon" ),
-CSW( CSW_LEVEL3_ALT, "Dragoon Barb" ),
-CSW( CSW_LEVEL4, "Tyrant" ),
-CSW( CSW_LEVEL4_ALT, "Tyrant Flames" ),
-CSW( CSW_LEVEL5, "Hummel" ),
-CSW( CSW_LEVEL5_ALT, "Hummel Prickles" )
+CSW( CSW_ABUILDER, "Granger", ABUILDER_CLAW_DMG ),
+CSW( CSW_ABUILDER_ALT, "Granger Spit", ABUILDER_BLOB_DMG ),
+CSW( CSW_LEVEL1, "Basilisk", LEVEL1_CLAW_DMG ),
+CSW( CSW_LEVEL2, "Marauder", LEVEL2_CLAW_DMG ),
+CSW( CSW_LEVEL2_UPG, "Adv. Marauder", LEVEL2_CLAW_UPG_DMG ),
+CSW( CSW_LEVEL2_ALT, "Marauder Zap", LEVEL2_AREAZAP_DMG ),
+CSW( CSW_LEVEL3, "Dragoon", LEVEL3_CLAW_DMG ),
+CSW( CSW_LEVEL3_ALT, "Dragoon Barb", LEVEL3_BOUNCEBALL_DMG ),
+CSW( CSW_LEVEL4, "Tyrant", LEVEL4_CLAW_DMG ),
+CSW( CSW_LEVEL4_ALT, "Tyrant Flames", 50 ),
+CSW( CSW_LEVEL5, "Hummel", LEVEL5_CLAW_DMG ),
+CSW( CSW_LEVEL5_ALT, "Hummel Prickles", LEVEL5_PRICKLES_DMG )
#define CSW_MAX_NAME_LEN 15