Gaming/blizzless-diiis
Gaming/blizzless-diiis
3
0
Fork 1
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed animations issue + cleanup.

Browse Source
This commit is contained in:
Lucca Faria Ferri 2023-02-04 13:30:03 -08:00
parent 60b50263b1
commit 48c7fc7de5
8 changed files with 207 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Actor.cs
View File

@ -674,7 +674,12 @@ namespace DiIiS_NA.GameServer.GSSystem.ActorSystem
public void PlayAnimation(int animationType, AnimationSno animationSNO, float speed = 1.0f, int? ticksToPlay = null, int type2 = 0)
{
if (this.World == null || animationSNO == AnimationSno._NONE) return;
if (animationSNO == AnimationSno._NONE)
{
Logger.Warn($"PlayAnimation: {(int)animationSNO} is not a valid animation");
return;
}
if (this.World == null) return;
World.BroadcastIfRevealed(plr => new PlayAnimationMessage
{

8
src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/ComboSkill.cs
View File

@ -10,13 +10,7 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem
{
public abstract class ComboSkill : Skill
{
public int ComboIndex
{
get
{
return TargetMessage.ComboLevel;
}
}
public int ComboIndex => TargetMessage.ComboLevel;
public override AnimationSno GetActionAnimationSNO()
{

8
src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Implementations/HeroSkills/Necromancer.cs
View File

@ -2650,7 +2650,7 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Implementations
{
if (Rune_C > 0)
{
int[] Effects = new int[] { 47400, 474402, 474435, 474437, 474453, 474455, 474464, 474466 };
int[] Effects = new[] { 47400, 474402, 474435, 474437, 474453, 474455, 474464, 474466 };
Tar.PlayEffectGroup(Effects[RandomHelper.Next(0, 7)]);
yield return WaitSeconds(0.5f);
WeaponDamage(Tar, damage, damageType);
@ -2661,8 +2661,10 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Implementations
Point.UpdateDelay = 0.2f;
Point.OnUpdate = () =>
{
AttackPayload attack = new AttackPayload(this);
attack.Targets = GetEnemiesInRadius(Point.Position, range);
AttackPayload attack = new AttackPayload(this)
{
Targets = GetEnemiesInRadius(Point.Position, range)
};
attack.AddWeaponDamage(damage, damageType);
attack.OnHit = hitPayload =>

18
src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Payloads/AttackPayload.cs
View File

@ -8,6 +8,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DiIiS_NA.GameServer.GSSystem.AISystem.Brains;
namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
{
@ -80,7 +81,7 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
public void Apply()
{
if (Targets == null) Targets = new TargetList();
Targets ??= new TargetList();
if (Target.World != null)
{
if (!Target.World.Game.Working) return;
@ -92,18 +93,23 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
{
return;
}
if (Target is Player && DamageEntries.Count > 0)
{
if (Target is Player player && DamageEntries.Count > 0)
{
Player player = (Player)Target;
foreach (Actor extra in Targets.ExtraActors)
if (extra is DesctructibleLootContainer)
extra.OnTargeted(player, null);
}
if (Context.User is Player && Context.Target is Monster && Context.Target.GBHandle.Type == 1)
}
{
(Context.User as Player).ExpBonusData.MonsterAttacked((Context.User as Player).InGameClient.Game.TickCounter);
((Context.Target as Monster).Brain as AISystem.Brains.MonsterBrain).AttackedBy = Context.User;
if (Context.User is Player player && Context.Target is Monster monster && monster.GBHandle.Type == 1)
{
player.ExpBonusData.MonsterAttacked(player.InGameClient.Game
.TickCounter);
((MonsterBrain)monster.Brain).AttackedBy = player;
}
}
foreach (Actor target in Targets.Actors)

191
src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Payloads/HitPayload.cs
View File

@ -51,27 +51,17 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
{
IsCriticalHit = criticalHit;
IsDodged = false;
IsWeaponDamage = (attackPayload.DamageEntries.Count > 0 ? attackPayload.DamageEntries.First().IsWeaponBasedDamage : false);
IsWeaponDamage = (attackPayload.DamageEntries.Count > 0 && attackPayload.DamageEntries.First().IsWeaponBasedDamage);
if (Context.User == null)
Context.User = target;
Context.User ??= target;
Target ??= target;
if (Target == null)
Target = target;
if (Target == null) return;
if (Target.World == null) return;
if (!Target.World.Game.Working) return;
if (Target.World.Game.Paused) return;
if (!Target.Visible) return;
if (Target.Dead) return;
if (Target?.World == null ||
!Target.World.Game.Working ||
Target.World.Game.Paused ||
!Target.Visible ||
Target.Dead)
return;
if (Context.User is Monster && Context.Target is Player)
if (!Context.User.IsRevealedToPlayer(Context.Target as Player))
@ -448,112 +438,107 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
}
if (Target is Player) //check for passives here (incoming damage)
if (Target is Player playerTarget) //check for passives here (incoming damage)
{
var plr = Target as Player;
if (!plr.Attributes[GameAttribute.Cannot_Dodge] && FastRandom.Instance.NextDouble() < plr.DodgeChance)
if (!playerTarget.Attributes[GameAttribute.Cannot_Dodge] && FastRandom.Instance.NextDouble() < playerTarget.DodgeChance)
IsDodged = true;
if (plr.Toon.Class == ToonClass.Monk) //Monk defensive passives
if (playerTarget.Toon.Class == ToonClass.Monk) //Monk defensive passives
{
TotalDamage *= 0.7f; //Class damage reduction bonus
if (plr.World.BuffManager.HasBuff<TempestRush.TempestEffect>(plr)) //Tempest rush -> Slipstream
if (plr.World.BuffManager.GetFirstBuff<TempestRush.TempestEffect>(plr)._slipStream)
if (playerTarget.World.BuffManager.HasBuff<TempestRush.TempestEffect>(playerTarget)) //Tempest rush -> Slipstream
if (playerTarget.World.BuffManager.GetFirstBuff<TempestRush.TempestEffect>(playerTarget)._slipStream)
TotalDamage *= 0.8f;
if (plr.World.BuffManager.HasBuff<Epiphany.EpiphanyBuff>(plr)) //Epiphany -> Desert Shroud
if (plr.World.BuffManager.GetFirstBuff<Epiphany.EpiphanyBuff>(plr).DesertShroud)
if (playerTarget.World.BuffManager.HasBuff<Epiphany.EpiphanyBuff>(playerTarget)) //Epiphany -> Desert Shroud
if (playerTarget.World.BuffManager.GetFirstBuff<Epiphany.EpiphanyBuff>(playerTarget).DesertShroud)
TotalDamage *= 0.5f;
if (IsDodged) //Mantra of Evasion -> Backlash
if (plr.World.BuffManager.HasBuff<MantraOfEvasionPassive.MantraOfEvasionBuff>(plr))
if (plr.World.BuffManager.GetFirstBuff<MantraOfEvasionPassive.MantraOfEvasionBuff>(plr).Backlash)
plr.World.BuffManager.GetFirstBuff<MantraOfEvasionPassive.MantraOfEvasionBuff>(plr).BacklashTrigger = true;
if (playerTarget.World.BuffManager.HasBuff<MantraOfEvasionPassive.MantraOfEvasionBuff>(playerTarget))
if (playerTarget.World.BuffManager.GetFirstBuff<MantraOfEvasionPassive.MantraOfEvasionBuff>(playerTarget).Backlash)
playerTarget.World.BuffManager.GetFirstBuff<MantraOfEvasionPassive.MantraOfEvasionBuff>(playerTarget).BacklashTrigger = true;
}
if (plr.Toon.Class == ToonClass.Barbarian) //Barb defensive passives
if (playerTarget.Toon.Class == ToonClass.Barbarian) //Barb defensive passives
{
TotalDamage *= 0.7f; //Class damage reduction bonus
if (plr.SkillSet.HasPassive(205491) && PowerMath.Distance2D(Context.User.Position, plr.Position) > 6f) //Superstition (barbarian)
if (playerTarget.SkillSet.HasPassive(205491) && PowerMath.Distance2D(Context.User.Position, playerTarget.Position) > 6f) //Superstition (barbarian)
if (FastRandom.Instance.NextDouble() < Context.GetProcCoefficient())
plr.GeneratePrimaryResource(2f);
playerTarget.GeneratePrimaryResource(2f);
if (plr.SkillSet.HasPassive(205398) && (plr.Attributes[GameAttribute.Hitpoints_Cur] - TotalDamage) < (plr.Attributes[GameAttribute.Hitpoints_Max_Total] * 0.2f)) //Relentless (barbarian)
if (playerTarget.SkillSet.HasPassive(205398) && (playerTarget.Attributes[GameAttribute.Hitpoints_Cur] - TotalDamage) < (playerTarget.Attributes[GameAttribute.Hitpoints_Max_Total] * 0.2f)) //Relentless (barbarian)
TotalDamage *= 0.5f;
}
if (plr.Toon.Class == ToonClass.Wizard) //Wizard defensive passives
if (playerTarget.Toon.Class == ToonClass.Wizard) //Wizard defensive passives
{
if (plr.SkillSet.HasPassive(208471)) //GlassCannon (Wizard)
if (playerTarget.SkillSet.HasPassive(208471)) //GlassCannon (Wizard)
TotalDamage *= 1.1f;
if (plr.SkillSet.HasPassive(208547) && TotalDamage > (plr.Attributes[GameAttribute.Hitpoints_Max_Total] * 0.15f)) //Illusionist (Wizard)
if (playerTarget.SkillSet.HasPassive(208547) && TotalDamage > (playerTarget.Attributes[GameAttribute.Hitpoints_Max_Total] * 0.15f)) //Illusionist (Wizard)
{
foreach (var cdBuff in plr.World.BuffManager.GetBuffs<CooldownBuff>(plr))
foreach (var cdBuff in playerTarget.World.BuffManager.GetBuffs<CooldownBuff>(playerTarget))
if (cdBuff.TargetPowerSNO == 1769 || cdBuff.TargetPowerSNO == 168344)
cdBuff.Remove();
}
if (plr.SkillSet.HasPassive(208474) && (plr.Attributes[GameAttribute.Hitpoints_Cur] - TotalDamage) <= 0) //UnstableAnomaly (wizard)
if (playerTarget.SkillSet.HasPassive(208474) && (playerTarget.Attributes[GameAttribute.Hitpoints_Cur] - TotalDamage) <= 0) //UnstableAnomaly (wizard)
{
if (plr.World.BuffManager.GetFirstBuff<UnstableAnomalyCooldownBuff>(plr) == null)
if (playerTarget.World.BuffManager.GetFirstBuff<UnstableAnomalyCooldownBuff>(playerTarget) == null)
{
plr.AddPercentageHP(45);
plr.World.BuffManager.AddBuff(plr, plr, new UnstableAnomalyCooldownBuff());
plr.World.PowerManager.RunPower(plr, 30796);
plr.GenerateSecondaryResource(25f);
foreach (var cdBuff in plr.World.BuffManager.GetBuffs<CooldownBuff>(plr))
playerTarget.AddPercentageHP(45);
playerTarget.World.BuffManager.AddBuff(playerTarget, playerTarget, new UnstableAnomalyCooldownBuff());
playerTarget.World.PowerManager.RunPower(playerTarget, 30796);
playerTarget.GenerateSecondaryResource(25f);
foreach (var cdBuff in playerTarget.World.BuffManager.GetBuffs<CooldownBuff>(playerTarget))
if (cdBuff.TargetPowerSNO == 30796)
cdBuff.Remove();
}
}
}
if (plr.Toon.Class == ToonClass.WitchDoctor) //Witch Doctor defensive passives
if (playerTarget.Toon.Class == ToonClass.WitchDoctor) //Witch Doctor defensive passives
{
if (plr.SkillSet.HasPassive(217968)) //JungleFortitude (WD)
if (playerTarget.SkillSet.HasPassive(217968)) //JungleFortitude (WD)
TotalDamage *= 0.85f;
}
if (plr.Toon.Class == ToonClass.DemonHunter) //DH defensive passives
if (playerTarget.Toon.Class == ToonClass.DemonHunter) //DH defensive passives
{
if (plr.SkillSet.HasPassive(210801) && plr.World.BuffManager.GetFirstBuff<BroodingCooldownBuff>(plr) == null) //Brooding (DH)
plr.World.BuffManager.AddBuff(plr, plr, new BroodingCooldownBuff());
if (playerTarget.SkillSet.HasPassive(210801) && playerTarget.World.BuffManager.GetFirstBuff<BroodingCooldownBuff>(playerTarget) == null) //Brooding (DH)
playerTarget.World.BuffManager.AddBuff(playerTarget, playerTarget, new BroodingCooldownBuff());
}
if (plr.Toon.Class == ToonClass.Crusader) //Crusader defensive passives
if (playerTarget.Toon.Class == ToonClass.Crusader) //Crusader defensive passives
{
TotalDamage *= 0.7f; //Class damage reduction bonus
if (plr.SkillSet.HasPassive(310626)) //Vigilant
if (!(DominantDamageType == DamageType.Physical))
if (playerTarget.SkillSet.HasPassive(310626)) //Vigilant
if (DominantDamageType != DamageType.Physical)
TotalDamage *= 0.95f;
if (plr.World.BuffManager.HasBuff<CrusaderAkaratChampion.AkaratBuff>(plr)) //AkaratChampion resurrect once
if (plr.World.BuffManager.GetFirstBuff<CrusaderAkaratChampion.AkaratBuff>(plr).resurrectActive)
if ((plr.Attributes[GameAttribute.Hitpoints_Cur] - TotalDamage) <= 0)
if (playerTarget.World.BuffManager.HasBuff<CrusaderAkaratChampion.AkaratBuff>(playerTarget)) //AkaratChampion resurrect once
if (playerTarget.World.BuffManager.GetFirstBuff<CrusaderAkaratChampion.AkaratBuff>(playerTarget).resurrectActive)
if ((playerTarget.Attributes[GameAttribute.Hitpoints_Cur] - TotalDamage) <= 0)
{
plr.World.BuffManager.GetFirstBuff<CrusaderAkaratChampion.AkaratBuff>(plr).resurrectActive = false;
plr.AddPercentageHP(100);
playerTarget.World.BuffManager.GetFirstBuff<CrusaderAkaratChampion.AkaratBuff>(playerTarget).resurrectActive = false;
playerTarget.AddPercentageHP(100);
}
if (plr.World.BuffManager.HasBuff<CrusaderLawsOfJustice.LawsResBuff>(plr)) //Protect the Innocent
if (!plr.World.BuffManager.GetFirstBuff<CrusaderLawsOfJustice.LawsResBuff>(plr).Primary)
if (plr.World.BuffManager.GetFirstBuff<CrusaderLawsOfJustice.LawsResBuff>(plr).Redirect)
if (playerTarget.World.BuffManager.HasBuff<CrusaderLawsOfJustice.LawsResBuff>(playerTarget)) //Protect the Innocent
if (!playerTarget.World.BuffManager.GetFirstBuff<CrusaderLawsOfJustice.LawsResBuff>(playerTarget).Primary)
if (playerTarget.World.BuffManager.GetFirstBuff<CrusaderLawsOfJustice.LawsResBuff>(playerTarget).Redirect)
TotalDamage *= 0.8f;
}
TotalDamage *= 0.1f;
}
else if (Target is Minion) //check for passives here (incoming damage, minions)
else if (Target is Minion { Master: Player playerOwner }) //check for passives here (incoming damage, minions)
{
var minion = Target as Minion;
if (minion.Master != null && minion.Master is Player)
{
var plr = minion.Master as Player;
var plr = playerOwner;
var masterArmor = plr.Attributes[GameAttribute.Armor_Total];
var attackLevel = attackPayload.Context.User.Attributes[GameAttribute.Level];
@ -566,7 +551,6 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
TotalDamage *= 0.1f; //hack for unkillable minions
}
}
}
private static float ReductionFromResistance(float resistance, int attackerLevel)
{
@ -580,11 +564,11 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
private void CheckItemProcs(Player user)
{
if (user.Attributes[GameAttribute.Item_Power_Passive, 247724] == 1 && FastRandom.Instance.NextDouble() < 0.2)
if (Math.Abs(user.Attributes[GameAttribute.Item_Power_Passive, 247724] - 1) < 0.001 && FastRandom.Instance.NextDouble() < 0.2)
{
user.PlayEffectGroup(247770);
}
if (user.Attributes[GameAttribute.Item_Power_Passive, 245741] == 1 && FastRandom.Instance.NextDouble() < 0.2)
if (Math.Abs(user.Attributes[GameAttribute.Item_Power_Passive, 245741] - 1) < 0.001 && FastRandom.Instance.NextDouble() < 0.2)
{
user.PlayEffectGroup(245747);
}
@ -601,9 +585,9 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
if (!Target.Visible)
return;
if ((Target.Attributes[GameAttribute.Invulnerable] == true || Target.Attributes[GameAttribute.Immunity] == true) && Target.World != null)
if ((Target.Attributes[GameAttribute.Invulnerable] || Target.Attributes[GameAttribute.Immunity]) && Target.World != null)
{
if (!(Target is Minion))
if (Target is not Minion)
Target.World.BroadcastIfRevealed(plr => new FloatingNumberMessage()
{
ActorID = Target.DynamicID(plr),
@ -618,19 +602,21 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
return;
}
if (Target is Player)
switch (Target)
{
var plr = (Target as Player);
case Player playerActor:
{
var plr = playerActor;
if (plr.Dead) return;
if (IsDodged)
{
Target.World.BroadcastIfRevealed(plr => new FloatingNumberMessage()
playerActor.World.BroadcastIfRevealed(plr2 => new FloatingNumberMessage()
{
ActorID = Target.DynamicID(plr),
ActorID = Target.DynamicID(plr2),
Number = 0f,
Type = FloatingNumberMessage.FloatType.Dodge
}, Target);
}, playerActor);
plr.DodgesInARow++;
if (plr.Toon.Class == ToonClass.Monk && plr.DodgesInARow >= 15)
{
@ -648,21 +634,18 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
}
return;
}
else
{
plr.DodgesInARow = 0;
}
if (FastRandom.Instance.NextDouble() < Target.Attributes[GameAttribute.Block_Chance_Capped_Total])
if (FastRandom.Instance.NextDouble() < playerActor.Attributes[GameAttribute.Block_Chance_Capped_Total])
{
TotalDamage -= (float)FastRandom.Instance.NextDouble((double)Target.Attributes[GameAttribute.Block_Amount_Total_Min], (double)Target.Attributes[GameAttribute.Block_Amount_Total_Max]);
TotalDamage -= (float)FastRandom.Instance.NextDouble((double)playerActor.Attributes[GameAttribute.Block_Amount_Total_Min], (double)playerActor.Attributes[GameAttribute.Block_Amount_Total_Max]);
if (TotalDamage < 0f) TotalDamage = 0f;
Target.World.BroadcastIfRevealed(plr => new FloatingNumberMessage()
playerActor.World.BroadcastIfRevealed(plr3 => new FloatingNumberMessage()
{
ActorID = Target.DynamicID(plr),
ActorID = Target.DynamicID(plr3),
Number = TotalDamage,
Type = FloatingNumberMessage.FloatType.Block
}, Target);
}, playerActor);
Blocked = true;
plr.BlocksInARow++;
@ -679,14 +662,18 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
{
plr.BlocksInARow = 0;
}
break;
}
if (Target is DesctructibleLootContainer)
case DesctructibleLootContainer container:
{
(Target as DesctructibleLootContainer).ReceiveDamage(Target, 100);
if (Context.PowerSNO == 96296)
(Context.User as Player).AddAchievementCounter(74987243307049, 1);
container.ReceiveDamage(container, 100);
if (Context.User is Player plrAddAchievement
&& Context.PowerSNO == 96296)
plrAddAchievement.AddAchievementCounter(74987243307049, 1);
return;
}
}
if (Target.World != null)
Target.World.BuffManager.SendTargetPayload(Target, this);
@ -695,25 +682,25 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
if (Target == null || Target.World == null) return; //in case Target was killed in OnPayload
if (Context.User is Player)
if (Context.User is Player player)
{
CheckItemProcs(Context.User as Player);
if (Context.User.Attributes[GameAttribute.Steal_Health_Percent] > 0)
(Context.User as Player).AddHP(TotalDamage * Context.User.Attributes[GameAttribute.Steal_Health_Percent]);
CheckItemProcs(player);
if (player.Attributes[GameAttribute.Steal_Health_Percent] > 0)
player.AddHP(TotalDamage * Context.User.Attributes[GameAttribute.Steal_Health_Percent]);
if (Context.User.Attributes[GameAttribute.Hitpoints_On_Hit] > 0)
(Context.User as Player).AddHP(Context.User.Attributes[GameAttribute.Hitpoints_On_Hit]);
player.AddHP(Context.User.Attributes[GameAttribute.Hitpoints_On_Hit]);
if (IsCriticalHit)
if ((Context.User as Player).Toon.Class == ToonClass.Wizard)
if (player.Toon.Class == ToonClass.Wizard)
if (FastRandom.Instance.NextDouble() < Context.GetProcCoefficient())
(Context.User as Player).GeneratePrimaryResource(Context.User.Attributes[GameAttribute.Resource_On_Hit, 1]);
player.GeneratePrimaryResource(Context.User.Attributes[GameAttribute.Resource_On_Hit, 1]);
}
if (Context.User is Hireling)
if (Context.User is Hireling hireling)
{
if (Context.User.Attributes[GameAttribute.Steal_Health_Percent] > 0)
(Context.User as Hireling).AddHP(TotalDamage * Context.User.Attributes[GameAttribute.Steal_Health_Percent]);
if (Context.User.Attributes[GameAttribute.Hitpoints_On_Hit] > 0)
(Context.User as Hireling).AddHP(Context.User.Attributes[GameAttribute.Hitpoints_On_Hit]);
if (hireling.Attributes[GameAttribute.Steal_Health_Percent] > 0)
hireling.AddHP(TotalDamage * hireling.Attributes[GameAttribute.Steal_Health_Percent]);
if (hireling.Attributes[GameAttribute.Hitpoints_On_Hit] > 0)
hireling.AddHP(hireling.Attributes[GameAttribute.Hitpoints_On_Hit]);
}
@ -796,7 +783,7 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem.Payloads
deathload.Apply();
}
}
else if (AutomaticHitEffects && Target.World != null && !(Target is Player))
else if (AutomaticHitEffects && Target.World != null && Target is not Player)
{
// target didn't die, so play hit animation if the actor has one
if (Target.World.BuffManager.GetFirstBuff<KnockbackBuff>(Target) == null &&

14
src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/PowerContext.cs
View File

@ -150,8 +150,10 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem
public void WeaponDamage(TargetList targets, float damageMultiplier, DamageType damageType)
{
AttackPayload payload = new AttackPayload(this);
payload.Targets = targets;
AttackPayload payload = new AttackPayload(this)
{
Targets = targets
};
payload.AddWeaponDamage(damageMultiplier, damageType);
payload.Apply();
}
@ -166,15 +168,17 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem
public void Damage(TargetList targets, float minDamage, float damageDelta, DamageType damageType)
{
AttackPayload payload = new AttackPayload(this);
payload.Targets = targets;
AttackPayload payload = new AttackPayload(this)
{
Targets = targets
};
payload.AddDamage(minDamage, damageDelta, damageType);
payload.Apply();
}
public EffectActor SpawnEffect(ActorSno actorSNO, Vector3D position, float angle = 0, TickTimer timeout = null)
{
if (angle == -1)
if (Math.Abs(angle - (-1)) < 0.0001)
angle = (float)(Rand.NextDouble() * (Math.PI * 2));
if (timeout == null)
{

5
src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Skill.cs
View File

@ -53,12 +53,11 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem
try
{
int tag = EvalTag(PowerKeys.AnimationTag);
if (User.AnimationSet == null)
if (User.AnimationSet != null)
{
if (User.AnimationSet.Animations.ContainsKey(tag))
return User.AnimationSet.Animations[tag];
else return (AnimationSno)User.AnimationSet.GetAnimationTag(AnimationTags.Attack2);
return (AnimationSno)User.AnimationSet.GetAnimationTag(AnimationTags.Attack2);
}
}
catch (Exception e)

4
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestEvents/Implementations/Act III/Transformation/Line11.cs
View File

@ -15,8 +15,8 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem.QuestEvents.Implementations
public override void Execute(MapSystem.World world)
{
StartConversation(world, 195767);
var Leah = world.GetActorBySNO(ActorSno._leah_event47);
Leah.PlayActionAnimation(AnimationSno.leah_bss_event_lvlup);
var leah = world.GetActorBySNO(ActorSno._leah_event47);
leah.PlayActionAnimation(AnimationSno.leah_bss_event_lvlup);
}
private bool StartConversation(MapSystem.World world, Int32 conversationId)