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 death/despawning kinda (need to figure out why hp wont tick down after respawning)

Browse Source
This commit is contained in:
Tahir Akhlaq
2017-09-03 01:01:19 +01:00
parent c5cc7c2f00
commit 4978813c27
16 changed files with 251 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@@ -1781,21 +1781,6 @@ namespace FFXIVClassic_Map_Server.Actors
base.PostUpdate(tick, packets);
}
public override void AddHP(int hp)
{
// todo: +/- hp and die
// todo: check hidden effects and shit
var addHp = charaWork.parameterSave.hp[currentJob] + hp;
addHp = addHp.Clamp(ushort.MinValue, charaWork.parameterSave.hpMax[currentJob]);
charaWork.parameterSave.hp[currentJob] = (short)addHp;
if (charaWork.parameterSave.hp[currentJob] < 1)
Die(Program.Tick);
updateFlags |= ActorUpdateFlags.HpTpMp;
}
public override void Die(DateTime tick)
{
// todo: death timer
@@ -1981,7 +1966,7 @@ namespace FFXIVClassic_Map_Server.Actors
{
if (aiContainer.CanChangeState())
aiContainer.Cast(zone.FindActorInArea<Character>(targetId == 0 ? currentTarget : targetId), spellId);
else if (aiContainer.GetCurrentState() is MagicState)
else if (aiContainer.IsCurrentState<MagicState>())
// You are already casting.
SendGameMessage(Server.GetWorldManager().GetActor(), 32536, 0x20);
else
@@ -2141,7 +2126,7 @@ namespace FFXIVClassic_Map_Server.Actors
//action.animation = 0x19001000;
}
var target = state.GetTarget();
//if (target is BattleNpc)
if (target is BattleNpc)
{
((BattleNpc)target).hateContainer.UpdateHate(this, action.amount);
}
@@ -2164,6 +2149,8 @@ namespace FFXIVClassic_Map_Server.Actors
var skill = ((WeaponSkillState)state).GetWeaponSkill();
// todo: should just make a thing that updates the one slot cause this is dumb as hell
UpdateHotbarTimer(skill.id, skill.recastTimeSeconds);
// todo: this really shouldnt be called on each ws?
lua.LuaEngine.CallLuaBattleFunction(this, "onWeaponSkill", this, state.GetTarget(), skill);
}
}
}