Minor refactoring
This commit is contained in:
Vladislav Khorev committed
1 parent
794a820be9
commit
9d8ca865c7
22 files changed
+23
-23
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+22
-22
@@ -247,7 +247,7 @@ namespace ZL
|
|||||||
|
|
||||||
std::cout << "Load resurces step 4" << std::endl;
|
std::cout << "Load resurces step 4" << std::endl;
|
||||||
|
|
||||||
ItemRegistry::instance().loadFromJson("resources/config2/items.json", CONST_ZIP_FILE);
|
ItemRegistry::instance().loadFromJson("resources/config/items.json", CONST_ZIP_FILE);
|
||||||
|
|
||||||
createLocations();
|
createLocations();
|
||||||
|
|
||||||
@@ -317,7 +317,7 @@ namespace ZL
|
|||||||
gameState.chatHistory[i].clear();
|
gameState.chatHistory[i].clear();
|
||||||
}
|
}
|
||||||
gameState.inventory.items.clear();
|
gameState.inventory.items.clear();
|
||||||
gameState.questJournal.loadFromFile("resources/quests/quests.json", CONST_ZIP_FILE);
|
gameState.questJournal.loadFromFile("resources/config/quests.json", CONST_ZIP_FILE);
|
||||||
createLocations();
|
createLocations();
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -366,8 +366,8 @@ namespace ZL
|
|||||||
|
|
||||||
|
|
||||||
LocationSetup uniInteriorParams;
|
LocationSetup uniInteriorParams;
|
||||||
uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_interior_x.json";
|
uniInteriorParams.gameObjectsJsonPath = "resources/config/gameobjects_uni_interior_x.json";
|
||||||
uniInteriorParams.npcsJsonPath = "resources/config2/npcs_uni_interior.json";
|
uniInteriorParams.npcsJsonPath = "resources/config/npcs_uni_interior.json";
|
||||||
uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues_009.json";
|
uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues_009.json";
|
||||||
|
|
||||||
uniInteriorParams.navigationJsonPaths = {
|
uniInteriorParams.navigationJsonPaths = {
|
||||||
@@ -431,11 +431,11 @@ namespace ZL
|
|||||||
"resources/navigation/uni_interior3_darklands_all_open.json"
|
"resources/navigation/uni_interior3_darklands_all_open.json"
|
||||||
};*/
|
};*/
|
||||||
|
|
||||||
uniInteriorParams.teleportsJsonPath = "resources/config2/teleports_uni_interior.json";
|
uniInteriorParams.teleportsJsonPath = "resources/config/teleports_uni_interior.json";
|
||||||
uniInteriorParams.triggerZonesJsonPath = "resources/config2/trigger_zones_uni_interior.json";
|
uniInteriorParams.triggerZonesJsonPath = "resources/config/trigger_zones_uni_interior.json";
|
||||||
uniInteriorParams.lightsJsonPath = "resources/config2/lights_uni_interior.json";
|
uniInteriorParams.lightsJsonPath = "resources/config/lights_uni_interior.json";
|
||||||
uniInteriorParams.scriptPath = "resources/start_uni_interior.lua";
|
uniInteriorParams.scriptPath = "resources/start_uni_interior.lua";
|
||||||
uniInteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_interior_x.json";
|
uniInteriorParams.interactiveObjectsJsonPath = "resources/config/interactive_objects_uni_interior_x.json";
|
||||||
uniInteriorParams.playerPosition = Eigen::Vector3f(0.942694, 0, -9.63104);
|
uniInteriorParams.playerPosition = Eigen::Vector3f(0.942694, 0, -9.63104);
|
||||||
|
|
||||||
gameState.locations["uni_interior"] = std::make_shared<Location>(renderer, gameState.inventory);
|
gameState.locations["uni_interior"] = std::make_shared<Location>(renderer, gameState.inventory);
|
||||||
@@ -468,8 +468,8 @@ namespace ZL
|
|||||||
audioPlayer->crossFadeMusicFromPositionAsync("audio/bishkek fight calm.ogg");
|
audioPlayer->crossFadeMusicFromPositionAsync("audio/bishkek fight calm.ogg");
|
||||||
};
|
};
|
||||||
LocationSetup uniExteriorParams = uniInteriorParams;
|
LocationSetup uniExteriorParams = uniInteriorParams;
|
||||||
uniExteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_exterior_x.json";
|
uniExteriorParams.gameObjectsJsonPath = "resources/config/gameobjects_uni_exterior_x.json";
|
||||||
uniExteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_exterior_x.json";
|
uniExteriorParams.interactiveObjectsJsonPath = "resources/config/interactive_objects_uni_exterior_x.json";
|
||||||
//uniExteriorParams.navigationJsonPaths = {"resources/navigation/uni_exterior3_all.json"};
|
//uniExteriorParams.navigationJsonPaths = {"resources/navigation/uni_exterior3_all.json"};
|
||||||
|
|
||||||
uniExteriorParams.navigationJsonPaths = {
|
uniExteriorParams.navigationJsonPaths = {
|
||||||
@@ -482,12 +482,12 @@ namespace ZL
|
|||||||
"resources/navigation/uni_exterior3_trees.txt",
|
"resources/navigation/uni_exterior3_trees.txt",
|
||||||
};*/
|
};*/
|
||||||
|
|
||||||
uniExteriorParams.teleportsJsonPath = "resources/config2/teleports_uni_exterior.json";
|
uniExteriorParams.teleportsJsonPath = "resources/config/teleports_uni_exterior.json";
|
||||||
uniExteriorParams.triggerZonesJsonPath = "resources/config2/trigger_zones_uni_exterior.json";
|
uniExteriorParams.triggerZonesJsonPath = "resources/config/trigger_zones_uni_exterior.json";
|
||||||
uniExteriorParams.lightsJsonPath = "resources/config2/lights_uni_exterior.json";
|
uniExteriorParams.lightsJsonPath = "resources/config/lights_uni_exterior.json";
|
||||||
uniExteriorParams.scriptPath = "resources/start_uni_exterior.lua";
|
uniExteriorParams.scriptPath = "resources/start_uni_exterior.lua";
|
||||||
uniExteriorParams.playerPosition = Eigen::Vector3f(5, 0, -18.4);
|
uniExteriorParams.playerPosition = Eigen::Vector3f(5, 0, -18.4);
|
||||||
uniExteriorParams.npcsJsonPath = "resources/config2/npcs_uni_exterior.json";
|
uniExteriorParams.npcsJsonPath = "resources/config/npcs_uni_exterior.json";
|
||||||
uniExteriorParams.dialoguesJsonPath = "resources/dialogue/uni_exterior_dialogues002.json";
|
uniExteriorParams.dialoguesJsonPath = "resources/dialogue/uni_exterior_dialogues002.json";
|
||||||
|
|
||||||
|
|
||||||
@@ -509,11 +509,11 @@ namespace ZL
|
|||||||
gameState.locations["uni_exterior"]->player->state.onDeathAnimComplete = [this]() { startDarklandsTransition(); };
|
gameState.locations["uni_exterior"]->player->state.onDeathAnimComplete = [this]() { startDarklandsTransition(); };
|
||||||
|
|
||||||
LocationSetup params_dorm;
|
LocationSetup params_dorm;
|
||||||
//params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm.json";
|
//params_dorm.gameObjectsJsonPath = "resources/config/gameobjects_dorm.json";
|
||||||
//params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm_trees001.json";
|
//params_dorm.gameObjectsJsonPath = "resources/config/gameobjects_dorm_trees001.json";
|
||||||
params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm_new_x.json";
|
params_dorm.gameObjectsJsonPath = "resources/config/gameobjects_dorm_new_x.json";
|
||||||
|
|
||||||
params_dorm.npcsJsonPath = "resources/config2/npcs_dorm.json";
|
params_dorm.npcsJsonPath = "resources/config/npcs_dorm.json";
|
||||||
params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues003.json";
|
params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues003.json";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -544,11 +544,11 @@ namespace ZL
|
|||||||
"resources/navigation/dorm0_large.json",
|
"resources/navigation/dorm0_large.json",
|
||||||
"resources/navigation/dorm0_large.json",
|
"resources/navigation/dorm0_large.json",
|
||||||
};*/
|
};*/
|
||||||
params_dorm.teleportsJsonPath = "resources/config2/teleports_dorm.json";
|
params_dorm.teleportsJsonPath = "resources/config/teleports_dorm.json";
|
||||||
params_dorm.triggerZonesJsonPath = "resources/config2/trigger_zones_dorm.json";
|
params_dorm.triggerZonesJsonPath = "resources/config/trigger_zones_dorm.json";
|
||||||
params_dorm.lightsJsonPath = "resources/config2/lights_dorm.json";
|
params_dorm.lightsJsonPath = "resources/config/lights_dorm.json";
|
||||||
params_dorm.scriptPath = "resources/start_dorm.lua";
|
params_dorm.scriptPath = "resources/start_dorm.lua";
|
||||||
params_dorm.interactiveObjectsJsonPath = "resources/config2/interactive_objects_dorm_x.json";
|
params_dorm.interactiveObjectsJsonPath = "resources/config/interactive_objects_dorm_x.json";
|
||||||
params_dorm.playerPosition = Eigen::Vector3f(6.76345, 0, -14.6022);
|
params_dorm.playerPosition = Eigen::Vector3f(6.76345, 0, -14.6022);
|
||||||
|
|
||||||
gameState.locations["location_dorm"] = std::make_shared<Location>(renderer, gameState.inventory);
|
gameState.locations["location_dorm"] = std::make_shared<Location>(renderer, gameState.inventory);
|
||||||
|
|||||||
+1
-1
@@ -176,7 +176,7 @@ namespace ZL {
|
|||||||
texItemSelected_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/ButtonBkg001.png", zipFile, true);
|
texItemSelected_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/ButtonBkg001.png", zipFile, true);
|
||||||
texItemTransparent_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/ButtonBkgTransparent001.png", zipFile, true);
|
texItemTransparent_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/ButtonBkgTransparent001.png", zipFile, true);
|
||||||
|
|
||||||
gameState_.questJournal.loadFromFile("resources/quests/quests.json", zipFile);
|
gameState_.questJournal.loadFromFile("resources/config/quests.json", zipFile);
|
||||||
|
|
||||||
renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/quest_new001.png", zipFile, true);
|
renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/quest_new001.png", zipFile, true);
|
||||||
renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/quest_completed001.png", zipFile, true);
|
renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/quest_completed001.png", zipFile, true);
|
||||||
|
|||||||
Reference in new issue
Block a user