OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 05:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

added mobdata to config

Browse Source
This commit is contained in:
CPunch 2020-09-07 12:54:40 -05:00
parent c8c4ec7d01
commit df655dfe29
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.ini
View File

@ -28,6 +28,8 @@ motd=Welcome to OpenFusion!
npcdata=data/NPCs.json npcdata=data/NPCs.json
# warp target json data # warp target json data
warpdata=data/warps.json warpdata=data/warps.json
# mob json
mobdata=data/mobs.json
# is everyone a GM? # is everyone a GM?
gm=true gm=true

2
src/NPCManager.cpp
View File

@ -45,7 +45,7 @@ void NPCManager::init() {
// load temporary mob dump // load temporary mob dump
try { try {
std::ifstream inFile("data/mobs.json"); // not in settings, since it's temp std::ifstream inFile(settings::MOBJSON); // not in settings, since it's temp
nlohmann::json npcData; nlohmann::json npcData;
// read file into json // read file into json

2
src/settings.cpp
View File

@ -21,6 +21,7 @@ int settings::SPAWN_Z = -4210;
std::string settings::GMPASS = "pass"; std::string settings::GMPASS = "pass";
std::string settings::NPCJSON = "data/NPCs.json"; std::string settings::NPCJSON = "data/NPCs.json";
std::string settings::WARPJSON = "data/warps.json"; std::string settings::WARPJSON = "data/warps.json";
std::string settings::MOBJSON = "data/mobs.json";
std::string settings::MOTDSTRING = "Welcome to OpenFusion!"; std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
bool settings::GM = false; bool settings::GM = false;
@ -50,6 +51,7 @@ void settings::init() {
GMPASS = reader.Get("login", "pass", GMPASS); GMPASS = reader.Get("login", "pass", GMPASS);
NPCJSON = reader.Get("shard", "npcdata", NPCJSON); NPCJSON = reader.Get("shard", "npcdata", NPCJSON);
WARPJSON = reader.Get("shard", "warpdata", WARPJSON); WARPJSON = reader.Get("shard", "warpdata", WARPJSON);
MOBJSON = reader.Get("shard", "mobdata", MOBJSON);
MOTDSTRING = reader.Get("shard", "motd", MOTDSTRING); MOTDSTRING = reader.Get("shard", "motd", MOTDSTRING);
GM = reader.GetBoolean("shard", "gm", GM); GM = reader.GetBoolean("shard", "gm", GM);
} }

1
src/settings.hpp
View File

@ -15,6 +15,7 @@ namespace settings {
extern std::string MOTDSTRING; extern std::string MOTDSTRING;
extern std::string NPCJSON; extern std::string NPCJSON;
extern std::string WARPJSON; extern std::string WARPJSON;
extern std::string MOBJSON;
extern std::string GMPASS; extern std::string GMPASS;
extern bool GM; extern bool GM;