Compare commits

..

No commits in common. "cac8e96656ce1788fc4d9289d7592f68d4883e80" and "97ace3375a25fadec093d5ab765d1e93a9cf2820" have entirely different histories.

3 changed files with 1 additions and 26 deletions

View file

@ -51,12 +51,6 @@ namespace MosswartMassacre
_trackedItemIds.Add(item.Id); _trackedItemIds.Add(item.Id);
var mwo = MyWorldObjectCreator.Create(item); var mwo = MyWorldObjectCreator.Create(item);
_ = WebSocket.SendInventoryDeltaAsync("add", mwo); _ = WebSocket.SendInventoryDeltaAsync("add", mwo);
// Request appraisal if item needs full ID data (spells, combat stats, etc.)
if (!item.HasIdData && ObjectClassNeedsIdent(item.ObjectClass, item.Name))
{
CoreManager.Current.Actions.RequestId(item.Id);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -102,12 +96,6 @@ namespace MosswartMassacre
_trackedItemIds.Add(item.Id); _trackedItemIds.Add(item.Id);
var mwo = MyWorldObjectCreator.Create(item); var mwo = MyWorldObjectCreator.Create(item);
_ = WebSocket.SendInventoryDeltaAsync("add", mwo); _ = WebSocket.SendInventoryDeltaAsync("add", mwo);
// Request appraisal if item needs full ID data
if (!item.HasIdData && ObjectClassNeedsIdent(item.ObjectClass, item.Name))
{
CoreManager.Current.Actions.RequestId(item.Id);
}
} }
else else
{ {
@ -127,18 +115,6 @@ namespace MosswartMassacre
_trackedItemIds.Clear(); _trackedItemIds.Clear();
} }
private static bool ObjectClassNeedsIdent(ObjectClass oc, string name)
{
return oc == ObjectClass.Armor
|| oc == ObjectClass.Clothing
|| oc == ObjectClass.MeleeWeapon
|| oc == ObjectClass.MissileWeapon
|| oc == ObjectClass.WandStaffOrb
|| oc == ObjectClass.Jewelry
|| (oc == ObjectClass.Gem && !string.IsNullOrEmpty(name) && name.Contains("Aetheria"))
|| (oc == ObjectClass.Misc && !string.IsNullOrEmpty(name) && name.Contains("Essence"));
}
private static bool IsPlayerInventory(WorldObject item) private static bool IsPlayerInventory(WorldObject item)
{ {
try try

View file

@ -65,8 +65,7 @@ namespace MosswartMassacre
// build serializer/deserializer once // build serializer/deserializer once
var builder = new DeserializerBuilder() var builder = new DeserializerBuilder()
.WithNamingConvention(UnderscoredNamingConvention.Instance) .WithNamingConvention(UnderscoredNamingConvention.Instance);
.IgnoreUnmatchedProperties();
var deserializer = builder.Build(); var deserializer = builder.Build();
PluginSettings loaded = null; PluginSettings loaded = null;