mirror of
https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git
synced 2024-11-29 06:33:06 +00:00
0c9d6b2159
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 commita9b2c87aa0) (cherry picked from commit1955d76bfc) (cherry picked from commitf8eef7fb97) (cherry picked from commit2a0d0e7724) (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>
21 lines
482 B
C++
21 lines
482 B
C++
#pragma once
|
|
|
|
#include "packets/GameModeInf.h"
|
|
|
|
struct SardineUpdateTypes {
|
|
enum Type : u8 {
|
|
TIME = 1 << 0,
|
|
STATE = 1 << 1
|
|
};
|
|
};
|
|
typedef SardineUpdateTypes::Type SardineUpdateType;
|
|
|
|
struct PACKED SardinePacket : GameModeInf<SardineUpdateType> {
|
|
SardinePacket() : GameModeInf() {
|
|
setGameMode(GameMode::SARDINE);
|
|
mPacketSize = sizeof(SardinePacket) - sizeof(Packet);
|
|
};
|
|
bool1 isIt = false;
|
|
u8 seconds;
|
|
u16 minutes;
|
|
};
|