Fix up issues with reading test configs in non-testing mode and unncessary normal config variables stored for reading in testing mode. Release Build 12197.
This commit is contained in:
parent
532d846ea4
commit
2b77818001
@ -171,12 +171,12 @@ AiL::AiL(bool testingMode){
|
||||
#pragma region Extra Config Initializations
|
||||
if(TestingModeEnabled()){ //Unit Test-specific custom configurations.
|
||||
std::string CONFIG_PATH = "config_path"_S;
|
||||
std::string ITEM_CONFIG = CONFIG_PATH + "item_config"_S;
|
||||
std::string ITEM_SET_CONFIG = CONFIG_PATH + "item_set_config"_S;
|
||||
ITEM_CONFIG = CONFIG_PATH + "item-test_config"_S;
|
||||
ITEM_SET_CONFIG = CONFIG_PATH + "item_set-test_config"_S;
|
||||
std::string ITEM_CONFIG = CONFIG_PATH + "item-test_config"_S;
|
||||
std::string ITEM_SET_CONFIG = CONFIG_PATH + "item_set-test_config"_S;
|
||||
std::string ITEM_ENCHANTS_CONFIG = CONFIG_PATH + "Item Enchants Test Config"_S;
|
||||
utils::datafile::Read(DATA,ITEM_CONFIG,',',datafile::OverwriteMode::OVERWRITE);
|
||||
utils::datafile::Read(DATA,ITEM_SET_CONFIG,',',datafile::OverwriteMode::OVERWRITE);
|
||||
utils::datafile::Read(DATA,ITEM_ENCHANTS_CONFIG,',',datafile::OverwriteMode::OVERWRITE);
|
||||
auto keys=DATA.GetProperty("ItemConfiguration");
|
||||
for(auto&[key,value]:keys){
|
||||
std::string config=DATA["ItemConfiguration"][key].GetString();
|
||||
@ -233,9 +233,11 @@ void InitializeGameConfigurations(){
|
||||
{
|
||||
std::string ITEM_CONFIG = CONFIG_PATH + "item_config"_S;
|
||||
std::string ITEM_SET_CONFIG = CONFIG_PATH + "item_set_config"_S;
|
||||
std::string ITEM_ENCHANT_CONFIG = CONFIG_PATH + "Item Enchants"_S;
|
||||
|
||||
utils::datafile::Read(DATA,ITEM_CONFIG);
|
||||
utils::datafile::Read(DATA,ITEM_SET_CONFIG);
|
||||
utils::datafile::Read(DATA,ITEM_ENCHANT_CONFIG);
|
||||
}
|
||||
|
||||
std::string ITEM_STATS_CONFIG = CONFIG_PATH + "item_stats_config"_S;
|
||||
|
@ -39,7 +39,7 @@ All rights reserved.
|
||||
#define VERSION_MAJOR 1
|
||||
#define VERSION_MINOR 3
|
||||
#define VERSION_PATCH 0
|
||||
#define VERSION_BUILD 12194
|
||||
#define VERSION_BUILD 12197
|
||||
|
||||
#define stringify(a) stringify_(a)
|
||||
#define stringify_(a) #a
|
||||
|
@ -67,6 +67,12 @@ item_set_config = items/ItemSets.txt
|
||||
# Item Set Unit Testing Config
|
||||
item_set-test_config = items/ItemSets-test.txt
|
||||
|
||||
# Item Enchants Config
|
||||
Item Enchants = items/ItemEnchants.txt
|
||||
|
||||
# Item enchants unit testing config
|
||||
Item Enchants Test Config = items/ItemEnchants-test.txt
|
||||
|
||||
# Path to items configuration
|
||||
item_directory = items/
|
||||
|
||||
|
@ -1,15 +1,11 @@
|
||||
ItemConfiguration
|
||||
{
|
||||
Item Database = ItemDatabase.txt
|
||||
Item Enchants = ItemEnchants.txt
|
||||
Item Scripts = ItemScript.txt
|
||||
Item Categories = ItemCategory.txt
|
||||
Equipment = Equipment.txt
|
||||
Weapons = Weapons.txt
|
||||
Accessories = Accessories.txt
|
||||
|
||||
# Item enchants unit testing config
|
||||
Item Enchants Test Config = ItemEnchants-test.txt
|
||||
}
|
||||
Item
|
||||
{
|
||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user