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

2
Projects/Scripts/Items/Skill Items/Camping/Campfire.cs
View file

@ -44,7 +44,7 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public CampfireStatus Status
{
get
get => ItemID switch
{
return ItemID switch
{

18
Projects/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -233,21 +233,19 @@ namespace Server.Items
bool xEast = false, ySouth = false;
string fmt;
if (Sextant.Format(loc, map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth))
fmt = $"{yLat}°{yMins}'{(ySouth ? "S" : "N")},{xLong}°{xMins}'{(xEast ? "E" : "W")}";
else
fmt = "?????";
fmt = Sextant.Format(loc, map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth) ?
$"{yLat}°{yMins}'{(ySouth ? "S" : "N")},{xLong}°{xMins}'{(xEast ? "E" : "W")}" : "?????";
AddPage(0);
AddBackground(0, 40, 350, 300, 2520);
AddHtmlLocalized(30, 80, 285, 160, 1018326, true,
true); /* This is a message hastily scribbled by a passenger aboard a sinking ship.
* While it is probably too late to save the passengers and crew,
* perhaps some treasure went down with the ship!
* The message gives the ship's last known sextant co-ordinates.
*/
AddHtmlLocalized(30, 80, 285, 160, 1018326, true, true);
/* This is a message hastily scribbled by a passenger aboard a sinking ship.
* While it is probably too late to save the passengers and crew,
* perhaps some treasure went down with the ship!
* The message gives the ship's last known sextant co-ordinates.=
*/
AddHtml(35, 240, 230, 20, fmt);

3
Projects/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -200,7 +200,6 @@ namespace Server.Items
switch (Utility.Random(8))
{
default:
case 0:
x = -1;
y = -1;
break;
@ -405,4 +404,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Projects/Scripts/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs
View file

@ -159,9 +159,7 @@ namespace Server.Items
if (!(from is PlayerMobile pm))
return;
ContextMenuEntry miningEntry = new ContextMenuEntry(pm.ToggleMiningStone ? 6179 : 6178);
miningEntry.Color = 0x421F;
list.Add(miningEntry);
list.Add(new ContextMenuEntry(pm.ToggleMiningStone ? 6179 : 6178) {Color = 0x421F});
list.Add(new ToggleMiningStoneEntry(pm, false, 6176));
list.Add(new ToggleMiningStoneEntry(pm, true, 6177));

4
Projects/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -167,7 +167,7 @@ namespace Server.Items
from.Map != Map.Felucca && TargetMap == Map.Felucca && ShowFeluccaWarning)
{
if (from.AccessLevel == AccessLevel.Player || !from.Hidden)
from.Send(new PlaySound(0x20E, from.Location));
Packets.SendPlaySound(from.NetState, 0x20E, from.Location);
from.CloseGump<MoongateConfirmGump>();
from.SendGump(new MoongateConfirmGump(from, this));
}
@ -381,7 +381,7 @@ namespace Server.Items
}
}
public override void OnResponse(NetState state, RelayInfo info)
public override void OnResponse(NetState sender, RelayInfo info)
{
if (info.ButtonID == 1)
m_Gate.EndConfirmation(m_From);

1
Projects/Scripts/Items/Skill Items/Magical/Misc/RecallRune.cs
View file

@ -1,5 +1,4 @@
using Server.Multis;
using Server.Prompts;
using Server.Regions;
namespace Server.Items

5
Projects/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -76,8 +76,7 @@ namespace Server.Items
from.RevealingAction();
if (Users == null)
Users = new List<Mobile>();
Users ??= new List<Mobile>();
if (!Users.Contains(from))
Users.Add(from);
@ -169,7 +168,7 @@ namespace Server.Items
Effects.PlaySound(loc, map, 0x307);
Effects.SendLocationEffect(loc, map, 0x36B0, 9, 10, 0, 0);
Effects.SendLocationEffect(loc, map, 0x36B0, 9);
int alchemyBonus = 0;
if (direct)

6
Projects/Scripts/Items/Skill Items/Magical/Potions/NightSight.cs
View file

@ -29,7 +29,7 @@ namespace Server.Items
public override void Drink(Mobile from)
{
if (from.BeginAction<LightCycle>())
if (from.BeginAction<LightCycle.NightSightTimer>())
{
new LightCycle.NightSightTimer(from).Start();
from.LightLevel = LightCycle.DungeonLevel / 2;
@ -43,9 +43,7 @@ namespace Server.Items
Consume();
}
else
{
from.SendMessage("You already have nightsight.");
}
}
}
}
}

