Merge pull request CommunalHelper#267 from Etpio/dev

Held Cassete Blocks options

Author: catapillie

Loenn/entities/cassette_blocks/cassette_falling_block.lua

@@ -32,6 +32,7 @@ for i = 1, 4 do
             height = 16,
             customColor = colors[i],
             oldConnectionBehavior = false,
+            held = false,
         }
     }
 end

Loenn/entities/cassette_blocks/cassette_move_block.lua

@@ -49,6 +49,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

@@ -36,6 +36,7 @@ for i = 1, 4 do
             customColor = colors[i],
             noReturn = false,
             oldConnectionBehavior = false,
+            held = false,
         }
     }
 end

Loenn/entities/cassette_blocks/cassette_zip_mover.lua

@@ -47,6 +47,7 @@ for i = 1, 4 do
             noReturn = false,
             customColor = colors[i],
             oldConnectionBehavior = false,
+            held = false,
         }
     }
 end

Loenn/entities/cassette_blocks/custom_cassette_block.lua

@@ -32,6 +32,7 @@ for i = 1, 4 do
             height = 16,
             customColor = colors[i],
             oldConnectionBehavior = false,
+            held = false,
         }
     }
 end

Loenn/lang/en_gb.lang

@@ -156,6 +156,7 @@ entities.CommunalHelper/CustomCassetteBlock.attributes.description.index=The col
 entities.CommunalHelper/CustomCassetteBlock.attributes.description.tempo=The tempo of the cassette music in the room.
 entities.CommunalHelper/CustomCassetteBlock.attributes.description.customColor=Optional hexadecimal color code, visual-only change.
 entities.CommunalHelper/CustomCassetteBlock.attributes.description.oldConnectionBehavior=Force the old texture connection behavior (cassette entities connect to anything around them that is on the same index).
+entities.CommunalHelper/CustomCassetteBlock.attributes.description.held=Whether this Cassette Block is activated by holding the manual cassette key binding (using the Manual Cassette Controller).\nThis only works if this block's index is 0 or 1:\n- index 0: ACTIVE when key is HELD.\n- index 1: INACTIVE when key is HELD.
 
 # Cassette Falling Block
 entities.CommunalHelper/CassetteFallingBlock.placements.name.cassette_block_0=Cassette Falling Block (0 - Blue)
@@ -166,6 +167,7 @@ entities.CommunalHelper/CassetteFallingBlock.attributes.description.index=The co
 entities.CommunalHelper/CassetteFallingBlock.attributes.description.tempo=The tempo of the cassette music in the room.
 entities.CommunalHelper/CassetteFallingBlock.attributes.description.customColor=Optional hexadecimal color code, visual-only change.
 entities.CommunalHelper/CassetteFallingBlock.attributes.description.oldConnectionBehavior=Force the old texture connection behavior (cassette entities connect to anything around them that is on the same index).
+entities.CommunalHelper/CassetteFallingBlock.attributes.description.held=Whether this Cassette Block is activated by holding the manual cassette key binding (using the Manual Cassette Controller).\nThis only works if this block's index is 0 or 1:\n- index 0: ACTIVE when key is HELD.\n- index 1: INACTIVE when key is HELD.
 
 # Cassette Zip Mover
 entities.CommunalHelper/CassetteZipMover.placements.name.cassette_block_0=Cassette Zip Mover (0 - Blue)
@@ -180,6 +182,7 @@ entities.CommunalHelper/CassetteZipMover.attributes.description.waiting=Whether
 entities.CommunalHelper/CassetteZipMover.attributes.description.ticking=Causes this block to tick 5 times at every node before going back to its starting point, unless the player triggers it again. If `permanent` is true and the player doesn't trigger the Zip Mover in time, it'll lock in place.
 entities.CommunalHelper/CassetteZipMover.attributes.description.customColor=Optional hexadecimal color code, visual-only change.
 entities.CommunalHelper/CassetteZipMover.attributes.description.oldConnectionBehavior=Force the old texture connection behavior (cassette entities connect to anything around them that is on the same index).
+entities.CommunalHelper/CassetteZipMover.attributes.description.held=Whether this Cassette Block is activated by holding the manual cassette key binding (using the Manual Cassette Controller).\nThis only works if this block's index is 0 or 1:\n- index 0: ACTIVE when key is HELD.\n- index 1: INACTIVE when key is HELD.
 
 # Cassette Move Block
 entities.CommunalHelper/CassetteMoveBlock.placements.name.cassette_block_0=Cassette Move Block (0 - Blue)
