X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_hook.qc;h=ca94ace96e1cfe6ea1bcb87d8200ef0ffc04c673;hb=014e27ddc7d207bd3ffe09a5d966f969e4a50712;hp=a9b817006d918c9d16328e14d374ec1579170ccb;hpb=5d3aed9a8ec0ff58a4f3d08d679e9ddcf8fff579;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc index a9b817006..ca94ace96 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -1,41 +1,47 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ HOOK, -/* function */ w_hook, -/* ammotype */ IT_CELLS|IT_FUEL, -/* impulse */ 0, -/* flags */ WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, -/* rating */ 0, -/* model */ "hookgun", -/* netname */ "hook", -/* fullname */ _("Grappling Hook") +/* WEP_##id */ HOOK, +/* function */ W_Hook, +/* ammotype */ ammo_fuel, +/* impulse */ 0, +/* flags */ WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, +/* rating */ 0, +/* color */ '0 0.5 0', +/* modelname */ "hookgun", +/* simplemdl */ "foobar", +/* crosshair */ "gfx/crosshairhook 0.5", +/* wepimg */ "weaponhook", +/* refname */ "hook", +/* wepname */ _("Grappling Hook") ); -#define HOOK_SETTINGS(weapon) \ - WEP_ADD_CVAR(weapon, MO_BOTH, animtime) \ - WEP_ADD_CVAR(weapon, MO_BOTH, ammo) \ - WEP_ADD_CVAR(weapon, MO_BOTH, refire) \ - WEP_ADD_CVAR(weapon, MO_PRI, hooked_ammo) \ - WEP_ADD_CVAR(weapon, MO_PRI, hooked_time_free) \ - WEP_ADD_CVAR(weapon, MO_PRI, hooked_time_max) \ - WEP_ADD_CVAR(weapon, MO_SEC, damage) \ - WEP_ADD_CVAR(weapon, MO_SEC, duration) \ - WEP_ADD_CVAR(weapon, MO_SEC, edgedamage) \ - WEP_ADD_CVAR(weapon, MO_SEC, force) \ - WEP_ADD_CVAR(weapon, MO_SEC, gravity) \ - WEP_ADD_CVAR(weapon, MO_SEC, lifetime) \ - WEP_ADD_CVAR(weapon, MO_SEC, power) \ - WEP_ADD_CVAR(weapon, MO_SEC, radius) \ - WEP_ADD_CVAR(weapon, MO_SEC, speed) \ - WEP_ADD_CVAR(weapon, MO_SEC, health) \ - WEP_ADD_CVAR(weapon, MO_SEC, damageforcescale) \ - WEP_ADD_PROP(weapon, reloading_ammo, reload_ammo) \ - WEP_ADD_PROP(weapon, reloading_time, reload_time) \ - WEP_ADD_PROP(weapon, switchdelay_raise, switchdelay_raise) \ - WEP_ADD_PROP(weapon, switchdelay_drop, switchdelay_drop) +#define HOOK_SETTINGS(w_cvar,w_prop) HOOK_SETTINGS_LIST(w_cvar, w_prop, HOOK, hook) +#define HOOK_SETTINGS_LIST(w_cvar,w_prop,id,sn) \ + w_cvar(id, sn, BOTH, animtime) \ + w_cvar(id, sn, BOTH, refire) \ + w_cvar(id, sn, PRI, ammo) \ + w_cvar(id, sn, PRI, hooked_ammo) \ + w_cvar(id, sn, PRI, hooked_time_free) \ + w_cvar(id, sn, PRI, hooked_time_max) \ + w_cvar(id, sn, SEC, damage) \ + w_cvar(id, sn, SEC, duration) \ + w_cvar(id, sn, SEC, edgedamage) \ + w_cvar(id, sn, SEC, force) \ + w_cvar(id, sn, SEC, gravity) \ + w_cvar(id, sn, SEC, lifetime) \ + w_cvar(id, sn, SEC, power) \ + w_cvar(id, sn, SEC, radius) \ + w_cvar(id, sn, SEC, speed) \ + w_cvar(id, sn, SEC, health) \ + w_cvar(id, sn, SEC, damageforcescale) \ + 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 -HOOK_SETTINGS(hook) +HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) .float dmg; .float dmg_edge; @@ -125,7 +131,7 @@ void W_Hook_Attack2() { entity gren; - W_DecreaseAmmo(ammo_cells, WEP_CVAR_SEC(hook, ammo), FALSE); + //W_DecreaseAmmo(WEP_CVAR_SEC(hook, ammo)); // WEAPONTODO: Figure out how to handle ammo with hook secondary (gravitybomb) W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", CH_WEAPON_A, WEP_CVAR_SEC(hook, damage)); gren = spawn (); @@ -156,7 +162,7 @@ void W_Hook_Attack2() gren.velocity = gren.velocity + self.velocity; gren.gravity = WEP_CVAR_SEC(hook, gravity); - //W_SetupProjectileVelocity(gren); // just falling down! + //W_SetupProjVelocity_Basic(gren); // just falling down! gren.angles = '0 0 0'; gren.flags = FL_PROJECTILE; @@ -166,7 +172,7 @@ void W_Hook_Attack2() other = gren; MUTATOR_CALLHOOK(EditProjectile); } -float w_hook(float req) +float W_Hook(float req) { float hooked_time_max, hooked_fuel; @@ -182,12 +188,12 @@ float w_hook(float req) if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK)) { if(!self.hook) - if not(self.hook_state & HOOK_WAITING_FOR_RELEASE) - if not(self.hook_state & HOOK_FIRING) + if(!(self.hook_state & HOOK_WAITING_FOR_RELEASE)) + if(!(self.hook_state & HOOK_FIRING)) if (time > self.hook_refire) if (weapon_prepareattack(0, -1)) { - W_DecreaseAmmo(ammo_fuel, WEP_CVAR_PRI(hook, ammo), FALSE); + W_DecreaseAmmo(WEP_CVAR_PRI(hook, ammo)); self.hook_state |= HOOK_FIRING; weapon_thinkf(WFRAME_FIRE1, WEP_CVAR_PRI(hook, animtime), w_ready); } @@ -208,7 +214,7 @@ float w_hook(float req) self.hook_refire = max(self.hook_refire, time + WEP_CVAR_PRI(hook, refire) * W_WeaponRateFactor()); // hook also inhibits health regeneration, but only for 1 second - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) + if(!(self.items & IT_UNLIMITED_WEAPON_AMMO)) self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_fuel_regen); } @@ -226,11 +232,11 @@ float w_hook(float req) { if ( time > self.hook_time_fueldecrease ) { - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) + if(!(self.items & IT_UNLIMITED_WEAPON_AMMO)) { if ( self.ammo_fuel >= (time - self.hook_time_fueldecrease) * hooked_fuel ) { - W_DecreaseAmmo(ammo_fuel, (time - self.hook_time_fueldecrease) * hooked_fuel, FALSE); + W_DecreaseAmmo((time - self.hook_time_fueldecrease) * hooked_fuel); self.hook_time_fueldecrease = time; // decrease next frame again } @@ -252,16 +258,16 @@ float w_hook(float req) if (self.BUTTON_CROUCH) { - self.hook_state &~= HOOK_PULLING; + self.hook_state &= ~HOOK_PULLING; if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK)) - self.hook_state &~= HOOK_RELEASING; + self.hook_state &= ~HOOK_RELEASING; else self.hook_state |= HOOK_RELEASING; } else { self.hook_state |= HOOK_PULLING; - self.hook_state &~= HOOK_RELEASING; + self.hook_state &= ~HOOK_RELEASING; if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK)) { @@ -272,7 +278,7 @@ float w_hook(float req) else { self.hook_state |= HOOK_REMOVING; - self.hook_state &~= HOOK_WAITING_FOR_RELEASE; + self.hook_state &= ~HOOK_WAITING_FOR_RELEASE; } } @@ -286,13 +292,12 @@ float w_hook(float req) precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc precache_sound ("weapons/hook_fire.wav"); precache_sound ("weapons/hookbomb_fire.wav"); - WEP_SET_PROPS(HOOK_SETTINGS(hook), WEP_HOOK) + HOOK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: { - self.current_ammo = ammo_fuel; - self.hook_state &~= HOOK_WAITING_FOR_RELEASE; + self.hook_state &= ~HOOK_WAITING_FOR_RELEASE; return TRUE; } case WR_CHECKAMMO1: @@ -304,11 +309,12 @@ float w_hook(float req) } case WR_CHECKAMMO2: { - return self.ammo_cells >= WEP_CVAR_SEC(hook, ammo); + // infinite ammo for now + return TRUE; // self.ammo_cells >= WEP_CVAR_SEC(hook, ammo); // WEAPONTODO: see above } case WR_CONFIG: { - WEP_CONFIG_SETTINGS(HOOK_SETTINGS(hook)) + HOOK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS) return TRUE; } case WR_RESETPLAYER: @@ -329,7 +335,7 @@ float w_hook(float req) } #endif #ifdef CSQC -float w_hook(float req) +float W_Hook(float req) { switch(req) { @@ -348,6 +354,11 @@ float w_hook(float req) precache_sound("weapons/hookbomb_impact.wav"); return TRUE; } + case WR_ZOOMRETICLE: + { + // no weapon specific image for this weapon + return FALSE; + } } return TRUE; }