14
Projects/Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -355,13 +355,9 @@ namespace Server.Items
if (dropped is RecallRune rune)
{
if (IsLockedDown && from.AccessLevel < AccessLevel.GameMaster)
{
from.SendLocalizedMessage(502413, null, 0x35); // That cannot be done while the book is locked down.
}
else if (IsOpen(from))
{
from.SendLocalizedMessage(1005571); // You cannot place objects in the book while viewing the contents.
}
else if (Entries.Count < 16)
{
if (rune.Marked && rune.TargetMap != null)
@ -370,12 +366,12 @@ namespace Server.Items
rune.Delete();
from.Send(new PlaySound(0x42, GetWorldLocation()));
Packets.SendPlaySound(from.NetState, 0x42, GetWorldLocation());
string desc = rune.Description;
if (desc == null || (desc = desc.Trim()).Length == 0)
desc = "(indescript)";
desc = "(nondescript)";
from.SendMessage(desc);
@ -385,15 +381,13 @@ namespace Server.Items
from.SendLocalizedMessage(502409); // This rune does not have a marked location.
}
else
{
from.SendLocalizedMessage(502401); // This runebook is full.
}
}
else if (dropped is RecallScroll)
{
if (CurCharges < MaxCharges)
{
from.Send(new PlaySound(0x249, GetWorldLocation()));
Packets.SendPlaySound(from.NetState, 0x259, GetWorldLocation());
int amount = dropped.Amount;
@ -411,9 +405,7 @@ namespace Server.Items
}
}
else
{
from.SendLocalizedMessage(502410); // This book already has the maximum amount of charges.
}
}
return false;

51
Projects/Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -491,7 +491,7 @@ namespace Server.Items
scroll.Delete();
from.Send(new PlaySound(0x249, GetWorldLocation()));
Packets.SendPlaySound(from.NetState, 0x249, GetWorldLocation());
return true;
}
}
@ -569,49 +569,16 @@ namespace Server.Items
return;
if (Parent == null)
{
to.Send(WorldPacket);
}
SendWorldPacketFor(ns);
else if (Parent is Item)
{
// What will happen if the client doesn't know about our parent?
if (ns.ContainerGridLines)
to.Send(new ContainerContentUpdate6017(this));
else
to.Send(new ContainerContentUpdate(this));
}
Packets.SendContainerContentUpdate(ns, this);
else if (Parent is Mobile)
{
// What will happen if the client doesn't know about our parent?
to.Send(new EquipUpdate(this));
}
Packets.SendEquipUpdate(ns, this);
if (ns.HighSeas)
to.Send(new DisplaySpellbookHS(this));
else
to.Send(new DisplaySpellbook(this));
if (ObjectPropertyList.Enabled)
{
if (ns.NewSpellbook)
{
to.Send(new NewSpellbookContent(this, ItemID, BookOffset + 1, m_Content));
}
else
{
if (ns.ContainerGridLines)
to.Send(new SpellbookContent6017(SpellCount, BookOffset + 1, m_Content, this));
else
to.Send(new SpellbookContent(SpellCount, BookOffset + 1, m_Content, this));
}
}
else
{
if (ns.ContainerGridLines)
to.Send(new SpellbookContent6017(SpellCount, BookOffset + 1, m_Content, this));
else
to.Send(new SpellbookContent(SpellCount, BookOffset + 1, m_Content, this));
}
Packets.SendDisplayContainer(ns, Serial);
Packets.SendSpellbookContent(ns, Serial, ItemID, BookOffset + 1, m_Content);
}
public override void GetProperties(ObjectPropertyList list)
@ -810,11 +777,9 @@ namespace Server.Items
}
}
if (Attributes == null)
Attributes = new AosAttributes(this);
Attributes ??= new AosAttributes(this);
if (SkillBonuses == null)
SkillBonuses = new AosSkillBonuses(this);
SkillBonuses ??= new AosSkillBonuses(this);
if (Core.AOS && Parent is Mobile mobile)
SkillBonuses.AddTo(mobile);

