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

85
Projects/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
View file

@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Buffers;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
@ -87,7 +89,7 @@ namespace Server.Engines.MLQuests.Gumps
CloseCurrent(ns);
m_Pending[ns] = new RaceChangeState(owner, ns, targetRace);
ns.Send(new RaceChanger(from.Female, targetRace));
SendRaceChanger(ns, from.Female, targetRace);
}
private static void CloseCurrent(NetState ns)
@ -98,7 +100,7 @@ namespace Server.Engines.MLQuests.Gumps
m_Pending.Remove(ns);
}
ns.Send(CloseRaceChanger.Instance);
SendCloseRaceChanger(ns);
}
private static void Timeout(NetState ns)
@ -106,30 +108,21 @@ namespace Server.Engines.MLQuests.Gumps
if (IsPending(ns))
{
m_Pending.Remove(ns);
ns.Send(CloseRaceChanger.Instance);
SendCloseRaceChanger(ns);
}
}
public static bool IsWearingEquipment(Mobile from)
{
foreach (Item item in from.Items)
switch (item.Layer)
return from.Items.Select(item => item.Layer switch
{
case Layer.Hair:
case Layer.FacialHair:
case Layer.Backpack:
case Layer.Mount:
case Layer.Bank:
{
continue; // ignore
}
default:
{
return true;
}
}
return false;
Layer.Hair => false,
Layer.FacialHair => false,
Layer.Backpack => false,
Layer.Mount => false,
Layer.Bank => false,
_ => true
}).FirstOrDefault();
}
private static bool CanChange(PlayerMobile from, Race targetRace)
@ -238,38 +231,34 @@ namespace Server.Engines.MLQuests.Gumps
m_Timeout = Timer.DelayCall(m_TimeoutDelay, Timeout, ns);
}
}
}
public sealed class RaceChanger : Packet
{
public RaceChanger(bool female, Race targetRace)
: base(0xBF)
public static void SendRaceChanger(NetState ns, bool female, Race targetRace)
{
EnsureCapacity(7);
if (ns == null)
return;
m_Stream.Write((short)0x2A);
m_Stream.Write((byte)(female ? 1 : 0));
m_Stream.Write((byte)(targetRace.RaceID + 1));
SpanWriter writer = new SpanWriter(stackalloc byte[7]);
writer.Write((byte)0xBF); // Packet ID
writer.Write((ushort)0x07); // Dynamic Length
writer.Write((short)0x2A);
writer.Write(female);
writer.Write((byte)(targetRace.RaceID + 1));
ns.Send(writer.Span);
}
private static void SendCloseRaceChanger(NetState ns)
{
ns?.Send(stackalloc byte[]
{
0xBF, // Packet ID
0x07, // Dynamic Length
0x00,
0xFF
});
}
}
public sealed class CloseRaceChanger : Packet
{
public static readonly Packet Instance = SetStatic(new CloseRaceChanger());
private CloseRaceChanger()
: base(0xBF)
{
EnsureCapacity(7);
m_Stream.Write((short)0x2A);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0xFF);
}
}
#region For testing
public class RaceChangeDeed : Item, IRaceChanger
{
[Constructible]
@ -330,6 +319,4 @@ namespace Server.Engines.MLQuests.Gumps
int version = reader.ReadInt();
}
}
#endregion
}

15
Projects/Scripts/Engines/MLQuests/MLQuest.cs
View file

@ -86,14 +86,7 @@ namespace Server.Engines.MLQuests
public virtual int Version => 0;
public bool HasObjective<T>() where T : BaseObjective
{
foreach (BaseObjective obj in Objectives)
if (obj is T)
return true;
return false;
}
public bool HasObjective<T>() where T : BaseObjective => Objectives.OfType<T>().Any();
public virtual void Generate()
{
@ -151,11 +144,7 @@ namespace Server.Engines.MLQuests
}
}
foreach (BaseObjective obj in Objectives)
if (!obj.CanOffer(quester, pm, message))
return false;
return true;
return Objectives.All(obj => obj.CanOffer(quester, pm, message));
}
public virtual void SendOffer(IQuestGiver quester, PlayerMobile pm)

