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

1
Projects/Scripts/Items/Guilds/GuildDeed.cs
View file

@ -1,5 +1,6 @@
using Server.Guilds;
using Server.Multis;
using Server.Prompts;
namespace Server.Items
{

21
Projects/Scripts/Items/Guilds/Guildstone.cs
View file

@ -143,7 +143,8 @@ namespace Server.Items
if (Guild.NewGuildSystem && ItemID == 0xED4)
ItemID = 0xED6;
m_BeforeChangeover |= version <= 2;
if (version <= 2)
m_BeforeChangeover = true;
if (Guild.NewGuildSystem && m_BeforeChangeover)
Timer.DelayCall(TimeSpan.Zero, AddToHouse);
@ -250,8 +251,10 @@ namespace Server.Items
from.SendGump(new GuildGump(from, Guild));
}
else if (from.AccessLevel < AccessLevel.GameMaster && !Guild.IsMember(from))
Packets.SendMessageLocalized(from.NetState, Serial, ItemID, MessageType.Regular, 0x3B2, 3,
501158); // You are not a member ...
{
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, 501158, "",
"")); // You are not a member ...
}
else
{
GuildGump.EnsureClosed(from);
@ -259,6 +262,8 @@ namespace Server.Items
}
}
#region IAddon Members
public Item Deed => new GuildstoneDeed(Guild, m_GuildName, m_GuildAbbrev);
public bool CouldFit(IPoint3D p, Map map) => map.CanFit(p.X, p.Y, p.Z, ItemData.Height);
@ -371,7 +376,9 @@ namespace Server.Items
list.Add(1060802, $"{Utility.FixHtml(name)} [{Utility.FixHtml(abbr)}]");
}
else if (m_GuildName != null && m_GuildAbbrev != null)
{
list.Add(1060802, $"{Utility.FixHtml(m_GuildName)} [{Utility.FixHtml(m_GuildAbbrev)}]");
}
}
public override void OnDoubleClick(Mobile from)
@ -386,10 +393,14 @@ namespace Server.Items
from.BeginTarget(-1, true, TargetFlags.None, Placement_OnTarget);
}
else
{
from.SendLocalizedMessage(502092); // You must be in your house to do this.
}
}
else
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
}
public void Placement_OnTarget(Mobile from, object targeted)
@ -413,10 +424,14 @@ namespace Server.Items
Delete();
}
else
{
from.SendLocalizedMessage(1042036); // That location is not in your house.
}
}
else
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
}
}
}