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

Convert Regions/Spawns to JSON (#138)

Browse source
This commit is contained in:
Kamron Batman 2020-05-26 00:34:29 -07:00 • committed by GitHub
parent b8316e9202
commit 390f30e706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
117 changed files with 97306 additions and 4848 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Items/Special/Solen Items/BagOfSending.cs
View file

@ -138,7 +138,7 @@ namespace Server.Items
public override void OnDoubleClick(Mobile from)
{
if (from.Region.IsPartOf<Jail>())
if (from.Region.IsPartOf<JailRegion>())
from.SendMessage("You may not do that in jail.");
else if (!IsChildOf(from.Backpack))
MessageHelper.SendLocalizedMessageTo(this, from, 1062334,
@ -218,7 +218,7 @@ namespace Server.Items
if (m_Bag.Deleted)
return;
if (from.Region.IsPartOf<Jail>())
if (from.Region.IsPartOf<JailRegion>())
{
from.SendMessage("You may not do that in jail.");
}

2
Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -201,7 +201,7 @@ namespace Server.Items
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>())
from.Region.IsPartOf<JailRegion>() || from.Region.IsPartOf<SafeZone>())
{
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Regular, 0x22, 3, "",
"You cannot summon your pet to this location."));

4
Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -255,13 +255,13 @@ namespace Server.Items
return false;
}
if (from.Region.IsPartOf<Jail>())
if (from.Region.IsPartOf<JailRegion>())
{
from.SendLocalizedMessage(1114345, "", 0x35); // You'll need a better jailbreak plan than that!
return false;
}
if (boundRoot.Region.IsPartOf<Jail>())
if (boundRoot.Region.IsPartOf<JailRegion>())
{
from.SendLocalizedMessage(1019004); // You are not allowed to travel there.
return false;