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

rewrite CommonItemSet to support v2

Browse Source
This commit is contained in:
Martin Michelsen
2023-10-26 17:16:04 -07:00
parent 067c28dee5
commit 582fd84f5e
10 changed files with 619 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Lobby.cc
+6 -2
View File
@@ -47,16 +47,20 @@ void Lobby::create_item_creator() {
auto s = this->require_server_state();
shared_ptr<const RareItemSet> rare_item_set;
shared_ptr<const CommonItemSet> common_item_set;
if (this->base_version == GameVersion::BB) {
common_item_set = s->common_item_set_v3;
rare_item_set = s->rare_item_sets.at("rare-table-v4");
} else if (this->base_version == GameVersion::GC || this->base_version == GameVersion::XB) {
common_item_set = s->common_item_set_v3;
rare_item_set = s->rare_item_sets.at("rare-table-v3");
} else {
// TODO: Should there be a separate table for V1 eventually?
// TODO: Should there be separate tables for V1 eventually?
common_item_set = s->common_item_set_v2;
rare_item_set = s->rare_item_sets.at("rare-table-v2");
}
this->item_creator.reset(new ItemCreator(
s->common_item_set,
common_item_set,
rare_item_set,
s->armor_random_set,
s->tool_random_set,