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

60
Projects/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -84,7 +84,10 @@ namespace Server.Mobiles
return max;
}
private void CloseClaimList(Mobile from) => from.CloseGump<ClaimListGump>();
private void CloseClaimList(Mobile from)
{
from.CloseGump<ClaimListGump>();
}
public void BeginClaimList(Mobile from)
{
@ -138,7 +141,9 @@ namespace Server.Mobiles
(from as PlayerMobile)?.AutoStabled.Remove(pet);
}
else
{
SayTo(from, 1049612, pet.Name); // ~1_NAME~ remained in the stables because you have too many followers.
}
}
public void BeginStable(Mobile from)
@ -171,25 +176,43 @@ namespace Server.Mobiles
return;
if (pet.Body.IsHuman)
SayTo(from, 502672); // HA HA HA! Sorry, I am not an inn.
else if (!pet.Controlled)
SayTo(from, 1048053); // You can't stable that!
else if (pet.ControlMaster != from)
SayTo(from, 1042562); // You do not own that pet!
else if (pet.IsDeadPet)
SayTo(from, 1049668); // Living pets only, please.
else if (pet.Summoned)
SayTo(from, 502673); // I can not stable summoned creatures.
/*else if ( pet.Allured )
{
SayTo( from, 1048053 ); // You can't stable that!
}*/
SayTo(from, 502672); // HA HA HA! Sorry, I am not an inn.
}
else if (!pet.Controlled)
{
SayTo(from, 1048053); // You can't stable that!
}
else if (pet.ControlMaster != from)
{
SayTo(from, 1042562); // You do not own that pet!
}
else if (pet.IsDeadPet)
{
SayTo(from, 1049668); // Living pets only, please.
}
else if (pet.Summoned)
{
SayTo(from, 502673); // I can not stable summoned creatures.
}
/*
else if ( pet.Allured )
{
SayTo( from, 1048053 ); // You can't stable that!
}
*/
else if ((pet is PackLlama || pet is PackHorse || pet is Beetle) && pet.Backpack?.Items.Count > 0)
{
SayTo(from, 1042563); // You need to unload your pet.
}
else if (pet.Combatant != null && pet.InRange(pet.Combatant, 12) && pet.Map == pet.Combatant.Map)
{
SayTo(from, 1042564); // I'm sorry. Your pet seems to be busy.
}
else if (from.Stabled.Count >= GetMaxStabled(from))
{
SayTo(from, 1042565); // You have too many pets in the stables!
}
else
{
Container bank = from.FindBankNoCreate();
@ -218,7 +241,9 @@ namespace Server.Mobiles
: 502679); // [AOS: Your pet has been stabled.] Very well, thy pet is stabled. Thou mayst recover it by saying 'claim' to me. In one real world week, I shall sell it off if it is not claimed!
}
else
{
SayTo(from, 502677); // But thou hast not the funds in thy bank account!
}
}
}
@ -238,11 +263,8 @@ namespace Server.Mobiles
if (pet?.Deleted != false)
{
if (pet != null)
{
pet.IsStabled = false;
pet.StabledBy = null;
}
pet.IsStabled = false;
pet.StabledBy = null;
from.Stabled.RemoveAt(i);
--i;
continue;
@ -281,7 +303,7 @@ namespace Server.Mobiles
public bool CanClaim(Mobile from, BaseCreature pet) => from.Followers + pet.ControlSlots <= from.FollowersMax;
private static void DoClaim(Mobile from, BaseCreature pet)
private void DoClaim(Mobile from, BaseCreature pet)
{
pet.SetControlMaster(from);

31
Projects/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -44,13 +44,24 @@ namespace Server.Mobiles
public virtual void SayPriceTo(Mobile m)
{
Packets.SendMessageLocalizedAffix(m.NetState, Serial, Body, MessageType.Regular, SpeechHue, 3, 1008052, Name,
AffixType.Append, JoinCost.ToString());
m.Send(new MessageLocalizedAffix(Serial, Body, MessageType.Regular, SpeechHue, 3, 1008052, Name,
AffixType.Append, JoinCost.ToString(), ""));
}
public virtual bool WasNamed(string speech) => Name != null && Insensitive.StartsWith(speech, Name);
public virtual bool WasNamed(string speech)
{
string name = Name;
public override bool HandlesOnSpeech(Mobile from) => from.InRange(Location, 2) || base.HandlesOnSpeech(from);
return name != null && Insensitive.StartsWith(speech, name);
}
public override bool HandlesOnSpeech(Mobile from)
{
if (from.InRange(Location, 2))
return true;
return base.HandlesOnSpeech(from);
}
public override void OnSpeech(SpeechEventArgs e)
{
@ -74,10 +85,14 @@ namespace Server.Mobiles
else if (e.HasKeyword(0x0005)) // *resign* | *quit*
{
if (pm.NpcGuild != NpcGuild)
{
SayTo(pm, 501052); // Thou dost not belong to my guild!
}
else if (pm.NpcGuildJoinTime + QuitAge > DateTime.UtcNow ||
pm.NpcGuildGameTime + QuitGameAge > pm.GameTime)
{
SayTo(pm, 501053); // You just joined my guild! You must wait a week to resign.
}
else
{
SayTo(pm, 501054); // I accept thy resignation.
@ -96,11 +111,17 @@ namespace Server.Mobiles
if (from is PlayerMobile pm && dropped.Amount == JoinCost)
{
if (pm.NpcGuild == NpcGuild)
{
SayTo(pm, 501047); // Thou art already a member of our guild.
}
else if (pm.NpcGuild != NpcGuild.None)
{
SayTo(pm, 501046); // Thou must resign from thy other guild first.
}
else if (pm.GameTime < JoinGameAge || pm.CreationTime + JoinAge > DateTime.UtcNow)
{
SayTo(pm, 501048); // You are too young to join my guild...
}
else if (CheckCustomReqs(pm))
{
SayWelcomeTo(pm);
@ -133,4 +154,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}