24
Projects/Scripts/Engines/MLQuests/MLQuestContext.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Mobiles;
namespace Server.Engines.MLQuests
@ -113,14 +114,7 @@ namespace Server.Engines.MLQuests
return quest != null && HasDoneQuest(quest);
}
public bool HasDoneQuest(MLQuest quest)
{
foreach (MLDoneQuestInfo info in m_DoneQuests)
if (info.m_Quest == quest)
return true;
return false;
}
public bool HasDoneQuest(MLQuest quest) => m_DoneQuests.Any(info => info.m_Quest == quest);
public bool HasDoneQuest(MLQuest quest, out DateTime nextAvailable)
{
@ -180,20 +174,10 @@ namespace Server.Engines.MLQuests
{
MLQuest quest = MLQuestSystem.FindQuest(questType);
if (quest == null)
return null;
return FindInstance(quest);
return quest == null ? null : FindInstance(quest);
}
public MLQuestInstance FindInstance(MLQuest quest)
{
foreach (MLQuestInstance instance in QuestInstances)
if (instance.Quest == quest)
return instance;
return null;
}
public MLQuestInstance FindInstance(MLQuest quest) => QuestInstances.FirstOrDefault(instance => instance.Quest == quest);
public bool IsDoingQuest(Type questType)
{

41
Projects/Scripts/Engines/MLQuests/MLQuestEntry.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Engines.MLQuests.Gumps;
using Server.Engines.MLQuests.Objectives;
using Server.Engines.MLQuests.Rewards;
@ -36,16 +37,7 @@ namespace Server.Engines.MLQuests
Objectives = new BaseObjectiveInstance[quest.Objectives.Count];
BaseObjectiveInstance obj;
bool timed = false;
for (int i = 0; i < quest.Objectives.Count; ++i)
{
Objectives[i] = obj = quest.Objectives[i].CreateInstance(this);
if (obj.IsTimed)
timed = true;
}
bool timed = quest.Objectives.Aggregate(false, (current, t) => current | t.CreateInstance(this).IsTimed);
Register();
@ -113,14 +105,8 @@ namespace Server.Engines.MLQuests
Removed = true;
}
public bool AllowsQuestItem(Item item, Type type)
{
foreach (BaseObjectiveInstance objective in Objectives)
if (!objective.Expired && objective.AllowsQuestItem(item, type))
return true;
return false;
}
public bool AllowsQuestItem(Item item, Type type) =>
Objectives.Any(objective => !objective.Expired && objective.AllowsQuestItem(item, type));
public bool IsCompleted()
{
@ -252,13 +238,11 @@ namespace Server.Engines.MLQuests
if (Quest.ObjectiveType == ObjectiveType.All)
{
// TODO: 1115877 - You no longer have the required items to complete this quest.
foreach (BaseObjectiveInstance objective in Objectives)
if (!objective.IsCompleted())
return;
if (Objectives.Any(objective => !objective.IsCompleted()))
return;
foreach (BaseObjectiveInstance objective in Objectives)
if (!objective.OnBeforeClaimReward())
return;
if (Objectives.Any(objective => !objective.OnBeforeClaimReward()))
return;
foreach (BaseObjectiveInstance objective in Objectives)
objective.OnClaimReward();
@ -314,14 +298,7 @@ namespace Server.Engines.MLQuests
{
// On OSI a more naive method of checking is used.
// For containers, only the actual container item counts.
bool canFit = true;
foreach (Item rewardItem in rewards)
if (!Player.AddToBackpack(rewardItem))
{
canFit = false;
break;
}
bool canFit = rewards.All(rewardItem => Player.AddToBackpack(rewardItem));
if (!canFit)
{

5
Projects/Scripts/Engines/MLQuests/MLQuestPersistence.cs
View file

@ -14,8 +14,7 @@ namespace Server.Engines.MLQuests
public static void EnsureExistence()
{
if (m_Instance == null)
m_Instance = new MLQuestPersistence();
m_Instance ??= new MLQuestPersistence();
}
public override void Serialize(GenericWriter writer)
@ -55,4 +54,4 @@ namespace Server.Engines.MLQuests
MLQuest.Deserialize(reader, version);
}
}
}
}

21
Projects/Scripts/Engines/MLQuests/MLQuestSystem.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Server.Commands;
using Server.Commands.Generic;
using Server.Engines.MLQuests.Gumps;
@ -213,7 +214,7 @@ namespace Server.Engines.MLQuests
return;
}
bool enable = e.Length == 1 ? e.GetBoolean(0) : true;
bool enable = e.Length != 1 || e.GetBoolean(0);
foreach (MLQuest quest in Quests.Values)
quest.SaveEnabled = enable;
@ -329,17 +330,8 @@ namespace Server.Engines.MLQuests
}
}
public static bool CanMarkQuestItem(PlayerMobile pm, Item item, Type type)
{
MLQuestContext context = GetContext(pm);
if (context != null)
foreach (MLQuestInstance quest in context.QuestInstances)
if (!quest.ClaimReward && quest.AllowsQuestItem(item, type))
return true;
return false;
}
public static bool CanMarkQuestItem(PlayerMobile pm, Item item, Type type) =>
GetContext(pm)?.QuestInstances.Any(quest => !quest.ClaimReward && quest.AllowsQuestItem(item, type)) == true;
private static void OnMarkQuestItem(PlayerMobile pm, Item item, Type type)
{
@ -563,8 +555,7 @@ namespace Server.Engines.MLQuests
* Save first quest that reaches the CanOffer call.
* If no quests are valid at all, return this quest for displaying the CanOffer error message.
*/
if (fallback == null)
fallback = quest;
fallback ??= quest;
if (quest.CanOffer(quester, pm, context, false))
m_EligiblePool.Add(quest);
@ -643,7 +634,7 @@ namespace Server.Engines.MLQuests
if (questType == null)
return null; // no longer a type
return FindQuest(questType);
return questType == null ? null : FindQuest(questType);
}
public static MLQuest FindQuest(Type questType)

