Merge branch 'topaz' of https://github.com/DerpyProjectGroup/topaz in…

…to freedom

# Resolved Conflicts:
#	sql/job_points.sql

.gitignore

@@ -149,7 +149,6 @@ UpgradeLog*.XML
 /depcomp
 /missing
 /install-sh
-/tools/config.yaml
 
 src/common/config.h
 src/common/config.h.in
@@ -200,5 +199,9 @@ cmake_install.cmake
 /conf/server_message.conf
 /conf/server_message_fr.conf
 
+# Tool/misc configs
+/tools/config.yaml
+ip.txt
+
 # Tracy download
 ext/tracy/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "navmeshes"]
 	path = navmeshes
-	url = https://github.com/topaz-next/xiNavmeshes.git
+	url = https://github.com/DerpyProjectGroup/xiNavmeshes.git
+[submodule "xiNavmeshes"]
+	path = xiNavmeshes
+	url = https://github.com/DerpyProjectGroup/xiNavmeshes.git

CONTRIBUTING.md

@@ -12,35 +12,29 @@
 
 # General Guidelines
 
-* By contributing to Topaz Next, either through issues or pull requests, you are expected to abide by the rules laid out here in this Contributing Guide, and in our [Code of Conduct](https://github.com/topaz-next/topaz/blob/release/CODE_OF_CONDUCT.md).
-* Remember that "weaponizing" the code of conduct and purposely trying to use it to trap or harass others is in itself; harassment.
-* We are targetting the final released version of Final Fantasy XI. Until that version is released, we will be targetting the current retail release.
-* We do not support old client installs or DAT file modification. If you want to use or discuss such things, please do it elsewhere.
-* We do not support piracy of any kind. We encourage you to maintain an active retail subscription and support the game we all love.
-* It is not acceptable to 'patch' a missing fight or mechanic to allow other content to be completed. For example: If a quest relies on fishing but fishing doesn't work; that quest should remain blocked until fishing is implemented.
-* Users are encouraged to modify their servers in any whatever way they see fit to achieve their desired experience, especially if that experience doesn't align with our goals.
+* By contributing to Topaz, either through issues or pull requests, you are expected to abide by the rules laid out here in this Contributing Guide.
+* We do not support out-of-date clients or client modification.
+* We do not support piracy of any kind. We encourage you to maintain an active retail subscription and support the game.
 
 # License
 
-* We operate under [GNU General Public License v3.0](https://github.com/topaz-next/topaz/blob/release/LICENSE). This was the license we inherited from our ancestor projects, and we continue using it to maintain maximum compatibility with our shared community. While other licenses are compatible with the GPL3, some impose additional restrictions and responsibilities on end-users. This would result in further splitting of our already small community. As such, we cannot accept contributions that use other more restrictive licenses (such as AGPL3).
+* We operate under [GNU General Public License v3.0](https://github.com/DerpyProjectGroup/topaz/blob/topaz/LICENSE). We do not accept contributions that use other more restrictive licenses (such as AGPL3).
 
 # Workflow Guide
 
 * It is **always** better to come into Discord and ask a question instead of investing a lot of time in work that we're going to ask your to rewrite or split up.
-* Cite your sources for things that aren't obvious. This can be comments in your code, or your commit messages. Pull Request descriptions and comments will get lost over time, information in the repo lasts forever.
+* Cite your sources. This can be comments in your code, or your commit messages. Pull Request descriptions and comments will get lost over time.
 * If you're commiting work on someone else's behalf, use git's `--author` argument so they get the credit they deserve.
 * Make your commit messages meaningful, or amend/rebase once you're ready to push.
 
 # Issue Report Contributions:
 
-* If an issue involves incorrect NPCs or text, please include your client version (type `/ver` in game)
+* If an issue involves incorrect NPCs or text, please include your client and server versions (type `/ver` and `!ver` in game)
 * Unimplemented feature requests must be _retail behavior_, and adequetly cover everything about that feature which is missing.
 * Fill out the templated checkboxes that are preloaded in the issue body. These allow us to diagnose your issue as efficiently as possible, and confirm that you've searched for duplicate issues or recent fixes. 
 
 # Pull Request Contributions:
 
-**By submitting a pull request to Topaz Next, you agree to our [Limited Contributor License Agreement](https://github.com/topaz-next/topaz/blob/release/.github/CONTRIBUTOR_AGREEMENT.md)**
-
 All contributions must be done through pull requests to the Topaz repository. We don't take fixes from Discord to apply ourselves. If you need help with making a pull request, there is a GitHub guide on how to do so. If you still need help after consulting the guide, you can ask for help in Discord and we will be happy to help you.
 
 We prefer submitting early and often, over monolithic and once. If you're implementing a complex feature, please try to submit PRs as you get each smaller functional aspect working (use your best judgment on what counts as a useful PR). This way we can help make sure you're on the right track before you sink a lot of time into implementations we might want done in a different way.
@@ -49,7 +43,7 @@ Please try to leave your PR alone after submission, unless it's to fix bugs you'
 
 After a pull request is made, if a staff member leaves feedback for you to change, you must either fix or address it for your pull request to be merged.
 
-If you do not fill the checkboxes confirming that you agree to Topaz Next's Limited Contributor License Agreement, that you've read the supporting documentation, and that you've tested your code - your PR will not be reviewed.
+If you do not fill the checkboxes confirming that you've read the supporting documentation, and that you've tested your code - your PR will not be reviewed.
 
 # Style Guide
 

DOCKER.md

@@ -1,4 +1,4 @@
-Topaz Next Docker
+Topaz Docker
 ==========
 
 This guide assumes you have Docker (https://www.docker.com/) installed on your machine.

Dockerfile

@@ -16,11 +16,7 @@ ENV XI_DB_NAME=xidb
 WORKDIR /topaz
 
 # Update and install all requirements as well as some useful tools such as net-tools and nano
-RUN apt update && apt install -y net-tools nano build-essential software-properties-common g++-9 luajit-5.1-dev libzmq3-dev luarocks python3.7 cmake pkg-config g++ dnsutils git mariadb-server libluajit-5.1-dev libzmq3-dev autoconf pkg-config zlib1g-dev libssl-dev python3.6-dev libmariadb-dev-compat
-
-RUN apt install -y g++ g++-9 && g++ -v
-
-RUN apt install -y python3 python3-pip && python3 -v
+RUN apt update && apt install -y net-tools nano software-properties-common git python3 python3-pip g++-9 cmake make libluajit-5.1-dev libzmq3-dev libssl-dev zlib1g-dev mariadb-server libmariadb-dev luarocks
 
 # Copy everything from the host machine topaz folder to /topaz
 ADD . /topaz
@@ -33,7 +29,7 @@ COPY /conf/default/* conf/
 RUN pip3 install -r tools/requirements.txt
 
 # Ensure wait_for_db_then_launch.sh is executable
-RUN chmod +x ./wait_for_db_then_launch.sh
+RUN chmod +x ./tools/wait_for_db_then_launch.sh
 
 # Startup the server when the container starts
-ENTRYPOINT ./wait_for_db_then_launch.sh
+ENTRYPOINT ./tools/wait_for_db_then_launch.sh

README.md

@@ -1,26 +1,12 @@
-# Topaz Next 💎
-
-[![release build](https://img.shields.io/github/workflow/status/topaz-next/topaz/build/release?label=release)](https://github.com/topaz-next/topaz/actions?query=workflow%3Abuild+branch%3Arelease)
-[![canary build](https://img.shields.io/github/workflow/status/topaz-next/topaz/build/canary?label=canary)](https://github.com/topaz-next/topaz/actions?query=workflow%3Abuild+branch%3Acanary)
-[![Discord](https://img.shields.io/discord/785766425829572608.svg?label=discord&logo=discord)](https://discord.gg/YvM9mDHGKb)
-[![GitHub contributors](https://img.shields.io/github/contributors/topaz-next/topaz.svg)](https://GitHub.com/topaz-next/topaz/graphs/contributors/)
-![License](https://img.shields.io/github/license/topaz-next/topaz)
+# Topaz
+[![stable build status](https://github.com/DerpyProjectGroup/topaz/badges/stable/pipeline.svg?key_text=stable)](https://github.com/DerpyProjectGroup/topaz/commits/topaz)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 ## Summary
 Welcome to Topaz Next, an open source server emulator for FFXI.
 
-## Current support chat
-https://discord.gg/6EWFPxkZja
-
-## Old Discord
-https://discord.gg/26dAmXTtCa
-
 ## Getting Started
-
-A quick-start guide, frequently asked questions, and a table of "what works" are all available on [our wiki](https://github.com/topaz-next/topaz/wiki).
+A [quick start guide](https://github.com/DerpyProjectGroup/topaz/wikis/Quick-Start-Guide), [frequently asked questions](https://github.com/DerpyProjectGroup/topaz/-/wikis/Frequently-Asked-Questions), and a table of "[what works](https://github.com/DerpyProjectGroup/topaz/-/wikis/What-Works)" are all available on [our wiki](https://github.com/DerpyProjectGroup/topaz/wikis/home).
 
 ## LICENSE
-
-- Topaz Next is descended from Darkstar Project, which was licensed under [GNU GPL v3](https://github.com/topaz-next/topaz/blob/release/LICENSE)
-- Topaz Next is also descended from Project Topaz, which was licensed under [GNU GPL v3](https://github.com/topaz-next/topaz/blob/release/LICENSE)
-- Topaz Next itself is licensed under [GNU GPL v3](https://github.com/topaz-next/topaz/blob/release/LICENSE)
+Topaz is licensed under [GNU GPL v3](https://github.com/DerpyProjectGroup/topaz/blob/topaz/LICENSE)

conf/default/login.conf

@@ -1,4 +1,4 @@
-#Topaz login server conf
+#login server conf
 
 #--------------------------------
 #login server parametres

conf/default/map.conf

@@ -1,4 +1,4 @@
-#Topaz map server conf
+#map server conf
 
 #--------------------------------
 #map server parameters
@@ -80,6 +80,9 @@ exp_rate: 1.0
 exp_loss_rate: 1.0
 exp_party_gap_penalties: 1
 
+# Capacity Point Settings
+capacity_rate: 1.0
+
 #Determines Vana'diel time epoch (886/1/1 Firesday)
 # current timestamp - vanadiel_time_epoch = vana'diel time
 # 0 defaults to SE epoch 1009810800 (JP midnight 1/1/2002)

conf/default/packet_tcp.conf

@@ -1,4 +1,4 @@
-// Topaz tcp sockets Configuration file
+// tcp sockets Configuration file
 
 // Display debug reports (When something goes wrong during the report, the report is saved.)
 debug: no

conf/default/packet_udp.conf

@@ -1,4 +1,4 @@
-// Topaz tcp sockets Configuration file
+// tcp sockets Configuration file
 
 // Display debug reports (When something goes wrong during the report, the report is saved.)
 debug: no

conf/default/search_server.conf

@@ -1,4 +1,4 @@
-#Topaz search server config
+#search server config
 
 #--------------------------------
 #SQL parameters

conf/default/server_message.conf

@@ -1,3 +1,2 @@
-Please visit https://github.com/topaz-next/topaz for the latest information on the project. 
-Do not hesitate to join us on Discord! https://discord.gg/YvM9mDHGKb
+Please visit https://github.com/DerpyProjectGroup/topaz for the latest information on the project. 
 Thank you, and we hope you enjoy Topaz!

conf/default/version.conf

@@ -1,14 +1,9 @@
-#Topaz Version Info
-
 #Expected Client version (wrong version cannot log in)
-CLIENT_VER: 30210204_0
+CLIENT_VER: 30210327_1
 
 #WE STRONGLY ADVISE AGAINST LOCKING THE SERVER TO OLDER VERSIONS. IT IS A UNIVERSALLY BAD IDEA.
 
 #0 - disabled (every version allowed)
-#1 - enabled - strict (only exact CLIENT_VER allowed, default)
-#2 - enabled - greater than or equal  (matching or greater than CLIENT_VER allowed)
+#1 - enabled - strict (only exact CLIENT_VER allowed)
+#2 - enabled - greater than or equal  (matching or greater than CLIENT_VER allowed, default)
 VER_LOCK: 2
-
-#Current Server Version.
-#TOPAZ_VER: R202008-01

docker-compose.yml

@@ -16,7 +16,7 @@ services:
     ports:
       - "3306:3306"
 
-  # Ease of access tool for the DB, you can type in localhost:8080 to get a web interface to the DB. You can log in with root:topazisawesome
+  # Ease of access tool for the DB, you can type in localhost:8080 to get a web interface to the DB. You can log in with root:wheel
   db-admin-portal:
     image: adminer
     restart: always

documentation/AI_Events.txt

@@ -1,39 +1,45 @@
 States/Actions
 
-ABILITY_START - Entity, Ability
-ABILITY_USE - Entity, Target, Ability, action
-ABILITY_STATE_EXIT - Entity, Ability
+TICK - Entity
+ROAM_TICK - Mob
+COMBAT_TICK - Mob
 
-WEAPONSKILL_START - Entity, Skillid
-WEAPONSKILL_USE - Entity, Target, Skillid, TP, action
-WEAPONSKILL_TAKE - Target, Entity, Skillid, TP, action
-WEAPONSKILL_STATE_EXIT - Entity, Skillid
+EFFECTS_TICK - Entity
+EFFECT_GAIN - Entity, Effect
+EFFECT_LOSE - Entity, Effect
 
-MAGIC_START - Entity, Spell, action
-MAGIC_USE - Entity, Target, Spell, action
-MAGIC_STATE_EXIT - Entity, Spell
-MAGIC_TAKE - Target, Entity, Spell, action
+ITEM_START - Entity, Item, action
+ITEM_USE - Entity, Item, action
+ITEM_STATE_EXIT - Entity, Item
+
+WEATHER_CHANGE - Entity, weather, weather element
 
 SPAWN - Entity
-DESPAWN - Entity
-DEATH - Entity, Killer
 ENGAGE - Entity, Target
-DISENGAGE - Entity
-
 ATTACK - Attacker, defender, action
 ATTACKED - Defender, attacker, action
-
-ITEM_START - Entity, Item, action
-ITEM_USE - Entity, Item, action
-ITEM_STATE_EXIT - Entity, Item
-WEATHER_CHANGE - Entity, weather, weather element
+DISENGAGE - Entity
+DEATH - Entity, optionalKiller
+DESPAWN - Entity
 
 EXPERIENCE_POINTS - Entity, exp
 
-TICK - Entity
-EFFECTS_TICK - Entity
-EFFECT_GAIN - Entity, Effect
-EFFECT_LOSE - Entity, Effect
+TAKE_DAMAGE - Entity, amount, optionalAttacker, attackType, damageType
+CRITICAL_TAKE - Target, Attacker
 
-COMBAT_TICK - Mob
-ROAM_TICK - Mob
+RANGE_START - Entity, action
+
+ABILITY_START - Entity, Ability
+ABILITY_USE - Entity, Target, Ability, action
+ABILITY_TAKE - Target, Entity, Ability, action
+ABILITY_STATE_EXIT - Entity, Ability
+
+WEAPONSKILL_STATE_ENTER - Entity, Skillid
+WEAPONSKILL_USE - Entity, Target, Skillid, TP, action
+WEAPONSKILL_TAKE - Target, Entity, Skillid, TP, action
+WEAPONSKILL_STATE_EXIT - Entity, Skillid
+
+MAGIC_START - Entity, Spell, action
+MAGIC_USE - Entity, Target, Spell, action
+MAGIC_STATE_EXIT - Entity, Spell
+MAGIC_TAKE - Target, Entity, Spell, ?action?