Begin fixing ammo field usage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_mortar.qc

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index 47ac046545dc6760264296b521bda06fad2dda15..588d4994beffb1c708287d12f35c34d096fedeb8 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -1,8 +1,8 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(
-/* WEP_##id */ GRENADE_LAUNCHER,
+/* WEP_##id */ MORTAR,
 /* function */ w_glauncher,
-/* ammotype */ IT_ROCKETS,
+/* ammotype */ ammo_rockets,
 /* impulse  */ 4,
 /* flags    */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
 /* rating   */ BOT_PICKUP_RATING_MID,
@@ -11,29 +11,36 @@ REGISTER_WEAPON(
 /* fullname */ _("Mortar")
 );
 
-#define MORTAR_SETTINGS(w_cvar,w_prop) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, ammo) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, animtime) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_NONE, bouncefactor) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_NONE, bouncestop) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, damage) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, damageforcescale) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, edgedamage) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, force) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, health) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, lifetime) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_SEC,  lifetime_bounce) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, lifetime_stick) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, radius) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, refire) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_PRI,  remote_minbouncecnt) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, speed) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, speed_up) \
-       w_cvar(WEP_GRENADE_LAUNCHER, mortar, MO_BOTH, type) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, reloading_ammo, reload_ammo) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, reloading_time, reload_time) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, switchdelay_raise, switchdelay_raise) \
-       w_prop(WEP_GRENADE_LAUNCHER, mortar, switchdelay_drop, switchdelay_drop)
+#define MORTAR_SETTINGS(w_cvar,w_prop) MORTAR_SETTINGS_LIST(w_cvar, w_prop, MORTAR, mortar)
+#define MORTAR_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
+       w_cvar(id, sn, MO_BOTH, ammo) \
+       w_cvar(id, sn, MO_BOTH, animtime) \
+       w_cvar(id, sn, MO_NONE, bouncefactor) \
+       w_cvar(id, sn, MO_NONE, bouncestop) \
+       w_cvar(id, sn, MO_BOTH, damage) \
+       w_cvar(id, sn, MO_BOTH, damageforcescale) \
+       w_cvar(id, sn, MO_BOTH, edgedamage) \
+       w_cvar(id, sn, MO_BOTH, force) \
+       w_cvar(id, sn, MO_BOTH, health) \
+       w_cvar(id, sn, MO_BOTH, lifetime) \
+       w_cvar(id, sn, MO_SEC,  lifetime_bounce) \
+       w_cvar(id, sn, MO_BOTH, lifetime_stick) \
+       w_cvar(id, sn, MO_BOTH, radius) \
+       w_cvar(id, sn, MO_BOTH, refire) \
+       w_cvar(id, sn, MO_SEC,  remote_detonateprimary) \
+       w_cvar(id, sn, MO_PRI,  remote_minbouncecnt) \
+       w_cvar(id, sn, MO_BOTH, speed) \
+       w_cvar(id, sn, MO_BOTH, speed_up) \
+       w_cvar(id, sn, MO_BOTH, speed_z) \
+       w_cvar(id, sn, MO_BOTH, spread) \
+       w_cvar(id, sn, MO_BOTH, type) \
+       w_prop(id, sn, float,  reloading_ammo, reload_ammo) \
+       w_prop(id, sn, float,  reloading_time, reload_time) \
+       w_prop(id, sn, float,  switchdelay_raise, switchdelay_raise) \
+       w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(id, sn, string, weaponreplace, weaponreplace) \
+       w_prop(id, sn, float,  weaponstart, weaponstart) \
+       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride)
 
 #ifdef SVQC
 MORTAR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
