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

fix(codegen): Fixes base armor using wrong int type (#708)

Browse source
This commit is contained in:
Kamron Batman 2021-08-19 23:02:16 -07:00 • committed by GitHub
parent ca5e9342a0
commit c2f853d8a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -33,6 +33,7 @@ namespace Server.Items
[SerializableFieldDefault(1)] [SerializableFieldDefault(1)]
private AosArmorAttributes ArmorAttributesDefaultValue() => new(this); private AosArmorAttributes ArmorAttributesDefaultValue() => new(this);
[EncodedInt]
[InvalidateProperties] [InvalidateProperties]
[SerializableField(2)] [SerializableField(2)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
@ -41,6 +42,7 @@ namespace Server.Items
[SerializableFieldSaveFlag(2)] [SerializableFieldSaveFlag(2)]
private bool ShouldSerializePhysicalBonus() => _physicalBonus != 0; private bool ShouldSerializePhysicalBonus() => _physicalBonus != 0;
[EncodedInt]
[InvalidateProperties] [InvalidateProperties]
[SerializableField(3)] [SerializableField(3)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
@ -49,6 +51,7 @@ namespace Server.Items
[SerializableFieldSaveFlag(3)] [SerializableFieldSaveFlag(3)]
private bool ShouldSerializeFireBonus() => _fireBonus != 0; private bool ShouldSerializeFireBonus() => _fireBonus != 0;
[EncodedInt]
[InvalidateProperties] [InvalidateProperties]
[SerializableField(4)] [SerializableField(4)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
@ -57,6 +60,7 @@ namespace Server.Items
[SerializableFieldSaveFlag(4)] [SerializableFieldSaveFlag(4)]
private bool ShouldSerializeColdBonus() => _coldBonus != 0; private bool ShouldSerializeColdBonus() => _coldBonus != 0;
[EncodedInt]
[InvalidateProperties] [InvalidateProperties]
[SerializableField(5)] [SerializableField(5)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
@ -65,6 +69,7 @@ namespace Server.Items
[SerializableFieldSaveFlag(5)] [SerializableFieldSaveFlag(5)]
private bool ShouldSerializePoisonBonus() => _poisonBonus != 0; private bool ShouldSerializePoisonBonus() => _poisonBonus != 0;
[EncodedInt]
[InvalidateProperties] [InvalidateProperties]
[SerializableField(6)] [SerializableField(6)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
@ -80,6 +85,7 @@ namespace Server.Items
[SerializableFieldSaveFlag(7)] [SerializableFieldSaveFlag(7)]
private bool ShouldSerializeIdentified() => _identified; private bool ShouldSerializeIdentified() => _identified;
[EncodedInt]
[SerializableField(8)] [SerializableField(8)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private int _maxHitPoints; private int _maxHitPoints;
@ -281,6 +287,7 @@ namespace Server.Items
[SerializableFieldDefault(14)] [SerializableFieldDefault(14)]
private CraftResource ResourceDefaultValue() => DefaultResource; private CraftResource ResourceDefaultValue() => DefaultResource;
[EncodedInt]
[SerializableField(15)] [SerializableField(15)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int BaseArmorRating public int BaseArmorRating
@ -357,6 +364,7 @@ namespace Server.Items
public double ArmorRatingScaled => ArmorRating * ArmorScalar; public double ArmorRatingScaled => ArmorRating * ArmorScalar;
[EncodedInt]
[SerializableField(16)] [SerializableField(16)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int StrBonus public int StrBonus
@ -376,6 +384,7 @@ namespace Server.Items
[SerializableFieldDefault(16)] [SerializableFieldDefault(16)]
private int StrBonusDefaultValue() => -1; private int StrBonusDefaultValue() => -1;
[EncodedInt]
[SerializableField(17)] [SerializableField(17)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int DexBonus public int DexBonus
@ -395,6 +404,7 @@ namespace Server.Items
[SerializableFieldDefault(17)] [SerializableFieldDefault(17)]
private int DexBonusDefaultValue() => -1; private int DexBonusDefaultValue() => -1;
[EncodedInt]
[SerializableField(18)] [SerializableField(18)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int IntBonus public int IntBonus
@ -414,6 +424,7 @@ namespace Server.Items
[SerializableFieldDefault(18)] [SerializableFieldDefault(18)]
private int IntBonusDefaultValue() => -1; private int IntBonusDefaultValue() => -1;
[EncodedInt]
[SerializableField(19)] [SerializableField(19)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int StrRequirement public int StrRequirement
@ -433,6 +444,7 @@ namespace Server.Items
[SerializableFieldDefault(19)] [SerializableFieldDefault(19)]
private int StrReqDefaultValue() => -1; private int StrReqDefaultValue() => -1;
[EncodedInt]
[SerializableField(20)] [SerializableField(20)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int DexRequirement public int DexRequirement
@ -452,6 +464,7 @@ namespace Server.Items
[SerializableFieldDefault(20)] [SerializableFieldDefault(20)]
private int DexReqDefaultValue() => -1; private int DexReqDefaultValue() => -1;
[EncodedInt]
[SerializableField(21)] [SerializableField(21)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int IntRequirement public int IntRequirement
@ -692,6 +705,7 @@ namespace Server.Items
public virtual bool CanFortify => true; public virtual bool CanFortify => true;
[EncodedInt]
[SerializableField(9)] [SerializableField(9)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int HitPoints public int HitPoints

28
Projects/UOContent/Migrations/Server.Items.BaseArmor.v8.json
View file

@ -26,7 +26,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -35,7 +35,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -44,7 +44,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -53,7 +53,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -62,7 +62,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -80,7 +80,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -89,7 +89,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -128,7 +128,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -137,7 +137,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -146,7 +146,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -155,7 +155,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -164,7 +164,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -173,7 +173,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {
@ -182,7 +182,7 @@
"usesSaveFlag": true, "usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule", "rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [ "ruleArguments": [
"" "EncodedInt"
] ]
}, },
{ {