InkCombatRound6: Implement Sequential Filling Mechanic by russell-cj · Pull Request #1865 · endlessm/threadbare

russell-cj · 2026-01-26T19:58:27Z

This PR implements the Sequential Combo mechanic for Level 6. Barrels must now be filled in a specific, randomized order.

Visuals: Added a glow animation to the barrel to indicate the currently active target.
Barrel Logic: Barrels can now be locked. When locked (gray state), they do not receive ink.
New Mechanic: Introduced the BarrelUnlockSequence component:
- Shuffles the barrel order when the level starts.
- Keeps all barrels locked except one.
- Automatically unlocks the next barrel when the current one is completed.

🎮 Play Ink Drinker Level 6

Play Ink Drinker Level 6

resolves #1847

- Added the 'barrel_glow' folder containing the sprite sheet and animation resource. - Added a new AnimatedSprite2D node named 'BarrelGlow' to the FillingBarrel scene. - Configured the 'glowing' animation and set the correct offset to align with the barrel. feat: #1847

- Set the Y offset to -21 to align correctly with the barrel sprite. - Set the initial visibility to false so it remains hidden until activated. fix: #1847

- Added new component to handle sequential unlocking logic. - Implemented shuffle and locked state management. feat: #1847

- Updated 'filling_barrel.gd' to ignore inputs when locked. - Added visual feedback handling dimmed color for locked state. feat: #1847

- Added 'BarrelUnlockSequence' node to the level scene. - Configured barrels to unlock one by one in random order. feat: #1847

github-actions · 2026-01-26T20:01:57Z

Play this branch at https://play.threadbare.game/branches/endlessm/issue_1847.

(This launches the game from the start, not directly at the change(s) in this pull request.)

wjt · 2026-02-04T17:50:57Z

I pushed a conflict resolution.

Without reviewing the code in detail: this level is now extremely hard because you have to evade the Mothsache and also focus on one specific barrel at a time! (Don't feel the need to change this, it's just an observation before we review the logic.)

russell-cj · 2026-02-04T23:34:05Z

You’re absolutely right, @wjt. Originally, Level 6 was focused only on the sequential barrel mechanic, but later Mothsache was added to test it, which significantly increased the difficulty.

In fact, I had an idea that I didn’t get a chance to share before the internship ended. I’ll open a discussion and share the idea I had in mind with you.

russell-cj · 2026-02-05T00:04:22Z

I've just created the discussion regarding the difficulty curve and intermediate levels. You can find it here: #1881

wjt

This is a nice addition to the filling-game mechanic - I think it will make it possible to design more interesting puzzles.

wjt · 2026-02-09T15:22:28Z

scenes/game_elements/props/filling_barrel/components/filling_barrel.gd

 @export var color: Color:
 	set = _set_color

+var is_locked: bool = false


Please document this field.

Also make the set_locked_state function a setter for this field:

Suggested change

var is_locked: bool = false

var is_locked: bool = false:

set = set_is_locked

(I suggest renaming the method below.)

wjt · 2026-02-09T15:23:00Z

scenes/game_elements/props/filling_barrel/components/filling_barrel.gd

+		barrel_glow.visible = false
+
+
+func set_locked_state(locked: bool) -> void:


Suggested change

func set_locked_state(locked: bool) -> void:

func set_is_locked(locked: bool) -> void:

wjt · 2026-02-09T15:23:24Z

scenes/game_elements/props/filling_barrel/components/filling_barrel.gd

+		if barrel_glow:
+			barrel_glow.visible = false
+	else:
+		modulate = Color(1, 1, 1, 1)


Suggested change

modulate = Color(1, 1, 1, 1)

modulate = Color.WHITE

wjt · 2026-02-09T15:24:01Z

scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/barrel_unlock_sequence.gd

+
+func _ready() -> void:
+	if auto_start:
+		call_deferred("start_sequence")


Suggested change

call_deferred("start_sequence")

start_sequence.call_deferred()

But why do you need to defer this?

wjt · 2026-02-09T15:25:08Z

scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/barrel_unlock_sequence.gd

+	randomize()
+


Suggested change

randomize()

https://docs.godotengine.org/en/stable/tutorials/math/random_number_generation.html#the-randomize-method says:

Since Godot 4.0, the random seed is automatically set to a random value when the project starts. This means you don't need to call randomize() in _ready() anymore to ensure that results are random across project runs. However, you can still use randomize() if you want to use a specific seed number, or generate it using a different method.

wjt · 2026-02-09T15:26:24Z

scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/barrel_unlock_sequence.gd

+		var target: FillingBarrel = barrels[current_target_index]
+
+		if is_instance_valid(target):
+			target.set_locked_state(false)


If you add the set = ... syntax I suggest above, then this can be:

Suggested change

target.set_locked_state(false)

target.is_locked = false

wjt · 2026-02-09T15:36:07Z

scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/barrel_unlock_sequence.gd

