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

Target flag and bug fixes

Browse source 
Add new flags for MainTarget's party, which allows for Protect to buff
other parties.

Fixed incorrect script function calls
Fixed bug causing World server to get stuck in a loop
This commit is contained in:
Yogurt 2019-05-29 22:59:24 -07:00
parent 6127ad44cc
commit 4f80023156
7 changed files with 65 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
FFXIVClassic Map Server/Database.cs
View file

@ -2413,8 +2413,8 @@ namespace FFXIVClassic_Map_Server
battleCommand.job = reader.GetByte("classJob"); battleCommand.job = reader.GetByte("classJob");
battleCommand.level = reader.GetByte("lvl"); battleCommand.level = reader.GetByte("lvl");
battleCommand.requirements = (BattleCommandRequirements)reader.GetUInt16("requirements"); battleCommand.requirements = (BattleCommandRequirements)reader.GetUInt16("requirements");
battleCommand.mainTarget = (ValidTarget)reader.GetByte("mainTarget"); battleCommand.mainTarget = (ValidTarget)reader.GetUInt16("mainTarget");
battleCommand.validTarget = (ValidTarget)reader.GetByte("validTarget"); battleCommand.validTarget = (ValidTarget)reader.GetUInt16("validTarget");
battleCommand.aoeType = (TargetFindAOEType)reader.GetByte("aoeType"); battleCommand.aoeType = (TargetFindAOEType)reader.GetByte("aoeType");
battleCommand.basePotency = reader.GetUInt16("basePotency"); battleCommand.basePotency = reader.GetUInt16("basePotency");
battleCommand.numHits = reader.GetByte("numHits"); battleCommand.numHits = reader.GetByte("numHits");
@ -2454,7 +2454,26 @@ namespace FFXIVClassic_Map_Server
battleCommand.actionType = (ActionType)reader.GetInt16("actionType"); battleCommand.actionType = (ActionType)reader.GetInt16("actionType");
battleCommand.accuracyModifier = reader.GetFloat("accuracyMod"); battleCommand.accuracyModifier = reader.GetFloat("accuracyMod");
battleCommand.worldMasterTextId = reader.GetUInt16("worldMasterTextId"); battleCommand.worldMasterTextId = reader.GetUInt16("worldMasterTextId");
lua.LuaEngine.LoadBattleCommandScript(battleCommand, "weaponskill");
string folderName = "";
switch (battleCommand.commandType)
{
case CommandType.AutoAttack:
folderName = "autoattack";
break;
case CommandType.WeaponSkill:
folderName = "weaponskill";
break;
case CommandType.Ability:
folderName = "ability";
break;
case CommandType.Spell:
folderName = "magic";
break;
}
lua.LuaEngine.LoadBattleCommandScript(battleCommand, folderName);
battleCommandDict.Add(id, battleCommand); battleCommandDict.Add(id, battleCommand);
Tuple<byte, short> tuple = Tuple.Create<byte, short>(battleCommand.job, battleCommand.level); Tuple<byte, short> tuple = Tuple.Create<byte, short>(battleCommand.job, battleCommand.level);

43
FFXIVClassic Map Server/actors/chara/ai/helpers/TargetFind.cs
View file

