fix conflicts

.gitattributes

@@ -32,16 +32,16 @@
 ## For documentation
 
 # Documents
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
+*.doc    diff=astextplain
+*.DOC    diff=astextplain
 *.docx diff=astextplain
 *.DOCX diff=astextplain
 *.dot  diff=astextplain
 *.DOT  diff=astextplain
 *.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.PDF    diff=astextplain
+*.rtf    diff=astextplain
+*.RTF    diff=astextplain
 
 ## DOCUMENTATION
 *.markdown   text

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,72 @@
+name: Bug report
+description: Create a bug report to help us improve.
+title: "Bug: "
+body:
+  - type: textarea
+    id: current
+    attributes:
+      label: Current Behaviour
+      description: |
+        Description of the problem or issue here.
+        Include entries of affected creatures / items / quests / spells etc.
+        If this is a crash, post the crashlog (upload to https://gist.github.com/) and include the link here.
+        Never upload files! Use GIST for text and YouTube for videos!
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behaviour
+      description: |
+        Tell us what should happen instead.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce the problem
+      description: |
+        What does someone else need to do to encounter the same bug?
+      placeholder: |
+        1. Step 1
+        2. Step 2
+        3. Step 3
+    validations:
+      required: true
+  - type: textarea
+    id: extra
+    attributes:
+      label: Extra Notes
+      description: |
+        Do you have any extra notes that can help solve the issue that does not fit any other field?
+      placeholder: |
+        None
+    validations:
+      required: false
+  - type: textarea
+    id: commit
+    attributes:
+      label: AC rev. hash/commit
+      description: |
+        Copy the result of the `.server debug` command (if you need to run it from the client get a prat addon)
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: |
+        The Operating System the Server is running on.
+        i.e. Windows 11 x64, Debian 10 x64, macOS 12, Ubuntu 20.04
+    validations:
+      required: true
+  - type: textarea
+    id: custom
+    attributes:
+      label: Custom changes or Modules
+      description: |
+        List which custom changes or modules you have applied, i.e. Eluna module, etc.
+      placeholder: |
+        None
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,33 @@
+name: Feature request
+description: Suggest an idea for this project
+title: "Feature: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking your time to fill out a feature request. Remember to fill out all fields including the title above. 
+        An issue that is not properly filled out will be closed. 
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe your feature request or suggestion in detail
+      description: |
+        A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe a possible solution to your feature or suggestion in detail
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context or screenshots about the feature request here.
+    validations:
+      required: false

.github/pull_request_template.md

@@ -0,0 +1,24 @@
+<!-- First of all, THANK YOU for your contribution. -->
+
+## Changes Proposed:
+- 
+- 
+
+## Issues Addressed:
+<!-- If your fix has a relating issue, link it below -->
+- Closes
+
+## SOURCE:
+<!-- If you can, include a source that can strengthen your claim -->
+
+## Tests Performed:
+<!-- Does it build without errors? Did you test in-game? What did you test? On which OS did you test? Describe any other tests performed -->
+- 
+- 
+
+## How to Test the Changes:
+<!-- Describe in a detailed step-by-step order how to test the changes -->
+
+1.
+2.
+3.

README.md

@@ -2,6 +2,10 @@
 
 ## mod-skip-dk-starting-area
 
+- Latest build status with azerothcore:
+
+[![Build Status](https://github.com/azerothcore/mod-skip-dk-starting-area/workflows/core-build/badge.svg)](https://github.com/azerothcore/mod-skip-dk-starting-area)
+
 ## Description
 
 - Skips the Death Knight starting zone, for those who want to make a Death Knight without having to go through the starting area.
@@ -15,37 +19,23 @@
 ## Notice
 
 Due to the uniquiness of the module you will get this message on the worldconsole, but nothing is broken. It is due to the npc not exactly having a gossip menu in the database, the script handles the gossip menu because of the additional locales.
-![image](https://user-images.githubusercontent.com/16887899/152654078-7b94c62c-a5e8-42ed-96ed-39ffaacf38b1.png)
 
-Please add the adjustment to the conf to have that error message not show up:
-```
-#    Creatures.CustomIDs
-#        Description: The list of custom creatures with gossip dialogues hardcoded in core,
-#                     divided by "," without spaces.
-#                     It is implied that you do not use for these NPC dialogs data from "gossip_menu" table.
-#                     Server will skip these IDs during the definitions validation process.
-#        Example:     Creatures.CustomIDs = "190010,55005,999991,25462,98888" - Npcs for Transmog, Guild-zone, 1v1-arena modules
-#                                                                               Skip Dk Module, Racial Trait Swap Modules
-#        Default:     ""
-
-Creatures.CustomIDs = "190010,55005,999991,25462,98888"
-```
+![image](https://user-images.githubusercontent.com/16887899/152654078-7b94c62c-a5e8-42ed-96ed-39ffaacf38b1.png)
 
 ## Requirements
 
 - Latest AzerothCore Wotlk commit [de13bf4](https://github.com/azerothcore/azerothcore-wotlk/commit/de13bf426e162ee10cbd5470cec74122d1d4afa0) or newer
 
 ## Installation
 
-1. Simply place the module under the `modules` directory of your AzerothCore source. 
+1. Simply place the module under the `modules` directory of your AzerothCore source.
 2. Re-run CMake and rebuild the AzerothCore source.
-3. Run Sql on world from https://github.com/azerothcore/mod-skip-dk-starting-area/tree/master/sql/world on to the world db.
-## Edit module configuration (optional)
+3. Edit module configuration (optional)
 
 If you need to change the module configuration, go to your server configuration folder (where your worldserver or worldserver.exe is), copy SkipDKModule.conf.dist to SkipDKModule.conf and edit that new file.
 
-### Credits ###
-------------------------------------------------------------------------------------------------------------------
+### Credits
+
 - [acidmanifesto (MDic)](https://github.com/acidmanifesto/TC-Custom-Scripts/tree/main/335%20TC/Official%20Trinitycore%20Custom%20Scripts/Official%20Merged/Skip%20Death%20Knight%20Starter%20Area%20Module)
 - [Jinnaix](https://github.com/Jinnaix) For Translations assistance and sql formatting.
 - AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org/) - [discord chat community](https://discord.gg/PaqQRkd)

conf/SkipDKModule.conf.dist → conf/skip_dk_module.conf.dist

@@ -1,8 +1,5 @@
 [worldserver]
 
-###################################################################################################
-#Skip Death Knight Starting Area#
-#################################
 #
 #    Skip Death Knight Starting Area
 #        Enable this if you want to skip the Deathknight starting area
@@ -12,40 +9,42 @@
 #         Description: Announces Module when player logs in.
 #         Default:    0 - (Disabled)
 #                     1 - (Enabled)
+#
 
 Skip.Deathknight.Starter.Announce.enable = 1
 
+#
 #    Skip.DeathKnight.Starter.Enable
 #         Active Module for all new accounts regardless of account level. Instant Skip on DK Creation.
 #         Default:    0 - (Disabled)
 #                     1 - (Enabled)
+#
 
 Skip.Deathknight.Starter.Enable = 1
 
+#
 #    GM.Skip.Deathknight.Starter.Enable
 #         Active Module for all new accounts of a GM account level ONLY. Instant Skip on DK Creation.
 #         Ensure you have Skip.Deathknight.Starter.Enable set to 0 if using this conf.
 #         Default:    0 - (Disabled)
 #                     1 - (Enabled)
+#
 
 GM.Skip.Deathknight.Starter.Enable = 0
 
+#
 #    Skip.Deathknight.Start.Level
 #         Adjusted Death Knight Start Level if module is used.
 #         Default:    58 - (Default)
+#
+#
 
 Skip.Deathknight.Start.Level = 58
 
+#
 #    Skip.Deathknight.Optional.Enable
 #    Enables optional to skip when talking to lich king on first creation of dk.
 #    Default: 1 - (Active)
+#
 
 Skip.Deathknight.Optional.Enable = 1
-
-#    DeleteGold.Deathknight.Optional.Enable
-#    Enables option to delete all gold reward from quests on skip of dk. To stop this as sort of exploitative gold income.
-#    Default: 1 - (Active)
-
-DeleteGold.Deathknight.Optional.Enable = 1
-#
-###################################################################################################

include.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-## GETS THE CURRENT MODULE ROOT DIRECTORY
-MOD_SKIP_DK_STARTING_AREA_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )"
-
-source $MOD_SKIP_DK_STARTING_AREA_ROOT"/conf/conf.sh.dist"
-
-if [ -f $MOD_SKIP_DK_STARTING_AREA_ROOT"/conf/conf.sh" ]; then
-    source $MOD_SKIP_DK_STARTING_AREA_ROOT"/conf/conf.sh"
-fi