@@ -67,7 +74,7 @@ void W_Grenade_Explode2 (void)
 {
        if(other.takedamage == DAMAGE_AIM)
                if(IS_PLAYER(other))
-                       if(IsDifferentTeam(self.realowner, other))
+                       if(DIFF_TEAM(self.realowner, other))
                                if(other.deadflag == DEAD_NO)
                                        if(IsFlying(other))
                                                Send_Notification(NOTIF_ONE, self.realowner, MSG_ANNCE, ANNCE_ACHIEVEMENT_AIRSHOT);
@@ -134,6 +141,7 @@ void W_Grenade_Touch1 (void)
                        spamsound (self, CH_SHOTS, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
                else
                        spamsound (self, CH_SHOTS, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
+               pointparticles(particleeffectnum("hagar_bounce"), self.origin, self.velocity, 1);
                self.projectiledeathtype |= HITTYPE_BOUNCE;
                self.gl_bouncecnt += 1;
        }
@@ -178,6 +186,7 @@ void W_Grenade_Touch2 (void)
                        spamsound (self, CH_SHOTS, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
                else
                        spamsound (self, CH_SHOTS, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
+               pointparticles(particleeffectnum("hagar_bounce"), self.origin, self.velocity, 1);
                self.projectiledeathtype |= HITTYPE_BOUNCE;
                self.gl_bouncecnt += 1;
                
@@ -223,7 +232,7 @@ void W_Grenade_Attack (void)
        gren.bouncefactor = WEP_CVAR(mortar, bouncefactor);
        gren.bouncestop = WEP_CVAR(mortar, bouncestop);
        PROJECTILE_MAKETRIGGER(gren);
-       gren.projectiledeathtype = WEP_GRENADE_LAUNCHER;
+       gren.projectiledeathtype = WEP_MORTAR;
        setorigin(gren, w_shotorg);
        setsize(gren, '-3 -3 -3', '3 3 3');
 
@@ -239,7 +248,7 @@ void W_Grenade_Attack (void)
        gren.event_damage = W_Grenade_Damage;
        gren.damagedbycontents = TRUE;
        gren.missile_flags = MIF_SPLASH | MIF_ARC;
-       W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_mortar_primary); // WEAPONTODO
+       WEP_SETUPPROJVELOCITY_UP_PRI(gren, mortar);
 
        gren.angles = vectoangles (gren.velocity);
        gren.flags = FL_PROJECTILE;
@@ -272,7 +281,7 @@ void W_Grenade_Attack2 (void)
        gren.bouncefactor = WEP_CVAR(mortar, bouncefactor);
        gren.bouncestop = WEP_CVAR(mortar, bouncestop);
        PROJECTILE_MAKETRIGGER(gren);
-       gren.projectiledeathtype = WEP_GRENADE_LAUNCHER | HITTYPE_SECONDARY;
+       gren.projectiledeathtype = WEP_MORTAR | HITTYPE_SECONDARY;
        setorigin(gren, w_shotorg);
        setsize(gren, '-3 -3 -3', '3 3 3');
 
@@ -287,7 +296,7 @@ void W_Grenade_Attack2 (void)
        gren.event_damage = W_Grenade_Damage;
        gren.damagedbycontents = TRUE;
        gren.missile_flags = MIF_SPLASH | MIF_ARC;
-       W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_mortar_secondary); // WEAPONTODO
+       WEP_SETUPPROJVELOCITY_UP_SEC(gren, mortar); // WEAPONTODO
 
        gren.angles = vectoangles (gren.velocity);
        gren.flags = FL_PROJECTILE;
@@ -302,7 +311,7 @@ void W_Grenade_Attack2 (void)
 
 void spawnfunc_weapon_grenadelauncher (void)
 {
-       weapon_defaultspawnfunc(WEP_GRENADE_LAUNCHER);
+       weapon_defaultspawnfunc(WEP_MORTAR);
 }
 
 .float bot_secondary_grenademooth;
@@ -366,7 +375,7 @@ float w_glauncher(float req)
                        }
                        else if (self.BUTTON_ATCK2)
                        {
-                               if (cvar("g_balance_mortar_secondary_remote_detonateprimary"))
+                               if(WEP_CVAR_SEC(mortar, remote_detonateprimary))
                                {
                                        nadefound = 0;
                                        for(nade = world; (nade = find(nade, classname, "grenade")); ) if(nade.realowner == self)
@@ -413,13 +422,13 @@ float w_glauncher(float req)
                case WR_CHECKAMMO1:
                {
                        ammo_amount = self.ammo_rockets >= WEP_CVAR_PRI(mortar, ammo);
-                       ammo_amount += self.(weapon_load[WEP_GRENADE_LAUNCHER]) >= WEP_CVAR_PRI(mortar, ammo);
+                       ammo_amount += self.(weapon_load[WEP_MORTAR]) >= WEP_CVAR_PRI(mortar, ammo);
                        return ammo_amount;
                }
                case WR_CHECKAMMO2:
                {
                        ammo_amount = self.ammo_rockets >= WEP_CVAR_SEC(mortar, ammo);
-                       ammo_amount += self.(weapon_load[WEP_GRENADE_LAUNCHER]) >= WEP_CVAR_SEC(mortar, ammo);
+                       ammo_amount += self.(weapon_load[WEP_MORTAR]) >= WEP_CVAR_SEC(mortar, ammo);
                        return ammo_amount;
                }
                case WR_CONFIG: