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

fix JSON common table parser

Browse Source
This commit is contained in:
Martin Michelsen
2025-11-10 22:56:23 -08:00
parent 1d8befde8e
commit 712cfc9ac4
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CommonItemSet.cc
+3 -4
View File
@@ -122,15 +122,15 @@ CommonItemSet::Table::Table(const phosg::JSON& json, Episode episode)
const auto& enemy_type_drop_probs_json = json.at("EnemyTypeDropProbs").as_dict(); const auto& enemy_type_drop_probs_json = json.at("EnemyTypeDropProbs").as_dict();
const auto& enemy_item_classes_json = json.at("EnemyItemClasses").as_dict(); const auto& enemy_item_classes_json = json.at("EnemyItemClasses").as_dict();
for (size_t z = 0; z < 0x64; z++) { for (size_t z = 0; z < 0x64; z++) {
for (Episode episode : ALL_EPISODES_V4) {
auto types = enemy_types_for_rare_table_index(episode, z); auto types = enemy_types_for_rare_table_index(episode, z);
vector<string> names; vector<string> names;
if (types.empty()) { if (types.empty()) {
names.emplace_back(std::format("{}:!{:02X}", abbreviation_for_episode(episode), z)); names.emplace_back(std::format("{}:!{:02X}", abbreviation_for_episode(episode), z));
} } else {
for (auto type : enemy_types_for_rare_table_index(episode, z)) { for (auto type : types) {
names.emplace_back(std::format("{}:{}", abbreviation_for_episode(episode), phosg::name_for_enum(type))); names.emplace_back(std::format("{}:{}", abbreviation_for_episode(episode), phosg::name_for_enum(type)));
} }
}
for (const auto& name : names) { for (const auto& name : names) {
from_json_into(*enemy_meseta_ranges_json.at(name), this->enemy_meseta_ranges[z]); from_json_into(*enemy_meseta_ranges_json.at(name), this->enemy_meseta_ranges[z]);
this->enemy_type_drop_probs[z] = enemy_type_drop_probs_json.at(name)->as_int(); this->enemy_type_drop_probs[z] = enemy_type_drop_probs_json.at(name)->as_int();
@@ -138,7 +138,6 @@ CommonItemSet::Table::Table(const phosg::JSON& json, Episode episode)
} }
} }
} }
}
static const char* name_for_common_item_class(uint8_t item_class) { static const char* name_for_common_item_class(uint8_t item_class) {
switch (item_class) { switch (item_class) {