2
Projects/Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -387,7 +387,7 @@ namespace Server.Items
double toHeal = min + Utility.RandomDouble() * (max - min);
if (Patient.Body.IsMonster || Patient.Body.IsAnimal)
toHeal += Patient.HitsMax / 100;
toHeal += Patient.HitsMax / 100.0;
if (Core.AOS)
toHeal -= toHeal * Slips * 0.35; // TODO: Verify algorithm

9
Projects/Scripts/Items/Skill Items/Misc/FireHorn.cs
View file

@ -79,9 +79,8 @@ namespace Server.Items
from.Backpack.ConsumeUpTo(typeof(SulfurousAsh), sulfAsh);
from.PlaySound(0x15F);
Effects.SendPacket(from, from.Map,
new HuedEffect(EffectType.Moving, from.Serial, Serial.Zero, 0x36D4, from.Location, loc, 5, 0, false, true, 0,
0));
Effects.SendMovingEffect(from, loc, from.Map, 0x36D4, 5, 0, false, true);
IPooledEnumerable<Mobile> eable = from.Map.GetMobilesInRange(new Point3D(loc), 2);
@ -92,11 +91,9 @@ namespace Server.Items
|| Core.AOS && !from.InLOS(m))
return false;
if (m.Player)
playerVsPlayer = true;
playerVsPlayer |= m.Player;
return true;
}).ToList();
eable.Free();

9
Projects/Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -406,13 +406,8 @@ namespace Server.Items
number = 1041000;
}
if (attrs.Count == 0 && Crafter == null && Name != null)
return;
EquipmentInfo eqInfo = new EquipmentInfo(number, m_Crafter, false,
attrs.ToArray());
from.Send(new DisplayEquipmentInfo(this, eqInfo));
if (attrs.Count > 0 || Crafter != null || Name == null)
EquipmentPackets.SendDisplayEquipmentInfo(from.NetState, this, number, m_Crafter, false, attrs);
}
public override void Serialize(GenericWriter writer)

