jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-21 17:15:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use pointer-to-member signal connections for tutorial validation

Browse source 
Took 10 minutes
This commit is contained in:
Lukas Brübach 2026-08-09 03:30:57 +02:00
parent 569b531113
commit 9c0c480b2e
7 changed files with 56 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

41
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -186,8 +186,10 @@ void TabGame::finishTutorialInitialization()
loadDeckStep.requiresInteraction = true;
loadDeckStep.autoAdvanceOnValid = true;
loadDeckStep.validationTiming = ValidationTiming::OnSignal;
loadDeckStep.signalSource = game->getGameEventHandler();
loadDeckStep.signalName = SIGNAL(logDeckSelect(PlayerLogic *, QString, int));
loadDeckStep.signalHook = [this](TutorialController *controller) {
return connect(game->getGameEventHandler(), &GameEventHandler::logDeckSelect, controller,
&TutorialController::checkValidation);
};
loadDeckStep.validator = [] { return true; };
deckSelectSequence.addStep(loadDeckStep);
@ -199,8 +201,9 @@ void TabGame::finishTutorialInitialization()
readyUpStep.requiresInteraction = true;
readyUpStep.autoAdvanceOnValid = true;
readyUpStep.validationTiming = ValidationTiming::OnSignal;
readyUpStep.signalSource = this;
readyUpStep.signalName = SIGNAL(localPlayerReadyStateChanged(bool));
readyUpStep.signalHook = [this](TutorialController *controller) {
return connect(this, &TabGame::localPlayerReadyStateChanged, controller, &TutorialController::checkValidation);
};
readyUpStep.validator = [] { return true; };
deckSelectSequence.addStep(readyUpStep);
@ -256,10 +259,12 @@ void TabGame::finishTutorialInitialization()
lifeCounterStep.allowClickThrough = true;
lifeCounterStep.autoAdvanceOnValid = true;
lifeCounterStep.validationTiming = ValidationTiming::OnSignal;
lifeCounterStep.signalSource = game->getPlayerManager()
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
->getPlayerEventHandler();
lifeCounterStep.signalName = SIGNAL(logSetCounter(PlayerLogic *, QString, int, int));
lifeCounterStep.signalHook = [this](TutorialController *controller) {
return connect(game->getPlayerManager()
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
->getPlayerEventHandler(),
&PlayerEventHandler::logSetCounter, controller, &TutorialController::checkValidation);
};
lifeCounterStep.validator = [this] {
auto counters =
game->getPlayerManager()->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())->getCounters();
@ -283,10 +288,12 @@ void TabGame::finishTutorialInitialization()
diceRollStep.allowClickThrough = true;
diceRollStep.autoAdvanceOnValid = true;
diceRollStep.validationTiming = ValidationTiming::OnSignal;
diceRollStep.signalSource = game->getPlayerManager()
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
->getPlayerEventHandler();
diceRollStep.signalName = SIGNAL(logRollDie(PlayerLogic *, int, const QList<uint> &));
diceRollStep.signalHook = [this](TutorialController *controller) {
return connect(game->getPlayerManager()
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
->getPlayerEventHandler(),
&PlayerEventHandler::logRollDie, controller, &TutorialController::checkValidation);
};
diceRollStep.validator = [] { return true; };
diceRollStep.validationHint = tr("Roll a dice using any of these methods.");
@ -302,10 +309,12 @@ void TabGame::finishTutorialInitialization()
mulliganStep.allowClickThrough = true;
mulliganStep.autoAdvanceOnValid = true;
mulliganStep.validationTiming = ValidationTiming::OnSignal;
mulliganStep.signalSource = game->getPlayerManager()
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
->getPlayerEventHandler();
mulliganStep.signalName = SIGNAL(logDrawCards(PlayerLogic *, int, bool));
mulliganStep.signalHook = [this](TutorialController *controller) {
return connect(game->getPlayerManager()
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())
->getPlayerEventHandler(),
&PlayerEventHandler::logDrawCards, controller, &TutorialController::checkValidation);
};
mulliganStep.validator = [this] {
return game->getPlayerManager()
->getActiveLocalPlayer(game->getPlayerManager()->getLocalPlayerId())