From a90956948504394ed0987c124a38e480d34ea419 Mon Sep 17 00:00:00 2001 From: zaCade Date: Tue, 4 Jun 2019 18:18:58 +0200 Subject: [PATCH] Fuck you too alright :D --- _CleanupRequired/BossHP/scripting/BossHP.sp | 33 +++++++++++---------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/_CleanupRequired/BossHP/scripting/BossHP.sp b/_CleanupRequired/BossHP/scripting/BossHP.sp index 601182c2..ccd40c1f 100644 --- a/_CleanupRequired/BossHP/scripting/BossHP.sp +++ b/_CleanupRequired/BossHP/scripting/BossHP.sp @@ -957,7 +957,7 @@ public void OnGameFrame() delete Boss; g_aBoss.Erase(i); i--; - + continue; } @@ -1115,14 +1115,15 @@ bool BossInit(CBoss _Boss) int iCounterOnHitMinCount = GetOutputCount(iCounterEnt, "m_OnHitMin"); int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax"); - Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount; - - if(iCounterOnHitMaxCount == iCounterOnHitMinCount) + if(iCounterOnHitMinCount == iCounterOnHitMaxCount) { - 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 iMaxDiff = RoundFloat(GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iCounterEnt, "m_OutValue")); + Config.bCounterReverse = iMaxDiff > iMinDiff; } + else + Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount; } else if(_Boss.IsHPBar) { @@ -1209,26 +1210,28 @@ bool BossInit(CBoss _Boss) int iIteratorOnHitMinCount = GetOutputCount(iIteratorEnt, "m_OnHitMin"); int iIteratorOnHitMaxCount = GetOutputCount(iIteratorEnt, "m_OnHitMax"); - Config.bIteratorReverse = iIteratorOnHitMaxCount > iIteratorOnHitMinCount; - - if(iIteratorOnHitMaxCount == iIteratorOnHitMinCount) + if(iIteratorOnHitMinCount == iIteratorOnHitMaxCount) { - int iIteratorMaxDiff = RoundFloat(GetEntPropFloat(iIteratorEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iIteratorEnt, "m_OutValue")); - int iIteratorMinDiff = RoundFloat(GetOutputValueFloat(iIteratorEnt, "m_OutValue") - GetEntPropFloat(iIteratorEnt, Prop_Data, "m_flMin")); - Config.bIteratorReverse = iIteratorMaxDiff > iIteratorMinDiff; + int iMinDiff = 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 = iMaxDiff > iMinDiff; } + else + Config.bIteratorReverse = iIteratorOnHitMaxCount > iIteratorOnHitMinCount; int iCounterOnHitMinCount = GetOutputCount(iCounterEnt, "m_OnHitMin"); int iCounterOnHitMaxCount = GetOutputCount(iCounterEnt, "m_OnHitMax"); - Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount; - - if(iCounterOnHitMaxCount == iCounterOnHitMinCount) + if(iCounterOnHitMinCount == iCounterOnHitMaxCount) { - 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 iMaxDiff = RoundFloat(GetEntPropFloat(iCounterEnt, Prop_Data, "m_flMax") - GetOutputValueFloat(iCounterEnt, "m_OutValue")); + Config.bCounterReverse = iMaxDiff > iMinDiff; } + else + Config.bCounterReverse = iCounterOnHitMaxCount > iCounterOnHitMinCount; } _Boss.bActive = true;