diff --git a/.attach_pid3023 b/.attach_pid3023 new file mode 100644 index 000000000..e69de29bb diff --git a/.idea/misc.xml b/.idea/misc.xml index 048d263df..b5a2efe52 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f0bf753d0..180cf4750 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,20 @@ - - - - - - + + + + + + + + + + + + + + - + diff --git a/CompiledServer/production/09Scape/data/cache begin.zip b/CompiledServer/production/09Scape/data/cache begin.zip index 7f9139227..7e0e4e7d2 100644 Binary files a/CompiledServer/production/09Scape/data/cache begin.zip and b/CompiledServer/production/09Scape/data/cache begin.zip differ diff --git a/CompiledServer/production/09Scape/data/cache.zip b/CompiledServer/production/09Scape/data/cache.zip index d18a7ef67..9633ea1dd 100644 Binary files a/CompiledServer/production/09Scape/data/cache.zip and b/CompiledServer/production/09Scape/data/cache.zip differ diff --git a/CompiledServer/production/09Scape/data/cacheback up.rar b/CompiledServer/production/09Scape/data/cacheback up.rar index 64d970387..098476238 100644 Binary files a/CompiledServer/production/09Scape/data/cacheback up.rar and b/CompiledServer/production/09Scape/data/cacheback up.rar differ diff --git a/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp b/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp index d47d8013e..5a21fe783 100644 Binary files a/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp and b/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp differ diff --git a/CompiledServer/production/09Scape/data/kratoscache.zip b/CompiledServer/production/09Scape/data/kratoscache.zip index fcf7b882f..f89be5e74 100644 Binary files a/CompiledServer/production/09Scape/data/kratoscache.zip and b/CompiledServer/production/09Scape/data/kratoscache.zip differ diff --git a/CompiledServer/production/09Scape/server.properties b/CompiledServer/production/09Scape/server.properties index 3b032f944..a86078484 100644 --- a/CompiledServer/production/09Scape/server.properties +++ b/CompiledServer/production/09Scape/server.properties @@ -1,11 +1,11 @@ -name=Sparr0w +name=Crandor beta=false sql=true -devMode=false -gui=true +devMode=true +gui=false gameType=economy worldId=1 -country=6 +country=0 activity=Default gameplay members=true pvp=false diff --git a/CompiledServer/production/09Scape/server1.properties b/CompiledServer/production/09Scape/server1.properties index 431878dd2..46b3bb091 100644 --- a/CompiledServer/production/09Scape/server1.properties +++ b/CompiledServer/production/09Scape/server1.properties @@ -1,14 +1,14 @@ -name=Sparr0w +name=Crandor beta=true sql=true devMode=false gui=true gameType=economy worldId=1 -country=6 +country=0 activity=Default gameplay members=true pvp=false quickChat=true lootshare=true -msip=127.0.0.1 +msip=127.0.0.1 \ No newline at end of file diff --git a/CompiledServer/production/09Scape/server2.properties b/CompiledServer/production/09Scape/server2.properties index 79f730bed..8cd6bd174 100644 --- a/CompiledServer/production/09Scape/server2.properties +++ b/CompiledServer/production/09Scape/server2.properties @@ -1,14 +1,14 @@ -name=Sparr0w +name=Crandor beta=false sql=true devMode=true gui=false gameType=economy worldId=2 -country=6 +country=0 activity=Default gameplay members=true pvp=false quickChat=true lootshare=true -msip=127.0.0.1 +msip=127.0.0.1 \ No newline at end of file diff --git a/CompiledServer/production/09Scape/server3.properties b/CompiledServer/production/09Scape/server3.properties index 8a75a525b..cdab7aec2 100644 --- a/CompiledServer/production/09Scape/server3.properties +++ b/CompiledServer/production/09Scape/server3.properties @@ -1,14 +1,14 @@ -name=Sparr0w +name=Crandor beta=false sql=true -devMode=false +devMode=true gui=false gameType=economy worldId=3 -country=6 +country=0 activity=Default gameplay members=true -pvp=true +pvp=false quickChat=true lootshare=true -msip=127.0.0.1 +msip=127.0.0.1 \ No newline at end of file diff --git a/README.md b/README.md index dfbda99d5..7c399ab52 100644 --- a/README.md +++ b/README.md @@ -26,15 +26,15 @@ At any point, if you need help, you are free to join our Discord server at: http ## Step 3: Setting up the Database Since this portion of the guide is operating-system specific, you will either need basic database knowledge or a bit of help. Below are the things that need to be configured. + ### General: -- Configure root@localhost to have the password "password123" +- Configure root@localhost to have no password - Create databases in root named `server` and another named `global` - Import `Server/server.sql` and `Server/global.sql` into their respective databases - Start the database ### Windows: - Download and install [xampp](https://www.apachefriends.org/download.html) -- IMPORTANT TODO: Make the Windows guide include adding the password "password123" - Start the `Apache` and `MySQL` modules - Navigate to http://localhost/phpmyadmin/ - Create 2 new tables named `server` and `global` diff --git a/Server/data/cache begin.zip b/Server/data/cache begin.zip index 7f9139227..7e0e4e7d2 100644 Binary files a/Server/data/cache begin.zip and b/Server/data/cache begin.zip differ diff --git a/Server/data/cache.zip b/Server/data/cache.zip index d18a7ef67..9633ea1dd 100644 Binary files a/Server/data/cache.zip and b/Server/data/cache.zip differ diff --git a/Server/data/cacheback up.rar b/Server/data/cacheback up.rar index 64d970387..098476238 100644 Binary files a/Server/data/cacheback up.rar and b/Server/data/cacheback up.rar differ diff --git a/Server/data/kratoscache.zip b/Server/data/kratoscache.zip index fcf7b882f..f89be5e74 100644 Binary files a/Server/data/kratoscache.zip and b/Server/data/kratoscache.zip differ