Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scene loader for the map #93

Merged
merged 42 commits into from
May 3, 2024
Merged

Conversation

Turtyo
Copy link
Collaborator

@Turtyo Turtyo commented Apr 15, 2024

Description

Loads different scenes based on the event of the room clicked on the map

Related issue(s)

Closes #87

List of changes

  • Block map movement when entering the event
  • Allow map movement once the event is over
  • Load a scene that has the given event

Tests

None yet, I'll write those once I set everything correctly.

Additional notes

I still need to add things such as:

  • ✅ default when entering the game should be to see the map, and you select a room (instead of loading in a combat)
  • ✅ add some buttons to test scenes to ensure everything works correctly
  • ✅ maybe rework some parts of the TestingScene UI to make it an overlay that can be added to all the scenes (map and such)
  • ✅ I'm not sure blocking player movement is done yet, I need to check (probably just need to call that in _ready function for the scene and it should work)

I'll add a ✅ once those things are done

@Turtyo
Copy link
Collaborator Author

Turtyo commented Apr 19, 2024

@Tysterman74 as you can see in my last push i disable the button when the position is not set for the return button, which is another solution to the problem we had with setting a torch when fauna was not in a room (that you solved by adding a pop-up).
We could change it to disable the button instead. I like the little pop-up though, so we can keep it also

@Turtyo Turtyo marked this pull request as ready for review April 19, 2024 18:01
Works since EventRandom.choose_other_event() returns random by default
@JonaLam
Copy link
Collaborator

JonaLam commented Apr 21, 2024

You did change the default scene from main menu to the mapUI which you might want to change back, but it's not a big deal

@Turtyo
Copy link
Collaborator Author

Turtyo commented Apr 22, 2024

Did I ? That was not voluntary, will change it back to the main menu, what I want is the main menu to load the map when we load a new game

TODO: load the correct scene for the dialogue event
probably load a unique scene but different dialogue in it with the
on_event_start
@Turtyo
Copy link
Collaborator Author

Turtyo commented Apr 24, 2024

I need to finish setting up the dialogue so it works with the map switch. And I need to add tests.

We can't click on it when the dialogue is going, maybe it should be
added as an element of the balloon scene instead of in a separate
control like I did
@Tysterman74
Copy link
Collaborator

@Tysterman74 as you can see in my last push i disable the button when the position is not set for the return button, which is another solution to the problem we had with setting a torch when fauna was not in a room (that you solved by adding a pop-up). We could change it to disable the button instead. I like the little pop-up though, so we can keep it also

I think the pop-up is fine. Gives a bit of context and small tutorial to the user instead of leaving it disabled with no context.

@Tysterman74
Copy link
Collaborator

Tysterman74 commented Apr 26, 2024

I pulled your branch and everything looks good so far. I did find a bug here when we activate the mob scene and we exit back to main menu, we are not able to start up the game scene again. Was this okay to leave in or should we spin another issue for it?

fauna_game_scene_swithc_bug.mp4

There is also a bug if we're on the Shop/Heal scene and tap on the Deck icon at the top right it causes a crash.

@Turtyo
Copy link
Collaborator Author

Turtyo commented Apr 26, 2024

I found the bug about going to the main menu. I think this should probably be addressed with the save issue, as solving this implies reloading the scene correctly (which is the goal of the save PR iirc).
For the shop / heal crashing when taping the deck icon, that's not normal and i'll look into it

@Turtyo
Copy link
Collaborator Author

Turtyo commented Apr 26, 2024

I found the issue, we are kind of paying the price of a pretty hectic organization for how cards are managed. I'll try to think of a solution, the fix is probably coming tomorrow.

Tysterman74
Tysterman74 previously approved these changes Apr 28, 2024
Tomzkk
Tomzkk previously approved these changes May 3, 2024
Core/Battler.gd Outdated Show resolved Hide resolved
Dialog/test.dialogue Show resolved Hide resolved
Event/EventRandom.gd Show resolved Hide resolved
Global/GLOBAL_VAR.gd Show resolved Hide resolved
Global/SignalBus.gd Outdated Show resolved Hide resolved
@Turtyo Turtyo dismissed stale reviews from Tomzkk and Tysterman74 via acafb99 May 3, 2024 19:56
@Turtyo Turtyo merged commit ad76cf9 into Saplings-Projects:main May 3, 2024
1 check passed
@Turtyo Turtyo deleted the 87-map-loader branch May 3, 2024 21:10
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.

Scene loader for the map
4 participants