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

Add Academy defaults to the config file

Browse Source
This commit is contained in:
dongresource 2020-12-21 01:58:33 +01:00 committed by Gent S
parent e0808ffcbd
commit bc7f4883a2
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.ini
View File

@ -30,10 +30,15 @@ timeout=60000
simulatemobs=true simulatemobs=true
# little message players see when they enter the game # little message players see when they enter the game
motd=Welcome to OpenFusion! motd=Welcome to OpenFusion!
# NPC json data
npcdata=tdata/NPCs.json
# xdt json data # xdt json data
xdtdata=tdata/xdt.json 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 # mob json
mobdata=tdata/mobs.json mobdata=tdata/mobs.json
# path json # path json
@ -65,11 +70,16 @@ eventmode=0
eventcratechance=10 eventcratechance=10
# spawn coordinates (Z is height) # spawn coordinates (Z is height)
# the supplied defaults are at Sector V (future) # these are for the Future:
spawnx=632032 spawnx=632032
spawny=187177 spawny=187177
spawnz=-5500 spawnz=-5500
# ...and these are for the Academy:
#spawnx=19835
#spawny=108682
#spawnz=8450
# Player location monitor interface configuration # Player location monitor interface configuration
[monitor] [monitor]
enabled=false enabled=false

10
src/settings.cpp
View File

@ -15,10 +15,18 @@ time_t settings::TIMEOUT = 60000;
int settings::VIEWDISTANCE = 25600; int settings::VIEWDISTANCE = 25600;
bool settings::SIMULATEMOBS = true; 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_X = 632032;
int settings::SPAWN_Y = 187177; int settings::SPAWN_Y = 187177;
int settings::SPAWN_Z = -5500; 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; int settings::SPAWN_ANGLE = 130;
std::string settings::NPCJSON = "tdata/NPCs.json"; std::string settings::NPCJSON = "tdata/NPCs.json";
std::string settings::XDTJSON = "tdata/xdt.json"; std::string settings::XDTJSON = "tdata/xdt.json";