Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
hatersgit authored Nov 30, 2023
2 parents b57149a + 2818e1f commit 287b22a
Show file tree
Hide file tree
Showing 69 changed files with 5,290 additions and 642 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ CREATE TABLE `acore_world`.`forge_mythic_criteria` (
INSERT INTO acore_world.forge_mythic_criteria (id, `instance`, `type`, value) VALUES(1, 389, 0, 11520);
INSERT INTO acore_world.forge_mythic_criteria (id, `instance`, `type`, value) VALUES(2, 389, 1, 5);

DELETE FROM acore_world.itemrandomsuffix_dbc where ID in (102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150)
DELETE FROM acore_world.itemrandomsuffix_dbc where ID in (102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150);
INSERT INTO acore_world.itemrandomsuffix_dbc (ID, Name_Lang_enUS, Name_Lang_enGB, Name_Lang_koKR, Name_Lang_frFR, Name_Lang_deDE, Name_Lang_enCN, Name_Lang_zhCN, Name_Lang_enTW, Name_Lang_zhTW, Name_Lang_esES, Name_Lang_esMX, Name_Lang_ruRU, Name_Lang_ptPT, Name_Lang_ptBR, Name_Lang_itIT, Name_Lang_Unk, Name_Lang_Mask, InternalName, Enchantment_1, Enchantment_2, Enchantment_3, Enchantment_4, Enchantment_5, AllocationPct_1, AllocationPct_2, AllocationPct_3, AllocationPct_4, AllocationPct_5)
VALUES
(102, '+2' , NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 16712190, 'm+2' , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
DROP TABLE IF EXISTS `acore_world`.`forge_talent_exclusive`;
DROP TABLE IF EXISTS `acore_characters`.`forge_character_node_choices`;
CREATE TABLE `acore_characters`.`forge_character_node_choices` (
`guid` INT UNSIGNED NOT NULL,
`spec` INT UNSIGNED NOT NULL,
`tabId` INT UNSIGNED NOT NULL,
`node` TINYINT UNSIGNED NOT NULL,
`choice` INT UNSIGNED NOT NULL,
PRIMARY KEY (`guid`, `spec`, `tabId`, `node`));

DROP TABLE IF EXISTS `acore_world`.`forge_talent_choice_nodes`;
CREATE TABLE `acore_world`.`forge_talent_choice_nodes` (
`choiceNodeId` MEDIUMINT UNSIGNED NOT NULL,
`talentTabId` INT UNSIGNED NOT NULL,
`choiceSpellId` MEDIUMINT UNSIGNED NOT NULL,
PRIMARY KEY (`choiceNodeId`, `talentTabId`, `choiceSpellId`));

ALTER TABLE `acore_world`.`forge_talents`
ADD COLUMN `nodeType` TINYINT NOT null default 0;
8 changes: 8 additions & 0 deletions modules/mod-anti-cheat/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[*]
charset = utf-8
indent_style = space
indent_size = 4
tab_width = 4
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 80
105 changes: 105 additions & 0 deletions modules/mod-anti-cheat/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
## AUTO-DETECT
## Handle line endings automatically for files detected as
## text and leave all files detected as binary untouched.
## This will handle all files NOT defined below.
* text=auto eol=lf

# Text
*.conf text
*.conf.dist text
*.cmake text

## Scripts
*.sh text
*.fish text
*.lua text

## SQL
*.sql text

## C++
*.c text
*.cc text
*.cxx text
*.cpp text
*.c++ text
*.hpp text
*.h text
*.h++ text
*.hh text


## For documentation

# Documents
*.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

## DOCUMENTATION
*.markdown text
*.md text
*.mdwn text
*.mdown text
*.mkd text
*.mkdn text
*.mdtxt text
*.mdtext text
*.txt text
AUTHORS text
CHANGELOG text
CHANGES text
CONTRIBUTING text
COPYING text
copyright text
*COPYRIGHT* text
INSTALL text
license text
LICENSE text
NEWS text
readme text
*README* text
TODO text

## GRAPHICS
*.ai binary
*.bmp binary
*.eps binary
*.gif binary
*.ico binary
*.jng binary
*.jp2 binary
*.jpg binary
*.jpeg binary
*.jpx binary
*.jxr binary
*.pdf binary
*.png binary
*.psb binary
*.psd binary
*.svg text
*.svgz binary
*.tif binary
*.tiff binary
*.wbmp binary
*.webp binary


## ARCHIVES
*.7z binary
*.gz binary
*.jar binary
*.rar binary
*.tar binary
*.zip binary

## EXECUTABLES
*.exe binary
*.pyc binary
92 changes: 92 additions & 0 deletions modules/mod-anti-cheat/.github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
name: Bug report
description: Create a bug report to help us improve.
body:
- type: markdown
attributes:
value: |
Thank you for taking the time to fill out a bug report. Remember to fill out all fields including the title above.
An issue that is not properly filled out will be closed.
You can read more about the standards for a bug report [here](https://www.azerothcore.org/wiki/issue-tracker-standards).
- 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.
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected Blizzlike Behaviour
description: |
Tell us what should happen instead.
validations:
required: true
- type: textarea
id: source
attributes:
label: Source
description: |
If you have a source that proves how it is supposed to work, please add that to make it easier for devs to fix the issue.
validations:
required: false
- 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: |
Operating System, i.e. Windows 10 x64, Debian 10 x64, etc
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
- type: markdown
attributes:
value: |
Thank you for your contribution.
If you use AzerothCore regularly, we really NEED your help to:
- Test our fixes: https://www.azerothcore.org/wiki/How-to-test-a-PR
- Report issues or suggestions: https://github.com/azerothcore/azerothcore-wotlk/issues/new/choose
- Improve the documentation/wiki: https://www.azerothcore.org/wiki/home
With your help, the project can evolve much quicker!
20 changes: 20 additions & 0 deletions modules/mod-anti-cheat/.github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
blank_issues_enabled: true
contact_links:
- name: Website
url: https://www.azerothcore.org
about: On the AC website you can find a lot of things, such as existing modules.
- name: Wiki
url: https://www.azerothcore.org/wiki
about: You can find plenty of information on our Wiki.
- name: How to ask for help
url: https://www.azerothcore.org/wiki/How-to-ask-for-help
about: Before submitting an issue we'd love if you take a minute to read this.
- name: FAQ
url: https://www.azerothcore.org/wiki/faq
about: Frequently asked questions.
- name: Common Errors
url: https://www.azerothcore.org/wiki/common-errors
about: You can find common errors and their solutions here.
- name: Discord
url: https://discord.gg/gkt4y2x
about: Join the discussions over at our Discord Server.
42 changes: 42 additions & 0 deletions modules/mod-anti-cheat/.github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
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
- type: markdown
attributes:
value: |
Thank you for your contribution.
If you use AzerothCore regularly, we really NEED your help to:
- Test our fixes: https://www.azerothcore.org/wiki/How-to-test-a-PR
- Report issues or suggestions: https://github.com/azerothcore/azerothcore-wotlk/issues/new/choose
- Improve the documentation/wiki: https://www.azerothcore.org/wiki/home
With your help, the project can evolve much quicker!
56 changes: 56 additions & 0 deletions modules/mod-anti-cheat/.github/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore

[English](README.md) | [Español](README_ES.md) | [Svenska](README_SE.md) | [Portuguese](README_pt_BR.md)

## Anticheat Module

- Latest build status with AzerothCore:

[![Build Status](https://github.com/azerothcore/mod-anticheat/workflows/core-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/mod-anticheat)

This is a port of the PassiveAnticheat Script from lordpsyan's repo to [AzerothCore](http://www.azerothcore.org)

## Wiki

https://github.com/azerothcore/mod-anticheat/wiki

## Notice

Requires revision [825db0f](https://github.com/azerothcore/azerothcore-wotlk/commit/825db0f8c1fb6d938d0cec88df0447fe7ee5b3b2) or newer.

## How to install

### 1) Simply place the module under the `modules` folder of your AzerothCore source folder.

You can do clone it via git under the azerothcore/modules directory:

`cd path/to/azerothcore/modules`

`git clone https://github.com/azerothcore/mod-anticheat.git`

or you can manually [download the module](https://github.com/azerothcore/mod-anticheat/archive/master.zip), unzip and place it under the `azerothcore/modules` directory.

### 2) Re-run cmake and launch a clean build of AzerothCore

### 3) Execute the included `\sql\characters\base\charactersdb_anticheat.sql` file on your characters database and excute `\sql\world\Acore_strings.sql` on your world datase. This creates the necessary tables for this module.

**That's it.**

### (Optional) Edit module configuration

If you need to change the module configuration, go to your server configuration folder (e.g. **etc**), copy `Anticheat.conf.dist` to `Anticheat.conf` and edit it as you prefer.

# Known issues and TODO list:

- [ ] Localize

# Localize Acore_Strings
- [x] LOCALE_enUS = 0
- [ ] LOCALE_koKR = 1
- [ ] LOCALE_frFR = 2
- [ ] LOCALE_deDE = 3
- [ ] LOCALE_zhCN = 4
- [ ] LOCALE_zhTW = 5
- [x] LOCALE_esES = 6
- [x] LOCALE_esMX = 7
- [ ] LOCALE_ruRU = 8
Loading

0 comments on commit 287b22a

Please sign in to comment.