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

fix: Removes the old ore info. (#1247)

Browse source
This commit is contained in:
Kamron Batman 2022-11-13 00:41:26 -08:00 • committed by GitHub
parent d8cfb6b935
commit e66efefff3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Projects/UOContent/Items/Resources/Blacksmithing/Ingots.cs
View file

@ -39,33 +39,7 @@ namespace Server.Items
private void Deserialize(IGenericReader reader, int version)
{
switch (version)
{
case 1:
{
_resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
var info = reader.ReadInt() switch
{
0 => OreInfo.Iron,
1 => OreInfo.DullCopper,
2 => OreInfo.ShadowIron,
3 => OreInfo.Copper,
4 => OreInfo.Bronze,
5 => OreInfo.Gold,
6 => OreInfo.Agapite,
7 => OreInfo.Verite,
8 => OreInfo.Valorite,
_ => null
};
_resource = CraftResources.GetFromOreInfo(info);
break;
}
}
_resource = (CraftResource)reader.ReadInt();
}
public override void AddNameProperty(IPropertyList list)

32
Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs
View file

@ -39,35 +39,9 @@ namespace Server.Items
private void Deserialize(IGenericReader reader, int version)
{
switch (version)
{
case 1:
{
// Use this line instead if you are getting world loading issues
_resource = (CraftResource)reader.ReadByte();
// _resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
var info = reader.ReadInt() switch
{
0 => OreInfo.Iron,
1 => OreInfo.DullCopper,
2 => OreInfo.ShadowIron,
3 => OreInfo.Copper,
4 => OreInfo.Bronze,
5 => OreInfo.Gold,
6 => OreInfo.Agapite,
7 => OreInfo.Verite,
8 => OreInfo.Valorite,
_ => null
};
_resource = CraftResources.GetFromOreInfo(info);
break;
}
}
// Use this line instead if you are getting world loading issues
_resource = (CraftResource)reader.ReadByte();
// _resource = (CraftResource)reader.ReadInt();
}
private static int RandomSize() =>

16
Projects/UOContent/Items/Resources/Tailor/Hides.cs
View file

@ -38,21 +38,7 @@ namespace Server.Items
private void Deserialize(IGenericReader reader, int version)
{
switch (version)
{
case 1:
{
_resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
var info = new OreInfo(reader.ReadInt(), reader.ReadInt(), reader.ReadString());
_resource = CraftResources.GetFromOreInfo(info);
break;
}
}
_resource = (CraftResource)reader.ReadInt();
}
public override void AddNameProperty(IPropertyList list)

16
Projects/UOContent/Items/Resources/Tailor/Leathers.cs
View file

@ -38,21 +38,7 @@ namespace Server.Items
private void Deserialize(IGenericReader reader, int version)
{
switch (version)
{
case 1:
{
_resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
var info = new OreInfo(reader.ReadInt(), reader.ReadInt(), reader.ReadString());
_resource = CraftResources.GetFromOreInfo(info);
break;
}
}
_resource = (CraftResource)reader.ReadInt();
}
public override void AddNameProperty(IPropertyList list)