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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Gumps/Guilds/New Guild System/BaseGuildGump.cs
View file

@ -16,7 +16,7 @@ namespace Server.Guilds
guild = g;
player = pm;
pm.CloseGump(typeof(BaseGuildGump));
pm.CloseGump<BaseGuildGump>();
}
protected Guild guild{ get; }

4
Scripts/Gumps/Guilds/New Guild System/Create Guild Gump.cs
View file

@ -8,8 +8,8 @@ namespace Server.Guilds
{
public CreateGuildGump(PlayerMobile pm, string guildName = "Guild Name", string guildAbbrev = "") : base(10, 10)
{
pm.CloseGump(typeof(CreateGuildGump));
pm.CloseGump(typeof(BaseGuildGump));
pm.CloseGump<CreateGuildGump>();
pm.CloseGump<BaseGuildGump>();
AddPage(0);

4
Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs
View file

@ -19,7 +19,7 @@ namespace Server.Guilds
public GuildDiplomacyGump(PlayerMobile pm, Guild g)
: this(pm, g, NameComparer.Instance, true, "", 0, GuildDisplayType.All,
Utility.CastConvertList<BaseGuild, Guild>(new List<BaseGuild>(BaseGuild.List.Values)),
Utility.CastListCovariant<BaseGuild, Guild>(new List<BaseGuild>(BaseGuild.List.Values)),
1063136 + (int)GuildDisplayType.All)
{
}
@ -27,7 +27,7 @@ namespace Server.Guilds
public GuildDiplomacyGump(PlayerMobile pm, Guild g, IComparer<Guild> currentComparer, bool ascending, string filter,
int startNumber, GuildDisplayType display)
: this(pm, g, currentComparer, ascending, filter, startNumber, display,
Utility.CastConvertList<BaseGuild, Guild>(new List<BaseGuild>(BaseGuild.List.Values)),
Utility.CastListCovariant<BaseGuild, Guild>(new List<BaseGuild>(BaseGuild.List.Values)),
1063136 + (int)display)
{
}

2
Scripts/Gumps/Guilds/New Guild System/GuildInfoGump.cs
View file

@ -148,7 +148,7 @@ namespace Server.Guilds
// Guild Faction
if (Guild.OrderChaos && IsLeader(pm, guild))
{
pm.CloseGump(typeof(GuildChangeTypeGump));
pm.CloseGump<GuildChangeTypeGump>();
pm.SendGump(new GuildChangeTypeGump(pm, guild));
}

8
Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs
View file

@ -95,7 +95,7 @@ namespace Server.Guilds
if (pm.GuildRank.GetFlag(RankFlags.CanInvitePlayer))
{
pm.SendLocalizedMessage(1063048); // Whom do you wish to invite into your guild?
pm.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(InvitePlayer_Callback), guild);
pm.BeginTarget(-1, false, TargetFlags.None, InvitePlayer_Callback, guild);
}
else
{
@ -104,13 +104,11 @@ namespace Server.Guilds
}
}
public void InvitePlayer_Callback(Mobile from, object targeted, object state)
public void InvitePlayer_Callback(Mobile from, object targeted, Guild g)
{
PlayerMobile pm = from as PlayerMobile;
PlayerMobile targ = targeted as PlayerMobile;
Guild g = state as Guild;
PlayerState guildState = PlayerState.Find(g.Leader);
PlayerState targetState = PlayerState.Find(targ);
@ -137,7 +135,7 @@ namespace Server.Guilds
{
pm.SendLocalizedMessage(1063051, targ.Name); // ~1_val~ is already a member of a guild.
}
else if (targ.HasGump(typeof(BaseGuildGump)) || targ.HasGump(typeof(CreateGuildGump))
else if (targ.HasGump<BaseGuildGump>() || targ.HasGump<CreateGuildGump>()
) //TODO: Check message if CreateGuildGump Open
{
pm.SendLocalizedMessage(1063052, targ.Name); // ~1_val~ is currently considering another guild invitation.