From dd9f4b3302188f142898627142387888f245247e Mon Sep 17 00:00:00 2001
From: ceikry <ironceikry@gmail.com>
Date: Wed, 1 Jun 2022 19:25:54 -0500
Subject: [PATCH] Updated config

---
 worldprops/default.conf | 72 +++++++++++++++++++++++++++++++++++++++++
 worldprops/default.json | 60 ----------------------------------
 2 files changed, 72 insertions(+), 60 deletions(-)
 create mode 100644 worldprops/default.conf
 delete mode 100644 worldprops/default.json

diff --git a/worldprops/default.conf b/worldprops/default.conf
new file mode 100644
index 0000000..f995188
--- /dev/null
+++ b/worldprops/default.conf
@@ -0,0 +1,72 @@
+[server]
+#Secret key - this is sent by the client during login.
+#Client/Server MUST match or connection is refused.
+secret_key = "2009scape_development"
+write_logs = true
+msip = "127.0.0.1"
+
+[database]
+database_name = "global"
+database_username = "root"
+database_password = ""
+database_address = "127.0.0.1"
+database_port = "3306"
+
+
+[world]
+name = "2009scape"
+debug = false
+dev = false
+start_gui = false
+daily_restart = false
+#world number
+world_id = "1"
+country_id = "0"
+members = true
+#activity as displayed on the world list
+activity = "Singleplayer"
+pvp = false
+default_xp_rate = 5.0
+allow_slayer_reroll = false
+#enables a default clan for players to join automatically. Should be an account with the same name as @name, with a clan set up already.
+enable_default_clan = true
+enable_bots = true
+#message of the week model ID, 0 for random
+motw_identifier = "0"
+#text shown for message of the week - @name will be replaced with the name property set above.
+motw_text = "Welcome to @name!"
+#the coordinates new players spawn at
+new_player_location = "2524,5002,0"
+#the location of home teleport
+home_location = "3222,3218,0"
+autostock_ge = false
+allow_token_purchase = true
+skillcape_perks = true
+increased_door_time = false
+enable_botting = false
+max_adv_bots = 100
+wild_pvp_enabled = false
+jad_practice_enabled = true
+personalized_shops = true
+bots_influence_ge_price = false
+
+[paths]
+#path to the data folder, which contains the cache subfolder and such
+data_path = "data"
+#in the lines below, @data will be replaced with the value set for data_path
+cache_path = "@data/cache"
+store_path = "@data/serverstore"
+save_path = "@data/players"
+configs_path = "@data/configs"
+#this is where economy/grand exchange data gets saved
+grand_exchange_data_path = "@data/eco"
+#path to file defining the rare drop table
+rare_drop_table_path = "@data/RDT.xml"
+#path to file defining c.ele minor drop table
+cele_drop_table_path = "@data/CELEDT.xml"
+#path to file containing boot-time object changes
+object_parser_path = "@data/ObjectParser.xml"
+#path logs are written to
+logs_path = "@data/logs"
+bot_data = "@data/botdata"
+eco_data = "@data/eco"
\ No newline at end of file
diff --git a/worldprops/default.json b/worldprops/default.json
deleted file mode 100644
index f0f73d4..0000000
--- a/worldprops/default.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "2009scape",
-
-  "GameSettings": {
-    "debug": false,
-    "dev": false,
-    "startGui": false,
-    "worldID":"1",
-    "countryID": "0",
-    "activity": "2009scape classic.",
-    "pvpWorld": false,
-    "msip": "127.0.0.1",
-    "default_xp_rate": "5",
-    "allow_slayer_reroll": false,
-    "enable_default_clan": true,
-    "enable_bots": true,
-    "autostock_ge": true,
-    "allow_token_purchase": true,
-    "max_adv_bots": "0",
-    "message_of_the_week_identifier": "0",
-    "message_of_the_week_text": "Welcome to 2009Scape! <br><col=11ff00>N</col><col=ecff00>o</col><col=ff8300>w</col <col=ff0000>i</col><col=ff00d4>n</col> <col=6100ff>T</col><col=000fff>e</col><col=00f0ff>c</col><col=00ff59>h</col><col=93ff00>n</col><col=ff9e00>i</col><col=ff0000>c</col><col=ff00d1>o</col><col=2700ff>l</col><col=00f7ff>o</col><col=00ff0c>r</col><col=ff0000>!</col>"
-  },
-
-  "ServerSettings": {
-    "writeLogs": true,
-    "max_players": "2000",
-    "max_npcs": "32000",
-    "new_player_location": "2524,5002,0",
-    "home_location": "3222,3218,0",
-    "data_path": "data",
-    "cache_path": "./data/cache",
-    "store_path": "./data/store",
-    "save_path": "./data/players",
-    "configs_path": "./data/configs",
-    "grand_exchange_data_path": "./data/eco/",
-    "rare_drop_table_path": "./data/RDT.xml",
-    "object_parser_path": "./data/ObjectParser.xml",
-    "scripts_path": "scripts/",
-    "dialogue_scripts_path": "scripts/dialogue/",
-    "logs_path": "data/logs/",
-    "bot_data_path": "data/botdata/",
-    "database_name": "global",
-    "database_username": "root",
-    "database_password": "",
-    "database_address": "127.0.0.1",
-    "database_port": "3306",
-    "ms_secret_key": "2009scape_development"
-  },
-
-  "PluginToggles": {
-    "Trivia": false,
-    "RPS": false,
-    "Boredom": false,
-    "ShootingStars": true,
-    "MysteryBox": true,
-    "PKZone": false,
-    "ObjectParser": true,
-    "BlackJack": false
-  }
-}
\ No newline at end of file