UNLOZE/sm-plugins
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BossHP: blub^2

Browse Source
This commit is contained in:
neon 2018-10-08 19:15:36 +02:00
parent f780a626f0
commit 92fd59353c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BossHP/scripting/BossHP.sp
View File

@ -454,10 +454,10 @@ public void OnEntitySpawned(int entity)
else else
sOperation = "Subtract"; sOperation = "Subtract";
if (FindOutput(entity, "m_OnHealthChanged", 0, sTargetName, sOperation) != -1) if (FindOutput(entity, "m_OnHealthChanged", 0, sTargetName) != -1)
HookSingleEntityOutput(entity, "OnHealthChanged", HookCallbackDamagedBoss, false); HookSingleEntityOutput(entity, "OnHealthChanged", HookCallbackDamagedBoss, false);
if (FindOutput(entity, "m_OnDamaged", 0, sTargetName, sOperation) != -1) if (FindOutput(entity, "m_OnDamaged", 0, sTargetName) != -1)
HookSingleEntityOutput(entity, "OnDamaged", HookCallbackDamagedBoss, false); HookSingleEntityOutput(entity, "OnDamaged", HookCallbackDamagedBoss, false);
} }
@ -473,10 +473,10 @@ public void OnEntitySpawned(int entity)
else else
sOperation = "Subtract"; sOperation = "Subtract";
if (FindOutput(entity, "m_OnHealthChanged", 0, sTargetName, sOperation) != -1) if (FindOutput(entity, "m_OnHealthChanged", 0, sTargetName) != -1)
HookSingleEntityOutput(entity, "OnHealthChanged", HookCallbackDamagedBoss, false); HookSingleEntityOutput(entity, "OnHealthChanged", HookCallbackDamagedBoss, false);
if (FindOutput(entity, "m_OnDamaged", 0, sTargetName, sOperation) != -1) if (FindOutput(entity, "m_OnDamaged", 0, sTargetName) != -1)
HookSingleEntityOutput(entity, "OnDamaged", HookCallbackDamagedBoss, false); HookSingleEntityOutput(entity, "OnDamaged", HookCallbackDamagedBoss, false);
} }
else if (_Config.IsBreakable) else if (_Config.IsBreakable)
@ -490,7 +490,6 @@ public void OnEntitySpawned(int entity)
if (StrEqual(sTargetNameCfg, sTargetName)) if (StrEqual(sTargetNameCfg, sTargetName))
HookSingleEntityOutput(entity, "OnHealthChanged", HookCallbackDamagedBoss, false); HookSingleEntityOutput(entity, "OnHealthChanged", HookCallbackDamagedBoss, false);
} }
} }
} }
@ -929,7 +928,6 @@ bool BossInit(CBoss _Boss)
} }
Boss.iBreakableEnt = iBreakableEnt; Boss.iBreakableEnt = iBreakableEnt;
} }
else if(_Boss.IsCounter) else if(_Boss.IsCounter)
{ {
@ -992,7 +990,6 @@ bool BossInit(CBoss _Boss)
int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax"); int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax");
Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount; Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount;
} }
else if(_Boss.IsHPBar) else if(_Boss.IsHPBar)
{ {
@ -1329,7 +1326,6 @@ int FindEntityByTargetname(int entity, const char[] sTargetname, const char[] sC
return INVALID_ENT_REFERENCE; return INVALID_ENT_REFERENCE;
} }
stock int IsValidClient(int client, bool nobots = true) stock int IsValidClient(int client, bool nobots = true)
{ {
if (client <= 0 || client > MaxClients || !IsClientConnected(client) || (nobots && IsFakeClient(client))) if (client <= 0 || client > MaxClients || !IsClientConnected(client) || (nobots && IsFakeClient(client)))
@ -1371,4 +1367,4 @@ public void HookCallbackDamagedBoss(const char[] output, int caller, int activat
ShowOverlay(activator, "overlays/hitmarker/hitmarkerv2", 0.25); ShowOverlay(activator, "overlays/hitmarker/hitmarkerv2", 0.25);
} }
} }