From 723eca6c61fd102552ad708fb6afdfcbbe6f2920 Mon Sep 17 00:00:00 2001 From: "Julio A. Leyva Osorio" Date: Thu, 22 Feb 2024 00:56:50 -0500 Subject: [PATCH] Update and Fix Spell (#46) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update mod_learnspells.conf.dist * fix(cpp): Don't teach healing component of DK spell Death Strike (#1) Co-authored-by: Hasn Co-authored-by: Stefano Borzì * Update * Add Spell 19885 Track Hidden (Hunter) Add Spell 19885 Track Hidden (Hunter) * Move Spell 1804 - Pick Lock Pick Lock (1804) was incorrectly delivered at level 2. is added to m_ignoreSpells and created to be delivered correctly at level 16 * Update mod_learnspells.cpp Update Far Sight 6196 - Shaman * Upate Immolate and Life Tap (R2- R8) * Update Readme * Update README.md * Fireball (25306) - Mago lvl 62 Fireball (25306) - Mago lvl 62 * Ignore Dalaran Brilliance and Dalaran Intellect Ignore Dalaran Brilliance and Dalaran Intellect * Mage Portal and Teleport * fix portal * Fix Paladin Spell 53652, 53653, 53654 Beacon of Light * Add Redemption (R1-7) * Fix Ignore Mangle (Bear) (R1-5) and Mangle (Cat) (R1-5) Fix Swift Flight Form at level 71 * Update mod_learnspells.conf.dist --------- Co-authored-by: Hasn Co-authored-by: Stefano Borzì --- .github/ISSUE_TEMPLATE/bug_report.yml | 72 +++++++++ .github/ISSUE_TEMPLATE/feature_request.yml | 33 ++++ .github/README.md | 29 ++++ README.md | 9 -- conf/mod_learnspells.conf.dist | 2 +- src/mod_learnspells.cpp | 173 ++++++++++++++++++++- 6 files changed, 304 insertions(+), 14 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml create mode 100644 .github/README.md delete mode 100644 README.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000..5610d2b --- /dev/null +++ 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 new file mode 100644 index 0000000..58f79dd --- /dev/null +++ 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/.github/README.md b/.github/README.md new file mode 100644 index 0000000..30fa3cb --- /dev/null +++ b/.github/README.md @@ -0,0 +1,29 @@ +# ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore + +## mod-learn-spells +### This is a module for [AzerothCore](http://www.azerothcore.org) + +- Latest build status with azerothcore: + +[![Build Status](https://github.com/azerothcore/mod-learn-spells/workflows/core-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/mod-learn-spells) + +#### Features: + +LearnAllSpells teach new spells on level-up, like in Cataclysm and up. + +### This module currently requires: + +- AzerothCore v1.0.1+ + +### How to install + +1. Simply place the module under the `modules` folder of your AzerothCore source folder. +2. Re-run cmake and launch a clean build of AzerothCore +3. Run the Sql file into your database. +4. Ready. + +**Original_script:** + +http://www.ac-web.org/forums/showthread.php?172918-C-Automatically-Learn-New-Spells + +AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org) - [discord chat community](https://discord.gg/PaqQRkd) diff --git a/README.md b/README.md deleted file mode 100644 index c6cd98f..0000000 --- a/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore -## mod-learnspells -### LearnAllSpells module for AzerothCore. -- Latest build status with azerothcore: [![Build Status](https://github.com/azerothcore/mod-learn-spells/workflows/core-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/mod-learn-spells) - -LearnAllSpells teach new spells on level-up, like in Cataclysm and up. - -# Original script: -http://www.ac-web.org/forums/showthread.php?172918-C-Automatically-Learn-New-Spells \ No newline at end of file diff --git a/conf/mod_learnspells.conf.dist b/conf/mod_learnspells.conf.dist index 82e60ed..2ca4a87 100644 --- a/conf/mod_learnspells.conf.dist +++ b/conf/mod_learnspells.conf.dist @@ -16,7 +16,7 @@ LearnSpells.Announce = 1 # Useful for instant leveling type of servers # (1: true | 0: false) -LearnSpells.LearnAllOnFirstLogin = 0 +LearnSpells.OnFirstLogin = 0 # Max level Limit the player will learn spells # Default: = 80 diff --git a/src/mod_learnspells.cpp b/src/mod_learnspells.cpp index 98c3cba..2561bf9 100644 --- a/src/mod_learnspells.cpp +++ b/src/mod_learnspells.cpp @@ -38,9 +38,15 @@ private: 26367, 26369, 26370, 26363, 26371, 26372, 49278, 49279, 32176, 32175, 21169, 47206, 27285, 47833, 47836, 42223, 42224, 42225, 42226, 42218, 47817, 47818, 42231, 42232, 42233, 42230, 48466, 44203, 44205, 44206, 44207, 44208, 48444, 48445, 33891, 52374, 57532, 59921, 52372, 49142, 52375, 47633, 47632, 52373, 50536, 27214, 47822, 11682, 11681, 5857, 1010, 24907, 24905, 53227, 61391, 61390, 61388, 61387, 64801, 5421, 9635, 1178, 20186, 20185, 20184, 20187, 25899, 24406, 50581, 30708, 48076, 62900, 62901, 62902, 59671, 50589, 66906, 66907, 24131, 23455, 23458, 23459, 27803, 27804, 27805, 25329, 48075, 42243, 42244, 42245, 42234, 58432, 58433, 65878, 18848, 16979, 49376, 54055, 20647, 42243, 24131, 45470, - 31898, 31804, 53733, 31803, 53742, 53725, 53726, + 31898, 31804, 53733, 31803, 53742, 53725, 53726, 1804, 348, 1455, 1456, 11687, 11688, 11689, 27222, 57946, 25306, 53652, 53653, 53654, 7328, 10322, 10324, 20772, 20773, 48949, 48950, 33878, 33876, 33982, 33986, 33987, 33983, 48563, 48565, + 48566, 48564, + + //Dalaran Brilliance and Dalaran Intellect mage class as they are spells purchased in Dalaran with limited sales by NPCs + 61316,61024, + // COSMETIC SPELLS 28271, 28272, 61025, 61305, 61721, 61780, + // OPTIONAL QUEST SPELLS 18540, }; @@ -57,6 +63,13 @@ private: AdditionalSpellsList m_additionalSpells = { + {3, + { + {SPELLFAMILY_WARLOCK, + { + AddSpell{348}, // Immolate + }}, + }}, {6, { {SPELLFAMILY_WARRIOR, @@ -91,6 +104,10 @@ private: { AddSpell{3127}, // parry }}, + {SPELLFAMILY_PALADIN, + { + AddSpell{7328}, // Redemption (R1) + }}, }}, {14, { @@ -99,6 +116,17 @@ private: AddSpell{6197}, // eagle eye }}, }}, + {16, + { + {SPELLFAMILY_ROGUE, + { + AddSpell{1804}, // Pick Lock + }}, + {SPELLFAMILY_WARLOCK, + { + AddSpell{1455}, // Life Tap (R2) + }}, + }}, {20, { {SPELLFAMILY_WARRIOR, @@ -119,12 +147,22 @@ private: AddSpell{34769, TeamId::TEAM_HORDE}, // Schlachtross beschwören AddSpell{13819, TeamId::TEAM_ALLIANCE}, // Schlachtross beschwören }}, + {SPELLFAMILY_MAGE, + { + AddSpell{3567, TeamId::TEAM_HORDE}, // Teleport: Orgrimmar + AddSpell{32272, TeamId::TEAM_HORDE}, // Teleport: Silvermoon + AddSpell{3563, TeamId::TEAM_HORDE}, // Teleport: Undercity + AddSpell{3561, TeamId::TEAM_ALLIANCE}, // Teleport: Stormwind + AddSpell{3562, TeamId::TEAM_ALLIANCE}, // Teleport: Ironforge + AddSpell{32271, TeamId::TEAM_ALLIANCE}, // Teleport: Exodar + }}, }}, {24, { {SPELLFAMILY_HUNTER, { AddSpell{1462}, // Beast Lore + AddSpell{19885}, // Track Hidden }}, {SPELLFAMILY_ROGUE, { @@ -134,13 +172,21 @@ private: { AddSpell{5500}, // Sense Demons }}, - }}, - {24, - { {SPELLFAMILY_SHAMAN, { AddSpell{6196}, // Far Sight }}, + {SPELLFAMILY_PALADIN, + { + AddSpell{10322}, // Redemption (R2) + }}, + }}, + {26, + { + {SPELLFAMILY_WARLOCK, + { + AddSpell{1456}, // Life Tap (R3) + }}, }}, {30, { @@ -148,6 +194,11 @@ private: { AddSpell{66842}, // Call of the Elements }}, + {SPELLFAMILY_MAGE, + { + AddSpell{3566, TeamId::TEAM_HORDE}, // Teleport: Thunder Bluf + AddSpell{3565, TeamId::TEAM_ALLIANCE}, // Teleport: Darnassus + }}, }}, {32, { @@ -156,6 +207,27 @@ private: AddSpell{5225}, // Track Humanoids }}, }}, + {35, + { + {SPELLFAMILY_MAGE, + { + AddSpell{49358, TeamId::TEAM_HORDE}, // Teleport: Stonard + AddSpell{49361, TeamId::TEAM_HORDE}, // Portal: Stonard + AddSpell{49359, TeamId::TEAM_ALLIANCE}, // Teleport: Theramore + AddSpell{49360, TeamId::TEAM_ALLIANCE}, // Portal: Theramore + }}, + }}, + {36, + { + {SPELLFAMILY_WARLOCK, + { + AddSpell{11687}, // Life Tap (R4) + }}, + {SPELLFAMILY_PALADIN, + { + AddSpell{10324}, // Redemption (R3) + }}, + }}, {40, { {SPELLFAMILY_SHAMAN, @@ -186,13 +258,75 @@ private: AddSpell{20719}, // Feline Grace AddSpell{62600}, // Savage Defense }}, + {SPELLFAMILY_MAGE, + { + AddSpell{11417, TeamId::TEAM_HORDE}, // Portal: Orgrimmar + AddSpell{32267, TeamId::TEAM_HORDE}, // Portal: Silvermoon + AddSpell{11418, TeamId::TEAM_HORDE}, // Portal: Undercity + AddSpell{10059, TeamId::TEAM_ALLIANCE}, // Portal: Stormwind + AddSpell{11416, TeamId::TEAM_ALLIANCE}, // Portal: Ironforge + AddSpell{32266, TeamId::TEAM_ALLIANCE}, // Portal: Exodar + }}, }}, + {46, + { + {SPELLFAMILY_WARLOCK, + { + AddSpell{11688}, // Life Tap (R5) + }}, + }}, + {48, + { + {SPELLFAMILY_PALADIN, + { + AddSpell{20772}, // Redemption (R4) + }}, + }}, {50, { {SPELLFAMILY_SHAMAN, { AddSpell{66844}, // Call of the Spirits }}, + {SPELLFAMILY_MAGE, + { + AddSpell{11420, TeamId::TEAM_HORDE}, // Portal: Thunder Bluff + AddSpell{11419, TeamId::TEAM_ALLIANCE}, // Portal: Darnassus + }}, + }}, + {56, + { + {SPELLFAMILY_WARLOCK, + { + AddSpell{11689}, // Life Tap (R6) + }}, + }}, + {60, + { + {SPELLFAMILY_MAGE, + { + AddSpell{35715, TeamId::TEAM_HORDE}, // Teleport: Shattrath + AddSpell{33690, TeamId::TEAM_ALLIANCE}, // Teleport: Shattrath + }}, + {SPELLFAMILY_PALADIN, + { + AddSpell{20773}, // Redemption (R5) + }}, + }}, + {62, + { + {SPELLFAMILY_MAGE, + { + AddSpell{25306}, // Fireball (R12) + }}, + }}, + {65, + { + {SPELLFAMILY_MAGE, + { + AddSpell{35717, TeamId::TEAM_HORDE}, // Portal: Shattrath + AddSpell{33691, TeamId::TEAM_ALLIANCE}, // Portal: Shattrath + }}, }}, {66, { @@ -206,6 +340,13 @@ private: AddSpell{29858}, // Soulshatter }}, }}, + {68, + { + {SPELLFAMILY_WARLOCK, + { + AddSpell{27222}, // Life Tap (R7) + }}, + }}, {70, { {SPELLFAMILY_SHAMAN, @@ -214,11 +355,35 @@ private: AddSpell{32182, TeamId::TEAM_ALLIANCE}, // Heroism }}, }}, + {71, + { + {SPELLFAMILY_DRUID, + { + AddSpell{40120}, // Swift Flight Form + }}, + }}, + {72, + { + {SPELLFAMILY_PALADIN, + { + AddSpell{48949}, // Redemption (R6) + + }}, + }}, + {79, + { + {SPELLFAMILY_PALADIN, + { + AddSpell{48950}, // Redemption (R7) + + }}, + }}, {80, { {SPELLFAMILY_WARLOCK, { AddSpell{47836}, // Seed of Corruption (rank 3) + AddSpell{57946}, // Life Tap (R8) }}, }}, };