Skip to content

Champ scenes are now in the proper order#1914

Merged
wjt merged 3 commits intomainfrom
champ-reorder-scenes
Feb 12, 2026
Merged

Champ scenes are now in the proper order#1914
wjt merged 3 commits intomainfrom
champ-reorder-scenes

Conversation

@izzykriz
Copy link
Contributor

Scene navigation triggers have been adjusted for the Champ storyquest to go in the following order:

1: Intro
2: Combat
3: Sequence Puzzle
4: Stealth
5: Outro

@izzykriz izzykriz requested review from a team as code owners February 11, 2026 17:35
@github-actions
Copy link

Play this branch at https://play.threadbare.game/branches/endlessm/champ-reorder-scenes.

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

Copy link
Contributor

@felixwalberg felixwalberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be all set, as long as those 3 ext_resource deletions in the champ_stealth.tscn file are important.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally think it is very confusing that 1_stealth comes after 3_sequence_puzzle. I suggest renumbering all the folders in the champ/ folder so that they are in gameplay order.

Copy link
Member

@wjt wjt Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you rename resources in Godot (as opposed to your file manager), then (I believe) any references will be updated when you hit save. But in fact what is stored in the .tscn files when linking scenes in this way is the UID of the target scene - which does not change.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made this change, but I am going to have to go back and deal with merge conflicts. I am also noticing the zoom of the camera feels different. More of the tilemap (and the gray background) is visible, particularly in the intro/outro.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, bad recommendation from me. Revert the rename, so the branch can be merged; then rename in a new branch.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git revert e4fb403f370a72177fa1debc0b97e1e527b64d46
git push

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The zoom will not be anything to do with this branch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit reverted! After the team has got some other changes merged in I will look at adjusting tilemaps for the camera.

@wjt wjt merged commit 08ce7e2 into main Feb 12, 2026
6 checks passed
@wjt wjt deleted the champ-reorder-scenes branch February 12, 2026 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants