Commit 7838a9d6 authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko

Merge branch 'roberry-new-rule-order' into 'V3.7'

Bonus Roberry new rule order

See merge request !752
parents 3d43bebf 2b7b8da1
Pipeline #42324 canceled with stages
in 2 minutes and 13 seconds
......@@ -154,7 +154,7 @@ public class RobberyGame extends AbstractTablexiaGame<GameRule> {
rulesDefinition = TUTORIAL_RULE;
}else {
String lastRule = GameDAO.getLastGameScoreValueForGameDifficultyAndKey(getGameDifficulty().getDifficultyNumber(), getGame().getGameNumber(), SCORE_KEY_GAME_RULE);
rulesDefinition = forcedRulesDefinition != null ? forcedRulesDefinition : GameRulesDefinition.getNextGameRuleForDifficulty(robberyDifficultyDefinition.getReusesDifficulty(), lastRule);
rulesDefinition = forcedRulesDefinition != null ? forcedRulesDefinition : GameRulesDefinition.getNextGameRuleForDifficulty(robberyDifficultyDefinition.getGameDifficulty(), lastRule);
}
setGameScore(SCORE_KEY_GAME_RULE, rulesDefinition.getId());
......
......@@ -131,7 +131,16 @@ public enum GameRulesDefinition {
CC_0_notCC_0_T(18, GameDifficulty.HARD, CC_0_notCC_0_TRule.class, "game_robbery_rule_cc0notcc0t"),
CC_0_notCA_0_T(19, GameDifficulty.HARD, CC_0_notCA_0_TRule.class, "game_robbery_rule_cc0notca0t"),
CC_2_CC(20, GameDifficulty.HARD, CC_2_CCRule.class, "game_robbery_rule_cc2cc"),
CC_0_CC_0_CC(21, GameDifficulty.HARD, CC_0_CC_0_CCRule.class, "game_robbery_rule_cc0cc0cc");
CC_0_CC_0_CC(21, GameDifficulty.HARD, CC_0_CC_0_CCRule.class, "game_robbery_rule_cc0cc0cc"),
CC_1_notCA_BONUS(22, GameDifficulty.BONUS, CC_1_notCARule.class, "game_robbery_rule_cc1notca"),
CC_0_notCC_0_T_BONUS(23, GameDifficulty.BONUS, CC_0_notCC_0_TRule.class, "game_robbery_rule_cc0notcc0t"),
BC_2_BC_BONUS(24, GameDifficulty.BONUS, BC_2_BCRule.class, "game_robbery_rule_bc2bc"),
CC_0_notCA_0_T_BONUS(25, GameDifficulty.BONUS, CC_0_notCA_0_TRule.class, "game_robbery_rule_cc0notca0t"),
CC_2_CC_BONUS(26, GameDifficulty.BONUS, CC_2_CCRule.class, "game_robbery_rule_cc2cc"),
Bb_1_Bb_BONUS(27, GameDifficulty.BONUS, Bb_1_BbRule.class, "game_robbery_rule_bx1bx"),
CC_0_CC_0_CC_BONUS(28, GameDifficulty.BONUS, CC_0_CC_0_CCRule.class, "game_robbery_rule_cc0cc0cc");
private Class<? extends GameRule> gameRuleClass;
private String gameRuleStringName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment