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.

Sign up for GitHub

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

Jump to bottom

Random level/pack selection #405

Draft
wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

Random level/pack selection #405

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9688f09
LCTRL random button + SHIFT combo
Ena-Shepherd Apr 2, 2023
1c3d0be
PR clean
Ena-Shepherd Apr 2, 2023
def2034
Merge branch 'vittorioromeo:develop' into develop
Ena-Shepherd Apr 3, 2023
3b56e04
Hardcoded KeyCombo Lambda / rework. New behavior now never goes back …
Ena-Shepherd Apr 5, 2023
452b364
Merge branch 'vittorioromeo:develop' into develop
Ena-Shepherd Apr 5, 2023
33921b2
Merge branch 'vittorioromeo:develop' into develop
Ena-Shepherd Apr 9, 2023
251e842
Merge branch 'vittorioromeo:develop' into develop
Ena-Shepherd Nov 9, 2023
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
47 changes: 45 additions & 2 deletions src/SSVOpenHexagon/Core/MenuGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,6 @@ MenuGame::MenuGame(Steam::steam_manager& mSteamManager,
lvlDrawer->YScrollTo = 0;
}
}

return;
}

Expand Down Expand Up @@ -1015,6 +1014,49 @@ void MenuGame::initInput()
game.addInput( // hardcoded
{{k::F4}}, [this](ssvu::FT /*unused*/) { reloadAssets(true); },
t::Once);

game.addInput( // hardcoded
{{k::LControl}}, [this](ssvu::FT /*unused*/) {
int randomLevel;

if (lvlDrawer->levelDataIds->size() == 1)
return;

randomLevel = ssvu::getRndI(0, lvlDrawer->levelDataIds->size());

if (randomLevel >= lvlDrawer->levelDataIds->size())
setIndex(0);
else
setIndex(randomLevel);
Copy link
Owner

Choose a reason for hiding this comment

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

Why are all these checks necessary? Wouldn't the following just always work, or am I missing something?

Suggested change
int randomLevel;
if (lvlDrawer->levelDataIds->size() == 1)
return;
randomLevel = ssvu::getRndI(0, lvlDrawer->levelDataIds->size());
if (randomLevel >= lvlDrawer->levelDataIds->size())
setIndex(0);
else
setIndex(randomLevel);
setIndex(ssvu::getRndI(0, lvlDrawer->levelDataIds->size()));

Ditto for the other two similar functions.

Copy link
Author

@Ena-Shepherd Ena-Shepherd Apr 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Without the checks, line 1025 sometimes returns what seems to be undefined behavior like "-124852".
This creates an out of bounds error segfault and crashes the program.
Another exception to check is if the pack contains only 1 level, like tutorial pack, or the favorites list.

There is also 2 Keybinds intended to act as the combo keys, but i checked on both Shift Keys instead of Focus, so i will rework on this. (didn't find how to check on Focus directly).

Edit :
Also declared randomLevel and RandomCollection as separated ints in each lambda for better readability.
(3 nested function calls is a bit heavy)

Copy link
Owner

Choose a reason for hiding this comment

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

ssvu::getRndI(a, b) returns a number between a and b-1. So ssvu::getRndI(0, lvlDrawer->levelDataIds->size()) should always give a valid index.

The only case where it can go wrong is if lvlDrawer->levelDataIds->size() == 0, because it can underflow to a very large number. Maybe that's the only required check?

Copy link
Author

Choose a reason for hiding this comment

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

Yes, absolutely.
I'll modify that, and make the keys reassignable and everything should be good :)

Copy link

Choose a reason for hiding this comment

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

Is there any chance you could add a bind for "random level in random pack" too? It is very commonly used in osu, for example.

Copy link
Author

@Ena-Shepherd Ena-Shepherd Apr 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Is there any chance you could add a bind for "random level in random pack" too? It is very commonly used in osu, for example.

Yes, if @vittorioromeo is ok with that

playSoundOverride("beep.ogg");
},
t::Once);

game.addInput( // hardcoded
{{k::LControl, k::LShift}}, [this](ssvu::FT /*unused*/) {
int randomCollection;

if (getSelectablePackInfosSize() == 1)
return;
randomCollection = ssvu::getRndI(0, getSelectablePackInfosSize());

changePackTo(randomCollection);
playSoundOverride("beep.ogg");
},
t::Once);

game.addInput( // hardcoded
{{k::LControl, k::RShift}}, [this](ssvu::FT /*unused*/) {
int randomCollection;

if (getSelectablePackInfosSize() == 1)
return;
randomCollection = ssvu::getRndI(0, getSelectablePackInfosSize());

changePackTo(randomCollection);
playSoundOverride("beep.ogg");
},
t::Once);
}

void MenuGame::runLuaFile(const std::string& mFileName)
Expand Down Expand Up @@ -4993,7 +5035,8 @@ void MenuGame::drawLevelSelectionRightSide(
tempString = isFavoriteLevels() ? "PRESS F2 TO SHOW ALL LEVELS"
: "PRESS F2 TO SHOW FAVORITE LEVELS";
renderTextCentered(tempString, txtSelectionSmall.font, topLeft);
tempString = "\nHOLD FOCUS TO JUMP BETWEEN PACKS";

tempString = "\nPRESS LCONTROL TO SELECT A RANDOM LEVEL\nHOLD FOCUS TO JUMP BETWEEN PACKS";
renderTextCentered(tempString, txtSelectionSmall.font, topLeft);

//----------------------------------------
Expand Down