mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-20 11:47:48 +00:00
Code Activity

Pass BattleCommand to combat functions to prepare for passing

Browse source 
BattleCommand to scripts.

Add CommandResultContainer to status update to handle death from dots.
This commit is contained in:
Yogurt 2019-05-27 17:31:25 -07:00
parent 75c6708ac5
commit cc07e1f453
3 changed files with 53 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
FFXIVClassic Map Server/actors/chara/Character.cs
View file

@ -842,15 +842,19 @@ namespace FFXIVClassic_Map_Server.Actors
} }
public virtual void OnDamageDealt(Character defender, CommandResult action, CommandResultContainer actionContainer = null) public virtual void OnDamageDealt(Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
switch (action.hitType) switch (action.hitType)
{ {
case (HitType.Miss): case (HitType.Miss):
OnMiss(this, action, actionContainer); OnMiss(defender, skill, action, actionContainer);
break;
case (HitType.Crit):
OnCrit(defender, skill, action, actionContainer);
OnHit(defender, skill, action, actionContainer);
break; break;
default: default:
OnHit(defender, action, actionContainer); OnHit(defender, skill, action, actionContainer);
break; break;
} }
@ -865,18 +869,18 @@ namespace FFXIVClassic_Map_Server.Actors
} }
} }
public virtual void OnDamageTaken(Character attacker, CommandResult action, CommandResultContainer actionContainer = null) public virtual void OnDamageTaken(Character attacker, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
switch (action.hitType) switch (action.hitType)
{ {
case (HitType.Miss): case (HitType.Miss):
OnEvade(attacker, action, actionContainer); OnEvade(attacker, skill, action, actionContainer);
break; break;
case (HitType.Parry): case (HitType.Parry):
OnParry(attacker, action, actionContainer); OnParry(attacker, skill, action, actionContainer);
break; break;
case (HitType.Block): case (HitType.Block):
OnBlock(attacker, action, actionContainer); OnBlock(attacker, skill, action, actionContainer);
break; break;
} }
@ -1030,38 +1034,42 @@ namespace FFXIVClassic_Map_Server.Actors
} }
//Called when this character evades attacker's action //Called when this character evades attacker's action
public void OnEvade(Character attacker, CommandResult action, CommandResultContainer actionContainer = null) public void OnEvade(Character attacker, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
SetProc((ushort)HitType.Evade); SetProc((ushort)HitType.Evade);
statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnEvade, "onEvade", attacker, this, action, actionContainer); statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnEvade, "onEvade", attacker, this, action, actionContainer);
} }
//Called when this character blocks attacker's action //Called when this character blocks attacker's action
public void OnBlock(Character attacker, CommandResult action, CommandResultContainer actionContainer = null) public void OnBlock(Character attacker, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
SetProc((ushort)HitType.Block); SetProc((ushort)HitType.Block);
statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnBlock, "onBlock", attacker, this, action, actionContainer); statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnBlock, "onBlock", attacker, this, action, actionContainer);
} }
//Called when this character parries attacker's action //Called when this character parries attacker's action
public void OnParry(Character attacker, CommandResult action, CommandResultContainer actionContainer = null) public void OnParry(Character attacker, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
SetProc((ushort)HitType.Parry); SetProc((ushort)HitType.Parry);
statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnParry, "onParry", attacker, this, action, actionContainer); statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnParry, "onParry", attacker, this, action, actionContainer);
} }
//Called when this character misses //Called when this character misses
public void OnMiss(Character defender, CommandResult action, CommandResultContainer actionContainer = null) public void OnMiss(Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
SetProc((ushort)HitType.Miss); SetProc((ushort)HitType.Miss);
statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnMiss, "onMiss", this, defender, action, actionContainer); statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnMiss, "onMiss", this, defender, action, actionContainer);
} }
public void OnHit(Character defender, CommandResult action, CommandResultContainer actionContainer = null) public void OnHit(Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnHit, "onHit", this, defender, action, actionContainer); statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnHit, "onHit", this, defender, action, actionContainer);
} }
public void OnCrit(Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{
statusEffects.CallLuaFunctionByFlag((uint)StatusEffectFlags.ActivateOnHit, "onCrit", this, defender, action, actionContainer);
}
//The order of messages that appears after using a command is: //The order of messages that appears after using a command is:
//1. Cast start messages. (ie "You begin casting... ") //1. Cast start messages. (ie "You begin casting... ")

30
FFXIVClassic Map Server/actors/chara/ai/StatusEffectContainer.cs
View file

@ -35,15 +35,16 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
public void Update(DateTime tick) public void Update(DateTime tick)
{ {
CommandResultContainer resultContainer = new CommandResultContainer();
//Regen/Refresh/Regain effects tick every 3 seconds //Regen/Refresh/Regain effects tick every 3 seconds
if ((DateTime.Now - lastTick).Seconds >= 3) if ((DateTime.Now - lastTick).Seconds >= 3)
{ {
RegenTick(tick); RegenTick(tick, resultContainer);
lastTick = DateTime.Now; lastTick = DateTime.Now;
} }
// list of effects to remove
// if (owner is Player) UpdateTimeAtIndex(4, 4294967295); // list of effects to remove
var removeEffects = new List<StatusEffect>(); var removeEffects = new List<StatusEffect>();
for (int i = 0; i < effects.Values.Count; i++) for (int i = 0; i < effects.Values.Count; i++)
{ {
@ -59,15 +60,16 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
RemoveStatusEffect(effect); RemoveStatusEffect(effect);
} }
if (sendUpdate) resultContainer.CombineLists();
if (resultContainer.GetList().Count > 0)
{ {
owner.zone.BroadcastPacketsAroundActor(owner, owner.GetActorStatusPackets()); owner.DoBattleAction(0, 0x7c000062, resultContainer.GetList());
sendUpdate = false;
} }
} }
//regen/refresh/regain //regen/refresh/regain
public void RegenTick(DateTime tick) public void RegenTick(DateTime tick, CommandResultContainer resultContainer)
{ {
ushort dotTick = (ushort) owner.GetMod(Modifier.RegenDown); ushort dotTick = (ushort) owner.GetMod(Modifier.RegenDown);
ushort regenTick = (ushort) owner.GetMod(Modifier.Regen); ushort regenTick = (ushort) owner.GetMod(Modifier.Regen);
@ -77,17 +79,23 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
//DoTs tick before regen and the full dot damage is displayed, even if some or all of it is nullified by regen. Only effects like stoneskin actually alter the number shown //DoTs tick before regen and the full dot damage is displayed, even if some or all of it is nullified by regen. Only effects like stoneskin actually alter the number shown
if (dotTick > 0) if (dotTick > 0)
{ {
CommandResult action = new CommandResult(owner.actorId, 30331, (uint)(HitEffect.HitEffectType | HitEffect.Hit), dotTick); //Unsure why 10105 is the textId used
//Also unsure why magicshield is used
CommandResult action = new CommandResult(owner.actorId, 10105, (uint)(HitEffect.MagicEffectType | HitEffect.MagicShield | HitEffect.NoResist), dotTick);
utils.BattleUtils.HandleStoneskin(owner, action); utils.BattleUtils.HandleStoneskin(owner, action);
// todo: figure out how to make red numbers appear for enemies getting hurt by dots // todo: figure out how to make red numbers appear for enemies getting hurt by dots
//owner.DelHP(action.amount); resultContainer.AddAction(action);
utils.BattleUtils.DamageTarget(owner, owner, action, null); owner.DelHP(action.amount, resultContainer);
owner.DoBattleAction(0, 0, action);
} }
//DoTs are the only effect to show numbers, so that doesnt need to be handled for these //DoTs are the only effect to show numbers, so that doesnt need to be handled for these
if (regenTick != 0)
owner.AddHP(regenTick); owner.AddHP(regenTick);
if (refreshtick != 0)
owner.AddMP(refreshtick); owner.AddMP(refreshtick);
if (regainTick != 0)
owner.AddTP(regainTick); owner.AddTP(regainTick);
} }

19
FFXIVClassic Map Server/actors/chara/ai/utils/BattleUtils.cs
View file

@ -241,7 +241,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
defender.SubtractMod((uint)Modifier.Stoneskin, mitigation); defender.SubtractMod((uint)Modifier.Stoneskin, mitigation);
} }
public static void DamageTarget(Character attacker, Character defender, CommandResult action, CommandResultContainer actionContainer= null) public static void DamageTarget(Character attacker, Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer= null)
{ {
if (defender != null) if (defender != null)
{ {
@ -254,9 +254,9 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
bnpc.lastAttacker = attacker; bnpc.lastAttacker = attacker;
} }
defender.DelHP((short)action.amount); defender.DelHP((short)action.amount, actionContainer);
attacker.OnDamageDealt(defender, action, actionContainer); attacker.OnDamageDealt(defender, skill, action, actionContainer);
defender.OnDamageTaken(attacker, action, actionContainer); defender.OnDamageTaken(attacker, skill, action, actionContainer);
// todo: other stuff too // todo: other stuff too
if (defender is BattleNpc) if (defender is BattleNpc)
@ -272,11 +272,11 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
} }
} }
public static void HealTarget(Character caster, Character target, CommandResult action, CommandResultContainer actionContainer = null) public static void HealTarget(Character caster, Character target, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
{ {
if (target != null) if (target != null)
{ {
target.AddHP(action.amount); target.AddHP(action.amount, actionContainer);
target.statusEffects.CallLuaFunctionByFlag((uint) StatusEffectFlags.ActivateOnHealed, "onHealed", caster, target, action, actionContainer); target.statusEffects.CallLuaFunctionByFlag((uint) StatusEffectFlags.ActivateOnHealed, "onHealed", caster, target, action, actionContainer);
} }
@ -512,8 +512,9 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
actionContainer.AddAction(action); actionContainer.AddAction(action);
action.enmity = (ushort) (action.enmity * (skill != null ? skill.enmityModifier : 1)); action.enmity = (ushort) (action.enmity * (skill != null ? skill.enmityModifier : 1));
//Damage the target //Damage the target
DamageTarget(attacker, defender, action, actionContainer); DamageTarget(attacker, defender, skill, action, actionContainer);
} }
public static void FinishActionSpell(Character attacker, Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null) public static void FinishActionSpell(Character attacker, Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
@ -542,7 +543,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
actionContainer.AddAction(action); actionContainer.AddAction(action);
DamageTarget(attacker, defender, action, actionContainer); DamageTarget(attacker, defender, skill, action, actionContainer);
} }
public static void FinishActionHeal(Character attacker, Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null) public static void FinishActionHeal(Character attacker, Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)
@ -552,7 +553,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
actionContainer.AddAction(action); actionContainer.AddAction(action);
HealTarget(attacker, defender, action, actionContainer); HealTarget(attacker, defender, skill, action, actionContainer);
} }
public static void FinishActionStatus(Character attacker, Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null) public static void FinishActionStatus(Character attacker, Character defender, BattleCommand skill, CommandResult action, CommandResultContainer actionContainer = null)