From 0e3fac4d34eac988c78acdbf1e313704a60027e4 Mon Sep 17 00:00:00 2001
From: dongresource <dongresource@protonmail.com>
Date: Mon, 4 Jan 2021 17:08:44 +0100
Subject: [PATCH] Updated tdata and changed how the default JSON paths are
 resolved

---
 config.ini       | 25 +++++++++++++------------
 src/settings.cpp | 13 ++++++++++---
 tdata            |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/config.ini b/config.ini
index b3d584a..de375de 100644
--- a/config.ini
+++ b/config.ini
@@ -31,26 +31,27 @@ simulatemobs=true
 # little message players see when they enter the game
 motd=Welcome to OpenFusion!
 
-# xdt json data
-xdtdata=tdata/xdt.json
-# if you want to run the Academy build, comment the previous line
-# and uncomment the next one
-#xdtdata=tdata/xdt_1013.json
+# The following are the default locations of the JSON files the server
+# requires to run. You can override them by changing their values and
+# uncommenting them (removing the leading # character from that line).
 
+# xdt json data
+#xdtdata=tdata/xdt.json
 # NPC json data
-npcdata=tdata/NPCs.json
+#npcdata=tdata/NPCs.json
 # mob json
-mobdata=tdata/mobs.json
+#mobdata=tdata/mobs.json
 # academy mobs & npcs json
-academydata=tdata/academy.json
+#academydata=tdata/1013/academy.json
 # path json
-pathdata=tdata/paths.json
+#pathdata=tdata/paths.json
 # drop json
-dropdata=tdata/drops.json
+#dropdata=tdata/drops.json
 # gruntwork output (this is what you submit)
-gruntwork=tdata/gruntwork.json
+#gruntwork=tdata/gruntwork.json
 # location of the database
-dbpath=database.db
+#dbpath=database.db
+
 # should tutorial flags be disabled off the bat?
 disablefirstuseflag=true
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 7e01ba9..0d721ff 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -29,15 +29,22 @@ int settings::SPAWN_Z = 8450;
 
 int settings::SPAWN_ANGLE = 130;
 std::string settings::NPCJSON = "tdata/NPCs.json";
-std::string settings::XDTJSON = "tdata/xdt.json";
 std::string settings::MOBJSON = "tdata/mobs.json";
-std::string settings::ACADEMYJSON = "tdata/academy.json";
 std::string settings::PATHJSON = "tdata/paths.json";
-std::string settings::DROPSJSON = "tdata/drops.json";
 std::string settings::EGGSJSON = "tdata/eggs.json";
 std::string settings::GRUNTWORKJSON = "tdata/gruntwork.json";
 std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
 std::string settings::DBPATH = "database.db";
+std::string settings::ACADEMYJSON = "tdata/1013/academy.json";
+
+#if PROTOCOL_VERSION == 1013
+std::string settings::XDTJSON = "tdata/1013/xdt.json";
+std::string settings::DROPSJSON = "tdata/1013/drops.json";
+#else
+std::string settings::DROPSJSON = "tdata/drops.json";
+std::string settings::XDTJSON = "tdata/xdt.json";
+#endif
+
 int settings::ACCLEVEL = 1;
 bool settings::DISABLEFIRSTUSEFLAG = true;
 
diff --git a/tdata b/tdata
index 385b298..2d1af8e 160000
--- a/tdata
+++ b/tdata
@@ -1 +1 @@
-Subproject commit 385b298533d3532765bf4fc8179d999297c38814
+Subproject commit 2d1af8e5d6c91135cc66f85e5ca34b9bbe4a3bb3