X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fnades%2Fnades.qc;h=11926b36d025b263032e2c1cf6355094c1305802;hb=f67b2effcc9360ae443fc7da413d37b84e060e19;hp=c09e221e469ec96b7e912b3bc0491dd372cc68e7;hpb=644a3be96a591dcc4928a5048970bb94a24ea766;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index c09e221e4..11926b36d 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -16,7 +16,7 @@ entity Nade_TrailEffect(int proj, int nade_team) case PROJECTILE_NADE_BURN: return EFFECT_NADE_TRAIL_BURN(nade_team); } - FOREACH(Nades, true, LAMBDA( + FOREACH(Nades, true, { for (int j = 0; j < 2; j++) { if (it.m_projectile[j] == proj) @@ -26,7 +26,7 @@ entity Nade_TrailEffect(int proj, int nade_team) break; } } - )); + }); return EFFECT_Null; } @@ -74,7 +74,7 @@ MUTATOR_HOOKFUNCTION(cl_nades, EditProjectile) if (proj.cnt == PROJECTILE_NAPALM_FOUNTAIN) { - loopsound(proj, CH_SHOTS_SINGLE, SND(FIREBALL_FLY2), VOL_BASE, ATTEN_NORM); + loopsound(proj, CH_SHOTS_SINGLE, SND_FIREBALL_FLY2, VOL_BASE, ATTEN_NORM); proj.mins = '-16 -16 -16'; proj.maxs = '16 16 16'; } @@ -133,7 +133,7 @@ void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expan DrawNadeProgressBar(myPos, mySize, bonusProgress, nadeColor); if(autocvar_hud_panel_ammo_text) - drawstring_aspect(textPos, ftos(bonusNades), eX * (2/3) * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(textPos, ftos(bonusNades), vec2((2/3) * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); if(draw_expanding) drawpic_aspect_skin_expanding(iconPos, nadeIcon, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, expand_time); @@ -220,7 +220,7 @@ void napalm_damage(entity this, float dist, float damage, float edgedamage, floa { d = vlen(WarpZone_UnTransformOrigin(RandomSelection_chosen_ent, this.origin) - RandomSelection_chosen_ent.fireball_impactvec); d = damage + (edgedamage - damage) * (d / dist); - Fire_AddDamage(RandomSelection_chosen_ent, this.realowner, d * burntime, burntime, this.projectiledeathtype | HITTYPE_BOUNCE); + Fire_AddDamage(RandomSelection_chosen_ent, this.realowner, d * burntime, burntime, this.projectiledeathtype); //trailparticles(this, particleeffectnum(EFFECT_FIREBALL_LASER), this.origin, RandomSelection_chosen_ent.fireball_impactvec); Send_Effect(EFFECT_FIREBALL_LASER, this.origin, RandomSelection_chosen_ent.fireball_impactvec - this.origin, 1); } @@ -265,7 +265,7 @@ void nade_napalm_ball(entity this) entity proj; vector kick; - spamsound(this, CH_SHOTS, SND(FIREBALL_FIRE), VOL_BASE, ATTEN_NORM); + spamsound(this, CH_SHOTS, SND_FIREBALL_FIRE, VOL_BASE, ATTEN_NORM); proj = new(grenade); proj.owner = this.owner; @@ -577,7 +577,7 @@ void nade_entrap_touch(entity this, entity toucher) if(!pushdeltatime) return; // div0: ticrate independent, 1 = identity (not 20) - toucher.velocity = toucher.velocity * pow(autocvar_g_nades_entrap_strength, pushdeltatime); + toucher.velocity = toucher.velocity * (autocvar_g_nades_entrap_strength ** pushdeltatime); #ifdef SVQC UpdateCSQCProjectile(toucher); @@ -738,7 +738,7 @@ void nade_boom(entity this) IL_EACH(g_projectiles, it.classname == "grapplinghook" && it.aiment == this, { - RemoveGrapplingHook(it.realowner); + RemoveHook(it); }); delete(this); @@ -769,7 +769,6 @@ void nade_touch(entity this, entity toucher) if(autocvar_g_nades_pickup) if(time >= this.spawnshieldtime) if(!toucher.nade && this.health == this.max_health) // no boosted shot pickups, thank you very much - if(!STAT(FROZEN, toucher)) if(CanThrowNade(toucher)) // prevent some obvious things, like dead players if(IS_REAL_CLIENT(toucher)) // above checks for IS_PLAYER, don't need to do it here { @@ -787,7 +786,7 @@ void nade_touch(entity this, entity toucher) { IL_EACH(g_projectiles, it.classname == "grapplinghook" && it.aiment == this, { - RemoveGrapplingHook(it.realowner); + RemoveHook(it); }); delete(this); return; @@ -799,7 +798,7 @@ void nade_touch(entity this, entity toucher) //UpdateCSQCProjectile(this); if(this.health == this.max_health) { - spamsound(this, CH_SHOTS, SND(GRENADE_BOUNCE_RANDOM()), VOL_BASE, ATTEN_NORM); + spamsound(this, CH_SHOTS, SND_GRENADE_BOUNCE_RANDOM(), VOL_BASE, ATTEN_NORM); return; } @@ -890,20 +889,18 @@ void toss_nade(entity e, bool set_owner, vector _velocity, float _time) delete(e.fake_nade); e.fake_nade = NULL; + Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER, CPID_NADES); + makevectors(e.v_angle); // NOTE: always throw from first weapon entity? - W_SetupShot(e, weaponentities[0], false, false, SND_Null, CH_WEAPON_A, 0); - - Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER, CPID_NADES); + W_SetupShot(e, _nade.weaponentity_fld, false, false, SND_Null, CH_WEAPON_A, 0); vector offset = (v_forward * autocvar_g_nades_throw_offset.x) - + (v_right * autocvar_g_nades_throw_offset.y) - + (v_up * autocvar_g_nades_throw_offset.z); - if(autocvar_g_nades_throw_offset == '0 0 0') - offset = '0 0 0'; + + (v_right * autocvar_g_nades_throw_offset.y) + + (v_up * autocvar_g_nades_throw_offset.z); - setorigin(_nade, w_shotorg + offset + (v_right * 25) * -1); + setorigin(_nade, w_shotorg + offset); //setmodel(_nade, MDL_PROJECTILE_NADE); //setattachment(_nade, NULL, ""); PROJECTILE_MAKETRIGGER(_nade); @@ -1036,6 +1033,8 @@ void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, strin if(Nades_from(n.nade_type) == NADE_TYPE_Null) n.nade_type = NADE_TYPE_NORMAL.m_id; + .entity weaponentity = weaponentities[0]; // TODO: unhardcode + setmodel(n, MDL_PROJECTILE_NADE); //setattachment(n, player, "bip01 l hand"); n.exteriormodeltoclient = player; @@ -1050,10 +1049,10 @@ void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, strin setthink(n, nade_beep); n.nextthink = max(n.wait - 3, time); n.projectiledeathtype = DEATH_NADE.m_id; + n.weaponentity_fld = weaponentity; n.nade_lifetime = ntime; setmodel(fn, MDL_NADE_VIEW); - .entity weaponentity = weaponentities[0]; // TODO: unhardcode setattachment(fn, player.(weaponentity), ""); fn.realowner = fn.owner = player; fn.colormod = Nades_from(n.nade_type).m_color; @@ -1061,6 +1060,7 @@ void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, strin fn.glowmod = player.glowmod; setthink(fn, SUB_Remove); fn.nextthink = n.wait; + fn.weaponentity_fld = weaponentity; player.nade = n; player.fake_nade = fn; @@ -1091,8 +1091,8 @@ void nade_prime(entity this) } else { - ntype = ((autocvar_g_nades_client_select) ? this.cvar_cl_nade_type : autocvar_g_nades_nade_type); - pntype = ((autocvar_g_nades_client_select) ? this.cvar_cl_pokenade_type : autocvar_g_nades_pokenade_monster_type); + ntype = ((autocvar_g_nades_client_select) ? CS(this).cvar_cl_nade_type : autocvar_g_nades_nade_type); + pntype = ((autocvar_g_nades_client_select) ? CS(this).cvar_cl_pokenade_type : autocvar_g_nades_pokenade_monster_type); } spawn_held_nade(this, this, autocvar_g_nades_nade_lifetime, ntype, pntype); @@ -1103,9 +1103,6 @@ bool CanThrowNade(entity this) if(this.vehicle) return false; - if(gameover) - return false; - if(IS_DEAD(this)) return false; @@ -1251,8 +1248,8 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) if(autocvar_g_nades_bonus_client_select) { - player.nade_type = player.cvar_cl_nade_type; - player.pokenade_type = player.cvar_cl_pokenade_type; + player.nade_type = CS(player).cvar_cl_nade_type; + player.pokenade_type = CS(player).cvar_cl_pokenade_type; } else { @@ -1279,7 +1276,7 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) { vector revive_extra_size = '1 1 1' * autocvar_g_freezetag_revive_extra_size; n = 0; - FOREACH_CLIENT(IS_PLAYER(it) && it != player, LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it) && it != player, { if(!IS_DEAD(it)) if(STAT(FROZEN, it) == 0) if(SAME_TEAM(it, player)) @@ -1291,7 +1288,7 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) it.reviving = true; ++n; } - )); + }); } if(n && STAT(FROZEN, player) == 3) // OK, there is at least one teammate reviving us @@ -1307,10 +1304,10 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) Send_Notification(NOTIF_ONE, o, MSG_CENTER, CENTER_FREEZETAG_REVIVE, player.netname); } - FOREACH_CLIENT(IS_PLAYER(it) && it.reviving, LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it) && it.reviving, { it.revive_progress = player.revive_progress; it.reviving = false; - )); + }); } } @@ -1346,7 +1343,7 @@ MUTATOR_HOOKFUNCTION(nades, PlayerSpawn) player.nade_refire = time + autocvar_g_nades_nade_refire; if(autocvar_g_nades_bonus_client_select) - player.nade_type = player.cvar_cl_nade_type; + player.nade_type = CS(player).cvar_cl_nade_type; player.nade_timer = 0; @@ -1374,19 +1371,19 @@ MUTATOR_HOOKFUNCTION(nades, PlayerDies, CBC_ORDER_LAST) if(!STAT(FROZEN, frag_target) || !autocvar_g_freezetag_revive_nade) toss_nade(frag_target, true, '0 0 100', max(frag_target.nade.wait, time + 0.05)); - float killcount_bonus = ((frag_attacker.killcount >= 1) ? bound(0, autocvar_g_nades_bonus_score_minor * frag_attacker.killcount, autocvar_g_nades_bonus_score_medium) : autocvar_g_nades_bonus_score_minor); - if(IS_PLAYER(frag_attacker)) { + float killcount_bonus = ((CS(frag_attacker).killcount >= 1) ? bound(0, autocvar_g_nades_bonus_score_minor * CS(frag_attacker).killcount, autocvar_g_nades_bonus_score_medium) : autocvar_g_nades_bonus_score_minor); + if (SAME_TEAM(frag_attacker, frag_target) || frag_attacker == frag_target) nades_RemoveBonus(frag_attacker); else if(frag_target.flagcarried) nades_GiveBonus(frag_attacker, autocvar_g_nades_bonus_score_medium); - else if(autocvar_g_nades_bonus_score_spree && frag_attacker.killcount > 1) + else if(autocvar_g_nades_bonus_score_spree && CS(frag_attacker).killcount > 1) { #define SPREE_ITEM(counta,countb,center,normal,gentle) \ case counta: { nades_GiveBonus(frag_attacker, autocvar_g_nades_bonus_score_spree); break; } - switch(frag_attacker.killcount) + switch(CS(frag_attacker).killcount) { KILL_SPREE_LIST default: nades_GiveBonus(frag_attacker, autocvar_g_nades_bonus_score_minor); break; @@ -1400,7 +1397,7 @@ MUTATOR_HOOKFUNCTION(nades, PlayerDies, CBC_ORDER_LAST) nades_RemoveBonus(frag_target); } -MUTATOR_HOOKFUNCTION(nades, PlayerDamage_Calculate) +MUTATOR_HOOKFUNCTION(nades, Damage_Calculate) { entity frag_inflictor = M_ARGV(0, entity); entity frag_attacker = M_ARGV(1, entity); @@ -1482,11 +1479,6 @@ MUTATOR_HOOKFUNCTION(nades, BuildMutatorsString) M_ARGV(0, string) = strcat(M_ARGV(0, string), ":Nades"); } -MUTATOR_HOOKFUNCTION(nades, BuildMutatorsPrettyString) -{ - M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Nades"); -} - MUTATOR_HOOKFUNCTION(nades, BuildGameplayTipsString) { M_ARGV(0, string) = strcat(M_ARGV(0, string), "\n\n^3nades^8 are enabled, press 'g' to use them\n");