25
Projects/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -6,7 +6,7 @@ using Server.Mobiles;
namespace Server.Items
{
[Flippable(0x2790, 0x27DB)]
public class LeatherNinjaBelt : BaseWaist, IDyable, INinjaWeapon
public class LeatherNinjaBelt : BaseWaist, INinjaWeapon
{
private Poison m_Poison;
private int m_PoisonCharges;
@ -27,18 +27,18 @@ namespace Server.Items
public override CraftResource DefaultResource => CraftResource.RegularLeather;
public virtual int WrongAmmoMessage => 1063301; //You can only place shuriken in a ninja belt.
public virtual int NoFreeHandMessage => 1063299; //You must have a free hand to throw shuriken.
public virtual int EmptyWeaponMessage => 1063297; //You have no shuriken in your ninja belt!
public virtual int RecentlyUsedMessage => 1063298; //You cannot throw another shuriken yet.
public virtual int FullWeaponMessage => 1063302; //You cannot add any more shuriken.
public int WrongAmmoMessage => 1063301; //You can only place shuriken in a ninja belt.
public int NoFreeHandMessage => 1063299; //You must have a free hand to throw shuriken.
public int EmptyWeaponMessage => 1063297; //You have no shuriken in your ninja belt!
public int RecentlyUsedMessage => 1063298; //You cannot throw another shuriken yet.
public int FullWeaponMessage => 1063302; //You cannot add any more shuriken.
public virtual int WeaponMinRange => 2;
public virtual int WeaponMaxRange => 10;
public int WeaponMinRange => 2;
public int WeaponMaxRange => 10;
public virtual int WeaponDamage => Utility.RandomMinMax(3, 5);
public int WeaponDamage => Utility.RandomMinMax(3, 5);
public virtual Type AmmoType => typeof(Shuriken);
public Type AmmoType => typeof(Shuriken);
[CommandProperty(AccessLevel.GameMaster)]
public int UsesRemaining
@ -81,7 +81,8 @@ namespace Server.Items
public void AttackAnimation(Mobile from, Mobile to)
{
if (from.Body.IsHuman) from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0);
if (from.Body.IsHuman)
from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0);
from.PlaySound(0x23A);
from.MovingEffect(to, 0x27AC, 1, 0, false, false);
@ -156,4 +157,4 @@ namespace Server.Items
}
}
}
}
}

1
Projects/Scripts/Items/Skill Items/Tailor Items/Misc/Dyes.cs
View file

@ -1,4 +1,3 @@
using Server.HuePickers;
using Server.Targeting;
namespace Server.Items

7
Projects/Scripts/Items/Skill Items/Thief/DisguisePersistance.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
namespace Server.Items
{
@ -31,12 +30,10 @@ namespace Server.Items
writer.Write(timerCount);
foreach (KeyValuePair<Mobile, Timer> entry in DisguiseTimers.Timers)
foreach (var (m, value) in DisguiseTimers.Timers)
{
Mobile m = entry.Key;
writer.Write(m);
writer.Write(entry.Value.Next - DateTime.UtcNow);
writer.Write(value.Next - DateTime.UtcNow);
writer.Write(m.NameMod);
}
}

12
Projects/Scripts/Items/Skill Items/Tinkering/Spyglass.cs
View file

@ -20,10 +20,10 @@ namespace Server.Items
from.LocalOverheadMessage(MessageType.Regular, 0x3B2,
1008155); // You peer into the heavens, seeking the moons...
from.Send(new MessageLocalizedAffix(from.Serial, from.Body, MessageType.Regular, 0x3B2, 3,
1008146 + (int)Clock.GetMoonPhase(Map.Trammel, from.X, from.Y), "", AffixType.Prepend, "Trammel : ", ""));
from.Send(new MessageLocalizedAffix(from.Serial, from.Body, MessageType.Regular, 0x3B2, 3,
1008146 + (int)Clock.GetMoonPhase(Map.Felucca, from.X, from.Y), "", AffixType.Prepend, "Felucca : ", ""));
Packets.SendMessageLocalizedAffix(from.NetState, from.Serial, from.Body, MessageType.Regular, 0x3B2, 3,
1008146 + (int)Clock.GetMoonPhase(Map.Trammel, from.X, from.Y), "", AffixType.Prepend, "Trammel : ");
Packets.SendMessageLocalizedAffix(from.NetState, from.Serial, from.Body, MessageType.Regular, 0x3B2, 3,
1008146 + (int)Clock.GetMoonPhase(Map.Felucca, from.X, from.Y), "", AffixType.Prepend, "Felucca : ");
if (from is PlayerMobile player)
{
@ -33,7 +33,7 @@ namespace Server.Items
return;
FindIngredientObjective obj = qs.FindObjective<FindIngredientObjective>();
if (obj?.Completed == false && obj.Ingredient == Ingredient.StarChart)
{
Clock.GetTime(from.Map, from.X, from.Y, out int hours, out int _);
@ -68,4 +68,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}