From 44989c08fe7b43564cca59f30b447019efdd2dca Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Thu, 12 May 2022 11:49:34 -0700 Subject: [PATCH] move default files to system/players --- .gitignore | 4 +++- src/Player.cc | 4 ++-- system/{blueburst => players}/default.nsa | Bin system/{blueburst => players}/default.nsb | Bin .../default_player_0.nsc} | Bin .../default_player_1.nsc} | Bin .../default_player_10.nsc} | Bin .../default_player_11.nsc} | Bin .../default_player_2.nsc} | Bin .../default_player_3.nsc} | Bin .../default_player_4.nsc} | Bin .../default_player_5.nsc} | Bin .../default_player_6.nsc} | Bin .../default_player_7.nsc} | Bin .../default_player_8.nsc} | Bin .../default_player_9.nsc} | Bin 16 files changed, 5 insertions(+), 3 deletions(-) rename system/{blueburst => players}/default.nsa (100%) rename system/{blueburst => players}/default.nsb (100%) rename system/{blueburst/player_class_0.nsc => players/default_player_0.nsc} (100%) rename system/{blueburst/player_class_1.nsc => players/default_player_1.nsc} (100%) rename system/{blueburst/player_class_10.nsc => players/default_player_10.nsc} (100%) rename system/{blueburst/player_class_11.nsc => players/default_player_11.nsc} (100%) rename system/{blueburst/player_class_2.nsc => players/default_player_2.nsc} (100%) rename system/{blueburst/player_class_3.nsc => players/default_player_3.nsc} (100%) rename system/{blueburst/player_class_4.nsc => players/default_player_4.nsc} (100%) rename system/{blueburst/player_class_5.nsc => players/default_player_5.nsc} (100%) rename system/{blueburst/player_class_6.nsc => players/default_player_6.nsc} (100%) rename system/{blueburst/player_class_7.nsc => players/default_player_7.nsc} (100%) rename system/{blueburst/player_class_8.nsc => players/default_player_8.nsc} (100%) rename system/{blueburst/player_class_9.nsc => players/default_player_9.nsc} (100%) diff --git a/.gitignore b/.gitignore index 1051095f..ea730dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,6 @@ install_manifest.txt # Files modified by the user and/or server that don't have defaults system/config.json system/licenses.nsi -system/players/* +system/players/player_* +system/players/account_* +system/players/bank_* diff --git a/src/Player.cc b/src/Player.cc index 47abf531..10b0716a 100644 --- a/src/Player.cc +++ b/src/Player.cc @@ -350,7 +350,7 @@ string ClientGameData::player_data_filename() const { } string ClientGameData::player_template_filename(uint8_t char_class) { - return string_printf("system/blueburst/player_class_%hhu.nsc", char_class); + return string_printf("system/players/default_player_%hhu.nsc", char_class); } void ClientGameData::create_player( @@ -388,7 +388,7 @@ void ClientGameData::load_account_data() { log(INFO, "[BB/Account] No account data for %s; using default", this->bb_username.c_str()); data.reset(new SavedAccountDataBB( - load_object_file("system/blueburst/default.nsa"))); + load_object_file("system/players/default.nsa"))); if (data->signature != ACCOUNT_FILE_SIGNATURE) { throw runtime_error("default account data header is incorrect"); } diff --git a/system/blueburst/default.nsa b/system/players/default.nsa similarity index 100% rename from system/blueburst/default.nsa rename to system/players/default.nsa diff --git a/system/blueburst/default.nsb b/system/players/default.nsb similarity index 100% rename from system/blueburst/default.nsb rename to system/players/default.nsb diff --git a/system/blueburst/player_class_0.nsc b/system/players/default_player_0.nsc similarity index 100% rename from system/blueburst/player_class_0.nsc rename to system/players/default_player_0.nsc diff --git a/system/blueburst/player_class_1.nsc b/system/players/default_player_1.nsc similarity index 100% rename from system/blueburst/player_class_1.nsc rename to system/players/default_player_1.nsc diff --git a/system/blueburst/player_class_10.nsc b/system/players/default_player_10.nsc similarity index 100% rename from system/blueburst/player_class_10.nsc rename to system/players/default_player_10.nsc diff --git a/system/blueburst/player_class_11.nsc b/system/players/default_player_11.nsc similarity index 100% rename from system/blueburst/player_class_11.nsc rename to system/players/default_player_11.nsc diff --git a/system/blueburst/player_class_2.nsc b/system/players/default_player_2.nsc similarity index 100% rename from system/blueburst/player_class_2.nsc rename to system/players/default_player_2.nsc diff --git a/system/blueburst/player_class_3.nsc b/system/players/default_player_3.nsc similarity index 100% rename from system/blueburst/player_class_3.nsc rename to system/players/default_player_3.nsc diff --git a/system/blueburst/player_class_4.nsc b/system/players/default_player_4.nsc similarity index 100% rename from system/blueburst/player_class_4.nsc rename to system/players/default_player_4.nsc diff --git a/system/blueburst/player_class_5.nsc b/system/players/default_player_5.nsc similarity index 100% rename from system/blueburst/player_class_5.nsc rename to system/players/default_player_5.nsc diff --git a/system/blueburst/player_class_6.nsc b/system/players/default_player_6.nsc similarity index 100% rename from system/blueburst/player_class_6.nsc rename to system/players/default_player_6.nsc diff --git a/system/blueburst/player_class_7.nsc b/system/players/default_player_7.nsc similarity index 100% rename from system/blueburst/player_class_7.nsc rename to system/players/default_player_7.nsc diff --git a/system/blueburst/player_class_8.nsc b/system/players/default_player_8.nsc similarity index 100% rename from system/blueburst/player_class_8.nsc rename to system/players/default_player_8.nsc diff --git a/system/blueburst/player_class_9.nsc b/system/players/default_player_9.nsc similarity index 100% rename from system/blueburst/player_class_9.nsc rename to system/players/default_player_9.nsc