warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Projects/Scripts/Spells/Base/SpellHelper.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Engines.CannedEvil;
using Server.Engines.ConPVP;
using Server.Engines.PartySystem;
@ -149,8 +148,13 @@ namespace Server.Spells
public static bool DisableSkillCheck{ get; set; }
public static TimeSpan GetDamageDelayForSpell(Spell sp) =>
!sp.DelayedDamage ? TimeSpan.Zero : Core.AOS ? AosDamageDelay : OldDamageDelay;
public static TimeSpan GetDamageDelayForSpell(Spell sp)
{
if (!sp.DelayedDamage)
return TimeSpan.Zero;
return Core.AOS ? AosDamageDelay : OldDamageDelay;
}
public static bool CheckMulti(Point3D p, Map map, bool houses = true, int housingrange = 0)
{
@ -169,7 +173,9 @@ namespace Server.Spells
return true;
}
else if (multi.Contains(p))
{
return true;
}
}
return false;
@ -185,15 +191,36 @@ namespace Server.Spells
if (item.RootParent != from)
from.Direction = from.GetDirectionTo(item.GetWorldLocation());
}
else if (!ReferenceEquals(from, target))
else if (from != target)
{
from.Direction = from.GetDirectionTo(target);
}
}
public static bool CheckCombat(Mobile m) =>
RestrictTravelCombat &&
(m.Aggressed.Any(info => info.Defender.Player && DateTime.UtcNow - info.LastCombatTime < CombatHeatDelay) ||
Core.Expansion == Expansion.AOS && m.Aggressors.Any(info =>
info.Attacker.Player && DateTime.UtcNow - info.LastCombatTime < CombatHeatDelay));
public static bool CheckCombat(Mobile m)
{
if (!RestrictTravelCombat)
return false;
for (int i = 0; i < m.Aggressed.Count; ++i)
{
AggressorInfo info = m.Aggressed[i];
if (info.Defender.Player && DateTime.UtcNow - info.LastCombatTime < CombatHeatDelay)
return true;
}
if (Core.Expansion == Expansion.AOS)
for (int i = 0; i < m.Aggressors.Count; ++i)
{
AggressorInfo info = m.Aggressors[i];
if (info.Attacker.Player && DateTime.UtcNow - info.LastCombatTime < CombatHeatDelay)
return true;
}
return false;
}
public static bool AdjustField(ref Point3D p, Map map, int height, bool mobsBlock)
{
@ -219,7 +246,9 @@ namespace Server.Spells
public static void GetSurfaceTop(ref IPoint3D p)
{
if (p is Item item)
{
p = item.GetSurfaceTop();
}
else if (p is StaticTarget t)
{
int z = t.Z;
@ -231,10 +260,15 @@ namespace Server.Spells
}
}
public static bool AddStatOffset(Mobile m, StatType type, int offset, TimeSpan duration) =>
offset > 0
? AddStatBonus(m, m, type, offset, duration)
: offset >= 0 || AddStatCurse(m, m, type, -offset, duration);
public static bool AddStatOffset(Mobile m, StatType type, int offset, TimeSpan duration)
{
if (offset > 0)
return AddStatBonus(m, m, type, offset, duration);
if (offset < 0)
return AddStatCurse(m, m, type, -offset, duration);
return true;
}
public static bool AddStatBonus(Mobile caster, Mobile target, StatType type) => AddStatBonus(caster, target, type, GetOffset(caster, target, type, false), GetDuration(caster, target));
@ -570,7 +604,7 @@ namespace Server.Spells
// Always allow monsters to teleport
if (caster is BaseCreature bc && !bc.Controlled && !bc.Summoned && (type == TravelCheckType.TeleportTo || type == TravelCheckType.TeleportFrom))
return true;
return true;
m_TravelCaster = caster;
m_TravelType = type;