Adjust SlimeEffect API, allow custom poison damage

infclass · Jan 21, 2024 · 45bf193 · 45bf193
1 parent f27d543
commit 45bf193
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/src/game/server/infclass/classes/humans/human.cpp b/src/game/server/infclass/classes/humans/human.cpp
@@ -2109,17 +2109,15 @@ bool CInfClassHuman::FindPortalPosition(vec2 *pPosition)
 	return false;
 }
 
-void CInfClassHuman::OnSlimeEffect(int Owner)
+void CInfClassHuman::OnSlimeEffect(int Owner, int Damage, float DamageInterval)
 {
-	int Count = Config()->m_InfSlimePoisonDamage;
 	if(GetPlayerClass() == PLAYERCLASS_BIOLOGIST)
 	{
 		// Note: actually probably the character 'll stay in the slime for
 		// more than 1 tick and it 'll result in 2 damage dealt
-		Count = 1;
+		Damage = 1;
 	}
-	const float Interval = 1.25f;
-	m_pCharacter->Poison(Count, Owner, EDamageType::SLUG_SLIME, Interval);
+	m_pCharacter->Poison(Damage, Owner, EDamageType::SLUG_SLIME, DamageInterval);
 }
 
 bool CInfClassHuman::HasWhiteHole() const

diff --git a/src/game/server/infclass/classes/humans/human.h b/src/game/server/infclass/classes/humans/human.h
@@ -66,7 +66,7 @@ class CInfClassHuman : public CInfClassPlayerClass
 	void OnGrenadeFired(WeaponFireContext *pFireContext) override;
 	void OnLaserFired(WeaponFireContext *pFireContext) override;
 
-	void OnSlimeEffect(int Owner) override;
+	void OnSlimeEffect(int Owner, int Damage, float DamageInterval) override;
 	bool HasWhiteHole() const;
 	void GiveWhiteHole();
 	void RemoveWhiteHole();

diff --git a/src/game/server/infclass/classes/infcplayerclass.h b/src/game/server/infclass/classes/infcplayerclass.h
@@ -113,7 +113,7 @@ class CInfClassPlayerClass
 	virtual void OnLaserFired(WeaponFireContext *pFireContext);
 	virtual void OnNinjaFired(WeaponFireContext *pFireContext);
 
-	virtual void OnSlimeEffect(int Owner) = 0;
+	virtual void OnSlimeEffect(int Owner, int Damage, float DamageInterval) = 0;
 	virtual void OnFloatingPointCollected(int Points);
 
 	virtual void GiveUpgrade() {}

diff --git a/src/game/server/infclass/classes/infected/infected.cpp b/src/game/server/infclass/classes/infected/infected.cpp
@@ -996,7 +996,7 @@ bool CInfClassInfected::HasHumansNearby()
 	return false;
 }
 
-void CInfClassInfected::OnSlimeEffect(int Owner)
+void CInfClassInfected::OnSlimeEffect(int Owner, int Damage, float DamageInterval)
 {
 	if(!m_pCharacter->IsAlive())
 		return;

diff --git a/src/game/server/infclass/classes/infected/infected.h b/src/game/server/infclass/classes/infected/infected.h
@@ -48,7 +48,7 @@ class CInfClassInfected : public CInfClassPlayerClass
 
 	void OnHammerFired(WeaponFireContext *pFireContext) override;
 
-	void OnSlimeEffect(int Owner) override;
+	void OnSlimeEffect(int Owner, int Damage, float DamageInterval) override;
 	void OnFloatingPointCollected(int Points) override;
 	void OnLaserWall();
 

diff --git a/src/game/server/infclass/entities/slug-slime.cpp b/src/game/server/infclass/entities/slug-slime.cpp
@@ -15,6 +15,10 @@ CSlugSlime::CSlugSlime(CGameContext *pGameContext, vec2 Pos, int Owner) :
 {
 	m_StartTick = Server()->Tick();
 	m_EndTick = m_StartTick;
+
+	m_Damage = Config()->m_InfSlimePoisonDamage;
+	m_DamageInterval = 1.25f;
+
 	GameWorld()->InsertEntity(this);
 }
 
@@ -35,7 +39,7 @@ void CSlugSlime::Tick()
 		if(!GameServer()->Collision()->AreConnected(p->m_Pos, m_Pos, 84.0f))
 			continue; // not in reach
 
-		p->GetClass()->OnSlimeEffect(m_Owner);
+		p->GetClass()->OnSlimeEffect(m_Owner, m_Damage, m_DamageInterval);
 	}
 
 	int ExistsForTicks = Server()->Tick() - m_StartTick;
@@ -81,3 +85,9 @@ bool CSlugSlime::Replenish(int PlayerID, int EndTick)
 	m_EndTick = EndTick;
 	return true;
 }
+
+void CSlugSlime::SetDamage(int Damage, float Interval)
+{
+	m_Damage = Damage;
+	m_DamageInterval = Interval;
+}
diff --git a/src/game/server/infclass/entities/slug-slime.h b/src/game/server/infclass/entities/slug-slime.h
@@ -18,10 +18,13 @@ class CSlugSlime : public CPlacedObject
 	int GetEndTick() const { return m_EndTick; }
 
 	bool Replenish(int PlayerID, int EndTick);
+	void SetDamage(int Damage, float Interval);
 
 private:
 	int m_StartTick = 0;
 	int m_EndTick = 0;
+	int m_Damage{};
+	float m_DamageInterval{};
 };
 
 #endif