Merge branch 'master' of github.com:azerothcore/mod-guildhouse into H…

…o2x-Innkeeper-location
azerothcore · Apr 8, 2024 · 472a4b4 · 472a4b4
2 parents e4f54d7 + 80db14d
commit 472a4b4
Show file tree

Hide file tree

Showing 20 changed files with 280 additions and 249 deletions.
diff --git a/.git_commit_template.txt b/.git_commit_template.txt
diff --git a/.gitattributes b/.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

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.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
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.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
diff --git a/README.md b/README.md
@@ -1,28 +1,31 @@
 # ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore
-- Latest build status with azerothcore: [![Build Status](https://travis-ci.org/azerothcore/mod-guildhouse.svg?branch=master)](https://travis-ci.org/azerothcore/mod-guildhouse)
-# Guild House Module
 
+- Latest build status with azerothcore:
+
+[![Build Status](https://github.com/azerothcore/mod-guildhouse/actions/workflows/core-build.yml/badge.svg)](https://github.com/azerothcore/mod-guildhouse)
 
-## Important notes
+# Guild House Module
 
-You have to use at least AzerothCore commit [77f1363](https://github.com/azerothcore/azerothcore-wotlk/commit/77f13636b75f9b25fc1290e297cd002e7df3c89b).
+> [!IMPORTANT]
+> You have to use at least AzerothCore commit [77f1363](https://github.com/azerothcore/azerothcore-wotlk/commit/77f13636b75f9b25fc1290e297cd002e7df3c89b).
 
 ## Description
 
 This is a phased guild house system for AzerothCore, it allows players from the same guild to visit their guild house.
+
 All guilds will get their own phasing system and then the guild master can purchase NPC creatures and other stuff to complete the Guild House.
 
 ### Purchasables
 
-* Class Trainers (all available in Wrath)
-* Primary Profession Trainers (all available in Wrath)
-* Secondary Profession Trainers (all available in Wrath)
-* Vendors: Reagents Vendor, Food & Drink, Trade Goods, Ammo & Repair Vendor, and Poisons Vendor
-* Portals to Neutral, Horde and Alliance cities
-* Spirit Healer
-* Guild Bank and Personal Bank access
-* Auctioneer/Neutral Auctioneer
-* Stable Master
+- Class Trainers (all available in Wrath)
+- Primary Profession Trainers (all available in Wrath)
+- Secondary Profession Trainers (all available in Wrath)
+- Vendors: Reagents Vendor, Food & Drink, Trade Goods, Ammo & Repair Vendor, and Poisons Vendor
+- Portals to Neutral, Horde and Alliance cities
+- Spirit Healer
+- Guild Bank and Personal Bank access
+- Auctioneer/Neutral Auctioneer
+- Stable Master
 
 ## How to use ingame
 
@@ -36,8 +39,7 @@ All guilds will get their own phasing system and then the guild master can purch
 
 ```
 1) Place the module under the `modules` directory of your AzerothCore source.
-2) Import the SQL files manually to the right Database (auth, world or characters)
-3) Re-run cmake and launch a clean build of AzerothCore.
+2) Re-run cmake and launch a clean build of AzerothCore.
 ```
 
 ## Edit module configuration (optional)
@@ -46,10 +48,10 @@ If you need to change the module configuration, go to your server configuration
 
 ## Credits
 
-* [Talamortis](https://github.com/talamortis) (Original author of the module)
-* [Rochet2](https://github.com/Rochet2/): Thanks for the help with the phasing situation & General support
-* [rbedfordpro](https://github.com/rbedfordpro) & [WiZZy](https://github.com/wizzymore)
-* [Nelnamara - Porkserver](https://github.com/Porkserver) & [SoulSeekkor](https://github.com/SoulSeekkor) 2022 rework, crash fixes and new additions
-* [Bogir](https://github.com/Bogir) For being amazing and forever helpful
+- [Talamortis](https://github.com/talamortis) (Original author of the module)
+- [Rochet2](https://github.com/Rochet2/): Thanks for the help with the phasing situation & General support
+- [rbedfordpro](https://github.com/rbedfordpro) & [WiZZy](https://github.com/wizzymore)
+- [Nelnamara - Porkserver](https://github.com/Porkserver) & [SoulSeekkor](https://github.com/SoulSeekkor) 2022 rework, crash fixes and new additions
+- [Bogir](https://github.com/Bogir) For being amazing and forever helpful
 
 AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org/) - [discord chat community](https://discord.gg/64FH6Y8)
diff --git a/sql/auth/.gitkeep → conf/.gitkeep b/sql/auth/.gitkeep → conf/.gitkeep
diff --git a/conf/conf.sh.dist b/conf/conf.sh.dist
diff --git a/sql/characters/.gitkeep → data/.gitkeep b/sql/characters/.gitkeep → data/.gitkeep
diff --git a/sql/world/.gitkeep → data/sql/db-characters/.gitkeep b/sql/world/.gitkeep → data/sql/db-characters/.gitkeep
diff --git a/sql/characters/guildhouse.sql → ...l/db-characters/2024_04_07_guildhouse.sql b/sql/characters/guildhouse.sql → ...l/db-characters/2024_04_07_guildhouse.sql
diff --git a/data/sql/db-world/.gitkeep b/data/sql/db-world/.gitkeep
diff --git a/sql/world/creatures_objects.sql → ...world/2024_04_07_00_creatures_objects.sql b/sql/world/creatures_objects.sql → ...world/2024_04_07_00_creatures_objects.sql
diff --git a/sql/world/guildhouse_spawns.sql → ...world/2024_04_07_01_guildhouse_spawns.sql b/sql/world/guildhouse_spawns.sql → ...world/2024_04_07_01_guildhouse_spawns.sql
diff --git a/include.sh b/include.sh
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-MOD_GUILDHOUSE_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )"
-
-source $MOD_GUILDHOUSE_ROOT"/conf/conf.sh.dist"
-
-if [ -f $MOD_GUILDHOUSE_ROOT"/conf/conf.sh" ]; then
-    source $MOD_GUILDHOUSE_ROOT"/conf/conf.sh"
-fi

diff --git a/pull_request_template.md b/pull_request_template.md
@@ -0,0 +1,25 @@
+<!-- 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.
diff --git a/setup_git_commit_template.sh b/setup_git_commit_template.sh
diff --git a/sql/README.md b/sql/README.md
diff --git a/src/loader.cpp b/src/loader.cpp
@@ -1,7 +1,8 @@
 void AddGuildHouseScripts();
 void AddGuildHouseButlerScripts();
 
-void Addmod_guildhouseScripts() {
+void Addmod_guildhouseScripts()
+{
     AddGuildHouseScripts();
     AddGuildHouseButlerScripts();
 }