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

fix: Adds Poison to codegen (#1002)

Browse source
This commit is contained in:
Kamron Batman 2022-04-18 00:05:44 -07:00 • committed by GitHub
parent 933c41070f
commit fc3d9b926d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 140 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Items/Food/Beverage.cs
View file

@ -1101,7 +1101,7 @@ namespace Server.Items
writer.Write(Poisoner);
Poison.Serialize(Poison, writer);
writer.Write(Poison);
writer.Write((int)m_Content);
writer.Write(m_Quantity);
}
@ -1133,7 +1133,7 @@ namespace Server.Items
}
case 0:
{
Poison = Poison.Deserialize(reader);
Poison = reader.ReadPoison();
m_Content = (BeverageType)reader.ReadInt();
m_Quantity = reader.ReadInt();
break;

6
Projects/UOContent/Items/Food/Food.cs
View file

@ -142,7 +142,7 @@ namespace Server.Items
writer.Write(Poisoner);
Poison.Serialize(Poison, writer);
writer.Write(Poison);
writer.Write(FillFactor);
}
@ -170,12 +170,12 @@ namespace Server.Items
}
case 2:
{
Poison = Poison.Deserialize(reader);
Poison = reader.ReadPoison();
break;
}
case 3:
{
Poison = Poison.Deserialize(reader);
Poison = reader.ReadPoison();
FillFactor = reader.ReadInt();
break;
}

4
Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs
View file

@ -123,7 +123,7 @@ namespace Server.Items
writer.Write(m_UsesRemaining);
Poison.Serialize(m_Poison, writer);
writer.Write(m_Poison);
writer.Write(m_PoisonCharges);
}
@ -139,7 +139,7 @@ namespace Server.Items
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_Poison = reader.ReadPoison();
m_PoisonCharges = reader.ReadInt();
break;

4
Projects/UOContent/Items/Skill Items/Ninjitsu/FukiyaDarts.cs
View file

@ -93,7 +93,7 @@ namespace Server.Items
writer.Write(m_UsesRemaining);
Poison.Serialize(m_Poison, writer);
writer.Write(m_Poison);
writer.Write(m_PoisonCharges);
}
@ -109,7 +109,7 @@ namespace Server.Items
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_Poison = reader.ReadPoison();
m_PoisonCharges = reader.ReadInt();
break;

4
Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -136,7 +136,7 @@ namespace Server.Items
writer.Write(m_UsesRemaining);
Poison.Serialize(m_Poison, writer);
writer.Write(m_Poison);
writer.Write(m_PoisonCharges);
}
@ -152,7 +152,7 @@ namespace Server.Items
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_Poison = reader.ReadPoison();
m_PoisonCharges = reader.ReadInt();
break;

4
Projects/UOContent/Items/Skill Items/Ninjitsu/Shuriken.cs
View file

@ -94,7 +94,7 @@ namespace Server.Items
writer.Write(m_UsesRemaining);
Poison.Serialize(m_Poison, writer);
writer.Write(m_Poison);
writer.Write(m_PoisonCharges);
}
@ -110,7 +110,7 @@ namespace Server.Items
{
m_UsesRemaining = reader.ReadInt();
m_Poison = Poison.Deserialize(reader);
m_Poison = reader.ReadPoison();
m_PoisonCharges = reader.ReadInt();
break;

4
Projects/UOContent/Items/Traps/GasTrap.cs
View file

@ -85,7 +85,7 @@ namespace Server.Items
writer.Write(0); // version
Poison.Serialize(Poison, writer);
writer.Write(Poison);
}
public override void Deserialize(IGenericReader reader)
@ -98,7 +98,7 @@ namespace Server.Items
{
case 0:
{
Poison = Poison.Deserialize(reader);
Poison = reader.ReadPoison();
break;
}
}

6
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -3614,7 +3614,7 @@ namespace Server.Items
if (GetSaveFlag(flags, SaveFlag.Poison))
{
Poison.Serialize(m_Poison, writer);
writer.Write(m_Poison);
}
if (GetSaveFlag(flags, SaveFlag.PoisonCharges))
@ -3797,7 +3797,7 @@ namespace Server.Items
if (GetSaveFlag(flags, SaveFlag.Poison))
{
m_Poison = Poison.Deserialize(reader);
m_Poison = reader.ReadPoison();
}
if (GetSaveFlag(flags, SaveFlag.PoisonCharges))
@ -4057,7 +4057,7 @@ namespace Server.Items
m_Crafter = reader.ReadEntity<Mobile>();
m_Poison = Poison.Deserialize(reader);
m_Poison = reader.ReadPoison();
m_PoisonCharges = reader.ReadInt();
if (m_StrReq == OldStrengthReq)

2
Projects/UOContent/UOContent.csproj
View file

@ -46,7 +46,7 @@
<PackageReference Include="Zstd.Binaries" Version="1.3.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.0.2" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.0.3" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.0.4" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="Migrations/*.v*.json" />