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

fix Ep3 NTE DEF die rules not working

Browse Source
This commit is contained in:
Martin Michelsen
2024-02-14 18:53:15 -08:00
parent 8c514a0688
commit 9ff7d6fff3
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/DataIndexes.cc
+1 -1
View File
@@ -1534,7 +1534,7 @@ RulesTrial::RulesTrial(const Rules& r)
this->atk_die_behavior = 0; // Random
}
if (r.def_dice_value_range == 0xFF) {
this->atk_die_behavior = 0xFF;
this->def_die_behavior = 0xFF;
} else {
auto def_range = r.def_dice_range(false);
if (def_range.first == def_range.second) {
src/Episode3/Server.cc
+19 -9
View File
@@ -2169,15 +2169,25 @@ void Server::handle_CAx13_update_map_during_setup_t(shared_ptr<Client> c, const
// the values from the $dicerange command if available.
const auto& map_rules = this->last_chosen_map->version(c->language())->map->default_rules;
auto& server_rules = this->map_and_rules->rules;
server_rules.def_dice_value_range = (map_rules.def_dice_value_range == 0xFF)
? ((this->def_dice_value_range_override == 0xFF) ? 0 : this->def_dice_value_range_override)
: map_rules.def_dice_value_range;
server_rules.atk_dice_value_range_2v1 = (map_rules.atk_dice_value_range_2v1 == 0xFF)
? ((this->atk_dice_value_range_2v1_override == 0xFF) ? 0 : this->atk_dice_value_range_2v1_override)
: map_rules.atk_dice_value_range_2v1;
server_rules.def_dice_value_range_2v1 = (map_rules.def_dice_value_range_2v1 == 0xFF)
? ((this->def_dice_value_range_2v1_override == 0xFF) ? 0 : this->def_dice_value_range_2v1_override)
: map_rules.def_dice_value_range_2v1;
// NTE can specify the DEF dice value range in its Rules struct, so we use
// that unless the map or $dicerange overrides it.
server_rules.def_dice_value_range = (map_rules.def_dice_value_range != 0xFF)
? map_rules.def_dice_value_range
: (this->def_dice_value_range_override != 0xFF)
? this->def_dice_value_range_override
: this->options.is_nte()
? server_rules.def_dice_value_range
: 0;
server_rules.atk_dice_value_range_2v1 = (map_rules.atk_dice_value_range_2v1 != 0xFF)
? map_rules.atk_dice_value_range_2v1
: (this->atk_dice_value_range_2v1_override != 0xFF)
? this->atk_dice_value_range_2v1_override
: 0;
server_rules.def_dice_value_range_2v1 = (map_rules.def_dice_value_range_2v1 != 0xFF)
? map_rules.def_dice_value_range_2v1
: (this->def_dice_value_range_2v1_override != 0xFF)
? this->def_dice_value_range_2v1_override
: 0;
// If this match is part of a tournament, ignore the rules sent by the
// client and use the tournament rules instead.