From a9aea992bfbaf01db58c6269418569c14214a0a3 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sat, 14 Sep 2024 16:04:26 -0400 Subject: [PATCH] adjust items --- .../Items/General/exampleitems.milk.json | 2 ++ .../Items/General/exampleitems.nautilus.json | 17 ----------- .../Harvestable/exampleitems.nautilus.json | 28 +++++++++++++++++++ ...exampleitems.exampledredgeharvestpoi2.json | 13 +++++++++ .../POI/Item/exampleitems.exampleitempoi.json | 6 ++-- Winch.Examples/ExampleItems/ExampleEnums.cs | 1 + 6 files changed, 47 insertions(+), 20 deletions(-) delete mode 100644 Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.nautilus.json create mode 100644 Winch.Examples/ExampleItems/Assets/Items/Harvestable/exampleitems.nautilus.json create mode 100644 Winch.Examples/ExampleItems/Assets/POI/Harvest/exampleitems.exampledredgeharvestpoi2.json diff --git a/Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.milk.json b/Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.milk.json index 3105dcfa..4f528ca2 100644 --- a/Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.milk.json +++ b/Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.milk.json @@ -1,6 +1,8 @@ { "itemNameKey": "exampleitems.milk.name", "itemDescriptionKey": "exampleitems.milk.desc", + "itemType": "GENERAL", + "itemSubtype": "EXAMPLE", "sprite": "exampleitems.milk", "itemColor": { "r": 58, diff --git a/Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.nautilus.json b/Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.nautilus.json deleted file mode 100644 index 4e37bedb..00000000 --- a/Winch.Examples/ExampleItems/Assets/Items/General/exampleitems.nautilus.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "itemNameKey": "exampleitems.nautilus.name", - "itemDescriptionKey": "exampleitems.nautilus.desc", - "sprite": "exampleitems.nautilus", - "itemColor": { - "r": 58, - "g": 40, - "b": 32, - "a": 255 - }, - "value": 50, - "dimensions": [ - "X" - ], - "damageMode": "DESTROY" -} - diff --git a/Winch.Examples/ExampleItems/Assets/Items/Harvestable/exampleitems.nautilus.json b/Winch.Examples/ExampleItems/Assets/Items/Harvestable/exampleitems.nautilus.json new file mode 100644 index 00000000..a7338822 --- /dev/null +++ b/Winch.Examples/ExampleItems/Assets/Items/Harvestable/exampleitems.nautilus.json @@ -0,0 +1,28 @@ +{ + "itemNameKey": "exampleitems.nautilus.name", + "itemDescriptionKey": "exampleitems.nautilus.desc", + "itemType": "GENERAL", + "itemSubtype": "MATERIAL", + "sprite": "exampleitems.nautilus", + "itemColor": { + "r": 58, + "g": 40, + "b": 32, + "a": 255 + }, + "value": 50, + "dimensions": [ + "X" + ], + "damageMode": "DESTROY", + "harvestMinigameType": "DREDGE_RADIAL", + "perSpotMin": 1, + "perSpotMax": 1, + "harvestPOICategory": "MATERIAL", + "harvestableType": "DREDGE", + "harvestDifficulty": "VERY_HARD", + "canBeCaughtByRod": true, + "canBeCaughtByNet": true, + "canBeCaughtByPot": true +} + diff --git a/Winch.Examples/ExampleItems/Assets/POI/Harvest/exampleitems.exampledredgeharvestpoi2.json b/Winch.Examples/ExampleItems/Assets/POI/Harvest/exampleitems.exampledredgeharvestpoi2.json new file mode 100644 index 00000000..e1f6f501 --- /dev/null +++ b/Winch.Examples/ExampleItems/Assets/POI/Harvest/exampleitems.exampledredgeharvestpoi2.json @@ -0,0 +1,13 @@ +{ + "location": { + "x": 390.0, + "y": 0.0, + "z": -365.0 + }, + "harvestableParticlePrefab": "ImportantDredgeParticles", + "items": [ "exampleitems.nautilus" ], + "startStock": 1, + "maxStock": 1, + "doesRestock": true, + "usesTimeSpecificStock": false +} \ No newline at end of file diff --git a/Winch.Examples/ExampleItems/Assets/POI/Item/exampleitems.exampleitempoi.json b/Winch.Examples/ExampleItems/Assets/POI/Item/exampleitems.exampleitempoi.json index 0a2a330d..0c52950c 100644 --- a/Winch.Examples/ExampleItems/Assets/POI/Item/exampleitems.exampleitempoi.json +++ b/Winch.Examples/ExampleItems/Assets/POI/Item/exampleitems.exampleitempoi.json @@ -1,9 +1,9 @@ { "location": { - "x": 390.0, + "x": 425.0, "y": 0.0, - "z": -365.0 + "z": -375.0 }, "harvestableParticlePrefab" : "ImportantDredgeParticles", - "items": ["exampleitems.nautilus"] + "items": ["exampleitems.milk"] } \ No newline at end of file diff --git a/Winch.Examples/ExampleItems/ExampleEnums.cs b/Winch.Examples/ExampleItems/ExampleEnums.cs index 4e741a41..f669bfcf 100644 --- a/Winch.Examples/ExampleItems/ExampleEnums.cs +++ b/Winch.Examples/ExampleItems/ExampleEnums.cs @@ -5,6 +5,7 @@ namespace ExampleItems; [EnumHolder] public static class ExampleEnums { + public static readonly ItemSubtype EXAMPLE; public static readonly GridKey EXAMPLE_INPUT; public static readonly GridKey EXAMPLE_OUTPUT; }