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

fix: Changes BaseWeapon to source generator and changes crafter to string (#1519)

Browse source
This commit is contained in:
Kamron Batman 2023-09-29 22:45:37 -07:00 • committed by GitHub
parent d6823309d4
commit 972949455b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3824 additions and 3801 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Misc/ArcaneGem.cs
View file

@ -129,7 +129,7 @@ public partial class ArcaneGem : Item
else else
{ {
weapon.Quality = WeaponQuality.Regular; weapon.Quality = WeaponQuality.Regular;
weapon.Crafter = from; weapon.Crafter = from.RawName;
} }
eq.CurArcaneCharges = eq.MaxArcaneCharges = charges; eq.CurArcaneCharges = eq.MaxArcaneCharges = charges;

2
Projects/UOContent/Items/Wands/BaseWand.cs
View file

@ -226,7 +226,7 @@ public abstract partial class BaseWand : BaseBashing
return; return;
} }
from.NetState.SendDisplayEquipmentInfo(Serial, number, Crafter?.RawName, false, attrs); from.NetState.SendDisplayEquipmentInfo(Serial, number, Crafter, false, attrs);
} }
public void Cast(Spell spell) public void Cast(Spell spell)

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

File diff suppressed because it is too large Load diff

255
Projects/UOContent/Migrations/Server.Items.BaseWeapon.v10.json generated Normal file
View file

@ -0,0 +1,255 @@
{
"version": 10,
"type": "Server.Items.BaseWeapon",
"properties": [
{
"name": "DamageLevel",
"type": "Server.Items.WeaponDamageLevel",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "AccuracyLevel",
"type": "Server.Items.WeaponAccuracyLevel",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "DurabilityLevel",
"type": "Server.Items.WeaponDurabilityLevel",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "Quality",
"type": "Server.Items.WeaponQuality",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "HitPoints",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "MaxHitPoints",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Slayer",
"type": "Server.Items.SlayerName",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "Poison",
"type": "Server.Poison",
"usesSaveFlag": true,
"rule": "PrimitiveUOTypeMigrationRule",
"ruleArguments": [
"Poison"
]
},
{
"name": "PoisonCharges",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Crafter",
"type": "string",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Identified",
"type": "bool",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "StrRequirement",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "DexRequirement",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "IntRequirement",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "MinDamage",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "MaxDamage",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "HitSound",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "MissSound",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Speed",
"type": "float",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "MaxRange",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Skill",
"type": "Server.SkillName",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "Type",
"type": "Server.Items.WeaponType",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "Animation",
"type": "Server.Items.WeaponAnimation",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "Resource",
"type": "Server.Items.CraftResource",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "Attributes",
"type": "Server.AosAttributes",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "WeaponAttributes",
"type": "Server.AosWeaponAttributes",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "PlayerConstructed",
"type": "bool",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "SkillBonuses",
"type": "Server.AosSkillBonuses",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "Slayer2",
"type": "Server.Items.SlayerName",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "AosElementDamages",
"type": "Server.AosElementAttributes",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "EngravedText",
"type": "string",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
}
]
}

2
Projects/UOContent/Mobiles/Guards/ArcherGuard.cs
View file

@ -44,7 +44,7 @@ public partial class ArcherGuard : BaseGuard
var bow = new Bow(); var bow = new Bow();
bow.Movable = false; bow.Movable = false;
bow.Crafter = this; bow.Crafter = Name;
bow.Quality = WeaponQuality.Exceptional; bow.Quality = WeaponQuality.Exceptional;
AddItem(bow); AddItem(bow);

2
Projects/UOContent/Mobiles/Guards/WarriorGuard.cs
View file

@ -67,7 +67,7 @@ public partial class WarriorGuard : BaseGuard
var weapon = new Halberd var weapon = new Halberd
{ {
Movable = false, Movable = false,
Crafter = this, Crafter = Name,
Quality = WeaponQuality.Exceptional Quality = WeaponQuality.Exceptional
}; };

2
Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/Guardian.cs
View file

@ -51,7 +51,7 @@ namespace Server.Mobiles
var bow = new Bow(); var bow = new Bow();
bow.Movable = false; bow.Movable = false;
bow.Crafter = this; bow.Crafter = Name;
bow.Quality = WeaponQuality.Exceptional; bow.Quality = WeaponQuality.Exceptional;
AddItem(bow); AddItem(bow);