diff --git a/src/RareItemSet.cc b/src/RareItemSet.cc index c8616ecf..4dd37adb 100644 --- a/src/RareItemSet.cc +++ b/src/RareItemSet.cc @@ -386,7 +386,7 @@ RareItemSet::RareItemSet(const phosg::JSON& json, shared_ptr files; - for (uint8_t difficulty = 0; difficulty < 4; difficulty++) { + for (uint8_t difficulty = 0; difficulty < (is_v1 ? 3 : 4); difficulty++) { for (uint8_t section_id = 0; section_id < 10; section_id++) { ParsedRELData rel(this->get_collection(GameMode::NORMAL, Episode::EP1, difficulty, section_id)); files.emplace_back(rel.serialize(false, is_v1)); @@ -648,11 +648,29 @@ string RareItemSet::serialize_html( \n\ \n"); + string mode_token; + switch (mode) { + case GameMode::NORMAL: + mode_token = ""; + break; + case GameMode::BATTLE: + mode_token = " (battle mode)"; + break; + case GameMode::CHALLENGE: + mode_token = " (challenge mode)"; + break; + case GameMode::SOLO: + mode_token = " (solo mode)"; + break; + default: + throw logic_error("invalid game mode"); + } + blocks.emplace_back(phosg::string_printf( - "
%s %s drop chart (%s mode)
", + "
%s %s drop chart%s
", name_for_episode(episode), name_for_difficulty(difficulty), - name_for_mode(mode))); + mode_token.c_str())); blocks.emplace_back("
"); auto add_location_header = [&](const char* location_name) -> void { diff --git a/src/StaticGameData.cc b/src/StaticGameData.cc index e9767fbe..27e992ae 100644 --- a/src/StaticGameData.cc +++ b/src/StaticGameData.cc @@ -781,7 +781,7 @@ size_t FloorDefinition::limit_for_episode(Episode ep) { switch (ep) { case Episode::EP1: case Episode::EP2: - return 0x11; + return 0x12; case Episode::EP4: return 0x0B; default: