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

fix: Code gens items. Fixes code genning of ore (#684)

Browse source 
### THIS IS A BREAKING CHANGE IF YOU ARE ALREADY USING CODEGEN. IF YOUR WORLD HAS ERRORS LOADING PLEASE CONTACT ME ON DISCORD. ORE MIGHT FAIL TO LOAD.
 
### Changes
* Fixes Components from addons not marking dirty
* Code gens BaseAddonContainer
* Code gens Ingots
* Fixes code gen deserialization for Ore
* Code gens dyetubs
* Code gens reagents
* Code gens tailor commodities
* Code gens fish
This commit is contained in:
Kamron Batman 2021-08-14 22:16:42 -07:00 • committed by GitHub
parent 2de4717390
commit 25fa9b397b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
163 changed files with 1128 additions and 2494 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Projects/UOContent/Items/Resources/Fishing/BigFish.cs
View file

@ -2,35 +2,22 @@ using System;
namespace Server.Items
{
public class BigFish : Item, ICarvable
[Serializable(1, false)]
public partial class BigFish : Item, ICarvable
{
private Mobile m_Fisher;
[InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
[SerializableField(0)]
private Mobile _fisher;
[Constructible]
public BigFish() : base(0x09CC)
{
Weight = Utility.RandomMinMax(
3,
200
); // TODO: Find correct formula. max on OSI currently 200, OSI dev says it's not 200 as max, and ~ 1/1,000,000 chance to get highest
// TODO: Find correct formula. max on OSI currently 200, OSI dev says it's not 200 as max, and ~ 1/1,000,000 chance to get highest
Weight = Utility.RandomMinMax(3, 200);
Hue = Utility.RandomBool() ? 0x847 : 0x58C;
}
public BigFish(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Fisher
{
get => m_Fisher;
set
{
m_Fisher = value;
InvalidateProperties();
}
}
public override int LabelNumber => 1041112; // a big fish
public void Carve(Mobile from, Item item)
@ -44,43 +31,18 @@ namespace Server.Items
if (Weight >= 20)
{
if (m_Fisher != null)
if (_fisher != null)
{
list.Add(1070857, m_Fisher.Name); // Caught by ~1_fisherman~
list.Add(1070857, _fisher.Name); // Caught by ~1_fisherman~
}
list.Add(1070858, ((int)Weight).ToString()); // ~1_weight~ stones
}
}
public override void Serialize(IGenericWriter writer)
private void Deserialize(IGenericReader reader, int version)
{
base.Serialize(writer);
writer.Write(1); // version
writer.Write(m_Fisher);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 1:
{
m_Fisher = reader.ReadEntity<Mobile>();
break;
}
case 0:
{
Weight = Utility.RandomMinMax(3, 200);
break;
}
}
Weight = Utility.RandomMinMax(3, 200);
}
}
}

21
Projects/UOContent/Items/Resources/Fishing/Fish.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items
{
public class Fish : Item, ICarvable
[Serializable(0, false)]
public partial class Fish : Item, ICarvable
{
[Constructible]
public Fish(int amount = 1) : base(Utility.Random(0x09CC, 4))
@ -10,27 +11,9 @@ namespace Server.Items
Amount = amount;
}
public Fish(Serial serial) : base(serial)
{
}
public void Carve(Mobile from, Item item)
{
ScissorHelper(from, new RawFishSteak(), 4);
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

125
Projects/UOContent/Items/Resources/Fishing/MagicFish.cs
View file

@ -4,14 +4,11 @@ using Server.Spells;
namespace Server.Items
{
public abstract class BaseMagicFish : Item
[Serializable(0, false)]
public abstract partial class BaseMagicFish : Item
{
public BaseMagicFish(int hue) : base(0xDD6) => Hue = hue;
public BaseMagicFish(Serial serial) : base(serial)
{
}
public virtual int Bonus => 0;
public virtual StatType Type => StatType.Str;
@ -43,141 +40,58 @@ namespace Server.Items
Delete();
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class PrizedFish : BaseMagicFish
[Serializable(0, false)]
public partial class PrizedFish : BaseMagicFish
{
[Constructible]
public PrizedFish() : base(51)
{
}
public PrizedFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Int;
public override int LabelNumber => 1041073; // prized fish
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Hue == 151)
{
Hue = 51;
}
}
}
public class WondrousFish : BaseMagicFish
[Serializable(0, false)]
public partial class WondrousFish : BaseMagicFish
{
[Constructible]
public WondrousFish() : base(86)
{
}
public WondrousFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Dex;
public override int LabelNumber => 1041074; // wondrous fish
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Hue == 286)
{
Hue = 86;
}
}
}
public class TrulyRareFish : BaseMagicFish
[Serializable(0, false)]
public partial class TrulyRareFish : BaseMagicFish
{
[Constructible]
public TrulyRareFish() : base(76)
{
}
public TrulyRareFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Str;
public override int LabelNumber => 1041075; // truly rare fish
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Hue == 376)
{
Hue = 76;
}
}
}
public class PeculiarFish : BaseMagicFish
[Serializable(0, false)]
public partial class PeculiarFish : BaseMagicFish
{
[Constructible]
public PeculiarFish() : base(66)
{
}
public PeculiarFish(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1041076; // highly peculiar fish
public override bool Apply(Mobile from)
@ -185,24 +99,5 @@ namespace Server.Items
from.Stam += 10;
return true;
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (Hue == 266)
{
Hue = 66;
}
}
}
}