diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc index a21e0127..21e4c74f 100644 --- a/src/ReceiveCommands.cc +++ b/src/ReceiveCommands.cc @@ -3813,12 +3813,12 @@ shared_ptr create_game_generic( // Episode 1 (for example) are actually 1, 20, 40, 80. switch (episode) { case Episode::EP1: { - const auto& min_levels = (c->version() == Version::BB_V4) ? s->min_levels_v4[0] : DEFAULT_MIN_LEVELS_EP1; + const auto& min_levels = (c->version() == Version::BB_V4) ? s->min_levels_v4[0] : DEFAULT_MIN_LEVELS_V3; min_level = min_levels[difficulty]; break; } case Episode::EP2: { - const auto& min_levels = (c->version() == Version::BB_V4) ? s->min_levels_v4[1] : DEFAULT_MIN_LEVELS_EP2; + const auto& min_levels = (c->version() == Version::BB_V4) ? s->min_levels_v4[1] : DEFAULT_MIN_LEVELS_V3; min_level = min_levels[difficulty]; break; } @@ -3826,7 +3826,7 @@ shared_ptr create_game_generic( min_level = 0; break; case Episode::EP4: { - const auto& min_levels = (c->version() == Version::BB_V4) ? s->min_levels_v4[2] : DEFAULT_MIN_LEVELS_EP4; + const auto& min_levels = (c->version() == Version::BB_V4) ? s->min_levels_v4[2] : DEFAULT_MIN_LEVELS_V3; min_level = min_levels[difficulty]; break; } diff --git a/src/ServerState.cc b/src/ServerState.cc index fd064468..3091594c 100644 --- a/src/ServerState.cc +++ b/src/ServerState.cc @@ -978,9 +978,9 @@ void ServerState::parse_config(const JSON& json, bool is_reload) { this->rare_enemy_rates_challenge = Map::DEFAULT_RARE_ENEMIES; } - this->min_levels_v4[0] = DEFAULT_MIN_LEVELS_EP1; - this->min_levels_v4[1] = DEFAULT_MIN_LEVELS_EP2; - this->min_levels_v4[2] = DEFAULT_MIN_LEVELS_EP4; + this->min_levels_v4[0] = DEFAULT_MIN_LEVELS_V4_EP1; + this->min_levels_v4[1] = DEFAULT_MIN_LEVELS_V4_EP2; + this->min_levels_v4[2] = DEFAULT_MIN_LEVELS_V4_EP4; try { for (const auto& ep_it : json.get_dict("BBMinimumLevels")) { array levels({0, 0, 0, 0}); diff --git a/src/StaticGameData.cc b/src/StaticGameData.cc index c0279869..2b8fe7f3 100644 --- a/src/StaticGameData.cc +++ b/src/StaticGameData.cc @@ -781,6 +781,7 @@ char char_for_challenge_rank(uint8_t rank) { return "BAS"[rank]; } -const array DEFAULT_MIN_LEVELS_EP1({0, 19, 39, 79}); -const array DEFAULT_MIN_LEVELS_EP2({0, 29, 49, 89}); -const array DEFAULT_MIN_LEVELS_EP4({0, 39, 79, 109}); +const array DEFAULT_MIN_LEVELS_V3({0, 19, 39, 79}); +const array DEFAULT_MIN_LEVELS_V4_EP1({0, 19, 39, 79}); +const array DEFAULT_MIN_LEVELS_V4_EP2({0, 29, 49, 89}); +const array DEFAULT_MIN_LEVELS_V4_EP4({0, 39, 79, 109}); diff --git a/src/StaticGameData.hh b/src/StaticGameData.hh index cd5c48a0..5181e6c9 100644 --- a/src/StaticGameData.hh +++ b/src/StaticGameData.hh @@ -80,6 +80,7 @@ uint32_t class_flags_for_class(uint8_t char_class); char char_for_challenge_rank(uint8_t rank); -extern const std::array DEFAULT_MIN_LEVELS_EP1; -extern const std::array DEFAULT_MIN_LEVELS_EP2; -extern const std::array DEFAULT_MIN_LEVELS_EP4; +extern const std::array DEFAULT_MIN_LEVELS_V3; +extern const std::array DEFAULT_MIN_LEVELS_V4_EP1; +extern const std::array DEFAULT_MIN_LEVELS_V4_EP2; +extern const std::array DEFAULT_MIN_LEVELS_V4_EP4;