Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ ShinyHunt_OverworldReset::ShinyHunt_OverworldReset()
LockMode::UNLOCK_WHILE_RUNNING,
false
)
, MOVEMENT_GROUP(
"Movement After Loading",
LockMode::UNLOCK_WHILE_RUNNING
)
, MOVEMENT(
"<b>Movement:</b><br>"
"Move the player after entering the game to close gap. ",
Expand Down Expand Up @@ -119,12 +123,13 @@ ShinyHunt_OverworldReset::ShinyHunt_OverworldReset()
})
{
PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
PA_ADD_OPTION(MOVEMENT);
PA_ADD_OPTION(RESET_DELAY);
PA_ADD_OPTION(MOVEMENT_GROUP);
MOVEMENT_GROUP.PA_ADD_OPTION(MOVEMENT);
MOVEMENT_GROUP.PA_ADD_OPTION(RUN_DIRECTION);
MOVEMENT_GROUP.PA_ADD_OPTION(RUN_DURATION);
MOVEMENT_GROUP.PA_ADD_OPTION(ROLLS);
PA_ADD_OPTION(ROTATE_CAMERA);
PA_ADD_OPTION(RUN_DIRECTION);
PA_ADD_OPTION(RUN_DURATION);
PA_ADD_OPTION(ROLLS);
PA_ADD_OPTION(SHINY_DETECTED);
PA_ADD_OPTION(NOTIFICATIONS);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
#include "Common/Cpp/Options/EnumDropdownOption.h"
#include "Common/Cpp/Options/GroupOption.h"
#include "Common/Cpp/Options/SimpleIntegerOption.h"
#include "Common/Cpp/Options/TimeDurationOption.h"
#include "CommonFramework/Notifications/EventNotificationsTable.h"
Expand Down Expand Up @@ -69,6 +70,8 @@ class ShinyHunt_OverworldReset : public SingleSwitchProgramInstance, ConfigOptio
MillisecondsOption RESET_DELAY;
BooleanCheckBoxOption ROTATE_CAMERA;

// Holds MOVEMENT, RUN_DIRECTION, RUN_DURATION and ROLLS in one box in the UI.
GroupOption MOVEMENT_GROUP;
EnumDropdownOption<Movement> MOVEMENT;
EnumDropdownOption<RunDirection> RUN_DIRECTION;
MillisecondsOption RUN_DURATION;
Expand Down
Loading