add registerstrawberry attribute to dream strawberries + add placement for a tracked version

Author: aonkeeper4

Loenn/entities/misc/dream_dash_berry.lua

@@ -1,43 +1,47 @@
 local utils = require("utils")
 
-local dreamDashBerry = {}
-
-dreamDashBerry.name = "CommunalHelper/DreamStrawberry"
-dreamDashBerry.depth = -100
-dreamDashBerry.nodeLineRenderType = "fan"
-dreamDashBerry.nodeLimits = {0, -1}
-
-dreamDashBerry.fieldInformation = {
-    order = {
-        fieldType = "integer"
-    },
-    checkpointID = {
-        fieldType = "integer"
+local function createHandler(name)
+    handler = {}
+    
+    handler.name = name
+    handler.depth = -100
+    handler.nodeLineRenderType = "fan"
+    handler.nodeLimits = {0, -1}
+
+    handler.fieldInformation = {
+        order = {
+            fieldType = "integer"
+        },
+        checkpointID = {
+            fieldType = "integer"
+        }
     }
-}
 
-dreamDashBerry.placements = {
-    name = "dream_dash_berry",
-    data = {
-        order = -1,
-        checkpointID = -1
+    handler.placements = {
+        name = "dream_dash_berry",
+        data = {
+            order = -1,
+            checkpointID = -1
+        }
     }
-}
 
-dreamDashBerry.texture = "collectables/CommunalHelper/dreamberry/wings01"
-dreamDashBerry.nodeTexture = "collectables/CommunalHelper/dreamberry/seed02"
+    handler.texture = "collectables/CommunalHelper/dreamberry/wings01"
+    handler.nodeTexture = "collectables/CommunalHelper/dreamberry/seed02"
 
-function dreamDashBerry.selection(room, entity)
-    local x, y = entity.x or 0, entity.y or 0
-    local nodes = entity.nodes or {{x = 0, y = 0}}
+    function handler.selection(room, entity)
+        local x, y = entity.x or 0, entity.y or 0
+        local nodes = entity.nodes or {{x = 0, y = 0}}
 
-    local rects = {}
-    for _, node in ipairs(nodes) do
-        local nx, ny = node.x or 0, node.y or 0
-        table.insert(rects, utils.rectangle(nx - 4, ny - 4, 7, 9))
+        local rects = {}
+        for _, node in ipairs(nodes) do
+            local nx, ny = node.x or 0, node.y or 0
+            table.insert(rects, utils.rectangle(nx - 4, ny - 4, 7, 9))
+        end
+
+        return utils.rectangle(x - 6, y - 7, 12, 13), rects
     end
 
-    return utils.rectangle(x - 6, y - 7, 12, 13), rects
+    return handler
 end
 
-return dreamDashBerry
+return createHandler("CommunalHelper/DreamStrawberry"), createHandler("CommunalHelper/DreamStrawberryTracked")

Loenn/lang/en_gb.lang

@@ -672,6 +672,9 @@ entities.CommunalHelper/RedlessBerry.attributes.description.winged=Makes this Re
 entities.CommunalHelper/DreamStrawberry.placements.name.dream_dash_berry=Dream Strawberry
 entities.CommunalHelper/DreamStrawberry.attributes.description.checkpointID=Manually determine what checkpoint section strawberries are visually grouped up in, showing up on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
 entities.CommunalHelper/DreamStrawberry.attributes.description.order=Manually determine what order strawberries are visually placed in on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
+entities.CommunalHelper/DreamStrawberryTracked.placements.name.dream_dash_berry=Dream Strawberry (Counts Toward Total)
+entities.CommunalHelper/DreamStrawberryTracked.attributes.description.checkpointID=Manually determine what checkpoint section strawberries are visually grouped up in, showing up on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
+entities.CommunalHelper/DreamStrawberryTracked.attributes.description.order=Manually determine what order strawberries are visually placed in on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
 
 # Seeker Dash Refill
 entities.CommunalHelper/SeekerDashRefill.placements.name.seeker_dash_refill=Seeker Dash Refill

src/Entities/Misc/DreamStrawberry.cs

@@ -9,6 +9,7 @@ namespace Celeste.Mod.CommunalHelper.Entities;
 // Originally I made this as a standalone entity for someone's map they were working on, but to make this fully work with DreamTunnelDash I moved it to CommunalHelper
 // I gave them a plugin for the old version when i finished and I'd like to keep some compatability to the old version so they dont have to redo their berries using it
 [CustomEntity("CommunalHelper/DreamStrawberry", "DreamDashListener/DreamDashBerry")]
+[RegisterStrawberry(false, false)]
 public class DreamStrawberry : Strawberry
 {
     // Original OnDash method from Celeste.Strawberry
@@ -174,3 +175,12 @@ private static void Player_ctor(On.Celeste.Player.orig_ctor orig, Player self, V
 
     #endregion
 }
+
+// is this the right way to do it? maybe!
+[CustomEntity("CommunalHelper/DreamStrawberryTracked")]
+[RegisterStrawberry(true, false)]
+public class DreamStrawberryTracked : DreamStrawberry
+{
+    public DreamStrawberryTracked(EntityData data, Vector2 offset, EntityID id) : base(data, offset, id)
+    { }
+}