@@ -198,6 +201,7 @@ entities.CommunalHelper/CassetteMoveBlock.attributes.description.crashTime=The t
 entities.CommunalHelper/CassetteMoveBlock.attributes.description.regenTime=The time it takes for this Cassette Move Block to respawn after breaking in seconds.
 entities.CommunalHelper/CassetteMoveBlock.attributes.description.shakeOnCollision=Whether this Cassette Move Block should start shaking if it collides with a solid for longer than the default break time.
 entities.CommunalHelper/CassetteMoveBlock.attributes.description.noDebris=Whether this Cassette Move Block should not spawn debris when it breaks.
+entities.CommunalHelper/CassetteMoveBlock.attributes.description.held=Whether this Cassette Block is activated by holding the manual cassette key binding (using the Manual Cassette Controller).\nThis only works if this block's index is 0 or 1:\n- index 0: ACTIVE when key is HELD.\n- index 1: INACTIVE when key is HELD.
 
 # Cassette Swap Block
 entities.CommunalHelper/CassetteSwapBlock.placements.name.cassette_block_0=Cassette Swap Block (0 - Blue)
@@ -209,6 +213,7 @@ entities.CommunalHelper/CassetteSwapBlock.attributes.description.index=The color
 entities.CommunalHelper/CassetteSwapBlock.attributes.description.tempo=The tempo of the cassette music in the room.
 entities.CommunalHelper/CassetteSwapBlock.attributes.description.customColor=Optional hexadecimal color code, visual-only change.
 entities.CommunalHelper/CassetteSwapBlock.attributes.description.oldConnectionBehavior=Force the old texture connection behavior (cassette entities connect to anything around them that is on the same index).
+entities.CommunalHelper/CassetteSwapBlock.attributes.description.held=Whether this Cassette Block is activated by holding the manual cassette key binding (using the Manual Cassette Controller).\nThis only works if this block's index is 0 or 1:\n- index 0: ACTIVE when key is HELD.\n- index 1: INACTIVE when key is HELD.
 
 # Cassette Jump Fix Controller
 entities.CommunalHelper/CassetteJumpFixController.placements.name.controller=Cassette Jump Fix Controller

src/CommunalHelperModule.cs

@@ -58,7 +58,7 @@ public override void Load()
         // Panel-specific hooks loaded from AbstractPanel.Load
 
         ConnectedSwapBlockHooks.Hook();
-        CustomCassetteBlock.Hook();
+        CustomCassetteBlock.Hook();
 
         AttachedWallBooster.Hook();
         MoveBlockRedirect.Load();
@@ -157,7 +157,7 @@ public override void Unload()
         DreamDashCollider.Unload();
 
         ConnectedSwapBlockHooks.Unhook();
-        CustomCassetteBlock.Unhook();
+        CustomCassetteBlock.Unhook();
 
         AttachedWallBooster.Unhook();
         MoveBlockRedirect.Unload();
@@ -247,7 +247,7 @@ public override void Initialize()
         }
 
         // Register CustomCassetteBlock types
-        CustomCassetteBlock.Initialize();
+        CustomCassetteBlock.Initialize();
 
         // We may hook methods in other mods, so this needs to be done after they're loaded
         AbstractPanel.LoadDelayed();

src/Entities/CassetteBlocks/CassetteFallingBlock.cs

@@ -10,14 +10,14 @@ public class CassetteFallingBlock : CustomCassetteBlock
 
     public bool HasStartedFalling { get; private set; }
 
-    public CassetteFallingBlock(Vector2 position, EntityID id, int width, int height, int index, float tempo, bool oldConnectionBehavior, Color? overrideColor)
-        : base(position, id, width, height, index, tempo, true, oldConnectionBehavior, dynamicHitbox: true, overrideColor)
+    public CassetteFallingBlock(Vector2 position, EntityID id, int width, int height, int index, float tempo, bool oldConnectionBehavior, bool held ,Color? overrideColor)
+        : base(position, id, width, height, index, tempo, true, oldConnectionBehavior,held , dynamicHitbox: true, overrideColor)
     {
         Add(new Coroutine(Sequence()));
     }
 
     public CassetteFallingBlock(EntityData data, Vector2 offset, EntityID id)
