zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-08-02 15:51:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

More bug fixes

Browse source 
Fixed loading status effects on login
Fixed barrage issues
Added untraited version of Protect
Added sanguine rite
This commit is contained in:
yogurt 2018-05-27 18:07:52 -05:00
parent a7e59fa7e4
commit 8de606051a
14 changed files with 99 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
FFXIVClassic Map Server/Database.cs
View file

@ -957,10 +957,7 @@ namespace FFXIVClassic_Map_Server
var tick = reader.GetUInt32(3);
var tier = reader.GetByte(4);
var extra = reader.GetUInt64(5);
player.charaWork.status[count] = reader.GetUInt16(0);
player.charaWork.statusShownTime[count] = reader.GetUInt32(1);
var effect = Server.GetWorldManager().GetStatusEffect(id);
if (effect != null)
{
@ -973,6 +970,7 @@ namespace FFXIVClassic_Map_Server
// dont wanna send ton of messages on login (i assume retail doesnt)
player.statusEffects.AddStatusEffect(effect, null, true);
}
}
}
@ -2229,8 +2227,7 @@ namespace FFXIVClassic_Map_Server
string queries = "";
foreach (var effect in player.statusEffects.GetStatusEffects())
{
var duration = effect.GetDuration() + effect.GetStartTime().Second - Program.Tick.Second;
var duration = Utils.UnixTimeStampUTC(effect.GetEndTime()) - Utils.UnixTimeStampUTC();
queries += Environment.NewLine + $"REPLACE INTO characters_statuseffect(characterId, statusId, magnitude, duration, tick, tier, extra) VALUES ({player.actorId}, {effect.GetStatusEffectId()}, {effect.GetMagnitude()}, {duration}, {effect.GetTickMs()}, {effect.GetTier()}, {effect.GetExtra()});";
}

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

@ -1073,13 +1073,12 @@ namespace FFXIVClassic_Map_Server.Actors
ushort hitCount = 0;
for (int hitNum = 1; hitNum <= command.numHits; hitNum++)
{
var action = new BattleAction(chara.actorId, command, (byte)GetHitDirection(chara), (byte)hitNum);
var action = new BattleAction(chara.actorId, command, (byte)GetHitDirection(chara), (byte) hitNum);
//uncached script
lua.LuaEngine.CallLuaBattleCommandFunction(this, command, folder, "onSkillFinish", this, chara, command, action, actions);
//cached script
//skill.CallLuaFunction(owner, "onSkillFinish", this, chara, command, action, actions);
if (action.hitType > HitType.Evade && action.hitType != HitType.Resist)
{
hitTarget = true;

10
FFXIVClassic Map Server/actors/chara/ai/StatusEffect.cs
View file

@ -132,7 +132,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
Resonance = 223114,
Soughspeak = 223115,
PresenceofMind2 = 223116,
SanguineRite = 223117,
SanguineRite = 223117, //old effect
PunishingBarbs = 223118,
DarkSeal = 223119,
Emulate = 223120,
@ -143,7 +143,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
SkullSunder = 223126,
Bloodletter = 223127, //comboed effect
Levinbolt = 223128,
Protect = 223129, //old Protect
Protect = 223129, //untraited protect
Shell = 223130, //old shell
Reraise = 223131,
ShockSpikes = 223132,
@ -246,13 +246,13 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
Excruciate = 223231,
Necrogenesis = 223232,
Parsimony = 223233,
SanguineRite2 = 223234,
SanguineRite2 = 223234, //untraited effect
Aero = 223235,
Outmaneuver2 = 223236,
Blindside2 = 223237,
Decoy2 = 223238, //Traited
Protect2 = 223239, //new Protect
SanguineRite3 = 223240,
Protect2 = 223239, //Traited
SanguineRite3 = 223240, //Traited
Bloodletter2 = 223241, //uncomboed effect
FullyBlissfulMind = 223242,
MagicEvasionDown = 223243,