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

core(fix): Fixes type aliasing, categorizations, and NPE (#444)

Browse source 
- [X] Fixes lookup of type aliases
- [X] Fixes categorization
- [X] Removes rebuild categorizations
- [X] Fixes an NPE with DoHarmful and Combatant

Closes #441
This commit is contained in:
Kamron Batman 2021-02-03 16:14:04 -08:00 • committed by GitHub
parent 24ebdd0f90
commit 5d9ebf062f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 3821 additions and 4881 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Projects/UOContent/Commands/Object Creation/CAGLoader.cs
View file

@ -17,7 +17,9 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text.Json.Serialization;
using Server.Items;
using Server.Json;
using Server.Utilities;
namespace Server.Commands
{
@ -26,7 +28,7 @@ namespace Server.Commands
public static CAGCategory Load()
{
var root = new CAGCategory("Add Menu");
var path = Path.Combine(Core.BaseDirectory, "Data/objects.json");
var path = Path.Combine(Core.BaseDirectory, "Data/categorization.json");
var list = JsonConfig.Deserialize<List<CAGJson>>(path);
@ -76,9 +78,61 @@ namespace Server.Commands
parent.Nodes = new CAGNode[cag.Objects.Length];
for (var i = 0; i < cag.Objects.Length; i++)
{
var obj = cag.Objects[i];
obj.Parent = parent;
parent.Nodes[i] = obj;
var cagObj = cag.Objects[i];
cagObj.Parent = parent;
parent.Nodes[i] = cagObj;
// Set ItemID and Hue
if (cagObj.Hue == null || cagObj.ItemID == null)
{
var type = cagObj.Type;
if (type.IsAssignableTo(typeof(Item)))
{
var item = cagObj.Type.CreateInstance<Item>();
if (cagObj.ItemID == null)
{
var itemID = item.ItemID;
if (item is BaseAddon addon && addon.Components.Count == 1)
{
itemID = addon.Components[0].ItemID;
}
if (itemID > TileData.MaxItemValue)
{
itemID = 1;
}
cagObj.ItemID = itemID;
}
if (cagObj.Hue == null)
{
int hue = item.Hue & 0x7FFF;
hue = (hue & 0x4000) != 0 ? 0 : hue;
cagObj.Hue = hue == 0 ? null : hue;
}
item.Delete();
}
if (type.IsAssignableTo(typeof(Mobile)))
{
var m = cagObj.Type.CreateInstance<Mobile>();
cagObj.ItemID ??= ShrinkTable.Lookup(m, 1);
if (cagObj.Hue == null)
{
int hue = m.Hue & 0x7FFF;
hue = (hue & 0x4000) != 0 ? 0 : hue;
cagObj.Hue = hue == 0 ? null : hue;
}
m.Delete();
}
}
}
}
@ -86,10 +140,12 @@ namespace Server.Commands
}
}
public class CAGJson
public record CAGJson
{
[JsonPropertyName("category")] public string Category { get; set; }
[JsonPropertyName("category")]
public string Category { get; init; }
[JsonPropertyName("objects")] public CAGObject[] Objects { get; set; }
[JsonPropertyName("objects")]
public CAGObject[] Objects { get; init; }
}
}