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

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

252
Projects/Scripts/Mobiles/BaseCreature.cs
View file

@ -327,7 +327,6 @@ namespace Server.Mobiles
{
if (m_Paragon == value)
return;
if (value)
Paragon.Convert(this);
else
@ -916,7 +915,7 @@ namespace Server.Mobiles
return (double)chance / 1000;
}
public override void Damage(int amount, Mobile from = null, bool informMount = true)
public override void Damage(int amount, Mobile from)
{
int oldHits = Hits;
@ -931,10 +930,10 @@ namespace Server.Mobiles
if (oath == this)
{
amount = (int)(amount * 1.1);
from?.Damage(amount, from);
from.Damage(amount, from);
}
base.Damage(amount, from, informMount);
base.Damage(amount, from);
if (SubdueBeforeTame && !Controlled && oldHits > HitsMax / 10 && Hits <= HitsMax / 10)
PublicOverheadMessage(MessageType.Regular, 0x3B2, false,
@ -2111,7 +2110,9 @@ namespace Server.Mobiles
}
}
else if (ReacquireOnMovement)
{
ForceReacquire();
}
InhumanSpeech speechType = SpeechType;
@ -2132,7 +2133,10 @@ namespace Server.Mobiles
if (MLQuestSystem.Enabled && CanShout && m is PlayerMobile mobile)
CheckShout(mobile, oldLocation);
if (m_NoDupeGuards == m || !Body.IsHuman || Kills >= 5 || AlwaysMurderer || AlwaysAttackable || m.Kills < 5 ||
if (m_NoDupeGuards == m)
return;
if (!Body.IsHuman || Kills >= 5 || AlwaysMurderer || AlwaysAttackable || m.Kills < 5 ||
!m.InRange(Location, 12) || !m.Alive)
return;
@ -3052,12 +3056,7 @@ namespace Server.Mobiles
IsDeadPet = false;
IPooledEnumerable<NetState> eable = Map.GetClientsInRange(Location);
foreach (NetState ns in eable)
Packets.SendBondStatus(ns, Serial, false);
eable.Free();
Effects.SendPacket(Location, Map, new BondedStatus(0, Serial, 0));
SendIncomingPacket();
SendIncomingPacket();
@ -3101,7 +3100,10 @@ namespace Server.Mobiles
m_ReturnQueued = true;
}
else if (PlayerRangeSensitive) AIObject?.Deactivate();
else if (PlayerRangeSensitive)
{
AIObject?.Deactivate();
}
base.OnSectorDeactivate();
}
@ -3235,11 +3237,15 @@ namespace Server.Mobiles
{
if (m_MLQuests == null)
{
m_MLQuests = StaticMLQuester ? MLQuestSystem.FindQuestList(GetType()) : ConstructQuestList();
if (StaticMLQuester)
m_MLQuests = MLQuestSystem.FindQuestList(GetType());
else
m_MLQuests = ConstructQuestList();
// return EmptyList, but don't cache it (run construction again next time)
if (m_MLQuests == null)
return MLQuestSystem.EmptyList;
return
MLQuestSystem
.EmptyList; // return EmptyList, but don't cache it (run construction again next time)
}
return m_MLQuests;
@ -3263,7 +3269,9 @@ namespace Server.Mobiles
if (m_MLNextShout > DateTime.UtcNow || pm.Hidden || !pm.Alive)
return;
if (!InRange(pm.Location, ShoutRange) || InRange(oldLocation, ShoutRange) || !CanSee(pm) || !InLOS(pm))
int shoutRange = ShoutRange;
if (!InRange(pm.Location, shoutRange) || InRange(oldLocation, shoutRange) || !CanSee(pm) || !InLOS(pm))
return;
MLQuestContext context = MLQuestSystem.GetContext(pm);
@ -3306,7 +3314,16 @@ namespace Server.Mobiles
public Spawner MySpawner => Spawner as Spawner;
[CommandProperty(AccessLevel.GameMaster)]
public Mobile LastOwner => Owners?.Count > 0 ? Owners[^1] : null;
public Mobile LastOwner
{
get
{
if (Owners == null || Owners.Count == 0)
return null;
return Owners[Owners.Count - 1];
}
}
[CommandProperty(AccessLevel.GameMaster)]
public bool IsBonded
@ -3715,7 +3732,9 @@ namespace Server.Mobiles
public virtual void AddPetFriend(Mobile m)
{
Friends ??= new List<Mobile>();
if (Friends == null)
Friends = new List<Mobile>();
Friends.Add(m);
}
@ -3846,13 +3865,28 @@ namespace Server.Mobiles
typeof(Gold)
};
public virtual bool CheckFoodPreference(Item f) =>
CheckFoodPreference(f, FoodType.Eggs, m_Eggs) ||
CheckFoodPreference(f, FoodType.Fish, m_Fish) ||
CheckFoodPreference(f, FoodType.GrainsAndHay, m_GrainsAndHay) ||
CheckFoodPreference(f, FoodType.Meat, m_Meat) ||
CheckFoodPreference(f, FoodType.FruitsAndVegies, m_FruitsAndVegies) ||
CheckFoodPreference(f, FoodType.Gold, m_Gold);
public virtual bool CheckFoodPreference(Item f)
{
if (CheckFoodPreference(f, FoodType.Eggs, m_Eggs))
return true;
if (CheckFoodPreference(f, FoodType.Fish, m_Fish))
return true;
if (CheckFoodPreference(f, FoodType.GrainsAndHay, m_GrainsAndHay))
return true;
if (CheckFoodPreference(f, FoodType.Meat, m_Meat))
return true;
if (CheckFoodPreference(f, FoodType.FruitsAndVegies, m_FruitsAndVegies))
return true;
if (CheckFoodPreference(f, FoodType.Gold, m_Gold))
return true;
return false;
}
public virtual bool CheckFoodPreference(Item fed, FoodType type, Type[] types)
{
@ -3870,79 +3904,82 @@ namespace Server.Mobiles
public virtual bool CheckFeed(Mobile from, Item dropped)
{
if (IsDeadPet || !Controlled || ControlMaster != from && !IsPetFriend(from))
return false;
Item f = dropped;
if (!CheckFoodPreference(f))
return false;
int amount = f.Amount;
if (amount <= 0)
return false;
int stamGain;
if (f is Gold)
stamGain = amount - 50;
else
stamGain = amount * 15 - 50;
if (stamGain > 0)
Stam += stamGain;
if (Core.SE)
if (!IsDeadPet && Controlled && (ControlMaster == from || IsPetFriend(from)))
{
if (m_Loyalty < MaxLoyalty)
m_Loyalty = MaxLoyalty;
}
else
for (int i = 0; i < amount; ++i)
if (m_Loyalty < MaxLoyalty && 0.5 >= Utility.RandomDouble())
m_Loyalty += 10;
Item f = dropped;
/* if ( happier )*/
// looks like in OSI pets say they are happier even if they are at maximum loyalty
SayTo(from, 502060); // Your pet looks happier.
if (Body.IsAnimal)
Animate(3, 5, 1, true, false, 0);
else if (Body.IsMonster)
Animate(17, 5, 1, true, false, 0);
if (IsBondable && !IsBonded)
{
Mobile master = m_ControlMaster;
if (master != null && master == from) //So friends can't start the bonding process
if (CheckFoodPreference(f))
{
if (MinTameSkill <= 29.1 || master.Skills.AnimalTaming.Base >= MinTameSkill ||
OverrideBondingReqs() ||
Core.ML && master.Skills.AnimalTaming.Value >= MinTameSkill)
int amount = f.Amount;
if (amount > 0)
{
if (BondingBegin == DateTime.MinValue)
int stamGain;
if (f is Gold)
stamGain = amount - 50;
else
stamGain = amount * 15 - 50;
if (stamGain > 0)
Stam += stamGain;
if (Core.SE)
{
BondingBegin = DateTime.UtcNow;
if (m_Loyalty < MaxLoyalty) m_Loyalty = MaxLoyalty;
}
else if (BondingBegin + BondingDelay <= DateTime.UtcNow)
else
{
IsBonded = true;
BondingBegin = DateTime.MinValue;
from.SendLocalizedMessage(1049666); // Your pet has bonded with you!
for (int i = 0; i < amount; ++i)
if (m_Loyalty < MaxLoyalty && 0.5 >= Utility.RandomDouble())
m_Loyalty += 10;
}
}
else if (Core.ML)
{
from.SendLocalizedMessage(
1075268); // Your pet cannot form a bond with you until your animal taming ability has risen.
/* if ( happier )*/
// looks like in OSI pets say they are happier even if they are at maximum loyalty
SayTo(from, 502060); // Your pet looks happier.
if (Body.IsAnimal)
Animate(3, 5, 1, true, false, 0);
else if (Body.IsMonster)
Animate(17, 5, 1, true, false, 0);
if (IsBondable && !IsBonded)
{
Mobile master = m_ControlMaster;
if (master != null && master == from) //So friends can't start the bonding process
{
if (MinTameSkill <= 29.1 || master.Skills.AnimalTaming.Base >= MinTameSkill ||
OverrideBondingReqs() ||
Core.ML && master.Skills.AnimalTaming.Value >= MinTameSkill)
{
if (BondingBegin == DateTime.MinValue)
{
BondingBegin = DateTime.UtcNow;
}
else if (BondingBegin + BondingDelay <= DateTime.UtcNow)
{
IsBonded = true;
BondingBegin = DateTime.MinValue;
from.SendLocalizedMessage(1049666); // Your pet has bonded with you!
}
}
else if (Core.ML)
{
from.SendLocalizedMessage(
1075268); // Your pet cannot form a bond with you until your animal taming ability has risen.
}
}
}
dropped.Delete();
return true;
}
}
}
dropped.Delete();
return true;
return false;
}
#endregion
@ -3995,10 +4032,23 @@ namespace Server.Mobiles
public virtual bool CanTeach => false;
public virtual bool CheckTeach(SkillName skill, Mobile from) =>
CanTeach && (skill != SkillName.Stealth || !(from.Skills.Hiding.Base < Stealth.HidingRequirement)) &&
(skill != SkillName.RemoveTrap || !(from.Skills.Lockpicking.Base < 50.0) && !(from.Skills.DetectHidden.Base < 50.0)) &&
(Core.AOS || skill != SkillName.Focus && skill != SkillName.Chivalry && skill != SkillName.Necromancy);
public virtual bool CheckTeach(SkillName skill, Mobile from)
{
if (!CanTeach)
return false;
if (skill == SkillName.Stealth && from.Skills.Hiding.Base < Stealth.HidingRequirement)
return false;
if (skill == SkillName.RemoveTrap && (from.Skills.Lockpicking.Base < 50.0 ||
from.Skills.DetectHidden.Base < 50.0))
return false;
if (!Core.AOS && (skill == SkillName.Focus || skill == SkillName.Chivalry || skill == SkillName.Necromancy))
return false;
return true;
}
public enum TeachResult
{
@ -4108,8 +4158,16 @@ namespace Server.Mobiles
return TeachResult.Success;
}
public virtual bool CheckTeachingMatch(Mobile m) =>
m_Teaching != (SkillName)(-1) && (!(m is PlayerMobile mobile) || mobile.Learning == m_Teaching);
public virtual bool CheckTeachingMatch(Mobile m)
{
if (m_Teaching == (SkillName)(-1))
return false;
if (m is PlayerMobile mobile)
return mobile.Learning == m_Teaching;
return true;
}
private SkillName m_Teaching = (SkillName)(-1);
@ -5054,7 +5112,9 @@ namespace Server.Mobiles
if (c.Loyalty <= 0)
lock (toRelease)
{
toRelease.Add(c);
}
}
}
@ -5062,12 +5122,18 @@ namespace Server.Mobiles
if (!c.Controlled && !c.IsStabled && (c.Region.IsPartOf<HouseRegion>() && c.CanBeDamaged() ||
c.RemoveIfUntamed && c.Spawner == null))
{
if (c.RemoveStep++ >= 20)
c.RemoveStep++;
if (c.RemoveStep >= 20)
lock (toRemove)
{
toRemove.Add(c);
}
}
else
{
c.RemoveStep = 0;
}
});
// TODO: Parallelize this