Dredge Harvest Zone

DREDGE-Mods · Aug 16, 2024 · ef868dc · ef868dc
1 parent 9e86004
commit ef868dc
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 6 deletions.
diff --git a/Winch.Examples/ExampleItems/Assets/HarvestZones/exampleitems.examplecrabharvestzone.json b/Winch.Examples/ExampleItems/Assets/HarvestZones/exampleitems.examplecrabharvestzone.json
@@ -4,6 +4,7 @@
         "y": 0.0,
         "z": -354.0
     },
+    "colliderType": "SPHERE",
     "radius": 50,
     "harvestableItems": [ "exampleitems.rainbowfiddlercrab" ],
     "day": true,

diff --git a/Winch.Examples/ExampleItems/Assets/HarvestZones/exampleitems.exampledredgeharvestzone.json b/Winch.Examples/ExampleItems/Assets/HarvestZones/exampleitems.exampledredgeharvestzone.json
@@ -0,0 +1,16 @@
+{
+    "location": {
+        "x": 0,
+        "y": 0,
+        "z": -300
+    },
+    "colliderType": "BOX",
+    "size": {
+        "x": 3000,
+        "y": 500,
+        "z": 3000
+    },
+    "harvestableItems": [ "exampleitems.diamond" ],
+    "day": true,
+    "night": false
+}
diff --git a/Winch.Examples/ExampleItems/Assets/HarvestZones/exampleitems.exampleharvestzone.json b/Winch.Examples/ExampleItems/Assets/HarvestZones/exampleitems.exampleharvestzone.json
@@ -4,6 +4,7 @@
         "y": 0.0,
         "z": -354.0
     },
+    "colliderType": "SPHERE",
     "radius": 50,
     "harvestableItems": [ "exampleitems.mccod" ],
     "day": true,

diff --git a/...Examples/ExampleItems/Assets/HarvestZones/exampleitems.examplenightdredgeharvestzone.json b/...Examples/ExampleItems/Assets/HarvestZones/exampleitems.examplenightdredgeharvestzone.json
@@ -0,0 +1,16 @@
+{
+    "location": {
+        "x": 0,
+        "y": 0,
+        "z": -300
+    },
+    "colliderType": "BOX",
+    "size": {
+        "x": 3000,
+        "y": 500,
+        "z": 3000
+    },
+    "harvestableItems": [ "exampleitems.musicdisc" ],
+    "day": false,
+    "night": true
+}
diff --git a/Winch/Serialization/HarvestZone/CustomHarvestZone.cs b/Winch/Serialization/HarvestZone/CustomHarvestZone.cs
@@ -8,11 +8,19 @@ namespace Winch.Serialization.HarvestZone;
 
 public class CustomHarvestZone : SerializedScriptableObject
 {
-    public Vector3 location = Vector3.zero;
+    public Vector3 location = new Vector3(0, 0, -300);
+    public ColliderType colliderType = ColliderType.SPHERE;
     public float radius = 200;
+    public Vector3 size = new Vector3(3000, 500, 3000);
     public List<string> harvestableItems = new List<string>();
     public bool day = true;
     public bool night = true;
 
     public List<HarvestableItemData> HarvestableItems => ItemUtil.TryGetHarvestables(harvestableItems);
+
+    public enum ColliderType
+    {
+        SPHERE,
+        BOX
+    }
 }
diff --git a/Winch/Serialization/HarvestZone/CustomHarvestZoneConverter.cs b/Winch/Serialization/HarvestZone/CustomHarvestZoneConverter.cs
@@ -10,8 +10,10 @@ public class CustomHarvestZoneConverter : DredgeTypeConverter<CustomHarvestZone>
 {
     private readonly Dictionary<string, FieldDefinition> _definitions = new()
     {
-        { "location", new( Vector3.zero, o=> DredgeTypeHelpers.ParseVector3(o)) },
+        { "location", new( new Vector3(0, 0, -300), o=> DredgeTypeHelpers.ParseVector3(o)) },
+        { "colliderType", new( CustomHarvestZone.ColliderType.SPHERE, o=> DredgeTypeHelpers.GetEnumValue<CustomHarvestZone.ColliderType>(o)) },
         { "radius", new( 200, o=> float.Parse(o.ToString())) },
+        { "size", new( new Vector3(3000, 500, 3000), o=> DredgeTypeHelpers.ParseVector3(o)) },
         { "harvestableItems", new( new List<string>(), o => DredgeTypeHelpers.ParseStringList((JArray)o)) },
         { "day", new( true, o => bool.Parse(o.ToString())) },
         { "night", new( true, o => bool.Parse(o.ToString())) },

diff --git a/Winch/Util/HarvestZoneUtil.cs b/Winch/Util/HarvestZoneUtil.cs
@@ -45,10 +45,20 @@ internal static GameObject CreateGameObjectFromCustomHarvestZone(CustomHarvestZo
         harvestZoneObj.transform.SetParent(GameObject.Find("HarvestZones/FullZones").transform);
         harvestZoneObj.transform.position = customHarvestZone.location;
 
-        var sphereCollider = harvestZoneObj.AddComponent<SphereCollider>();
-        sphereCollider.radius = customHarvestZone.radius;
-        sphereCollider.enabled = true;
-        sphereCollider.contactOffset = 0.01f;
+        if (customHarvestZone.colliderType == CustomHarvestZone.ColliderType.SPHERE)
+        {
+            var sphereCollider = harvestZoneObj.AddComponent<SphereCollider>();
+            sphereCollider.radius = customHarvestZone.radius;
+            sphereCollider.enabled = true;
+            sphereCollider.contactOffset = 0.01f;
+        }
+        else if (customHarvestZone.colliderType == CustomHarvestZone.ColliderType.BOX)
+        {
+            var boxCollider = harvestZoneObj.AddComponent<BoxCollider>();
+            boxCollider.size = customHarvestZone.size;
+            boxCollider.enabled = true;
+            boxCollider.contactOffset = 0.01f;
+        }
 
         var harvestZone = harvestZoneObj.AddComponent<HarvestZone>();
         harvestZone.harvestableItems = customHarvestZone.HarvestableItems.ToArray();