+		push_warning("BarrelUnlockSequence: No barrels assigned.")
+		return
+
+	barrels.shuffle()


I don't think the order should necessarily be shuffled. The order of the barrels is part of the level design - for example, you could imagine designing a level where it would be impossible to get across a bridge until the first barrel is filled.

Another way of looking at this is: if the order is random each time the level is played, then why do I (the level designer) have to manually assign the barrels to this node, rather than this component discovering the barrels in the scene by itself?

threadbare/scenes/game_logic/fill_game_logic.gd

Line 42 in 2942489

var filling_barrels: Array = get_tree().get_nodes_in_group("filling_barrels")

Some ideas:

Remove the shuffle() call

Keep it, but add an @export var randomize_barrel_order: bool variable (adjusting the default value to taste :) )

If you think the mechanic is best enjoyed with a random order: keep the shuffle, but remove the @export from var barrels and instead populate that array in _ready in the same way that fill_game_logic.gd does

wjt · 2026-02-09T15:36:45Z

scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/barrel_unlock_sequence.gd

+	if current_target_index < barrels.size():
+		var target: FillingBarrel = barrels[current_target_index]
+
+		if is_instance_valid(target):


I'm always a bit suspicious of is_instance_valid calls because I think they tend to mask bugs. In what situation would you expect a barrel to be freed from the scene before it has been enabled? Or is there another case I have not considered which would cause an element of the array to be freed?

wjt · 2026-02-09T15:38:30Z

scenes/game_elements/props/filling_barrel/components/filling_barrel.gd

+	is_locked = locked
+
+	if is_locked:
+		modulate = Color(0.5, 0.5, 0.5, 1)


Perhaps define a const LOCKED_COLOR := Color(0.5, 0.5, 0.5, 1) constant for this?

wjt · 2026-02-09T15:43:11Z

scenes/game_elements/props/filling_barrel/components/filling_barrel.gd

 	animated_sprite_2d.animation = FILLING_NAME_ANIMATION
 	animated_sprite_2d.frame = 0

+	if barrel_glow:


You have this line above:

@onready var barrel_glow: AnimatedSprite2D = $BarrelGlow

$x is a shorthand for get_node("x"). docs.
get_node() raises an error if the node does not exist.

You should do one of the following two things:

In the @onready ... line, replace $BarrelGlow with get_node_or_null("BarrelGlow"), which does not raise an error if the node does not exist https://docs.godotengine.org/en/stable/classes/class_node.html#class-node-method-get-node-or-null

Remove all the if barrel_glow: checks - by using $BarrelGlow we are requiring that the scene that this script is attached to has a node of that name.

(You may ask, why does _set_sprite_frames have a similar if animated_sprite_2d: check? Good question! One answer is: setters can run before a node is ready, so @onready variables may not have been populated yet. But then you might say: but doesn't that setter check if not is_node_ready(): first? Yes it does. The if animated_sprite_2d: check is redundant.)

russell-cj added 5 commits January 24, 2026 11:22

adjust BarrelGlow offset and initial visibility

566ebec

- Set the Y offset to -21 to align correctly with the barrel sprite. - Set the initial visibility to false so it remains hidden until activated. fix: #1847

add BarrelUnlockSequence script

4a51929

- Added new component to handle sequential unlocking logic. - Implemented shuffle and locked state management. feat: #1847

implement locking capability in FillingBarrel

d233f85

- Updated 'filling_barrel.gd' to ignore inputs when locked. - Added visual feedback handling dimmed color for locked state. feat: #1847

integrate sequential barrel mechanic

1c1ec84

- Added 'BarrelUnlockSequence' node to the level scene. - Configured barrels to unlock one by one in random order. feat: #1847

russell-cj requested review from manuq and wjt January 26, 2026 19:58

russell-cj self-assigned this Jan 26, 2026

russell-cj requested a review from a team as a code owner January 26, 2026 19:58

russell-cj added the Core Gameplay & Mechanics label Jan 26, 2026

russell-cj added this to Threadbare Development Jan 26, 2026

Merge remote-tracking branch 'origin/main' into issue_1847

70c6083

russell-cj moved this to In Progress in Threadbare Development Feb 6, 2026

wjt requested changes Feb 9, 2026

View reviewed changes

	var is_locked: bool = false
	var is_locked: bool = false:
	set = set_is_locked

		barrel_glow.visible = false


		func set_locked_state(locked: bool) -> void:

	func set_locked_state(locked: bool) -> void:
	func set_is_locked(locked: bool) -> void:

	call_deferred("start_sequence")
	start_sequence.call_deferred()

Conversation

russell-cj commented Jan 26, 2026

🎮 Play Ink Drinker Level 6

Uh oh!

github-actions bot commented Jan 26, 2026

Uh oh!

wjt commented Feb 4, 2026

Uh oh!

russell-cj commented Feb 4, 2026

Uh oh!

russell-cj commented Feb 5, 2026

Uh oh!

wjt left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wjt Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

wjt Feb 9, 2026 •

edited

Loading