In some kingdoms (e.g. in Sand, but not in Cascade) it always/sometimes crashed the game when closing the keyboard.
I assume that's because the Keyboard was on the SceneHeap which it shouldn't.
At least moving it to the game mode heap fixed it.
But then there was a memory leak that the game mode heap growed everytime the scene was reloaded.
That was because of some never freed memory in the Keyboard class.
I tried to implement destructors for `StageSceneStateServerConfig` and `FreezeTagConfigMenu` but that also crashed.
So I added new `clean()` methods instead.
- Show "SMOO made by CraftyBoss" for about 5 seconds
- Then show "Freeze-Tag & Sardines made by Amethyst-szs" for about 5 seconds.
- This does only overlay the game starting normally and does not slow down the process additionally.
---
Changes compared to the original cherry-picked version:
- Put all into the speedboot namespace instead of only a few things.
- Don't load into the game, but stay in the main menu
- (Because of issues with new save files)
- Added text: "Made by CraftyBoss"
- Added text: "& Sardines"
- Speed up transition animation between the two screens
- (Because it is now shown for a shorter total time)
Instead of directly (speed)booting into the game like in the original cherry-picked commit, this stays in the main menu.
The original behavior can be restored by setting `speedbootAutoload` to `true` inside `BootHooks.cpp`.
This is to prevent issues with new empty save files.
They normally don't get to the main menu but to an extra menu that now is invisible behind the custom boot screen.
The game doesn't load automatically then but the player needs to blindly navigate the invisible menu to start the game.
Till Cap Kingdom is fully loaded only the custom boot screen is visible (e.g. during the first cutscene video).
(cherry picked from commit c1eac0852eb839560dbc2ccafe373176c9911684)
Co-authored-by: Robin C. Ladiges <rcl.git@blackpinguin.de>
Similar to Hide & Seek with two teams: chasers (seekers) and runners (hiders).
The chasers try to catch all runners in a given round time.
When all runners are catched the chasers win and the round ends immediately (wipe out).
When the round time runs out, the runners win the round.
Instead of joining the chasers runners are frozen when touching a chaser or dying.
(Frozen at the last safe position when falling off the map.)
In the frozen state they can spectate other players.
Frozen runners are unfrozen when they are touched by other runners.
Players gain points instead of accumulating time based on their performance:
- Chasers receive points by catching runners or if they freeze themselves.
- Runners receive points over time by not being frozen or by unfreezing other runners.
- The team that wins gets extra points.
A round is limited to the current stage, so checkpoint warps and stage changes are disabled.
To be able to start a new round (with R + Up) a player first needs to become a "host".
The host status can be activated in the freeze-tag config menu.
---
Changes compared to the original cherry-picked version:
- fix: try to not mix legacy update types between freeze-tag and other game modes
- (see GameModeInf.h)
- fix: change the player we spectate if they disconnect even if they aren't at the end of the list
- fix: don't add players to an already started round (they missed the round start)
- fix: don't start rounds w/ survival events when the round length decreases
- fix: a round can end w/ wipeout if there is only one runner (cancelled for legacy clients)
- fix: don't score a rescue event after a wipeout
- fix: cancel the round when deactivating freeze-tag
- change: combined freeze-tag config menu buttons to single toggle buttons
- change: not closing the freeze-tag config menu after changing an option
- change: split host mode & round length into two distinct options
- change: possibility to always change settings in the FT config menu
- change: send gamemode NONE when Freeze-Tag is selected but not active
- change: improved distance calculations in squared distance space
- change: short invulnerability at round start
- add: toggle options to control mario/cappy collision/bounciness
- add: show freeze-tag specific controls in the debug menu
- depending on the current state: host, frozen, debug mode
- add: can only start a round with at least one runner and one chaser
- add: automatically cancel a round after 5s if there are not enough chasers/runners
- add: show who manually started/cancelled a round
- add: UI for players in other game modes outside of rounds
- remove: custom boot screen, because it directly loads into the game
- not seeing the main menu is an issue for empty save files
- this is added again separately w/ the next commit
(cherry picked from commit 782d0bd0831348c5ae327d50d0ab98f16f6111e3)
(cherry picked from commit 6525060e108a604636bd8f952ce1910a8050ee9a)
(cherry picked from commit 918f61fbfd619d781d88dc74878d392c48cfa480)
(cherry picked from commit db8331b158d3277388dcb8d0df2da43d78988c7d)
(cherry picked from commit 991aadb0f22ed0c745c218fdaae6ec43bb243e15)
(cherry picked from commit fe17cff52b4241418b37cd30ac3fa0af40d3b9f6)
(cherry picked from commit c5d6d428c6b25a5cdb0ff76c474b584a65b4bc60)
(cherry picked from commit b00088f08fa489b35c439987780bff718bb21417)
(cherry picked from commit 42c89927db611c662d9c01ff00c0e657e999e583)
(cherry picked from commit 4818a24d12caa2af64ca6378a5a5f33b53c0b59a)
(cherry picked from commit d707f2cf7dbeeb96602f9e45fa431fdd0ed476c3)
(cherry picked from commit c1791080f1aa3ef2e49bee7703cc4b365d122922)
(cherry picked from commit 96aff7dd7167d8244acef7884fa3503d4c3f868a)
(cherry picked from commit 1d774cc6ad884de571148ca77d212b55140699a5)
(cherry picked from commit bafca58e3906a6cd1046d7e7aed9512ab648c95d)
(cherry picked from commit 5cd4319c20417f317f75338ad61222fd7bee3ec7)
(cherry picked from commit a1575998c0835180a795a2a909a0b2c0942902d5)
(cherry picked from commit a14e813da77c2d6d4c4b6f82fd52d22c4a9ffb55)
(cherry picked from commit 1cd6c1f9443621ca0cd85fb277763cf5a6f10244)
(cherry picked from commit 7e5f16a3b8b4696c934a4acf3ccc544ac93af9ca)
(cherry picked from commit d022dde1de568b50e36ec809ff37d8ef42c81afa)
(cherry picked from commit c09456bd1d6efa8ba2471c507654bedbbe062b0d)
(cherry picked from commit 0fb6413ec91bbf679e9f8cea1aa512159101fa46)
(cherry picked from commit dcac5dfe120177df0cfe7bf9a6ef1bfac5d67afc)
(cherry picked from commit 6a412903aa34cd8fd740e0f898c75f2e01fe39c8)
(cherry picked from commit 794b06c50a004dd258344592a4521f5d9a85db60)
(cherry picked from commit e76e669074a671130ef453402033c65fdd004066)
(cherry picked from commit bfc14c15bb4ad5a517783c13d8f61a7cb5c40d4f)
(cherry picked from commit d888e3b71b519b214a693df92ced9fe5ce05101b)
(cherry picked from commit 8db6e28cf42499e95f2924c22acb026926c09be5)
(cherry picked from commit 784d9e6de300d13f761a4f3b21e1ec803f762b72)
(cherry picked from commit 43ee8bfecf5abb090aa98089730e79e93713ebfd)
(cherry picked from commit ab78a812fd18781655ccf38e803f619ea427d1ac)
(cherry picked from commit d2d37d0879a4e4959862d9dbc2256456c45df7cf)
(cherry picked from commit 8cb299bbaeb3c35498558a23f2a5c4925b87e7d7)
(cherry picked from commit d3622c7c53077da0858e617d13d51588ba529164)
(cherry picked from commit e46f73576380569c200fad5248f88cc845c3ee3b)
(cherry picked from commit 8364cd18bc9acd4ffa554c8cc4df9e5c9432ff0c)
(cherry picked from commit e383c7700eb68345773eafbed3fd1cd86cfb37f2)
(cherry picked from commit 32895eaa17d8f58f8f838f143ec204eb39b69509)
(cherry picked from commit dd9a98c02f4b8761d30d1bbb5a6604324ee721df)
(cherry picked from commit 63937fa7c5e316859e0a57188a803dbf57fcb202)
(cherry picked from commit eac79954958a591a0deb244d9b564f9c01a7fe41)
(cherry picked from commit f46e6a1e426a4c14708ee48f91348294877e7f8e)
(cherry picked from commit 8b15d09d2f093e7c9960f4395bf54478122e0273)
(cherry picked from commit b56e0b5bcb2cde4f0723252ee6f00b55af47e6b2)
Co-authored-by: Robin C. Ladiges <rcl.git@blackpinguin.de>
Very similar to Hide & Seek but a bit different.
Hiders (single sardine) and seekers (sardines pack) are kind of inverted.
The seekers (isIt = true) are hiding, and the hiders (isIt = false) try to find them.
The timer counts up for the seekers and not for the hiders.
Only one player can change from hider to seeker via the button combination.
Other hiders need to touch a seeker to become a seeker themselves.
A hider that dies doesn't join the seekers, but when a seeker dies they become a hider.
A round ends when all hiders have joined the seekers as usual.
The sardines game mode has three toggable options:
- Gravity: as in H&S mode
- Tether: Binds the seekers (sardines pack) together, by adding a force when moving apart
- Tether Snapping: Change from seeker to hider when too far away from other seekers
---
Changes compared to the original cherry-picked version:
- fix: gravity camera in Sardines mode doesn't crash the game anymore
- fix: logic for the big sardines icon (and timer control) isn't wrongly inverted
- (this was only an issue in the `freeze-tag` branch when unpausing)
- change: combined sardine config menu buttons to single toggle buttons
- change: not closing the sardines config menu after changing an option
- change: send gamemode NONE when Sardines is selected but not active
- change: improved distance calculations in squared distance space
- change: possibility to always change settings in the Sardines config menu
- add: toggle options to control mario/cappy collision/bounciness
- add: show sardines specific controls in the debug menu
- remove: new players list (moved to PR CraftyBoss/SuperMarioOdysseyOnline#68)
- remove: unlock costume doors (moved to PR CraftyBoss/SuperMarioOdysseyOnline#69)
(cherry picked from commit a9b2c87aa0)
(cherry picked from commit 1955d76bfc)
(cherry picked from commit f8eef7fb97)
(cherry picked from commit 2a0d0e7724)
(cherry picked from commit 918f61fbfd619d781d88dc74878d392c48cfa480)
(cherry picked from commit 96aff7dd7167d8244acef7884fa3503d4c3f868a)
(cherry picked from commit 0fb6413ec91bbf679e9f8cea1aa512159101fa46)
(cherry picked from commit ab78a812fd18781655ccf38e803f619ea427d1ac)
Co-authored-by: Robin C. Ladiges <rcl.git@blackpinguin.de>
- change: general game mode management more abstract and less H&S oriented
- change: split 8bit updateType into 4bit game mode and 4bit update type.
- change: don't process packets from other game modes (legacy mode for backwards compatibility)
- change: cache game mode of other players in puppet, resend GameModeInf on detected game mode change
- change: send gamemode NONE when H&S is selected but not active
- change: improved distance calculations in squared distance space
- change: change from hider to seeker when dead even if there are no other players
- fix: add hours to the minutes for the H&S GameModeInf packet
- fix: set milliseconds and hours when receiving time from server
- fix: keep the new time from the server for longer than a single frame
- fix: reset H&S icon after receiving a new state from the server
- refac: move code to generate PlayerList into own abstract LayoutPlayerList class.
- refac: to_string() method for GameTime to simplify code in the Game Mode Icon class.
- refac: rename TagInf packet to GameModeInf packet
- refac: remove param from `SocketClient::tryGetPacket()` (unused)
- refac: move all H&S specific files into the same directory (out of layouts)
- refac: move GameModeTimer.cpp from source/server/hns/ to source/server/gamemode/
- refac: clean up some unused, duplicate or complicated imports
- [mod menu] change: use the game mode name in the options & menu title
- [mod menu] change: select the next game mode in the game mode select menu
- [mod menu] change: possibility to always change the gravity setting in the H&S config menu
- [mod menu] add: toggle options to control mario/cappy collision/bounciness
(cherry picked from commit a9b2c87aa0)
(cherry picked from commit 918f61fbfd619d781d88dc74878d392c48cfa480)
(cherry picked from commit 96aff7dd7167d8244acef7884fa3503d4c3f868a)
(cherry picked from commit 0fb6413ec91bbf679e9f8cea1aa512159101fa46)
(cherry picked from commit ab78a812fd18781655ccf38e803f619ea427d1ac)
Co-authored-by: Robin C. Ladiges <rcl.git@blackpinguin.de>
This change only makes it work when in offline/airplane mode.
When connected to a server it still crashes.
Likely due to a different part of the code.
Thanks to https://github.com/piplup55 for pointing out to me that this worked in old versions.
I then tested a few older builds and found out that it started to not work with version `v1.1.0`.
Using `git bisect` I was able to find out that commit 34691affb0 introduced the issue.
There are TCP timeouts, but in situations where it fails instantly there would otherwise be no delay.
(E.g. firewall rejection, or when in flight mode.)
2 warnings found (use --debug to expand):
- FromAsCasing: 'as' and 'FROM' keywords' casing do not match (line 1)
- JSONArgsRecommended: JSON arguments recommended for ENTRYPOINT to prevent unintended behavior related to OS signals (line 13)
- Client.hpp: add bool variable and methods
- hooks.cpp: save/load value from common.bin
- main.cpp: change
- StageSceneStateServerConfig: add button to the mod menu to toggle it
- Show `Yes` and `No` instead of `True` and `False`
- Remove `Is in Capture`
- Always show `Capture`
- Combine `Animation Index` and `Packet Animation` into one `Animation` line
- Rename `Puppet0` to `Empty Slot 1`
- Don't mention puppets
- Show how much is used instead of how much is free.
- Double precision, because of observable inaccuracies otherwise.
- Divide by 1024 instead of by 1000 to display KiB instead of KB.
- Show only one fractional digit.
- (The max is exactly 320 KiB, so need to show a fractional digit for it.)
Cherry picked this aspect from the original commit and did the romfs change for all languages (not only for `USen`).
a9b2c87aa0
(cherry picked from commit a9b2c87aa0)
Co-authored-by: Robin C. Ladiges <rcl.git@blackpinguin.de>