16
Projects/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Engines.MLQuests.Definitions;
using Server.Engines.MLQuests.Gumps;
using Server.Items;
@ -135,20 +136,7 @@ namespace Server.Engines.MLQuests.Mobiles
{
MLQuestContext context = MLQuestSystem.GetContext(pm);
if (context == null)
return 0;
int result = 0;
foreach (Type type in Needed)
{
MLQuest quest = MLQuestSystem.FindQuest(type);
if (quest == null || context.HasDoneQuest(quest))
++result;
}
return result;
return context == null ? 0 : Needed.Select(MLQuestSystem.FindQuest).Count(quest => quest == null || context.HasDoneQuest(quest));
}
public virtual void OnComplete(PlayerMobile pm)

46
Projects/Scripts/Engines/MLQuests/Mobiles/SirHelper.cs
View file

@ -42,9 +42,7 @@ namespace Server.Engines.MLQuests.Mobiles
public override bool GetGender() => false;
public override void CheckMorph()
{
}
public override bool CheckMorph() => true;
public override void InitOutfit()
{
@ -53,22 +51,9 @@ namespace Server.Engines.MLQuests.Mobiles
HairHue = FacialHairHue = 0x8A7;
AddItem(new Sandals());
Item item;
item = new Cloak();
item.ItemID = 0x26AD;
item.Hue = 0x455;
AddItem(item);
item = new Robe();
item.ItemID = 0x26AE;
item.Hue = 0x4AB;
AddItem(item);
item = new Backpack();
item.Movable = false;
AddItem(item);
AddItem(new Cloak{ ItemID = 0x26AD, Hue = 0x455});
AddItem(new Robe {ItemID = 0x26AE, Hue = 0x4AB});
AddItem(new Backpack {Movable = false});
}
public override void OnDoubleClick(Mobile from)
@ -92,32 +77,23 @@ namespace Server.Engines.MLQuests.Mobiles
if (m_NextShout <= DateTime.UtcNow)
{
Packet shoutPacket = null;
foreach (NetState state in GetClientsInRange(12))
IPooledEnumerable eable = GetClientsInRange(12);
foreach (NetState state in eable)
{
Mobile m = state.Mobile;
if (m.CanSee(this) && m.InLOS(this) && m.CanBeginAction(this))
{
if (shoutPacket == null)
shoutPacket = Packet.Acquire(new MessageLocalized(Serial, Body, MessageType.Regular, 946, 3,
1078099, Name, "")); // Double Click On Me For Help!
state.Send(shoutPacket);
}
Packets.SendMessageLocalized(state, Serial, Body, MessageType.Regular, 946, 3,
1078099, Name); // Double Click On Me For Help!
}
Packet.Release(shoutPacket);
eable.Free();
m_NextShout = DateTime.UtcNow + m_ShoutDelay;
}
}
private void EndLock(Mobile m)
{
m.EndAction(this);
}
private void EndLock(Mobile m) => m.EndAction(this);
public override void Serialize(GenericWriter writer)
{
@ -135,4 +111,4 @@ namespace Server.Engines.MLQuests.Mobiles
Frozen = true;
}
}
}
}

