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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Spells/Base/MagerySpell.cs
View file

@ -55,10 +55,10 @@ namespace Server.Spells
int maxSkill = (1 + (int)Circle) * 10;
maxSkill += (1 + (int)Circle / 6) * 25;
if (m.Skills[SkillName.MagicResist].Value < maxSkill)
m.CheckSkill(SkillName.MagicResist, 0.0, m.Skills[SkillName.MagicResist].Cap);
if (m.Skills.MagicResist.Value < maxSkill)
m.CheckSkill(SkillName.MagicResist, 0.0, m.Skills.MagicResist.Cap);
return m.Skills[SkillName.MagicResist].Value;
return m.Skills.MagicResist.Value;
}
public virtual bool CheckResisted(Mobile target)
@ -76,16 +76,16 @@ namespace Server.Spells
int maxSkill = (1 + (int)Circle) * 10;
maxSkill += (1 + (int)Circle / 6) * 25;
if (target.Skills[SkillName.MagicResist].Value < maxSkill)
target.CheckSkill(SkillName.MagicResist, 0.0, target.Skills[SkillName.MagicResist].Cap);
if (target.Skills.MagicResist.Value < maxSkill)
target.CheckSkill(SkillName.MagicResist, 0.0, target.Skills.MagicResist.Cap);
return n >= Utility.RandomDouble();
}
public virtual double GetResistPercentForCircle(Mobile target, SpellCircle circle)
{
double firstPercent = target.Skills[SkillName.MagicResist].Value / 5.0;
double secondPercent = target.Skills[SkillName.MagicResist].Value -
double firstPercent = target.Skills.MagicResist.Value / 5.0;
double secondPercent = target.Skills.MagicResist.Value -
((Caster.Skills[CastSkill].Value - 20.0) / 5.0 + (1 + (int)circle) * 5.0);
return (firstPercent > secondPercent ? firstPercent : secondPercent) /

18
Scripts/Spells/Base/Spell.cs
View file

@ -89,9 +89,9 @@ namespace Server.Spells
if (IsCasting)
{
object o = ProtectionSpell.Registry[Caster];
double d = ProtectionSpell.Registry[Caster];
if (!(o is double d) || d <= Utility.RandomDouble() * 100.0)
if (d <= Utility.RandomDouble() * 100.0)
Disturb(DisturbType.Hurt, false, true);
}
}
@ -242,7 +242,7 @@ namespace Server.Spells
// There is no chance to gain
// m.CheckSkill( SkillName.Inscribe, 0.0, 120.0 );
return m.Skills[SkillName.Inscribe].Value;
return m.Skills.Inscribe.Value;
}
public virtual int GetInscribeFixed(Mobile m)
@ -250,7 +250,7 @@ namespace Server.Spells
// There is no chance to gain
// m.CheckSkill( SkillName.Inscribe, 0.0, 120.0 );
return m.Skills[SkillName.Inscribe].Fixed;
return m.Skills.Inscribe.Fixed;
}
public virtual int GetDamageFixed(Mobile m)
@ -269,7 +269,7 @@ namespace Server.Spells
public virtual double GetResistSkill(Mobile m)
{
return m.Skills[SkillName.MagicResist].Value;
return m.Skills.MagicResist.Value;
}
public virtual double GetDamageScalar(Mobile target)
@ -279,7 +279,7 @@ namespace Server.Spells
if (!Core.AOS) //EvalInt stuff for AoS is handled elsewhere
{
double casterEI = Caster.Skills[DamageSkill].Value;
double targetRS = target.Skills[SkillName.MagicResist].Value;
double targetRS = target.Skills.MagicResist.Value;
/*
if ( Core.AOS )
@ -645,7 +645,7 @@ namespace Server.Spells
int fcMax = 4;
if (CastSkill == SkillName.Magery || CastSkill == SkillName.Necromancy ||
CastSkill == SkillName.Chivalry && Caster.Skills[SkillName.Magery].Value >= 70.0)
CastSkill == SkillName.Chivalry && Caster.Skills.Magery.Value >= 70.0)
fcMax = 2;
int fc = AosAttributes.GetValue(Caster, AosAttribute.CastSpeed);
@ -653,7 +653,7 @@ namespace Server.Spells
if (fc > fcMax)
fc = fcMax;
if (ProtectionSpell.Registry.Contains(Caster))
if (ProtectionSpell.Registry.ContainsKey(Caster))
fc -= 2;
if (EssenceOfWindSpell.IsDebuffed(Caster))
@ -911,4 +911,4 @@ namespace Server.Spells
}
}
}
}
}

36
Scripts/Spells/Base/SpellHelper.cs
View file

@ -22,7 +22,7 @@ namespace Server
{
public static void Nullify(Mobile from)
{
if (!from.CanBeginAction(typeof(DefensiveSpell)))
if (!from.CanBeginAction<DefensiveSpell>())
new InternalTimer(from).Start();
}
@ -40,7 +40,7 @@ namespace Server
protected override void OnTick()
{
m_Mobile.EndAction(typeof(DefensiveSpell));
m_Mobile.EndAction<DefensiveSpell>();
}
}
}
@ -333,7 +333,7 @@ namespace Server.Spells
if (Core.AOS)
return TimeSpan.FromSeconds(6 * caster.Skills.EvalInt.Fixed / 50 + 1);
return TimeSpan.FromSeconds(caster.Skills[SkillName.Magery].Value * 1.2);
return TimeSpan.FromSeconds(caster.Skills.Magery.Value * 1.2);
}
public static double GetOffsetScalar(Mobile caster, Mobile target, bool curse)
@ -378,7 +378,7 @@ namespace Server.Spells
}
}
return 1 + (int)(caster.Skills[SkillName.Magery].Value * 0.1);
return 1 + (int)(caster.Skills.Magery.Value * 0.1);
}
public static Guild GetGuildFor(Mobile m)
@ -484,7 +484,7 @@ namespace Server.Spells
if (map == null)
return;
double scale = 1.0 + (caster.Skills[SkillName.Magery].Value - 100.0) / 200.0;
double scale = 1.0 + (caster.Skills.Magery.Value - 100.0) / 200.0;
if (scaleDuration)
duration = TimeSpan.FromSeconds(duration.TotalSeconds * scale);
@ -617,7 +617,7 @@ namespace Server.Spells
return false;
}
if (caster != null && caster.AccessLevel == AccessLevel.Player && caster.Region.IsPartOf(typeof(Jail)))
if (caster != null && caster.AccessLevel == AccessLevel.Player && caster.Region.IsPartOf<Jail>())
{
caster.SendLocalizedMessage(1114345); // You'll need a better jailbreak plan than that!
return false;
@ -698,7 +698,7 @@ namespace Server.Spells
public static bool IsFeluccaDungeon(Map map, Point3D loc)
{
Region region = Region.Find(loc, map);
return region.IsPartOf(typeof(DungeonRegion)) && region.Map == Map.Felucca;
return region.IsPartOf<DungeonRegion>() && region.Map == Map.Felucca;
}
public static bool IsKhaldun(Map map, Point3D loc)
@ -723,13 +723,11 @@ namespace Server.Spells
{
#region Duels
if (Region.Find(loc, map).IsPartOf(typeof(SafeZone)))
if (Region.Find(loc, map).IsPartOf<SafeZone>())
{
if (m_TravelType == TravelCheckType.TeleportTo || m_TravelType == TravelCheckType.TeleportFrom)
{
PlayerMobile pm = m_TravelCaster as PlayerMobile;
if (pm?.DuelPlayer != null && !pm.DuelPlayer.Eliminated)
if (m_TravelCaster is PlayerMobile pm && pm.DuelPlayer != null && !pm.DuelPlayer.Eliminated)
return true;
}
@ -750,12 +748,12 @@ namespace Server.Spells
return false;
}*/
return Region.Find(loc, map).IsPartOf(typeof(StrongholdRegion));
return Region.Find(loc, map).IsPartOf<StrongholdRegion>();
}
public static bool IsChampionSpawn(Map map, Point3D loc)
{
return Region.Find(loc, map).IsPartOf(typeof(ChampionSpawnRegion));
return Region.Find(loc, map).IsPartOf<ChampionSpawnRegion>();
}
public static bool IsDoomFerry(Map map, Point3D loc)
@ -858,11 +856,11 @@ namespace Server.Spells
#region Dueling
SafeZone sz = (SafeZone)Region.Find(loc, map).GetRegion(typeof(SafeZone));
SafeZone sz = Region.Find(loc, map).GetRegion<SafeZone>();
if (sz != null)
{
PlayerMobile pm = (PlayerMobile)caster;
PlayerMobile pm = caster as PlayerMobile;
if (pm?.DuelContext == null || !pm.DuelContext.Started || pm.DuelPlayer == null || pm.DuelPlayer.Eliminated)
return true;
@ -870,7 +868,7 @@ namespace Server.Spells
#endregion
GuardedRegion reg = (GuardedRegion)Region.Find(loc, map).GetRegion(typeof(GuardedRegion));
GuardedRegion reg = Region.Find(loc, map).GetRegion<GuardedRegion>();
return reg != null && !reg.IsDisabled();
}
@ -1176,7 +1174,7 @@ namespace Server.Spells
return false;
}
if (!caster.CanBeginAction(typeof(PolymorphSpell)))
if (!caster.CanBeginAction<PolymorphSpell>())
{
caster.SendLocalizedMessage(1061628); // You can't do that while polymorphed.
return false;
@ -1200,7 +1198,7 @@ namespace Server.Spells
{
caster.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
}
else if (!caster.CanBeginAction(typeof(PolymorphSpell)))
else if (!caster.CanBeginAction<PolymorphSpell>())
{
caster.SendLocalizedMessage(1061628); // You can't do that while polymorphed.
}
@ -1213,7 +1211,7 @@ namespace Server.Spells
{
caster.SendLocalizedMessage(1061091); // You cannot cast that spell in this form.
}
else if (!caster.CanBeginAction(typeof(IncognitoSpell)) || caster.IsBodyMod && GetContext(caster) == null)
else if (!caster.CanBeginAction<IncognitoSpell>() || caster.IsBodyMod && GetContext(caster) == null)
{
spell.DoFizzle();
}