incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix minimum player levels for Hard, etc. on non-V4

Browse Source
This commit is contained in:
Martin Michelsen
2023-12-17 13:50:18 -08:00
parent f14f7dd93b
commit 7a34fb0f7a
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+3 -3
View File
@@ -3813,12 +3813,12 @@ shared_ptr<Lobby> 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<Lobby> 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;
}
src/ServerState.cc
+3 -3
View File
@@ -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<size_t, 4> levels({0, 0, 0, 0});
src/StaticGameData.cc
+4 -3
View File
@@ -781,6 +781,7 @@ char char_for_challenge_rank(uint8_t rank) {
return "BAS"[rank];
}
const array<size_t, 4> DEFAULT_MIN_LEVELS_EP1({0, 19, 39, 79});
const array<size_t, 4> DEFAULT_MIN_LEVELS_EP2({0, 29, 49, 89});
const array<size_t, 4> DEFAULT_MIN_LEVELS_EP4({0, 39, 79, 109});
const array<size_t, 4> DEFAULT_MIN_LEVELS_V3({0, 19, 39, 79});
const array<size_t, 4> DEFAULT_MIN_LEVELS_V4_EP1({0, 19, 39, 79});
const array<size_t, 4> DEFAULT_MIN_LEVELS_V4_EP2({0, 29, 49, 89});
const array<size_t, 4> DEFAULT_MIN_LEVELS_V4_EP4({0, 39, 79, 109});
src/StaticGameData.hh
+4 -3
View File
@@ -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<size_t, 4> DEFAULT_MIN_LEVELS_EP1;
extern const std::array<size_t, 4> DEFAULT_MIN_LEVELS_EP2;
extern const std::array<size_t, 4> DEFAULT_MIN_LEVELS_EP4;
extern const std::array<size_t, 4> DEFAULT_MIN_LEVELS_V3;
extern const std::array<size_t, 4> DEFAULT_MIN_LEVELS_V4_EP1;
extern const std::array<size_t, 4> DEFAULT_MIN_LEVELS_V4_EP2;
extern const std::array<size_t, 4> DEFAULT_MIN_LEVELS_V4_EP4;