14
Projects/Scripts/Engines/MLQuests/Objectives/EscortObjective.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Linq;
using Server.Gumps;
using Server.Misc;
using Server.Mobiles;
@ -20,14 +21,13 @@ namespace Server.Engines.MLQuests.Objectives
MLQuestContext context = MLQuestSystem.GetContext(pm);
if (context != null)
foreach (MLQuestInstance instance in context.QuestInstances)
if (instance.Quest.IsEscort)
{
if (message)
MLQuestSystem.Tell(quester, pm, 500896); // I see you already have an escort.
if (context.QuestInstances.Any(instance => instance.Quest.IsEscort))
{
if (message)
MLQuestSystem.Tell(quester, pm, 500896); // I see you already have an escort.
return false;
}
return false;
}
DateTime nextEscort = pm.LastEscortTime + BaseEscortable.EscortDelay;

26
Projects/Scripts/Engines/MLQuests/Objectives/KillObjective.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Linq;
using Server.Gumps;
using Server.Mobiles;
@ -91,22 +92,21 @@ namespace Server.Engines.MLQuests.Objectives
{
int desired = Objective.DesiredAmount;
foreach (Type acceptedType in Objective.AcceptedTypes)
if (acceptedType.IsAssignableFrom(type))
{
if (Objective.Area?.Contains(mob) == false)
return false;
if (Objective.AcceptedTypes.Any(acceptedType => acceptedType.IsAssignableFrom(type)))
{
if (Objective.Area?.Contains(mob) == false)
return false;
PlayerMobile pm = Instance.Player;
PlayerMobile pm = Instance.Player;
if (++Slain >= desired)
pm.SendLocalizedMessage(1075050); // You have killed all the required quest creatures of this type.
else
pm.SendLocalizedMessage(1075051,
(desired - Slain).ToString()); // You have killed a quest creature. ~1_val~ more left.
if (++Slain >= desired)
pm.SendLocalizedMessage(1075050); // You have killed all the required quest creatures of this type.
else
pm.SendLocalizedMessage(1075051,
(desired - Slain).ToString()); // You have killed a quest creature. ~1_val~ more left.
return true;
}
return true;
}
return false;
}

10
Projects/Scripts/Engines/MLQuests/QuestArea.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Linq;
namespace Server.Engines.MLQuests
{
@ -34,14 +35,7 @@ namespace Server.Engines.MLQuests
// Debug method
public void Validate()
{
bool found = false;
foreach (Region r in Region.Regions)
if (r.Name == RegionName && (ForceMap == null || r.Map == ForceMap))
{
found = true;
break;
}
bool found = Region.Regions.Any(r => r.Name == RegionName && (ForceMap == null || r.Map == ForceMap));
if (!found)
Console.WriteLine("Warning: QuestArea region '{0}' does not exist (ForceMap = {1})", RegionName,