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

126
Projects/Scripts/Mobiles/Vendors/BaseVendor.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.ContextMenus;
using Server.Engines.BulkOrders;
using Server.Factions;
@ -25,10 +24,10 @@ namespace Server.Mobiles
{
private const int MaxSell = 500;
private static readonly TimeSpan InventoryDecayTime = TimeSpan.FromHours(1.0);
private static TimeSpan InventoryDecayTime = TimeSpan.FromHours(1.0);
private readonly List<IBuyItemInfo> m_ArmorBuyInfo = new List<IBuyItemInfo>();
private readonly List<IShopSellInfo> m_ArmorSellInfo = new List<IShopSellInfo>();
private List<IBuyItemInfo> m_ArmorBuyInfo = new List<IBuyItemInfo>();
private List<IShopSellInfo> m_ArmorSellInfo = new List<IShopSellInfo>();
public BaseVendor(string title = null)
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
@ -126,6 +125,7 @@ namespace Server.Mobiles
IShopSellInfo[] info = GetSellInfo();
int totalCost = 0;
List<BuyItemResponse> validBuy = new List<BuyItemResponse>(list.Count);
bool bought;
bool fromBank = false;
bool fullPurchase = true;
int controlSlots = buyer.FollowersMax - buyer.Followers;
@ -188,7 +188,7 @@ namespace Server.Mobiles
if (validBuy.Count == 0)
return false;
bool bought = buyer.AccessLevel >= AccessLevel.GameMaster;
bought = buyer.AccessLevel >= AccessLevel.GameMaster;
Container cont = buyer.Backpack;
if (!bought && cont != null)
@ -259,9 +259,8 @@ namespace Server.Mobiles
if (cont?.TryDropItem(buyer, buyItem, false) != true)
buyItem.MoveToWorld(buyer.Location, buyer.Map);
if (cont?.TryDropItem(buyer, buyItem, false) != true)
buyItem.MoveToWorld(buyer.Location, buyer.Map);
}
break;
}
}
}
else if (ser.IsMobile)
@ -310,7 +309,10 @@ namespace Server.Mobiles
public virtual bool OnSellItems(Mobile seller, List<SellItemResponse> list)
{
if (!(IsActiveBuyer && seller.CheckAlive()))
if (!IsActiveBuyer)
return false;
if (!seller.CheckAlive())
return false;
if (!CheckVendorAccess(seller))
@ -332,7 +334,12 @@ namespace Server.Mobiles
!resp.Item.Movable || resp.Item is Container container && container.Items.Count != 0)
continue;
if (info.Any(ssi => ssi.IsSellable(resp.Item))) Sold++;
foreach (IShopSellInfo ssi in info)
if (ssi.IsSellable(resp.Item))
{
Sold++;
break;
}
}
if (Sold > MaxSell)
@ -361,11 +368,14 @@ namespace Server.Mobiles
{
bool found = false;
if (buyInfo.Any(bii => bii.Restock(resp.Item, amount)))
{
resp.Item.Consume(amount);
found = true;
}
foreach (IBuyItemInfo bii in buyInfo)
if (bii.Restock(resp.Item, amount))
{
resp.Item.Consume(amount);
found = true;
break;
}
if (!found)
{
@ -512,9 +522,11 @@ namespace Server.Mobiles
if (CheckGargoyle())
return;
public virtual int GetShoeHue() => 0.1 > Utility.RandomDouble() ? 0 : Utility.RandomNeutralHue();
if (CheckNecromancer())
return;
public virtual bool CheckMorph() => CheckGargoyle() || CheckNecromancer() || CheckTokuno();
CheckTokuno();
}
public virtual bool CheckTokuno()
{
@ -536,7 +548,12 @@ namespace Server.Mobiles
public virtual bool CheckGargoyle()
{
if (!(Map == Map.Ilshenar && Region.IsPartOf("Gargoyle City")))
Map map = Map;
if (map != Map.Ilshenar)
return false;
if (!Region.IsPartOf("Gargoyle City"))
return false;
if (Body != 0x2F6 || (Hue & 0x8000) == 0)
@ -547,7 +564,12 @@ namespace Server.Mobiles
public virtual bool CheckNecromancer()
{
if (!(Map == Map.Malas && Region.IsPartOf("Umbra")))
Map map = Map;
if (map != Map.Malas)
return false;
if (!Region.IsPartOf("Umbra"))
return false;
if (Hue != 0x83E8)
@ -617,10 +639,12 @@ namespace Server.Mobiles
public virtual void CapitalizeTitle()
{
if (Title == null)
string title = Title;
if (title == null)
return;
string[] split = Title.Split(' ');
string[] split = title.Split(' ');
for (int i = 0; i < split.Length; ++i)
{
@ -706,7 +730,10 @@ namespace Server.Mobiles
public virtual void VendorBuy(Mobile from)
{
if (!(IsActiveSeller && from.CheckAlive()))
if (!IsActiveSeller)
return;
if (!from.CheckAlive())
return;
if (!CheckVendorAccess(from))
@ -797,13 +824,25 @@ namespace Server.Mobiles
NetState ns = from.NetState;
Packets.SendVendorBuyContent(ns, list);
Packets.SendVendorBuyList(ns, this, list);
Packets.SendDisplayBuyList(ns, this.Serial);
Packets.SendMobileStatusExtended(ns, from); //make sure their gold amount is sent
if (ns == null)
return;
if (ns.ContainerGridLines)
from.Send(new VendorBuyContent6017(list));
else
from.Send(new VendorBuyContent(list));
from.Send(new VendorBuyList(this, list));
if (ns.HighSeas)
from.Send(new DisplayBuyListHS(this));
else
from.Send(new DisplayBuyList(this));
from.Send(new MobileStatusExtended(from)); //make sure their gold amount is sent
for (int i = 0; i < opls.Count; ++i)
opls[i].Send(ns);
from.Send(opls[i]);
SayTo(from, 500186); // Greetings. Have a look around.
}
@ -818,14 +857,12 @@ namespace Server.Mobiles
AddItem(pack);
}
NetState ns = from.NetState;
Packets.SendEquipUpdate(ns, pack);
from.Send(new EquipUpdate(pack));
pack = FindItemOnLayer(Layer.ShopSell);
if (pack != null)
Packets.SendEquipUpdate(ns, pack);
from.Send(new EquipUpdate(pack));
pack = FindItemOnLayer(Layer.ShopResale);
@ -835,12 +872,15 @@ namespace Server.Mobiles
AddItem(pack);
}
Packets.SendEquipUpdate(ns, pack);
from.Send(new EquipUpdate(pack));
}
public virtual void VendorSell(Mobile from)
{
if (!(IsActiveBuyer && from.CheckAlive()))
if (!IsActiveBuyer)
return;
if (!from.CheckAlive())
return;
if (!CheckVendorAccess(from))
@ -871,10 +911,13 @@ namespace Server.Mobiles
if (list.Count > 0)
{
SendPacksTo(from);
Packets.SendVendorSellList(from.NetState, Serial, list);
from.Send(new VendorSellList(this, list));
}
else
{
Say(true, "You have nothing I would be interested in.");
}
}
public override bool OnDragDrop(Mobile from, Item dropped)
@ -949,7 +992,7 @@ namespace Server.Mobiles
return null;
}
private void ProcessSinglePurchase(BuyItemResponse buy, IBuyItemInfo bii, ICollection<BuyItemResponse> validBuy,
private void ProcessSinglePurchase(BuyItemResponse buy, IBuyItemInfo bii, List<BuyItemResponse> validBuy,
ref int controlSlots, ref bool fullPurchase, ref int totalCost)
{
int amount = buy.Amount;
@ -963,7 +1006,9 @@ namespace Server.Mobiles
int slots = bii.ControlSlots * amount;
if (controlSlots >= slots)
{
controlSlots -= slots;
}
else
{
fullPurchase = false;
@ -1140,9 +1185,10 @@ namespace Server.Mobiles
}
}
IsParagon = false;
if (IsParagon)
IsParagon = false;
Timer.DelayCall(TimeSpan.Zero, () => CheckMorph());
Timer.DelayCall(TimeSpan.Zero, CheckMorph);
}
public override void AddCustomContextEntries(Mobile from, List<ContextMenuEntry> list)
@ -1242,7 +1288,8 @@ namespace Server.ContextMenus
{
private BaseVendor m_Vendor;
public VendorBuyEntry(Mobile from, BaseVendor vendor) : base(6103, 8)
public VendorBuyEntry(Mobile from, BaseVendor vendor)
: base(6103, 8)
{
m_Vendor = vendor;
Enabled = vendor.CheckVendorAccess(from);
@ -1258,7 +1305,8 @@ namespace Server.ContextMenus
{
private BaseVendor m_Vendor;
public VendorSellEntry(Mobile from, BaseVendor vendor) : base(6104, 8)
public VendorSellEntry(Mobile from, BaseVendor vendor)
: base(6104, 8)
{
m_Vendor = vendor;
Enabled = vendor.CheckVendorAccess(from);

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();
}
}
}
}

3
Projects/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs
View file

@ -5,6 +5,7 @@ using Server.Gumps;
using Server.Items;
using Server.Multis;
using Server.Network;
using Server.Prompts;
namespace Server.Mobiles
{
@ -968,7 +969,7 @@ namespace Server.Mobiles
AddItem(580, 44, 4033);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (!m_Barkeeper.IsOwner(m_From))
return;

27
Projects/Scripts/Mobiles/Vendors/PlayerVendor.cs
View file

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Server.ContextMenus;
using Server.Engines.BulkOrders;
using Server.Ethics;
@ -9,6 +8,7 @@ using Server.Gumps;
using Server.Items;
using Server.Misc;
using Server.Multis;
using Server.Prompts;
using Server.Targeting;
namespace Server.Mobiles
@ -326,7 +326,11 @@ namespace Server.Mobiles
{
if (BaseHouse.NewVendorSystem) return ChargePerRealWorldDay / 12;
long total = m_SellItems.Values.Aggregate<VendorItem, long>(0, (current, vi) => current + vi.Price) - 500;
long total = 0;
foreach (VendorItem vi in m_SellItems.Values)
total += vi.Price;
total -= 500;
if (total < 0)
total = 0;
@ -341,7 +345,9 @@ namespace Server.Mobiles
{
if (BaseHouse.NewVendorSystem)
{
long total = m_SellItems.Values.Aggregate<VendorItem, long>(0, (current, vi) => current + vi.Price);
long total = 0;
foreach (VendorItem vi in m_SellItems.Values)
total += vi.Price;
return (int)(60 + total / 500 * 3);
}
@ -538,7 +544,11 @@ namespace Server.Mobiles
protected List<Item> GetItems()
{
List<Item> list = Items.Where(item => item.Movable && item != Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair).ToList();
List<Item> list = new List<Item>();
foreach (Item item in Items)
if (item.Movable && item != Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair)
list.Add(item);
if (Backpack != null)
list.AddRange(Backpack.Items);
@ -574,17 +584,18 @@ namespace Server.Mobiles
{
if (House.IsOwner(Owner)) // Move to moving crate
{
House.MovingCrate ??= new MovingCrate(House);
if (House.MovingCrate == null)
House.MovingCrate = new MovingCrate(House);
if (HoldGold > 0)
Banker.Deposit(House.MovingCrate, HoldGold);
foreach (Item item in list)
House.MovingCrate.DropItem(item);
foreach (Item item in list) House.MovingCrate.DropItem(item);
}
else // Move to vendor inventory
{
VendorInventory inventory = new VendorInventory(House, Owner, Name, ShopName) {Gold = HoldGold};
VendorInventory inventory = new VendorInventory(House, Owner, Name, ShopName);
inventory.Gold = HoldGold;
foreach (Item item in list) inventory.AddItem(item);

4
Projects/Scripts/Mobiles/Vendors/RentedVendor.cs
View file

@ -4,6 +4,7 @@ using Server.ContextMenus;
using Server.Gumps;
using Server.Misc;
using Server.Multis;
using Server.Prompts;
namespace Server.Mobiles
{
@ -128,7 +129,8 @@ namespace Server.Mobiles
{
if (RentalGold > 0 && House?.IsAosRules == true)
{
House.MovingCrate ??= new MovingCrate(House);
if (House.MovingCrate == null)
House.MovingCrate = new MovingCrate(House);
Banker.Deposit(House.MovingCrate, RentalGold);
RentalGold = 0;

5
Projects/Scripts/Mobiles/Vendors/VendorInventory.cs
View file

@ -116,7 +116,8 @@ namespace Server.Mobiles
{
if (m_Inventory.Gold > 0)
{
house.MovingCrate ??= new MovingCrate(house);
if (house.MovingCrate == null)
house.MovingCrate = new MovingCrate(house);
Banker.Deposit(house.MovingCrate, m_Inventory.Gold);
}
@ -133,4 +134,4 @@ namespace Server.Mobiles
}
}
}
}
}