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

30
Projects/Scripts/Items/Special/Solen Items/BagOfSending.cs
View file

@ -219,34 +219,54 @@ namespace Server.Items
return;
if (from.Region.IsPartOf<Jail>())
{
from.SendMessage("You may not do that in jail.");
}
else if (!m_Bag.IsChildOf(from.Backpack))
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054107,
0x59); // This item must be in your backpack.
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1062334,
0x59); // The bag of sending must be in your backpack. 1054107 is gone from client, using generic response
}
else if (m_Bag.Charges == 0)
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1042544, 0x59); // This item is out of charges.
}
else if (targeted is Item item)
{
int reqCharges = (int)Math.Max(1, Math.Ceiling(item.TotalWeight / 10.0));
if (!item.IsChildOf(from.Backpack))
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054152,
0x59); // You may only send items from your backpack to your bank box.
}
else if (item is BagOfSending || item is Container)
Packets.SendAsciiMessage(from.NetState, m_Bag.Serial, m_Bag.ItemID, MessageType.Regular, 0x3B2, 3, "",
"You cannot send a container through the bag of sending." );
{
from.Send(new AsciiMessage(m_Bag.Serial, m_Bag.ItemID, MessageType.Regular, 0x3B2, 3, "",
"You cannot send a container through the bag of sending."));
}
else if (item.LootType == LootType.Cursed)
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054108,
0x59); // The bag of sending rejects the cursed item.
}
else if (!item.VerifyMove(from) || item is QuestItem || item.Nontransferable)
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054109,
0x59); // The bag of sending rejects that item.
}
else if (SpellHelper.IsDoomGauntlet(from.Map, from.Location))
{
from.SendLocalizedMessage(1062089); // You cannot use that here.
}
else if (!from.BankBox.TryDropItem(from, item, false))
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054110, 0x59); // Your bank box is full.
}
else if (Core.ML && reqCharges > m_Bag.Charges)
{
from.SendLocalizedMessage(1079932); //You don't have enough charges to send that much weight
}
else
{
m_Bag.Charges -= Core.ML ? reqCharges : 1;
@ -258,4 +278,4 @@ namespace Server.Items
}
}
}
}
}

18
Projects/Scripts/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -177,27 +177,41 @@ namespace Server.Items
return;
if (Charges == 0)
{
SendLocalizedMessageTo(from,
1054122); // The Crystal Ball darkens. It must be charged before it can be used again.
}
else if (pet is BaseMount mount && mount.Rider == from)
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054124,
0x36); // The Crystal Ball fills with a yellow mist. Why would you summon your pet while riding it?
}
else if (pet.Map == Map.Internal && (!pet.IsStabled || from.Followers + pet.ControlSlots > from.FollowersMax))
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054125,
0x5); // The Crystal Ball fills with a blue mist. Your pet is not responding to the summons.
}
else if ((!pet.Controlled || pet.ControlMaster != from) && !from.Stabled.Contains(pet))
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054126,
0x8FD); // The Crystal Ball fills with a grey mist. You are not the owner of the pet you are attempting to summon.
}
else if (!pet.IsBonded)
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054127,
0x22); // The Crystal Ball fills with a red mist. You appear to have let your bond to your pet deteriorate.
}
else if (from.Map == Map.Ilshenar || from.Region.IsPartOf<DungeonRegion>() ||
from.Region.IsPartOf<Jail>() || from.Region.IsPartOf<SafeZone>())
Packets.SendAsciiMessage(from.NetState, Serial, ItemID, MessageType.Regular, 0x22, 3, "",
"You cannot summon your pet to this location.");
{
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Regular, 0x22, 3, "",
"You cannot summon your pet to this location."));
}
else if (Core.ML && from is PlayerMobile mobile && DateTime.UtcNow < mobile.LastPetBallTime.AddSeconds(15.0))
{
MessageHelper.SendLocalizedMessageTo(this, mobile, 1080072,
0x22); // You must wait a few seconds before you can summon your pet.
}
else
{
if (Core.ML)

1
Projects/Scripts/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -5,6 +5,7 @@ using Server.Factions;
using Server.Misc;
using Server.Mobiles;
using Server.Network;
using Server.Prompts;
using Server.Regions;
using Server.Spells;
using Server.Targeting;

22
Projects/Scripts/Items/Special/Solen Items/MessageHelper.cs Normal file
View file

@ -0,0 +1,22 @@
using Server.Network;
namespace Server
{
public class MessageHelper
{
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, int hue)
{
SendLocalizedMessageTo(from, to, number, "", hue);
}
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, string args, int hue)
{
to.Send(new MessageLocalized(from.Serial, from.ItemID, MessageType.Regular, hue, 3, number, "", args));
}
public static void SendMessageTo(Item from, Mobile to, string text, int hue)
{
to.Send(new UnicodeMessage(from.Serial, from.ItemID, MessageType.Regular, hue, 3, "ENU", "", text));
}
}
}