X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Frpc.qc;h=836b4be33acb7dab2325fd7e9da1d1f91c7ea56d;hb=6bd8012ca8b6f81cb0c1cb558d130bc9e1c44682;hp=1b336f4edfacb05546115c9385943d3373a504d5;hpb=5b22584122d4354ab7819853d0fa5219d14d832e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/rpc.qc b/qcsrc/common/weapons/weapon/rpc.qc index 1b336f4ed..836b4be33 100644 --- a/qcsrc/common/weapons/weapon/rpc.qc +++ b/qcsrc/common/weapons/weapon/rpc.qc @@ -1,19 +1,21 @@ #ifndef IMPLEMENTATION -REGISTER_WEAPON( -/* WEP_##id */ RPC, -/* function */ W_RocketPropelledChainsaw, -/* ammotype */ ammo_rockets, -/* impulse */ 7, -/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON, -/* rating */ BOT_PICKUP_RATING_HIGH, -/* color */ '0.5 0.5 0', -/* modelname */ "ok_rl", -/* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshairrocketlauncher 0.7", -/* wepimg */ "weaponrpc", -/* refname */ "rpc", -/* wepname */ _("Rocket Propelled Chainsaw") -); +CLASS(RocketPropelledChainsaw, Weapon) +/* ammotype */ ATTRIB(RocketPropelledChainsaw, ammo_field, .int, ammo_rockets) +/* impulse */ ATTRIB(RocketPropelledChainsaw, impulse, int, 7) +/* flags */ ATTRIB(RocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON); +/* rating */ ATTRIB(RocketPropelledChainsaw, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH); +/* color */ ATTRIB(RocketPropelledChainsaw, wpcolor, vector, '0.5 0.5 0'); +/* modelname */ ATTRIB(RocketPropelledChainsaw, mdl, string, "ok_rl"); +#ifndef MENUQC +/* model */ ATTRIB(RocketPropelledChainsaw, m_model, Model, MDL_RPC_ITEM); +#endif +/* crosshair */ ATTRIB(RocketPropelledChainsaw, w_crosshair, string, "gfx/crosshairrocketlauncher"); +/* crosshair */ ATTRIB(RocketPropelledChainsaw, w_crosshair_size, float, 0.6); +/* wepimg */ ATTRIB(RocketPropelledChainsaw, model2, string, "weaponrpc"); +/* refname */ ATTRIB(RocketPropelledChainsaw, netname, string, "rpc"); +/* wepname */ ATTRIB(RocketPropelledChainsaw, message, string, _("Rocket Propelled Chainsaw")); +ENDCLASS(RocketPropelledChainsaw) +REGISTER_WEAPON(RPC, NEW(RocketPropelledChainsaw)); #define RPC_SETTINGS(w_cvar,w_prop) RPC_SETTINGS_LIST(w_cvar, w_prop, RPC, rpc) #define RPC_SETTINGS_LIST(w_cvar,w_prop,id,sn) \ @@ -108,7 +110,7 @@ void W_RocketPropelledChainsaw_Attack (void) entity flash = spawn (); W_DecreaseAmmo(WEP_CVAR(rpc, ammo)); - W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', false, 5, W_Sound("rocket_fire"), CH_WEAPON_A, WEP_CVAR(rpc, damage)); + W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', false, 5, SND(ROCKET_FIRE), CH_WEAPON_A, WEP_CVAR(rpc, damage)); Send_Effect(EFFECT_ROCKET_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1); PROJECTILE_MAKETRIGGER(missile); @@ -138,7 +140,7 @@ void W_RocketPropelledChainsaw_Attack (void) CSQCProjectile(missile, true, PROJECTILE_RPC, false); - setmodel(flash, "models/flash.md3"); // precision set below + setmodel(flash, MDL_RPC_MUZZLEFLASH); // precision set below SUB_SetFade (flash, time, 0.1); flash.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION; W_AttachToShotorg(flash, '5 0 0'); @@ -147,23 +149,18 @@ void W_RocketPropelledChainsaw_Attack (void) MUTATOR_CALLHOOK(EditProjectile, self, missile); } -bool W_RocketPropelledChainsaw(int req) -{SELFPARAM(); - float ammo_amount = false; - switch(req) - { - case WR_AIM: + METHOD(RocketPropelledChainsaw, wr_aim, bool(entity thiswep)) { self.BUTTON_ATCK = bot_aim(WEP_CVAR(rpc, speed), 0, WEP_CVAR(rpc, lifetime), false); return true; } - case WR_THINK: + METHOD(RocketPropelledChainsaw, wr_think, bool(entity thiswep, bool fire1, bool fire2)) { if(WEP_CVAR(rpc, reload_ammo) && self.clip_load < WEP_CVAR(rpc, ammo)) - WEP_ACTION(self.weapon, WR_RELOAD); + _WEP_ACTION(self.weapon, WR_RELOAD); else { - if (self.BUTTON_ATCK) + if (fire1) { if(weapon_prepareattack(0, WEP_CVAR(rpc, refire))) { @@ -172,7 +169,7 @@ bool W_RocketPropelledChainsaw(int req) } } - if (self.BUTTON_ATCK2) + if (fire2) { // to-do } @@ -180,44 +177,39 @@ bool W_RocketPropelledChainsaw(int req) return true; } - case WR_INIT: + METHOD(RocketPropelledChainsaw, wr_init, bool(entity thiswep)) { - precache_model ("models/flash.md3"); - precache_model(W_Model("g_ok_rl.md3")); - precache_model(W_Model("v_ok_rl.md3")); - precache_model(W_Model("h_ok_rl.iqm")); - precache_sound (W_Sound("rocket_fire")); RPC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP); return true; } - case WR_CHECKAMMO1: + METHOD(RocketPropelledChainsaw, wr_checkammo1, bool(entity thiswep)) { - ammo_amount = self.WEP_AMMO(RPC) >= WEP_CVAR(rpc, ammo); + float ammo_amount = self.WEP_AMMO(RPC) >= WEP_CVAR(rpc, ammo); ammo_amount += self.(weapon_load[WEP_RPC.m_id]) >= WEP_CVAR(rpc, ammo); return ammo_amount; } - case WR_CHECKAMMO2: + METHOD(RocketPropelledChainsaw, wr_checkammo2, bool(entity thiswep)) { return false; } - case WR_CONFIG: + METHOD(RocketPropelledChainsaw, wr_config, bool(entity thiswep)) { RPC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS); return true; } - case WR_RELOAD: + METHOD(RocketPropelledChainsaw, wr_reload, bool(entity thiswep)) { - W_Reload(WEP_CVAR(rpc, ammo), W_Sound("reload")); + W_Reload(WEP_CVAR(rpc, ammo), SND(RELOAD)); return true; } - case WR_SUICIDEMESSAGE: + METHOD(RocketPropelledChainsaw, wr_suicidemessage, bool(entity thiswep)) { if((w_deathtype & HITTYPE_BOUNCE) || (w_deathtype & HITTYPE_SPLASH)) return WEAPON_RPC_SUICIDE_SPLASH; else return WEAPON_RPC_SUICIDE_DIRECT; } - case WR_KILLMESSAGE: + METHOD(RocketPropelledChainsaw, wr_killmessage, bool(entity thiswep)) { if(w_deathtype & HITTYPE_SECONDARY) return WEAPON_BLASTER_MURDER; @@ -226,40 +218,30 @@ bool W_RocketPropelledChainsaw(int req) else return WEAPON_RPC_MURDER_DIRECT; } - } - return false; -} #endif #ifdef CSQC -bool W_RocketPropelledChainsaw(int req) -{SELFPARAM(); - switch(req) - { - case WR_IMPACTEFFECT: + + METHOD(RocketPropelledChainsaw, wr_impacteffect, bool(entity thiswep)) { vector org2; org2 = w_org + w_backoff * 12; pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), org2, '0 0 0', 1); if(!w_issilent) - sound(self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM); + sound(self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM); return true; } - case WR_INIT: + METHOD(RocketPropelledChainsaw, wr_init, bool(entity thiswep)) { - precache_sound(W_Sound("rocket_impact")); return true; } - case WR_ZOOMRETICLE: + METHOD(RocketPropelledChainsaw, wr_zoomreticle, bool(entity thiswep)) { // no weapon specific image for this weapon return false; } - } - return false; -} #endif #endif