From bc7f4883a2568496a3f2a59cce3b4703780d7ccd Mon Sep 17 00:00:00 2001
From: dongresource <dongresource@protonmail.com>
Date: Mon, 21 Dec 2020 01:58:33 +0100
Subject: [PATCH] Add Academy defaults to the config file

---
 config.ini       | 16 +++++++++++++---
 src/settings.cpp | 10 +++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/config.ini b/config.ini
index d8b9239..6260221 100644
--- a/config.ini
+++ b/config.ini
@@ -30,10 +30,15 @@ timeout=60000
 simulatemobs=true
 # little message players see when they enter the game
 motd=Welcome to OpenFusion!
-# NPC json data
-npcdata=tdata/NPCs.json
+
 # 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
+
+# NPC json data
+npcdata=tdata/NPCs.json
 # mob json
 mobdata=tdata/mobs.json
 # path json
@@ -65,11 +70,16 @@ eventmode=0
 eventcratechance=10
 
 # spawn coordinates (Z is height)
-# the supplied defaults are at Sector V (future)
+# these are for the Future:
 spawnx=632032
 spawny=187177
 spawnz=-5500
 
+# ...and these are for the Academy:
+#spawnx=19835
+#spawny=108682
+#spawnz=8450
+
 # Player location monitor interface configuration
 [monitor]
 enabled=false
diff --git a/src/settings.cpp b/src/settings.cpp
index 8f4d0a3..1ca0e06 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -15,10 +15,18 @@ time_t settings::TIMEOUT = 60000;
 int settings::VIEWDISTANCE = 25600;
 bool settings::SIMULATEMOBS = true;
 
-// default spawn point is Sector V (future)
+// default spawn point
+#ifndef ACADEMY
+// Sector V (future)
 int settings::SPAWN_X = 632032;
 int settings::SPAWN_Y = 187177;
 int settings::SPAWN_Z = -5500;
+#else
+int settings::SPAWN_X = 19835;
+int settings::SPAWN_Y = 108682;
+int settings::SPAWN_Z = 8450;
+#endif
+
 int settings::SPAWN_ANGLE = 130;
 std::string settings::NPCJSON = "tdata/NPCs.json";
 std::string settings::XDTJSON = "tdata/xdt.json";