@ -18,20 +18,24 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
public enum ValidTarget : ushort public enum ValidTarget : ushort
{ {
None = 0x00, None = 0x00,
Self = 0x01, //Can be used on self (if this flag isn't set and target is self, return false) Self = 0x01, //Can be used on self (if this flag isn't set and target is self, return false)
SelfOnly = 0x02, //Must be used on self (if this flag is set and target isn't self, return false) SelfOnly = 0x02, //Must be used on self (if this flag is set and target isn't self, return false)
Party = 0x4, //Can be used on party members Party = 0x4, //Can be used on party members
PartyOnly = 0x8, //Must be used on party members PartyOnly = 0x8, //Must be used on party members
Ally = 0x10, //Can be used on allies Ally = 0x10, //Can be used on allies
AllyOnly = 0x20, //Must be used on allies AllyOnly = 0x20, //Must be used on allies
NPC = 0x40, //Can be used on static NPCs NPC = 0x40, //Can be used on static NPCs
NPCOnly = 0x60, //Must be used on static NPCs NPCOnly = 0x80, //Must be used on static NPCs
Enemy = 0x80, //Can be used on enemies Enemy = 0x100, //Can be used on enemies
EnemyOnly = 0x100, //Must be used on enemies EnemyOnly = 0x200, //Must be used on enemies
Object = 0x200, //Can be used on objects Object = 0x400, //Can be used on objects
ObjectOnly = 0x400, //Must be used on objects ObjectOnly = 0x800, //Must be used on objects
Corpse = 0x600, //Can be used on corpses Corpse = 0x1000, //Can be used on corpses
CorpseOnly = 0x800, //Must be used on corpses CorpseOnly = 0x2000, //Must be used on corpses
//These are only used for ValidTarget, not MainTarget
MainTargetParty = 0x4000, //Can be used on main target's party (This will basically always be true.)
MainTargetPartyOnly = 0x8000, //Must be used on main target's party (This is for Protect basically.)
} }
/// <summary> Targeting from/to different entity types </summary> /// <summary> Targeting from/to different entity types </summary>
@ -94,7 +98,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
{ {
Reset(); Reset();
this.owner = owner; this.owner = owner;
this.masterTarget = mainTarget == null ? owner : mainTarget; this.mainTarget = mainTarget == null ? owner : mainTarget;
} }
public void Reset() public void Reset()
@ -393,6 +397,15 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
if (validTarget == ValidTarget.Self && aoeType == TargetFindAOEType.None && owner != target) if (validTarget == ValidTarget.Self && aoeType == TargetFindAOEType.None && owner != target)
return false; return false;
//This skill can't be used on main target's party members and target is a party member of main target
if ((validTarget & ValidTarget.MainTargetParty) == 0 && target.currentParty == mainTarget.currentParty)
return false;
//This skill must be used on main target's party members and target is not a party member of main target
if ((validTarget & ValidTarget.MainTargetPartyOnly) != 0 && target.currentParty != mainTarget.currentParty)
return false;
// this is fuckin retarded, think of a better way l8r // this is fuckin retarded, think of a better way l8r
if (!ignoreAOE) if (!ignoreAOE)
{ {

4
FFXIVClassic Map Server/actors/chara/ai/state/AbilityState.cs
View file

@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
{ {
this.startTime = DateTime.Now; this.startTime = DateTime.Now;
this.skill = Server.GetWorldManager().GetBattleCommand(skillId); this.skill = Server.GetWorldManager().GetBattleCommand(skillId);
var returnCode = skill.CallLuaFunction(owner, "ability", "onAbilityPrepare", owner, target, skill); var returnCode = skill.CallLuaFunction(owner, "onAbilityPrepare", owner, target, skill);
this.target = (skill.mainTarget & ValidTarget.SelfOnly) != 0 ? owner : target; this.target = (skill.mainTarget & ValidTarget.SelfOnly) != 0 ? owner : target;
@ -39,7 +39,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
public override void OnStart() public override void OnStart()
{ {
var returnCode = skill.CallLuaFunction(owner, "ability", "onAbilityStart", owner, target, skill); var returnCode = skill.CallLuaFunction(owner, "onAbilityStart", owner, target, skill);
if (returnCode != 0) if (returnCode != 0)
{ {

4
FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs
View file

@ -112,8 +112,8 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
attackCommand.range = 5; attackCommand.range = 5;
attackCommand.rangeHeight = 10; attackCommand.rangeHeight = 10;
attackCommand.worldMasterTextId = 0x765D; attackCommand.worldMasterTextId = 0x765D;
attackCommand.mainTarget = (ValidTarget)384; attackCommand.mainTarget = (ValidTarget)768;
attackCommand.validTarget = (ValidTarget)384; attackCommand.validTarget = (ValidTarget)17152;
attackCommand.commandType = CommandType.AutoAttack; attackCommand.commandType = CommandType.AutoAttack;
attackCommand.numHits = (byte)owner.GetMod(Modifier.HitCount); attackCommand.numHits = (byte)owner.GetMod(Modifier.HitCount);
attackCommand.basePotency = 100; attackCommand.basePotency = 100;

6
FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs
View file

@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
this.startPos = owner.GetPosAsVector3(); this.startPos = owner.GetPosAsVector3();
this.startTime = DateTime.Now; this.startTime = DateTime.Now;
this.spell = Server.GetWorldManager().GetBattleCommand(spellId); this.spell = Server.GetWorldManager().GetBattleCommand(spellId);
var returnCode = spell.CallLuaFunction(owner, "magic", "onMagicPrepare", owner, target, spell); var returnCode = spell.CallLuaFunction(owner, "onMagicPrepare", owner, target, spell);
//Modify spell based on status effects. Need to do it here because they can modify cast times //Modify spell based on status effects. Need to do it here because they can modify cast times
List<StatusEffect> effects = owner.statusEffects.GetStatusEffectsByFlag((uint)(StatusEffectFlags.ActivateOnCastStart)); List<StatusEffect> effects = owner.statusEffects.GetStatusEffectsByFlag((uint)(StatusEffectFlags.ActivateOnCastStart));
@ -49,7 +49,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
public override void OnStart() public override void OnStart()
{ {
var returnCode = spell.CallLuaFunction(owner, "magic", "onMagicStart", owner, target, spell); var returnCode = spell.CallLuaFunction(owner, "onMagicStart", owner, target, spell);
if (returnCode != 0) if (returnCode != 0)
{ {
@ -68,7 +68,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
Player p = (Player)owner; Player p = (Player)owner;
if (spell.comboStep == 1 || ((p.playerWork.comboNextCommandId[0] == spell.id || p.playerWork.comboNextCommandId[1] == spell.id))) if (spell.comboStep == 1 || ((p.playerWork.comboNextCommandId[0] == spell.id || p.playerWork.comboNextCommandId[1] == spell.id)))
{ {
spell.CallLuaFunction(owner, "magic", "onCombo", owner, target, spell); spell.CallLuaFunction(owner, "onCombo", owner, target, spell);
spell.isCombo = true; spell.isCombo = true;
} }
} }

6
FFXIVClassic Map Server/actors/chara/ai/state/WeaponSkillState.cs
View file

@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
this.startTime = DateTime.Now; this.startTime = DateTime.Now;
this.skill = Server.GetWorldManager().GetBattleCommand(skillId); this.skill = Server.GetWorldManager().GetBattleCommand(skillId);
var returnCode = skill.CallLuaFunction(owner, "weaponskill", "onSkillPrepare", owner, target, skill); var returnCode = skill.CallLuaFunction(owner, "onSkillPrepare", owner, target, skill);
this.target = (skill.mainTarget & ValidTarget.SelfOnly) != 0 ? owner : target; this.target = (skill.mainTarget & ValidTarget.SelfOnly) != 0 ? owner : target;
@ -40,7 +40,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
public override void OnStart() public override void OnStart()
{ {
var returnCode = skill.CallLuaFunction(owner, "weaponskill", "onSkillStart", owner, target, skill); var returnCode = skill.CallLuaFunction(owner, "onSkillStart", owner, target, skill);
if (returnCode != 0) if (returnCode != 0)
{ {
@ -69,7 +69,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
//If owner is a player and the skill being used is part of the current combo //If owner is a player and the skill being used is part of the current combo
if (p.playerWork.comboNextCommandId[0] == skill.id || p.playerWork.comboNextCommandId[1] == skill.id) if (p.playerWork.comboNextCommandId[0] == skill.id || p.playerWork.comboNextCommandId[1] == skill.id)
{ {
skill.CallLuaFunction(owner, "weaponskill", "onCombo", owner, target, skill); skill.CallLuaFunction(owner, "onCombo", owner, target, skill);
skill.isCombo = true; skill.isCombo = true;
} }
//or if this just the start of a combo //or if this just the start of a combo

9
FFXIVClassic Map Server/actors/group/Group.cs
View file

@ -127,13 +127,14 @@ namespace FFXIVClassic_Map_Server.actors.group
while (true) while (true)
{ {
if (GetMemberCount() - currentIndex >= 64) int memberCount = Math.Min(GetMemberCount(), members.Count);
if (memberCount - currentIndex >= 64)
session.QueuePacket(GroupMembersX64Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex)); session.QueuePacket(GroupMembersX64Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex));
else if (GetMemberCount() - currentIndex >= 32) else if (memberCount - currentIndex >= 32)
session.QueuePacket(GroupMembersX32Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex)); session.QueuePacket(GroupMembersX32Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex));
else if (GetMemberCount() - currentIndex >= 16) else if (memberCount - currentIndex >= 16)
session.QueuePacket(GroupMembersX16Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex)); session.QueuePacket(GroupMembersX16Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex));
else if (GetMemberCount() - currentIndex > 0) else if (memberCount - currentIndex > 0)
session.QueuePacket(GroupMembersX08Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex)); session.QueuePacket(GroupMembersX08Packet.buildPacket(session.id, session.GetActor().zoneId, time, members, ref currentIndex));
else else
break; break;