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

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

2
Scripts/Mobiles/AI/AnimalAI.cs
View file

@ -1,6 +1,6 @@
// Ideas
// When you run on animals the panic
// When if ( distance < 8 && Utility.RandomDouble() * Math.Sqrt( (8 - distance) / 6 ) >= incoming.Skills[SkillName.AnimalTaming].Value )
// When if ( distance < 8 && Utility.RandomDouble() * Math.Sqrt( (8 - distance) / 6 ) >= incoming.Skills.AnimalTaming.Value )
// More your close, the more it can panic
/*
* AnimalHunterAI, AnimalHidingAI, AnimalDomesticAI...

12
Scripts/Mobiles/AI/BaseAI.cs
View file

@ -140,7 +140,7 @@ namespace Server.Mobiles
public long NextMove{ get; set; }
public virtual bool CanDetectHidden => m_Mobile.Skills[SkillName.DetectHidden].Value > 0;
public virtual bool CanDetectHidden => m_Mobile.Skills.DetectHidden.Value > 0;
public virtual bool WasNamed(string speech)
{
@ -1171,9 +1171,9 @@ namespace Server.Mobiles
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(FetchAbraxusScrollObjective));
QuestObjective obj = qs.FindObjective<FetchAbraxusScrollObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
m_Mobile.AddToBackpack(new ScrollOfAbraxus());
obj.Complete();
@ -2380,7 +2380,7 @@ namespace Server.Mobiles
m_Mobile.DebugSay("Checking for hidden players");
double srcSkill = m_Mobile.Skills[SkillName.DetectHidden].Value;
double srcSkill = m_Mobile.Skills.DetectHidden.Value;
if (srcSkill <= 0)
return;
@ -2392,8 +2392,8 @@ namespace Server.Mobiles
{
m_Mobile.DebugSay("Trying to detect {0}", trg.Name);
double trgHiding = trg.Skills[SkillName.Hiding].Value / 2.9;
double trgStealth = trg.Skills[SkillName.Stealth].Value / 1.8;
double trgHiding = trg.Skills.Hiding.Value / 2.9;
double trgStealth = trg.Skills.Stealth.Value / 1.8;
double chance = srcSkill / 1.2 - Math.Min(trgHiding, trgStealth);

24
Scripts/Mobiles/AI/MageAI.cs
View file

@ -64,7 +64,7 @@ namespace Server.Mobiles
public virtual bool SmartAI => m_Mobile is BaseVendor || m_Mobile is BaseEscortable || m_Mobile is Changeling;
public virtual bool IsNecromancer => Core.AOS && m_Mobile.Skills[SkillName.Necromancy].Value > 50;
public virtual bool IsNecromancer => Core.AOS && m_Mobile.Skills.Necromancy.Value > 50;
public override bool Think()
{
@ -245,9 +245,9 @@ namespace Server.Mobiles
public virtual bool UseNecromancy()
{
if (IsNecromancer)
return Utility.Random(m_Mobile.Skills[SkillName.Magery].BaseFixedPoint +
m_Mobile.Skills[SkillName.Necromancy].BaseFixedPoint) >=
m_Mobile.Skills[SkillName.Magery].BaseFixedPoint;
return Utility.Random(m_Mobile.Skills.Magery.BaseFixedPoint +
m_Mobile.Skills.Necromancy.BaseFixedPoint) >=
m_Mobile.Skills.Magery.BaseFixedPoint;
return false;
}
@ -259,7 +259,7 @@ namespace Server.Mobiles
public virtual Spell GetRandomDamageSpellNecro()
{
int bound = m_Mobile.Skills[SkillName.Necromancy].Value >= 100 ? 5 : 3;
int bound = m_Mobile.Skills.Necromancy.Value >= 100 ? 5 : 3;
switch (Utility.Random(bound))
{
@ -283,7 +283,7 @@ namespace Server.Mobiles
public virtual Spell GetRandomDamageSpellMage()
{
int maxCircle = (int)((m_Mobile.Skills[SkillName.Magery].Value + 20.0) / (100.0 / 7.0));
int maxCircle = (int)((m_Mobile.Skills.Magery.Value + 20.0) / (100.0 / 7.0));
if (maxCircle < 1)
maxCircle = 1;
@ -334,7 +334,7 @@ namespace Server.Mobiles
public virtual Spell GetRandomCurseSpellMage()
{
if (m_Mobile.Skills[SkillName.Magery].Value >= 40.0 && Utility.Random(4) == 0)
if (m_Mobile.Skills.Magery.Value >= 40.0 && Utility.Random(4) == 0)
return new CurseSpell(m_Mobile, null);
switch (Utility.Random(3))
@ -347,7 +347,7 @@ namespace Server.Mobiles
public virtual Spell GetRandomManaDrainSpell()
{
if (m_Mobile.Skills[SkillName.Magery].Value >= 80.0 && Utility.RandomBool())
if (m_Mobile.Skills.Magery.Value >= 80.0 && Utility.RandomBool())
return new ManaVampireSpell(m_Mobile, null);
return new ManaDrainSpell(m_Mobile, null);
@ -392,7 +392,7 @@ namespace Server.Mobiles
if (IsNecromancer)
{
double psDamage =
(m_Mobile.Skills[SkillName.SpiritSpeak].Value - c.Skills[SkillName.MagicResist].Value) / 10 +
(m_Mobile.Skills.SpiritSpeak.Value - c.Skills.MagicResist.Value) / 10 +
(c.Player ? 18 : 30);
if (psDamage > c.Hits)
@ -429,7 +429,7 @@ namespace Server.Mobiles
}
case 5: // Paralyze them
{
if (c.Paralyzed || m_Mobile.Skills[SkillName.Magery].Value <= 50.0)
if (c.Paralyzed || m_Mobile.Skills.Magery.Value <= 50.0)
goto default;
m_Mobile.DebugSay("Attempting to paralyze");
@ -641,8 +641,8 @@ namespace Server.Mobiles
}
}
if (!Core.AOS && SmartAI && !m_Mobile.StunReady && m_Mobile.Skills[SkillName.Wrestling].Value >= 80.0 &&
m_Mobile.Skills[SkillName.Anatomy].Value >= 80.0)
if (!Core.AOS && SmartAI && !m_Mobile.StunReady && m_Mobile.Skills.Wrestling.Value >= 80.0 &&
m_Mobile.Skills.Anatomy.Value >= 80.0)
EventSink.InvokeStunRequest(new StunRequestEventArgs(m_Mobile));
if (!m_Mobile.InRange(c, m_Mobile.RangePerception))

4
Scripts/Mobiles/AI/ThiefAI.cs
View file

@ -63,8 +63,8 @@ namespace Server.Mobiles
m_toDisarm = combatant.FindItemOnLayer(Layer.TwoHanded);
}
if (!Core.AOS && !m_Mobile.DisarmReady && m_Mobile.Skills[SkillName.Wrestling].Value >= 80.0 &&
m_Mobile.Skills[SkillName.ArmsLore].Value >= 80.0 && m_toDisarm != null)
if (!Core.AOS && !m_Mobile.DisarmReady && m_Mobile.Skills.Wrestling.Value >= 80.0 &&
m_Mobile.Skills.ArmsLore.Value >= 80.0 && m_toDisarm != null)
EventSink.InvokeDisarmRequest(new DisarmRequestEventArgs(m_Mobile));
if (m_toDisarm != null && m_toDisarm.IsChildOf(combatant.Backpack) &&