summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/EntityEffect.cpp77
-rw-r--r--src/Entities/EntityEffect.h4
2 files changed, 65 insertions, 16 deletions
diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp
index 58b76b21b..9cf20095d 100644
--- a/src/Entities/EntityEffect.cpp
+++ b/src/Entities/EntityEffect.cpp
@@ -237,17 +237,18 @@ void cEntityEffect::OnTick(cPawn & a_Target)
void cEntityEffectSpeed::OnActivate(cPawn & a_Target)
{
- // TODO: Add SetMormalMaxSpeed to cMonster
-
- if (!a_Target.IsPlayer())
+ if (a_Target.IsMob())
{
- return;
+ cMonster * Mob = (cMonster*) &a_Target;
+ Mob->SetWalkSpeed(Mob->GetWalkSpeed() + 0.2 * m_Intensity);
+ }
+ else if (a_Target.IsPlayer())
+ {
+ cPlayer * Player = (cPlayer*) &a_Target;
+ Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() + 0.2 * m_Intensity);
+ Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() + 0.26 * m_Intensity);
+ Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() + 0.2 * m_Intensity);
}
- cPlayer * Player = (cPlayer*) &a_Target;
-
- Player->SetNormalMaxSpeed(1.0 + 0.2 * m_Intensity);
- Player->SetSprintingMaxSpeed(1.3 + 0.26 * m_Intensity);
- Player->SetFlyingMaxSpeed(1.0 + 0.2 * m_Intensity);
}
@@ -256,17 +257,61 @@ void cEntityEffectSpeed::OnActivate(cPawn & a_Target)
void cEntityEffectSpeed::OnDeactivate(cPawn & a_Target)
{
- // TODO: Add SetMormalMaxSpeed to cMonster
+ if (a_Target.IsMob())
+ {
+ cMonster * Mob = (cMonster*) &a_Target;
+ Mob->SetWalkSpeed(Mob->GetWalkSpeed() - 0.2 * m_Intensity);
+ }
+ else if (a_Target.IsPlayer())
+ {
+ cPlayer * Player = (cPlayer*) &a_Target;
+ Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() - 0.2 * m_Intensity);
+ Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() - 0.26 * m_Intensity);
+ Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() - 0.2 * m_Intensity);
+ }
+}
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cEntityEffectSlowness:
- if (!a_Target.IsPlayer())
+void cEntityEffectSlowness::OnActivate(cPawn & a_Target)
+{
+ if (a_Target.IsMob())
{
- return;
+ cMonster * Mob = (cMonster*) &a_Target;
+ Mob->SetWalkSpeed(Mob->GetWalkSpeed() - 0.15 * m_Intensity);
}
- cPlayer * Player = (cPlayer*) &a_Target;
+ else if (a_Target.IsPlayer())
+ {
+ cPlayer * Player = (cPlayer*) &a_Target;
+ Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() - 0.15 * m_Intensity);
+ Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() - 0.195 * m_Intensity);
+ Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() - 0.15 * m_Intensity);
+ }
+}
+
+
- Player->SetNormalMaxSpeed(1.0);
- Player->SetSprintingMaxSpeed(1.3);
- Player->SetFlyingMaxSpeed(1.0);
+
+
+void cEntityEffectSlowness::OnDeactivate(cPawn & a_Target)
+{
+ if (a_Target.IsMob())
+ {
+ cMonster * Mob = (cMonster*) &a_Target;
+ Mob->SetWalkSpeed(Mob->GetWalkSpeed() + 0.15 * m_Intensity);
+ }
+ else if (a_Target.IsPlayer())
+ {
+ cPlayer * Player = (cPlayer*) &a_Target;
+ Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() + 0.15 * m_Intensity);
+ Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() + 0.195 * m_Intensity);
+ Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() + 0.15 * m_Intensity);
+ }
}
diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h
index e123a7f77..7cf9cd3d5 100644
--- a/src/Entities/EntityEffect.h
+++ b/src/Entities/EntityEffect.h
@@ -156,6 +156,10 @@ public:
super(a_Duration, a_Intensity, a_DistanceModifier)
{
}
+
+ virtual void OnActivate(cPawn & a_Target) override;
+
+ virtual void OnDeactivate(cPawn & a_Target) override;
};