Skip to content

Commit ec3227e

Browse files
committed
made pack animal talent bonus apply with any nearby friendly player or standard monster
1 parent f213863 commit ec3227e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/combat/common/damage.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ qboolean IsMorphedPlayer(const edict_t *ent) {
148148
|| ent->mtype == MORPH_BERSERK || ent->mtype == M_MYPARASITE);
149149
}
150150

151+
qboolean IsMonster(const edict_t* ent) {
152+
return (ent->mtype && (ent->mtype <= M_TANK || ent->mtype == M_SHAMBLER));
153+
}
154+
151155
float vrx_get_pack_modifier(const edict_t *ent) {
152156
//Talent: Pack Animal
153157
int talentLevel = 0;
@@ -175,10 +179,9 @@ float vrx_get_pack_modifier(const edict_t *ent) {
175179
// must be on our team
176180
if (!OnSameTeam(ent, e))
177181
continue;
178-
// must be morphed
179-
if (!IsMorphedPlayer(e))
180-
continue;
181-
return 1.0f + 0.1f * talentLevel; // +10% per level
182+
// must be player or standard, non-boss monster/drone
183+
if (e->client || IsMorphedPlayer(e) || IsMonster(e))
184+
return 1.0f + 0.2f * talentLevel; // +20% per level
182185
}
183186

184187
return 1.0;

0 commit comments

Comments
 (0)