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

fix v1 itemrt conversion

Browse Source
This commit is contained in:
Martin Michelsen
2025-02-25 14:51:52 -08:00
parent ef53a3b269
commit f3b547f93c
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RareItemSet.cc
+21 -3
View File
@@ -386,7 +386,7 @@ RareItemSet::RareItemSet(const phosg::JSON& json, shared_ptr<const ItemNameIndex
std::string RareItemSet::serialize_afs(bool is_v1) const { std::string RareItemSet::serialize_afs(bool is_v1) const {
vector<string> files; vector<string> 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++) { for (uint8_t section_id = 0; section_id < 10; section_id++) {
ParsedRELData rel(this->get_collection(GameMode::NORMAL, Episode::EP1, difficulty, section_id)); ParsedRELData rel(this->get_collection(GameMode::NORMAL, Episode::EP1, difficulty, section_id));
files.emplace_back(rel.serialize(false, is_v1)); files.emplace_back(rel.serialize(false, is_v1));
@@ -648,11 +648,29 @@ string RareItemSet::serialize_html(
</style>\n\ </style>\n\
</head><body>\n"); </head><body>\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( blocks.emplace_back(phosg::string_printf(
"<div class=\"title\">%s %s drop chart (%s mode)</div>", "<div class=\"title\">%s %s drop chart%s</div>",
name_for_episode(episode), name_for_episode(episode),
name_for_difficulty(difficulty), name_for_difficulty(difficulty),
name_for_mode(mode))); mode_token.c_str()));
blocks.emplace_back("<div class=\"table-container\"><table>"); blocks.emplace_back("<div class=\"table-container\"><table>");
auto add_location_header = [&](const char* location_name) -> void { auto add_location_header = [&](const char* location_name) -> void {
src/StaticGameData.cc
+1 -1
View File
@@ -781,7 +781,7 @@ size_t FloorDefinition::limit_for_episode(Episode ep) {
switch (ep) { switch (ep) {
case Episode::EP1: case Episode::EP1:
case Episode::EP2: case Episode::EP2:
return 0x11; return 0x12;
case Episode::EP4: case Episode::EP4:
return 0x0B; return 0x0B;
default: default: