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/Addons/BallotBox.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Server.Gumps;
using Server.Multis;
using Server.Network;
using Server.Prompts;
namespace Server.Items
{

23
Projects/Scripts/Items/Addons/ElvenSpinningwheelEastAddon.cs
View file

@ -26,8 +26,14 @@ namespace Server.Items
m_Timer.Start();
foreach (AddonComponent c in Components)
if (c.ItemID == 0x2DD9 || c.ItemID == 0x101C || c.ItemID == 0x10A4)
++c.ItemID;
switch (c.ItemID)
{
case 0x2DD9:
case 0x101C:
case 0x10A4:
++c.ItemID;
break;
}
}
public override void Serialize(GenericWriter writer)
@ -63,8 +69,15 @@ namespace Server.Items
m_Timer = null;
foreach (AddonComponent c in Components)
if (c.ItemID == 0x1016 || c.ItemID == 0x101A || c.ItemID == 0x101D || c.ItemID == 0x10A5)
--c.ItemID;
switch (c.ItemID)
{
case 0x1016:
case 0x101A:
case 0x101D:
case 0x10A5:
--c.ItemID;
break;
}
callback?.Invoke(this, from, hue);
}
@ -121,4 +134,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

24
Projects/Scripts/Items/Addons/ElvenSpinningwheelSouthAddon.cs
View file

@ -26,8 +26,15 @@ namespace Server.Items
m_Timer.Start();
foreach (AddonComponent c in Components)
if (c.ItemID == 0x1015 || c.ItemID == 0x1019 || c.ItemID == 0x101C || c.ItemID == 0x10A4)
++c.ItemID;
switch (c.ItemID)
{
case 0x1015:
case 0x1019:
case 0x101C:
case 0x10A4:
++c.ItemID;
break;
}
}
public override void Serialize(GenericWriter writer)
@ -64,8 +71,15 @@ namespace Server.Items
m_Timer = null;
foreach (AddonComponent c in Components)
if (c.ItemID == 0x1016 || c.ItemID == 0x101A || c.ItemID == 0x101D || c.ItemID == 0x10A5)
--c.ItemID;
switch (c.ItemID)
{
case 0x1016:
case 0x101A:
case 0x101D:
case 0x10A5:
--c.ItemID;
break;
}
callback?.Invoke(this, from, hue);
}
@ -122,4 +136,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

7
Projects/Scripts/Items/Addons/FlourMillEastAddon.cs
View file

@ -130,10 +130,11 @@ namespace Server.Items
{
List<AddonComponent> components = Components;
int[][] stageTable = m_StageTable;
for (int i = 0; i < components.Count; ++i)
{
AddonComponent component = components[i];
if (component == null)
if (!(components[i] is AddonComponent component))
continue;
int[] itemTable = FindItemTable(component.ItemID);
@ -209,4 +210,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

7
Projects/Scripts/Items/Addons/FlourMillSouthAddon.cs
View file

@ -118,10 +118,11 @@ namespace Server.Items
{
List<AddonComponent> components = Components;
int[][] stageTable = m_StageTable;
for (int i = 0; i < components.Count; ++i)
{
AddonComponent component = components[i];
if (component == null)
if (!(components[i] is AddonComponent component))
continue;
int[] itemTable = FindItemTable(component.ItemID);
@ -197,4 +198,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

22
Projects/Scripts/Items/Addons/JackOLantern.cs
View file

@ -39,7 +39,15 @@ namespace Server.Items
public override bool ShareHue => false;
private AddonComponent GetComponent(int itemID, int hue) => new AddonComponent(itemID) {Hue = hue, Name = "jack-o-lantern"};
private AddonComponent GetComponent(int itemID, int hue)
{
AddonComponent ac = new AddonComponent(itemID);
ac.Hue = hue;
ac.Name = "jack-o-lantern";
return ac;
}
public override void Serialize(GenericWriter writer)
{
@ -58,23 +66,17 @@ namespace Server.Items
Timer.DelayCall(TimeSpan.Zero, delegate
{
for (int i = 0; i < Components.Count; ++i)
{
AddonComponent ac = Components[i];
if (ac?.Hue == 2118)
if (Components[i] is AddonComponent ac && ac.Hue == 2118)
ac.Hue = 1161;
}
});
if (version <= 1)
Timer.DelayCall(TimeSpan.Zero, delegate
{
for (int i = 0; i < Components.Count; ++i)
{
AddonComponent ac = Components[i];
if (ac != null)
if (Components[i] is AddonComponent ac)
ac.Name = "jack-o-lantern";
}
});
}
}
}
}

24
Projects/Scripts/Items/Addons/SpinningwheelEastAddon.cs
View file

@ -34,8 +34,15 @@ namespace Server.Items
m_Timer.Start();
foreach (AddonComponent c in Components)
if (c.ItemID == 0x1015 || c.ItemID == 0x1019 || c.ItemID == 0x101C || c.ItemID == 0x10A4)
++c.ItemID;
switch (c.ItemID)
{
case 0x1015:
case 0x1019:
case 0x101C:
case 0x10A4:
++c.ItemID;
break;
}
}
public override void Serialize(GenericWriter writer)
@ -72,8 +79,15 @@ namespace Server.Items
m_Timer = null;
foreach (AddonComponent c in Components)
if (c.ItemID == 0x1016 || c.ItemID == 0x101A || c.ItemID == 0x101D || c.ItemID == 0x10A5)
--c.ItemID;
switch (c.ItemID)
{
case 0x1016:
case 0x101A:
case 0x101D:
case 0x10A5:
--c.ItemID;
break;
}
callback?.Invoke(this, from, hue);
}
@ -130,4 +144,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

24
Projects/Scripts/Items/Addons/SpinningwheelSouthAddon.cs
View file

@ -26,8 +26,15 @@ namespace Server.Items
m_Timer.Start();
foreach (AddonComponent c in Components)
if (c.ItemID == 0x1015 || c.ItemID == 0x1019 || c.ItemID == 0x101C || c.ItemID == 0x10A4)
++c.ItemID;
switch (c.ItemID)
{
case 0x1015:
case 0x1019:
case 0x101C:
case 0x10A4:
++c.ItemID;
break;
}
}
public override void Serialize(GenericWriter writer)
@ -64,8 +71,15 @@ namespace Server.Items
m_Timer = null;
foreach (AddonComponent c in Components)
if (c.ItemID == 0x1016 || c.ItemID == 0x101A || c.ItemID == 0x101D || c.ItemID == 0x10A5)
--c.ItemID;
switch (c.ItemID)
{
case 0x1016:
case 0x101A:
case 0x101D:
case 0x10A5:
--c.ItemID;
break;
}
callback?.Invoke(this, from, hue);
}
@ -122,4 +136,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}