From ca0bfd0e1885db23f2f1df28333fcaf55f49a769 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Wed, 17 Jul 2024 11:44:15 -0400 Subject: [PATCH] canBeDiscardedByPlayer --- Winch/Serialization/Item/EngineItemDataConverter.cs | 1 + Winch/Serialization/Item/FishItemDataConverter.cs | 1 + Winch/Serialization/Item/LightItemDataConverter.cs | 1 + Winch/Serialization/Item/RelicItemDataConverter.cs | 2 +- Winch/Serialization/Item/RodItemDataConverter.cs | 1 + Winch/Serialization/Item/SpatialItemDataConverter.cs | 2 +- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Winch/Serialization/Item/EngineItemDataConverter.cs b/Winch/Serialization/Item/EngineItemDataConverter.cs index 4ce6c030..786572b4 100644 --- a/Winch/Serialization/Item/EngineItemDataConverter.cs +++ b/Winch/Serialization/Item/EngineItemDataConverter.cs @@ -10,6 +10,7 @@ public class EngineItemDataConverter : SpatialItemDataConverter { "itemTypeIcon", new(TextureUtil.GetSprite("EngineIcon"), null) }, { "damageMode", new(DamageMode.OPERATION, null) }, { "moveMode", new(MoveMode.INSTALL, null) }, + { "canBeDiscardedByPlayer", new(true, null) }, { "canBeSoldInBulkAction", new(false, null) }, { "itemType", new(ItemType.EQUIPMENT, null) }, { "itemSubtype", new(ItemSubtype.ENGINE, null) }, diff --git a/Winch/Serialization/Item/FishItemDataConverter.cs b/Winch/Serialization/Item/FishItemDataConverter.cs index 923586c7..257c4ded 100644 --- a/Winch/Serialization/Item/FishItemDataConverter.cs +++ b/Winch/Serialization/Item/FishItemDataConverter.cs @@ -14,6 +14,7 @@ public class FishItemDataConverter : HarvestableItemDataConverter { "harvestMinigameType", new( HarvestMinigameType.FISHING_RADIAL, null) }, { "itemType", new(ItemType.GENERAL, null) }, { "itemSubtype", new(ItemSubtype.FISH, null) }, + { "canBeDiscardedByPlayer", new(true, null) }, { "minSizeCentimeters", new( 0f, o => float.Parse(o.ToString())) }, { "maxSizeCentimeters", new( 0f, o => float.Parse(o.ToString())) }, { "aberrations", new( new List(), o => DredgeTypeHelpers.ParseStringList((JArray)o)) }, diff --git a/Winch/Serialization/Item/LightItemDataConverter.cs b/Winch/Serialization/Item/LightItemDataConverter.cs index 0efd827f..31408695 100644 --- a/Winch/Serialization/Item/LightItemDataConverter.cs +++ b/Winch/Serialization/Item/LightItemDataConverter.cs @@ -10,6 +10,7 @@ public class LightItemDataConverter : SpatialItemDataConverter { "itemTypeIcon", new(TextureUtil.GetSprite("LightIcon"), null) }, { "damageMode", new(DamageMode.OPERATION, null) }, { "moveMode", new(MoveMode.INSTALL, null) }, + { "canBeDiscardedByPlayer", new(true, null) }, { "canBeSoldInBulkAction", new(false, null) }, { "itemType", new(ItemType.EQUIPMENT, null) }, { "itemSubtype", new(ItemSubtype.LIGHT, null) }, diff --git a/Winch/Serialization/Item/RelicItemDataConverter.cs b/Winch/Serialization/Item/RelicItemDataConverter.cs index 34173049..5e3902a2 100644 --- a/Winch/Serialization/Item/RelicItemDataConverter.cs +++ b/Winch/Serialization/Item/RelicItemDataConverter.cs @@ -12,7 +12,7 @@ public class RelicItemDataConverter : HarvestableItemDataConverter { "itemType", new(ItemType.GENERAL, null) }, { "itemSubtype", new(ItemSubtype.RELIC, null) }, { "canBeDiscarded", new(true, null) }, - { "canBeDiscardedByPlayer", new(true, null) }, + { "canBeDiscardedByPlayer", new(false, null) }, { "canBeSoldByPlayer", new(false, null) }, { "canBeSoldInBulkAction", new(true, null) }, { "harvestPOICategory", new(HarvestPOICategory.RELIC, null) }, diff --git a/Winch/Serialization/Item/RodItemDataConverter.cs b/Winch/Serialization/Item/RodItemDataConverter.cs index a44e89c6..7b4d7c25 100644 --- a/Winch/Serialization/Item/RodItemDataConverter.cs +++ b/Winch/Serialization/Item/RodItemDataConverter.cs @@ -9,6 +9,7 @@ public class RodItemDataConverter : HarvesterItemDataConverter { "itemTypeIcon", new( TextureUtil.GetSprite("RodIcon"), null) }, { "damageMode", new(DamageMode.OPERATION, null) }, { "moveMode", new(MoveMode.INSTALL, null) }, + { "canBeDiscardedByPlayer", new(true, null) }, { "canBeSoldInBulkAction", new(false, null) }, { "itemSubtype", new(ItemSubtype.ROD, null) }, { "fishingSpeedModifier", new(1f, o => float.Parse(o.ToString())) }, diff --git a/Winch/Serialization/Item/SpatialItemDataConverter.cs b/Winch/Serialization/Item/SpatialItemDataConverter.cs index 3f362c03..730f70ee 100644 --- a/Winch/Serialization/Item/SpatialItemDataConverter.cs +++ b/Winch/Serialization/Item/SpatialItemDataConverter.cs @@ -20,7 +20,7 @@ public class SpatialItemDataConverter : ItemDataConverter { "sprite", new(null, o => TextureUtil.GetSprite(o.ToString())) }, { "platformSpecificSpriteOverrides", new(null, null) }, { "itemColor", new(new Color(0.1922f, 0.1922f, 0.1922f, 255), o=> DredgeTypeHelpers.GetColorFromJsonObject(o)) }, // default game uses - { "canBeDiscardedByPlayer", new(true, o => bool.Parse(o.ToString())) }, + { "canBeDiscardedByPlayer", new(false, o => bool.Parse(o.ToString())) }, { "canBeDiscardedDuringQuestPickup", new(true, o => bool.Parse(o.ToString())) }, { "hasSpecialDiscardAction", new(false, o => bool.Parse(o.ToString())) }, { "discardPromptOverride", new("", null) },