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

Updates Packets & Randomizer (#43)

Browse source 
* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand.

* WIP - Rewriting packets.

* Cleanup and updates README

* Converts more packets

* Fixes header

* Converts Effects packets.

* Forgot the send command

* Adds the start of containers packets.

* Adds message packets with caching

* Extends the send methods

* Starts to add Acquire methods

* Converted the packets

* Cleanup

* Cleanup

* Adds more packets

* Adds more packets

* Fixes clearing arrays from pool. Adds Mobile Incoming

* Converts more packets.

* Moves more packets

* Moves more packets

* Test compression

* Merges

* Migrating to an idiomatic syntax that also supports compression, and proxying.

* Optimize the stack alloc. Changes attributes

* Converted container packets

* Visual Studio doesn't auto save files. I am still getting used to subpar IDEs.

* Adds static packet caching. Will profile later. Converts more packets

* Fixes packets and changes how compression is configured

* WIP - Adds basics for Gumps. Not finished though.

* Fix file

* Fixes formatting

* Changed SpanWriter to be more idiomatic.

* Fixes Span vs RawSpan and missing stackallocs

* Converts over some more gumps

* WIP - Deletes 32bit support.

* Drops RDRand32 support.

* Fixes gump compilation

* Converting gump components

* Removes old huffman compression function

* Revert signature for backwards compatibility

* WIP - Converting more gump components

* Creates ArraySet for the strings. Updates AppendTo to reference that.

* Converts the maining gump components

* Cleans up gump components

* Cleans up directives

* Cleans up ArraySet and moves it. Adds null-coalescing-assignment

* Cleanup, Target Packets, and C# 8 changes.

* Removed OPL Packet

* World packets

* Fixing packet uses

* Cleans up code. Fixes packet uses in various places.

* More cleanup for packets

* Code cleanup

* Converts more packet uses and cleans up more code

* More code cleanup

* Finishes fixing the packets in Item

* Updates secure trade packets

* Updates core and gets it to compile.

* Moved packets to scripts. Fixed account handler use of packets

* Code cleanup

* Updates chat packets

* Code cleanuo

* Adds party packets, but need to implement them.

* Party packets WIP

* Finishes party packets

* Rearrange movement namespaces and classes

* Finishes plant packets

* Code Formatting

* Fixes moving effects

* Code cleanup, eliminates equipinfo

* Adds more packets. Fixes bugs with various packets.

* Finishes mahjon packets

* Fixes mahjong packet

* Code cleanup

* Finishes mahjong packets

* Adds Map packets

* Add multifacet maps and charts

* Cleans up some packets with UTF8

* Optimizes packets

* Cleans up more packets. Moves the MessageHelper

* Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets.

* Updates protocol extensions packet receiver

* Fixes a few bugs. Fixes a few more packets.

* Code cleanup and fixing more packets

* Fixes packet effects

* Cleaned up more code

* Buff Icon cleanup

* Removed unused constructors

* Code Cleanup. Adds BoatHS Packets

* Moves house files. Updates house foundation packets.

* Deployment cleanup

* Fixes:

* Code cleanup

* More code cleanup

* More code cleanup

* Cleaned up BaseHouse

* Enforces styling

* Converts foreach to linq where possible.

* Dont need that

* Goals/Readme updates

* Removes 32bit support at the highest level. Turns on HRT by default.

* Code cleanup. Fixes extended features packet.

* Fixes various bugs

* Code cleanup

* Code cleanup

* Code cleanup. Fixes gump X/Y assignment.

* Code cleanup using |= operator

* More code cleanup

* Cleanup

* Fixes spacing issues. Thanks Visual Studio. You suck.

* Compiler error

* Fixes NPE from RunUO 2.7

* Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README

* Fixes more packets. Stupid trailing nulls.

* Fixes various bugs.

* Fixes for gumps

* Fixes more gump stuff. Going to split it out later since it is getting insane

* Recoded the gump writing

* WIP

* *Added output path of scripts project to dev branch
*Activated debugging in code
This commit is contained in:
Kamron Batman 2019-11-11 03:40:16 -08:00 • committed by 3HMonkey
parent 7aa8fd3df1
commit 179cb50557
588 changed files with 10843 additions and 16177 deletions
Download patch file Download diff file Expand all files Collapse all files

134
Projects/Scripts/Misc/Guild.cs
View file

@ -32,7 +32,7 @@ namespace Server.Guilds
public class RankDefinition
{
public static RankDefinition[] Ranks =
public static readonly RankDefinition[] Ranks =
{
new RankDefinition(1062963, 0, RankFlags.None), //Ronin
new RankDefinition(1062962, 1, RankFlags.Member), //Member
@ -78,8 +78,8 @@ namespace Server.Guilds
public class AllianceInfo
{
private Guild m_Leader;
private List<Guild> m_Members;
private List<Guild> m_PendingMembers;
private readonly List<Guild> m_Members;
private readonly List<Guild> m_PendingMembers;
public AllianceInfo(Guild leader, string name, Guild partner)
{
@ -154,21 +154,9 @@ namespace Server.Guilds
}
}
public bool IsPendingMember(Guild g)
{
if (g.Alliance != this)
return false;
public bool IsPendingMember(Guild g) => g.Alliance == this && m_PendingMembers.Contains(g);
return m_PendingMembers.Contains(g);
}
public bool IsMember(Guild g)
{
if (g.Alliance != this)
return false;
return m_Members.Contains(g);
}
public bool IsMember(Guild g) => g.Alliance == this && m_Members.Contains(g);
public void Serialize(GenericWriter writer)
{
@ -332,29 +320,18 @@ namespace Server.Guilds
public void AllianceChat(Mobile from, int hue, string text)
{
Packet p = null;
for (int i = 0; i < m_Members.Count; i++)
{
Guild g = m_Members[i];
for (int j = 0; j < g.Members.Count; j++)
{
Mobile m = g.Members[j];
NetState ns = g.Members[j].NetState;
NetState state = m.NetState;
if (state != null)
{
if (p == null)
p = Packet.Acquire(new UnicodeMessage(from.Serial, from.Body, MessageType.Alliance, hue, 3,
from.Language, from.Name, text));
state.Send(p);
}
if (ns != null)
Packets.SendUnicodeMessage(ns, from.Serial, from.Body, MessageType.Alliance, hue, 3, from.Language, from.Name, text);
}
}
Packet.Release(p);
}
public void AllianceChat(Mobile from, string text)
@ -683,9 +660,7 @@ namespace Server.Guilds
Mobile from = e.Mobile;
if (arg.Length == 0)
{
e.Mobile.Target = new GuildPropsTarget();
}
else
{
Guild g = uint.TryParse(arg, out uint id)
@ -720,7 +695,7 @@ namespace Server.Guilds
if (o is Guildstone stone)
{
if (stone?.Guild.Disbanded != false)
if (stone.Guild.Disbanded)
{
from.SendMessage("The guild associated with that Guildstone no longer exists");
return;
@ -729,9 +704,7 @@ namespace Server.Guilds
g = stone.Guild;
}
else if (o is Mobile mobile)
{
g = mobile.Guild as Guild;
}
if (g == null)
{
@ -773,13 +746,7 @@ namespace Server.Guilds
public AllianceInfo Alliance
{
get
{
if (m_AllianceInfo != null)
return m_AllianceInfo;
return m_AllianceLeader?.m_AllianceInfo;
}
get => m_AllianceInfo ?? m_AllianceLeader?.m_AllianceInfo;
set
{
AllianceInfo current = Alliance;
@ -822,10 +789,7 @@ namespace Server.Guilds
{
AllianceInfo alliance = g.Alliance;
if (alliance?.Leader != null && alliance.IsMember(g))
return alliance.Leader;
return g;
return alliance?.Leader != null && alliance.IsMember(g) ? alliance.Leader : g;
}
#endregion
@ -837,31 +801,9 @@ namespace Server.Guilds
public List<WarDeclaration> AcceptedWars{ get; private set; }
public WarDeclaration FindPendingWar(Guild g)
{
for (int i = 0; i < PendingWars.Count; i++)
{
WarDeclaration w = PendingWars[i];
public WarDeclaration FindPendingWar(Guild g) => PendingWars.FirstOrDefault(w => w.Opponent == g);
if (w.Opponent == g)
return w;
}
return null;
}
public WarDeclaration FindActiveWar(Guild g)
{
for (int i = 0; i < AcceptedWars.Count; i++)
{
WarDeclaration w = AcceptedWars[i];
if (w.Opponent == g)
return w;
}
return null;
}
public WarDeclaration FindActiveWar(Guild g) => AcceptedWars.FirstOrDefault(w => w.Opponent == g);
public void CheckExpiredWars()
{
@ -936,8 +878,7 @@ namespace Server.Guilds
if (!NewGuildSystem)
return;
if (killer == null)
killer = victim.FindMostRecentDamager(false);
killer ??= victim.FindMostRecentDamager(false);
if (killer == null || victim.Guild == null || killer.Guild == null)
return;
@ -1148,24 +1089,10 @@ namespace Server.Guilds
}
}
if (AllyDeclarations == null)
AllyDeclarations = new List<Guild>();
if (AllyInvitations == null)
AllyInvitations = new List<Guild>();
if (AcceptedWars == null)
AcceptedWars = new List<WarDeclaration>();
if (PendingWars == null)
PendingWars = new List<WarDeclaration>();
/*
if ( ( !NewGuildSystem && m_Guildstone == null )|| m_Members.Count == 0 )
Disband();
*/
AllyDeclarations ??= new List<Guild>();
AllyInvitations ??= new List<Guild>();
AcceptedWars ??= new List<WarDeclaration>();
PendingWars ??= new List<WarDeclaration>();
Timer.DelayCall(TimeSpan.Zero, VerifyGuild_Callback);
}
@ -1334,24 +1261,14 @@ namespace Server.Guilds
public void GuildChat(Mobile from, int hue, string text)
{
Packet p = null;
for (int i = 0; i < Members.Count; i++)
{
Mobile m = Members[i];
NetState ns = Members[i].NetState;
NetState state = m.NetState;
if (state != null)
{
if (p == null)
p = Packet.Acquire(new UnicodeMessage(from.Serial, from.Body, MessageType.Guild, hue, 3,
from.Language, from.Name, text));
state.Send(p);
}
if (ns != null)
Packets.SendUnicodeMessage(ns, from.Serial, from.Body, MessageType.Guild, hue, 3,
from.Language, from.Name, text);
}
Packet.Release(p);
}
public void GuildChat(Mobile from, string text)
@ -1402,17 +1319,12 @@ namespace Server.Guilds
Mobile winner = null;
int highVotes = 0;
foreach (KeyValuePair<Mobile, int> kvp in votes)
{
Mobile m = kvp.Key;
int val = kvp.Value;
foreach ((Mobile m, int val) in votes)
if (winner == null || val > highVotes)
{
winner = m;
highVotes = val;
}
}
if (NewGuildSystem && highVotes * 100 / Math.Max(votingMembers, 1) < MajorityPercentage && !Disbanded &&
winner != m_Leader && m_Leader.Guild == this)