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

Merge branch 'master' of https://git.unloze.com/UNLOZE/sm-plugins-unloze

Browse Source
This commit is contained in:
george 2019-06-04 18:02:59 +01:00
commit f9edee1322
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
BossHP/scripting/BossHP.sp
View File

@ -957,7 +957,7 @@ public void OnGameFrame()
delete Boss; delete Boss;
g_aBoss.Erase(i); g_aBoss.Erase(i);
i--; i--;
continue; continue;
} }
@ -1115,14 +1115,15 @@ bool BossInit(CBoss _Boss)
int iCounterOnHitMinCount = GetOutputCount(iCounterEnt, "m_OnHitMin"); int iCounterOnHitMinCount = GetOutputCount(iCounterEnt, "m_OnHitMin");
int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax"); int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax");
Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount; if(iCounterOnHitMinCount == iCounterOnHitMaxCount)
if(iCounterOnHitMaxCount == iCounterOnHitMinCount)
{ {
int iMaxDiff = RoundFloat(GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iCounterEnt, "m_OutValue"));
int iMinDiff = RoundFloat(GetOutputValueFloat(iCounterEnt, "m_OutValue") - GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMin")); int iMinDiff = RoundFloat(GetOutputValueFloat(iCounterEnt, "m_OutValue") - GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMin"));
int iMaxDiff = RoundFloat(GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iCounterEnt, "m_OutValue"));
Config.bCounterReverse = iMaxDiff > iMinDiff; Config.bCounterReverse = iMaxDiff > iMinDiff;
} }
else
Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount;
} }
else if(_Boss.IsHPBar) else if(_Boss.IsHPBar)
{ {
@ -1209,26 +1210,28 @@ bool BossInit(CBoss _Boss)
int iIteratorOnHitMinCount = GetOutputCount(iIteratorEnt, "m_OnHitMin"); int iIteratorOnHitMinCount = GetOutputCount(iIteratorEnt, "m_OnHitMin");
int iIteratorOnHitMaxCount = GetOutputCount(iIteratorEnt, "m_OnHitMax"); int iIteratorOnHitMaxCount = GetOutputCount(iIteratorEnt, "m_OnHitMax");
Config.bIteratorReverse = iIteratorOnHitMaxCount > iIteratorOnHitMinCount; if(iIteratorOnHitMinCount == iIteratorOnHitMaxCount)
if(iIteratorOnHitMaxCount == iIteratorOnHitMinCount)
{ {
int iIteratorMaxDiff = RoundFloat(GetEntPropFloat(iIteratorEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iIteratorEnt, "m_OutValue")); int iMinDiff = RoundFloat(GetOutputValueFloat(iIteratorEnt, "m_OutValue") - GetEntPropFloat(iIteratorEnt, Prop_Data, "m_flMin"));
int iIteratorMinDiff = RoundFloat(GetOutputValueFloat(iIteratorEnt, "m_OutValue") - GetEntPropFloat(iIteratorEnt, Prop_Data, "m_flMin")); int iMaxDiff = RoundFloat(GetEntPropFloat(iIteratorEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iIteratorEnt, "m_OutValue"));
Config.bIteratorReverse = iIteratorMaxDiff > iIteratorMinDiff;
Config.bIteratorReverse = iMaxDiff > iMinDiff;
} }
else
Config.bIteratorReverse = iIteratorOnHitMaxCount > iIteratorOnHitMinCount;
int iCounterOnHitMinCount = GetOutputCount(iCounterEnt, "m_OnHitMin"); int iCounterOnHitMinCount = GetOutputCount(iCounterEnt, "m_OnHitMin");
int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax"); int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax");
Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount; if(iCounterOnHitMinCount == iCounterOnHitMaxCount)
if(iCounterOnHitMaxCount == iCounterOnHitMinCount)
{ {
int iMaxDiff = RoundFloat(GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iCounterEnt, "m_OutValue"));
int iMinDiff = RoundFloat(GetOutputValueFloat(iCounterEnt, "m_OutValue") - GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMin")); int iMinDiff = RoundFloat(GetOutputValueFloat(iCounterEnt, "m_OutValue") - GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMin"));
int iMaxDiff = RoundFloat(GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iCounterEnt, "m_OutValue"));
Config.bCounterReverse = iMaxDiff > iMinDiff; Config.bCounterReverse = iMaxDiff > iMinDiff;
} }
else
Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount;
} }
_Boss.bActive = true; _Boss.bActive = true;