-        : this(data.Position + offset, id, data.Width, data.Height, data.Int("index"), data.Float("tempo", 1f), data.Bool("oldConnectionBehavior", true), data.HexColorNullable("customColor"))
+        : this(data.Position + offset, id, data.Width, data.Height, data.Int("index"), data.Float("tempo", 1f), data.Bool("oldConnectionBehavior", true), data.Bool("held"), data.HexColorNullable("customColor"))
     { }
 
     public override void OnStaticMoverTrigger(StaticMover sm)

src/Entities/CassetteBlocks/CassetteMoveBlock.cs

@@ -62,8 +62,8 @@ public class CassetteMoveBlock : CustomCassetteBlock
 
     private readonly bool noDebris;
 
-    public CassetteMoveBlock(Vector2 position, EntityID id, int width, int height, Directions direction, float moveSpeed, int index, float tempo, bool oldConnectionBehavior, Color? overrideColor, float crashTime, float regenTime, bool shakeOnCollision, bool noDebris)
-        : base(position, id, width, height, index, tempo, true, oldConnectionBehavior, dynamicHitbox: true, overrideColor)
+    public CassetteMoveBlock(Vector2 position, EntityID id, int width, int height, Directions direction, float moveSpeed, int index, float tempo, bool oldConnectionBehavior, bool held, Color? overrideColor, float crashTime, float regenTime, bool shakeOnCollision, bool noDebris)
+        : base(position, id, width, height, index, tempo, true, oldConnectionBehavior, held, dynamicHitbox: true, overrideColor)
     {
         startPosition = position;
         Direction = direction;
@@ -121,7 +121,7 @@ public CassetteMoveBlock(Vector2 position, EntityID id, int width, int height, D
     }
 
     public CassetteMoveBlock(EntityData data, Vector2 offset, EntityID id)
-        : this(data.Position + offset, id, data.Width, data.Height, data.Enum("direction", Directions.Left), data.Bool("fast") ? FastMoveSpeed : data.Float("moveSpeed", MoveSpeed), data.Int("index"), data.Float("tempo", 1f), data.Bool("oldConnectionBehavior", true), data.HexColorNullable("customColor"), data.Float("crashTime", 0.15f), data.Float("regenTime", 3f), data.Bool("shakeOnCollision", true), data.Bool("noDebris"))
+        : this(data.Position + offset, id, data.Width, data.Height, data.Enum("direction", Directions.Left), data.Bool("fast") ? FastMoveSpeed : data.Float("moveSpeed", MoveSpeed), data.Int("index"), data.Float("tempo", 1f), data.Bool("oldConnectionBehavior", true), data.Bool("held"),data.HexColorNullable("customColor"), data.Float("crashTime", 0.15f), data.Float("regenTime", 3f), data.Bool("shakeOnCollision", true), data.Bool("noDebris"))
     {
     }
 

src/Entities/CassetteBlocks/CassetteSwapBlock.cs

@@ -65,8 +65,8 @@ private void DrawTarget(Vector2 position, Color color)
 
     private readonly bool noReturn;
 
-    public CassetteSwapBlock(Vector2 position, EntityID id, int width, int height, Vector2 node, int index, float tempo, bool oldConnectionBehavior, bool noReturn, Color? overrideColor)
-        : base(position, id, width, height, index, tempo, true, oldConnectionBehavior, false, overrideColor)
+    public CassetteSwapBlock(Vector2 position, EntityID id, int width, int height, Vector2 node, int index, float tempo, bool oldConnectionBehavior, bool held ,bool noReturn, Color? overrideColor)
+        : base(position, id, width, height, index, tempo, true, oldConnectionBehavior, held ,false, overrideColor)
     {
         start = Position;
         end = node;
@@ -107,7 +107,7 @@ public CassetteSwapBlock(Vector2 position, EntityID id, int width, int height, V
     }
 
     public CassetteSwapBlock(EntityData data, Vector2 offset, EntityID id)
-        : this(data.Position + offset, id, data.Width, data.Height, data.Nodes[0] + offset, data.Int("index"), data.Float("tempo", 1f), data.Bool("oldConnectionBehavior", true), data.Bool("noReturn", false), data.HexColorNullable("customColor"))
+        : this(data.Position + offset, id, data.Width, data.Height, data.Nodes[0] + offset, data.Int("index"), data.Float("tempo", 1f), data.Bool("oldConnectionBehavior", true), data.Bool("held"), data.Bool("noReturn", false), data.HexColorNullable("customColor"))
     {
     }