InfClassCharacter: Refactor and fix poisoning

infclass · Dec 23, 2023 · 857025a · 857025a
1 parent bd6ddb0
commit 857025a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/game/server/infclass/entities/growingexplosion.cpp b/src/game/server/infclass/entities/growingexplosion.cpp
@@ -309,8 +309,14 @@ void CGrowingExplosion::Tick()
 					m_Hit[p->GetCID()] = true;
 					break;
 				case GROWING_EXPLOSION_EFFECT::POISON_INFECTED:
-					p->Poison(Config()->m_InfPoisonDamage, m_Owner, DAMAGE_TYPE::MERCENARY_GRENADE);
+				{
+					int Damage = maximum(Config()->m_InfPoisonDamage, 1);
+					const float PoisonDurationSeconds = Config()->m_InfPoisonDuration / 1000.0;
+					const float DamageIntervalSeconds = PoisonDurationSeconds / Damage;
+
+					p->Poison(Damage, m_Owner, DAMAGE_TYPE::MERCENARY_GRENADE, DamageIntervalSeconds);
 					p->GetClass()->DisableHealing(Config()->m_InfPoisonDuration / 1000.0f, m_Owner, DAMAGE_TYPE::MERCENARY_GRENADE);
+				}
 					GameServer()->SendEmoticon(p->GetCID(), EMOTICON_DROP);
 					m_Hit[p->GetCID()] = true;
 					break;

diff --git a/src/game/server/infclass/entities/infccharacter.cpp b/src/game/server/infclass/entities/infccharacter.cpp
@@ -206,13 +206,7 @@ void CInfClassCharacter::Tick()
 			vec2 Force(0, 0);
 			static const int PoisonDamage = 1;
 			TakeDamage(Force, PoisonDamage, m_PoisonFrom, m_PoisonDamageType);
-			if(m_Poison >= 0)
-			{
-				int Damage = maximum(Config()->m_InfPoisonDamage, 1);
-				const float PoisonDurationSeconds = Config()->m_InfPoisonDuration / 1000.0;
-				const float DamageIntervalSeconds = PoisonDurationSeconds / Damage;
-				m_PoisonTick = CurrentTick + Server()->TickSpeed() * DamageIntervalSeconds;
-			}
+			m_PoisonTick = CurrentTick + Server()->TickSpeed() * m_PoisonEffectInterval;
 
 			if(m_PoisonDamageType == DAMAGE_TYPE::SLUG_SLIME)
 			{
@@ -957,11 +951,13 @@ bool CInfClassCharacter::IsPoisoned() const
 	return m_Poison > 0;
 }
 
-void CInfClassCharacter::Poison(int Count, int From, DAMAGE_TYPE DamageType)
+void CInfClassCharacter::Poison(int Count, int From, DAMAGE_TYPE DamageType, float Interval)
 {
-	if(Count > m_Poison)
+	bool JustPoisoned = m_PoisonTick > Server()->Tick();
+	if(Count > m_Poison + JustPoisoned ? 1 : 0)
 	{
 		m_Poison = Count;
+		m_PoisonEffectInterval = Interval;
 		m_PoisonFrom = From;
 		m_PoisonDamageType = DamageType;
 	}

diff --git a/src/game/server/infclass/entities/infccharacter.h b/src/game/server/infclass/entities/infccharacter.h
@@ -200,7 +200,7 @@ class CInfClassCharacter : public CCharacter
 	void CancelSlowMotion();
 
 	bool IsPoisoned() const;
-	void Poison(int Count, int From, DAMAGE_TYPE DamageType);
+	void Poison(int Count, int From, DAMAGE_TYPE DamageType, float Interval = 1.0f);
 	void ResetPoisonEffect();
 
 	void ResetMovementsInput();
@@ -296,6 +296,7 @@ class CInfClassCharacter : public CCharacter
 	int m_SlowEffectApplicant;
 
 	int m_Poison = 0;
+	float m_PoisonEffectInterval{};
 	int m_PoisonTick = 0;
 	int m_PoisonFrom = 0;
 	DAMAGE_TYPE m_PoisonDamageType;