diff --git a/src/ServerState.cc b/src/ServerState.cc index 41f77686..c56f3477 100644 --- a/src/ServerState.cc +++ b/src/ServerState.cc @@ -958,19 +958,6 @@ void ServerState::load_config_early() { this->enable_brutal_peeps_mode = this->config_json->get_bool("EnableBrutalPeepsMode", false); this->enable_hardcore_mode = this->config_json->get_bool("EnableHardcoreMode", false); this->enable_test_mode = this->config_json->get_bool("EnableTestMode", false); - this->brutal_peeps_max_tier = std::min(10, std::max(0, this->config_json->get_int("BrutalPeepsMaxTier", 10))); - this->brutal_peeps_unlocked_tier_v2 = std::min( - this->brutal_peeps_max_tier, - std::max(-1, this->config_json->get_int("BrutalPeepsUnlockedTierV2", -1))); - this->brutal_peeps_unlocked_tier_v3 = std::min( - this->brutal_peeps_max_tier, - std::max(-1, this->config_json->get_int("BrutalPeepsUnlockedTierV3", -1))); - this->brutal_peeps_unlocked_tier_v4 = std::min( - this->brutal_peeps_max_tier, - std::max(-1, this->config_json->get_int("BrutalPeepsUnlockedTierV4", -1))); - this->brutal_peeps_enemy_hp_scale_tier = std::min( - this->brutal_peeps_max_tier, - std::max(-1, this->config_json->get_int("BrutalPeepsEnemyHPScaleTier", -1))); this->rare_notifs_enabled_for_client_drops = this->config_json->get_bool("RareNotificationsEnabledForClientDrops", false); this->default_rare_notifs_enabled_v1_v2 = this->config_json->get_bool("RareNotificationsEnabledByDefault", false); this->default_rare_notifs_enabled_v3_v4 = this->default_rare_notifs_enabled_v1_v2; diff --git a/src/ServerState.hh b/src/ServerState.hh index 6f2e2830..4b5023b0 100644 --- a/src/ServerState.hh +++ b/src/ServerState.hh @@ -176,13 +176,8 @@ struct ServerState : public std::enable_shared_from_this { bool enable_bb_ship_selection_menu = false; bool use_psov2_rand_crypt = false; // Used in some tests bool enable_brutal_peeps_mode = false; - int64_t brutal_peeps_enemy_hp_scale_tier = -1; // -1 = disabled; 0..10 = scale BB enemy HP in stream files bool enable_hardcore_mode = false; bool enable_test_mode = false; - int8_t brutal_peeps_max_tier = 10; - int8_t brutal_peeps_unlocked_tier_v2 = 0; - int8_t brutal_peeps_unlocked_tier_v3 = 0; - int8_t brutal_peeps_unlocked_tier_v4 = 0; bool use_legacy_item_random_behavior = false; // Used in some tests bool rare_notifs_enabled_for_client_drops = false; bool default_rare_notifs_enabled_v1_v2 = false;