v3.18.7

jhaakma · Dec 11, 2023 · 0b688d6 · 0b688d6
1 parent 596f2c6
commit 0b688d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/Data Files/Ashfall-metadata.toml b/Data Files/Ashfall-metadata.toml
@@ -4,7 +4,7 @@ description = "A camping, survival and needs mod for Morrowind."
 homepage = "https://www.nexusmods.com/morrowind/mods/49057"
 repository = "https://github.com/jhaakma/ashfall"
 authors = [ "Merlord",]
-version = "3.18.5"
+version = "3.18.7"
 
 [dependencies]
 assets = [ "Ashfall.esp", "Icons/ashfall", "Meshes/ashfall", "MWSE/mods/mer/ashfall", "Sound/ashfall", "Textures/Ashfall",]

diff --git a/Data Files/MWSE/mods/mer/ashfall/integrations/carryableContainers.lua b/Data Files/MWSE/mods/mer/ashfall/integrations/carryableContainers.lua
@@ -53,13 +53,6 @@ local callbacks = {
         end
     end,
     ---@param self CarryableContainer
-    ---@param data CarryableContainer.onCopyCreatedData
-    onCopyCreated = function(self, data)
-        -- logger:trace("onCopyCreated")
-        -- Backpack.registerBackpack(data.copy.id)
-        -- common.data.backpacks[data.copy.id:lower()] = true
-    end,
-    ---@param self CarryableContainer
     getWeightModifier = function(self)
         logger:trace("getWeightModifier()")
         --Set weight modifier to 0.1 if the backpack is equipped,
@@ -93,7 +86,6 @@ local containers = {
         capacity = 120,
         hasCollision = true,
         openFromInventory = callbacks.openFromInventory,
-        onCopyCreated = callbacks.onCopyCreated,
         getWeightModifier = callbacks.getWeightModifier,
         getWeightModifierText = callbacks.getWeightModifierText,
         weightModifier = 0.3,
@@ -104,7 +96,6 @@ local containers = {
         capacity = 120,
         hasCollision = true,
         openFromInventory = callbacks.openFromInventory,
-        onCopyCreated = callbacks.onCopyCreated,
         getWeightModifier = callbacks.getWeightModifier,
         getWeightModifierText = callbacks.getWeightModifierText,
         weightModifier = 0.3,
@@ -115,7 +106,6 @@ local containers = {
         capacity = 120,
         hasCollision = true,
         openFromInventory = callbacks.openFromInventory,
-        onCopyCreated = callbacks.onCopyCreated,
         getWeightModifier = callbacks.getWeightModifier,
         getWeightModifierText = callbacks.getWeightModifierText,
         weightModifier = 0.5,
@@ -126,7 +116,6 @@ local containers = {
         capacity = 100,
         hasCollision = true,
         openFromInventory = callbacks.openFromInventory,
-        onCopyCreated = callbacks.onCopyCreated,
         getWeightModifier = callbacks.getWeightModifier,
         getWeightModifierText = callbacks.getWeightModifierText,
         weightModifier = 0.5,
@@ -137,7 +126,6 @@ local containers = {
         capacity = 150,
         hasCollision = true,
         openFromInventory = callbacks.openFromInventory,
-        onCopyCreated = callbacks.onCopyCreated,
         getWeightModifier = callbacks.getWeightModifier,
         getWeightModifierText = callbacks.getWeightModifierText,
         weightModifier = 0.5,
@@ -148,7 +136,6 @@ local containers = {
         capacity = 120,
         hasCollision = true,
         openFromInventory = callbacks.openFromInventory,
-        onCopyCreated = callbacks.onCopyCreated,
         getWeightModifier = callbacks.getWeightModifier,
         getWeightModifierText = callbacks.getWeightModifierText,
         weightModifier = 0.3,
@@ -159,7 +146,6 @@ local containers = {
         capacity = 100,
         hasCollision = true,
         openFromInventory = callbacks.openFromInventory,
-        onCopyCreated = callbacks.onCopyCreated,
         getWeightModifier = callbacks.getWeightModifier,
         getWeightModifierText = callbacks.getWeightModifierText,
         weightModifier = 0.7,

diff --git a/Data Files/MWSE/mods/mer/ashfall/interop.lua b/Data Files/MWSE/mods/mer/ashfall/interop.lua
@@ -496,7 +496,7 @@ Interop.getBackPackWoodAxeIds = function()
     return table.copy(backpackConfig.woodAxes)
 end
 
----@param data { id: string, registerForBackpacks: boolean }[]
+---@param data (string|{ id: string, registerForBackpacks: boolean })[]
 function Interop.registerWoodAxes(data)
     logger:info("Registering Wood Axes")
     for _, v in pairs(data) do

diff --git a/Data Files/MWSE/mods/mer/ashfall/items/backpack/init.lua b/Data Files/MWSE/mods/mer/ashfall/items/backpack/init.lua
@@ -194,23 +194,18 @@ local function onEquipped(e)
     if not fileName then
         return
     end
-
     -- get parent for attaching
     local parent = e.reference.sceneNode:getObjectByName("Bip01 Spine1")
-
     -- detach old backpack mesh
     detachBackpack(parent)
     -- attach new backpack mesh
     attachBackpack(parent, fileName, e.reference)
-
-    --timer.delayOneFrame(function()
-        setSwitchNodes{reference=e.reference}
-    --end)
-
+    setSwitchNodes{reference=e.reference}
     -- update parent scene node
     parent:update()
     parent:updateNodeEffects()
 end
+event.register("equipped", onEquipped)
 
 
 local function onUnequipped(e)
@@ -232,7 +227,7 @@ local function onUnequipped(e)
     parent:update()
     parent:updateNodeEffects()
 end
-
+event.register("unequipped", onUnequipped)
 
 local function onMobileActivated(e)
     if e.reference.object.equipment then
@@ -241,15 +236,16 @@ local function onMobileActivated(e)
         end
     end
 end
+event.register("mobileActivated", onMobileActivated)
 
-local function onLoaded(e)
+event.register("loaded", function(e)
     onMobileActivated{reference=tes3.player}
     for i, cell in ipairs(tes3.getActiveCells()) do
         for ref in cell:iterateReferences(tes3.objectType.npc) do
             onMobileActivated{reference=ref}
         end
     end
-end
+end)
 
 ---@param e objectCreatedEventData
 event.register("objectCreated", function(e)
@@ -260,10 +256,6 @@ event.register("objectCreated", function(e)
     end
 end)
 
-event.register("loaded", onLoaded)
-event.register("equipped", onEquipped)
-event.register("unequipped", onUnequipped)
-event.register("mobileActivated", onMobileActivated)
 event.register("activate", function(e)
     if e.activator == tes3.player then
         timer.delayOneFrame(function()