Merge changes with dev

Author: aonkeeper4

Loenn/effects/cloudscape.lua

@@ -2,7 +2,7 @@ local cloudscape = {}
 
 cloudscape.name = "CommunalHelper/Cloudscape"
 cloudscape.canBackground = true
-cloudscape.canForeground = false
+cloudscape.canForeground = true
 
 cloudscape.fieldInformation = {
     bgColor = {

Loenn/entities/aero/aero_block_charged.lua

@@ -1,14 +1,24 @@
 local drawableNinePatch = require "structs.drawable_nine_patch"
 local drawableRectangle = require "structs.drawable_rectangle"
 local utils = require "utils"
+local communalHelper = require("mods").requireFromPlugin("libraries.communal_helper")
+
+local cassetteIndexOptions = {
+    ["None"] = -1,
+    ["0 - Blue"] = 0,
+    ["1 - Rose"] = 1,
+    ["2 - Bright Sun"] = 2,
+    ["3 - Malachite"] = 3
+}
+local cassetteIndexColors = communalHelper.cassetteBlockHexColors
 
 local aeroBlockCharged = {}
 
 aeroBlockCharged.name = "CommunalHelper/AeroBlockCharged"
 aeroBlockCharged.depth = 4999
-aeroBlockCharged.minimumSize = {16, 16}
+aeroBlockCharged.minimumSize = { 16, 16 }
 
-aeroBlockCharged.nodeLimits = {0, -1}
+aeroBlockCharged.nodeLimits = { 0, -1 }
 aeroBlockCharged.nodeLineRenderType = "line"
 
 aeroBlockCharged.fieldInformation = {
@@ -17,6 +27,14 @@ aeroBlockCharged.fieldInformation = {
     },
     inactiveColor = {
         fieldType = "color"
+    },
+    cassetteIndex = {
+        options = cassetteIndexOptions,
+        editable = false,
+        fieldType = "integer",
+    },
+    cassetteTempo = {
+        minimumValue = 0
     }
 }
 
@@ -31,16 +49,38 @@ aeroBlockCharged.placements = {
             loop = false,
             activeColor = "4BC0C8",
             inactiveColor = "FF6347",
-            easing = "CubeIn",
             -- SpirialisBug = false,
             SpirialisBugV2 = false,
-            wallbounceLeniency = true
+            wallbounceLeniency = true,
+            cassetteIndex = -1,
+            cassetteTempo = 1,
+            moveOnCassetteTick = false
         }
     }
 }
+for i = 0, 3 do
+    table.insert(aeroBlockCharged.placements, {
+        name = string.format("aero_block_charged_%s", i),
+        data = {
+            width = 16,
+            height = 16,
+            buttonSequence = "left -> right+top",
+            hover = true,
+            loop = false,
+            activeColor = cassetteIndexColors[i + 1],
+            inactiveColor = "FF6347",
+            -- SpirialisBug = false,
+            SpirialisBugV2 = false,
+            wallbounceLeniency = true,
+            cassetteIndex = i,
+            cassetteTempo = 1,
+            moveOnCassetteTick = false
+        }
+    })
+end
 
-local backgroundColor = {20 / 255, 3 / 255, 3 / 255}
-local outlineColor = {0, 0, 0}
+local backgroundColor = { 20 / 255, 3 / 255, 3 / 255 }
+local outlineColor = { 0, 0, 0 }
 local blockTexture = "objects/CommunalHelper/aero_block/blocks/nnn"
 
 local blockNinePatchOptions = {
@@ -60,6 +100,12 @@ function aeroBlockCharged.sprite(room, entity)
     table.insert(sprites, outline:getDrawableSprite())
     table.insert(sprites, rectangle:getDrawableSprite())
 
+    if entity.cassetteIndex and entity.cassetteIndex ~= -1 then
+        local cassetteIndicatorColor = entity.activeColor ~= "" and communalHelper.hexToColor(entity.activeColor) or cassetteIndexColors[entity.cassetteIndex + 1]
+        local cassetteIndicator = drawableRectangle.fromRectangle("fill", x + 4, y + 4, width - 8, height - 8, cassetteIndicatorColor)
+        table.insert(sprites, cassetteIndicator:getDrawableSprite())
+    end
+
     local frameNinePatch = drawableNinePatch.fromTexture(blockTexture, blockNinePatchOptions, x, y, width, height)
     local frameSprites = frameNinePatch:getDrawableSprite()
 
@@ -85,4 +131,4 @@ function aeroBlockCharged.selection(room, entity)
     return rect, noderects
 end
 
-return aeroBlockCharged
+return aeroBlockCharged

Loenn/entities/cassette_blocks/cassette_falling_block.lua

@@ -36,8 +36,12 @@ for i = 1, 4 do
             height = 16,
             customColor = colors[i],
             oldConnectionBehavior = false,
+<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
+=======
+            held = false,
+>>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end

Loenn/entities/cassette_blocks/cassette_move_block.lua

@@ -53,6 +53,7 @@ for i = 1, 4 do
             direction = "Right",
             moveSpeed = 60.0,
             oldConnectionBehavior = false,
+            held = false,
             crashTime = 0.15,
             regenTime = 3.0,
             shakeOnCollision = true,

Loenn/entities/cassette_blocks/cassette_swap_block.lua

@@ -40,8 +40,12 @@ for i = 1, 4 do
             customColor = colors[i],
             noReturn = false,
             oldConnectionBehavior = false,
+<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
+=======
+            held = false,
+>>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end

Loenn/entities/cassette_blocks/cassette_zip_mover.lua

@@ -51,8 +51,12 @@ for i = 1, 4 do
             noReturn = false,
             customColor = colors[i],
             oldConnectionBehavior = false,
+<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
+=======
+            held = false,
+>>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end

Loenn/entities/cassette_blocks/custom_cassette_block.lua

@@ -36,8 +36,12 @@ for i = 1, 4 do
             height = 16,
             customColor = colors[i],
             oldConnectionBehavior = false,
+<<<<<<< HEAD
             spritePath = "",
             sideAlpha = 1.0,
+=======
+            held = false,
+>>>>>>> 5ef928fe414af767303da25d68d3523b2af49bdf
         }
     }
 end

Loenn/entities/chains/chain.lua

@@ -19,6 +19,7 @@ chain.placements = {
         extraJoints = 0,
         outline = true,
         texture = "objects/CommunalHelper/chains/chain",
+        updateOffscreen = true,
     }
 }
 

Loenn/entities/chains/chained_falling_block.lua

@@ -4,16 +4,18 @@ local fakeTilesHelper = require("helpers.fake_tiles")
 local chainedFallingBlock = {}
 
 chainedFallingBlock.name = "CommunalHelper/ChainedFallingBlock"
-chainedFallingBlock.fieldInformation = {
-    tiletype = {
-        options = fakeTilesHelper.getTilesOptions(),
-        editable = false
-    },
-    fallDistance = {
-        minimumValue = 0,
-        fieldType = "integer"
+function chainedFallingBlock.fieldInformation()
+    return {
+        tiletype = {
+            options = fakeTilesHelper.getTilesOptions(),
+            editable = false
+        },
+        fallDistance = {
+            minimumValue = 0,
+            fieldType = "integer"
+        }
     }
-}
+end
 
 function chainedFallingBlock.depth(room, entity)
     return entity.behind and 5000 or 0

Loenn/entities/misc/move_block_group.lua

@@ -35,6 +35,7 @@ moveBlockGroup.placements = {
         name = "move_block_group",
         data = {
             color = defaultColorValue,
+            disablePulse = false,
             syncActivation = true,
             respawnBehavior = "Simultaneous"
         }