cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed infinite loop with DoBattleAction. Added some casting logic.

Browse Source
This commit is contained in:
Filip Maj
2017-08-29 00:33:23 -04:00
parent d81832f256
commit 67485eafc0
5 changed files with 106 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FFXIVClassic Map Server/actors/chara/Character.cs
View File

@@ -197,7 +197,7 @@ namespace FFXIVClassic_Map_Server.Actors
{
if (actions.Length - currentIndex >= 18)
BattleActionX18Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex);
else if (actions.Length - currentIndex >= 1)
else if (actions.Length - currentIndex > 1)
BattleActionX10Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex);
else if (actions.Length - currentIndex == 1)
{
@@ -218,7 +218,7 @@ namespace FFXIVClassic_Map_Server.Actors
{
if (actions.Count - currentIndex >= 18)
BattleActionX18Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex);
else if (actions.Count - currentIndex >= 1)
else if (actions.Count - currentIndex > 1)
BattleActionX10Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex);
else if (actions.Count - currentIndex == 1)
{

2
FFXIVClassic Map Server/actors/chara/ai/BattleCommand.cs
View File

@@ -86,7 +86,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
{
return (BattleCommand)MemberwiseClone();
}
public bool IsSpell()
{
return mpCost != 0 || castTimeSeconds != 0;

30
FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs
View File

@@ -55,18 +55,15 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
float[] baseCastDuration = { 1.0f, 0.25f };
float spellSpeed = spell.castTimeSeconds;
List<SubPacket> packets = new List<SubPacket>();
// command casting duration
if (owner.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER)
{
// todo: modify spellSpeed based on modifiers and stuff
// ((Player)owner).SendStartCastBar(spell.id, Utils.UnixTimeStampUTC(DateTime.Now.AddSeconds(spellSpeed)));
((Player)owner).SendStartCastbar(spell.id, Utils.UnixTimeStampUTC(DateTime.Now.AddSeconds(spellSpeed)));
owner.DoBattleAction(spell.id, spell.battleAnimation, new BattleAction(target.actorId, 30128, 1, 0, 1)); //You begin casting (6F000002: BLM, 6F000003: WHM)
}
// todo: change
owner.zone.BroadcastPacketsAroundActor(owner, packets);
}
}
@@ -106,6 +103,11 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
public override void OnComplete()
{
if (owner.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER)
{
((Player)owner).SendEndCastbar();
}
spell.targetFind.FindWithinArea(target, spell.validTarget);
isCompleted = true;
@@ -115,14 +117,12 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
var i = 0;
foreach (var chara in targets)
{
var action = new BattleAction(target.actorId, spell.worldMasterTextId, spell.effectAnimation, 0, (byte) HitDirection.None, 1);
var action = new BattleAction(target.actorId, spell.worldMasterTextId, spell.battleAnimation, 0, (byte) HitDirection.None, 1);
action.amount = (ushort)lua.LuaEngine.CallLuaBattleCommandFunction(owner, spell, "magic", "onMagicFinish", owner, chara, spell, action);
actions[i++] = action;
//packets.Add(BattleActionX01Packet.BuildPacket(chara.actorId, owner.actorId, action.targetId, spell.battleAnimation, action.effectId, action.worldMasterTextId, spell.id, action.amount, action.param));
actions[i++] = action;
}
owner.DoBattleAction(spell.id, spell.effectAnimation, actions);
owner.DoBattleAction(spell.id, spell.battleAnimation, actions);
}
public override void TryInterrupt()
@@ -164,12 +164,8 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
public override void Cleanup()
{
// command casting duration
var packets = new List<SubPacket>();
if (owner.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER)
{
// ((Player)owner).SendStartCastBar(0, 0);
}
owner.zone.BroadcastPacketsAroundActor(owner, packets);
//var packets = new List<SubPacket>();
//owner.zone.BroadcastPacketsAroundActor(owner, packets);
}
public BattleCommand GetSpell()