Commit Graph

240 Commits

Author SHA1 Message Date
Yunfan Li
9ebdbd8459 Merge branch 'master' into Playerbot 2024-09-29 23:22:47 +08:00
Jelle Meeus
6e4a9bbb14 fix(Core/Unit): fix Dual Wield for more creatures, CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK, creature disarm damage (#20015)
* enable CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK

* sql set CREATURE_FLAG_EXTRA_USE_OFFHAND

* use new HasOffHandWeaponForAttack instead of haveOffhandWeapon

no longer requires m_CanDualwield set to use Offhand attack
requires non-disarmed weapon in Offhand OR creature_flag_extra enabled

Co-authored-by: Ovah <dreadkiller@gmx.de>
Co-authored-by: Warlockbugs <warlockbugs@outlook.com>

* Make shapeshift forms which dont override attack speed use weapon damage

Co-authored-by: killerwife <killerwife@gmail.com>

* SetEquipmentSlots turning off damage update when using template default

Co-authored-by: killerwife <killerwife@gmail.com>

* Setup DualWield & Damage On Equipment Updates, implement Set and GetVirtualItem

Co-authored-by: Yatzii <47720837+Yatzii93@users.noreply.github.com>

* creature disarm damage

set disarm to reduce minmax damage by 50% instead of setting to 0

Co-authored-by: Warlockbugs <warlockbugs@outlook.com>

---------

Co-authored-by: Ovah <dreadkiller@gmx.de>
Co-authored-by: Warlockbugs <warlockbugs@outlook.com>
Co-authored-by: killerwife <killerwife@gmail.com>
Co-authored-by: Yatzii <47720837+Yatzii93@users.noreply.github.com>
2024-09-25 16:53:39 +02:00
Andrew
dea3d44b46 fix(Core/Spells): Prevent aura application if the target is immune (#20031) 2024-09-24 15:17:22 -03:00
Yunfan Li
66c55bc450 Merge branch 'master' into Playerbot 2024-09-22 21:56:15 +08:00
Kitzunu
386aea03ee chore(Core/Misc): Some cleanup (#19970)
* remove weird blanks

* update if

* ) ) to ))

* missed some ) )

* now switch

* .
2024-09-21 19:34:31 +02:00
Benjamin Jackson
a0057b9e90 fix(Core/Spells): Resolve a case of triggered spells prolonging combat. (#19991)
* Revert "fix(Core/Spells): Revert triggered spell logic change. (#19983)"

This reverts commit 3bb5ec779d.

* Add aura effect check.

Co-Authored-By: Anton Popovichenko <walkline.ua@gmail.com>

* Add comment, use target instead of owner.

* Adjust comment terminology.

---------

Co-authored-by: Anton Popovichenko <walkline.ua@gmail.com>
2024-09-19 09:49:56 -03:00
Yunfan Li
9780dbab7e Merge branch 'master' into Playerbot 2024-09-17 23:15:28 +08:00
Yunfan Li
910848c51b Revert "Revert "Merge branch 'master' into Playerbot""
This reverts commit 2358b256f2.
2024-09-17 23:14:42 +08:00
Benjamin Jackson
3bb5ec779d fix(Core/Spells): Revert triggered spell logic change. (#19983)
Revert "fix(Core/Spells): Resolve a case of triggered spells prolonging comba…"

This reverts commit edd7e10dfc.
2024-09-16 11:15:50 -03:00
Yunfan Li
2358b256f2 Revert "Merge branch 'master' into Playerbot"
This reverts commit 9973151927, reversing
changes made to 6f5b504e4c.
2024-09-13 17:13:32 +08:00
Yunfan Li
9973151927 Merge branch 'master' into Playerbot 2024-09-12 22:49:08 +08:00
Benjamin Jackson
edd7e10dfc fix(Core/Spells): Resolve a case of triggered spells prolonging combat. (#19819)
* Init.

* Expand trigger info check.

* Enclose evaluation in parentheses.

Maybe workflow will be happy?
2024-09-11 11:52:15 -03:00
Yunfan Li
414805e692 Merge branch 'master' into Playerbot 2024-09-04 23:46:34 +08:00
Benjamin Jackson
1edac37ac3 refactor(Core): Make more use of helpers. (#19835)
* Init.

* Reword.

* Update codestyle script.

Co-Authored-By: Kitzunu <24550914+Kitzunu@users.noreply.github.com>

* Add gameobject type ID check, reorder checks.

* Add helper/codestyle check for unit type.

* `IsUnit()` -> `IsCreature()`

* Add `IsUnit()` method.

* Use type mask.

https: //github.com/TrinityCore/TrinityCore/commit/cc71da35b5dc74abf71f8691161525a23d870bb5
Co-Authored-By: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-Authored-By: Ovahlord <18347559+Ovahlord@users.noreply.github.com>

* Replace instances of `isType` with `IsUnit`.

---------

Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-authored-by: Ovahlord <18347559+Ovahlord@users.noreply.github.com>
2024-09-03 14:41:31 -03:00
Kitzunu
9af86553c5 chore(Core/Misc): update floor and ceil to std (#19837) 2024-09-03 08:01:00 -03:00
Kitzunu
5d31b9f98f refactor(Core/Item): Add helpers (#19828) 2024-08-31 19:38:50 -03:00
Yunfan Li
a642358a43 Merge branch 'master' into Playerbot 2024-08-26 22:29:54 +08:00
Saqra1
68402b6d91 fix(Core/Spell): Reset cd on some channeled spells (#19696)
If a spell is both channeled and has SPELL_ATTR0_COOLDOWN_ON_EVENT
attribute (only rituals) is channeled for its full duration, it goes on
an infinite cooldown. The client needs to be notified when the ritual
ends without being completed.
2024-08-25 23:43:01 -03:00
Grimdhex
643362d697 refactor(Core/Object): adds consistency in the use of type object check (#19671) 2024-08-25 09:57:37 -03:00
Tereneckla
3419f0246b fix (Core/Spells) partially revert #19529 (#19703)
Update Spell.cpp
2024-08-22 20:36:39 -03:00
Yunfan Li
1bf88ad3a3 Merge branch 'master' into Playerbot 2024-08-19 18:59:50 +08:00
Tereneckla
79a653b13e fix (Core/Spells): remove object size for hit calculation of aoe aura spells that target enemies (#19529)
remove object size for aoe on enemy spells
2024-08-18 20:34:56 -03:00
Yunfan Li
27b243e7b2 Merge branch 'master' into Playerbot 2024-08-18 23:02:22 +08:00
sudlud
adc9f4e7ab fix(Core/Spell): check for player before dereferencing (#19666) 2024-08-18 05:57:02 -03:00
Grimdhex
9dc20bc261 fix(Core/Entities): crash fix cause by a pointer change in #19622 (#19633)
* fix(Core/Entities): crash fix cause by a pointer change in #19622

* fix blank space for codestyle check
2024-08-15 16:28:50 -03:00
Andrew
1565758da4 Revert "chore(Script/Misc): cleanup" (#19627)
Revert "chore(Script/Misc): cleanup (#19619)"

This reverts commit 7ff8f72397.
2024-08-15 05:43:11 +02:00
Kitzunu
7ff8f72397 chore(Script/Misc): cleanup (#19619)
* chore(Script/Misc): cleanup

* more cleanup

* cleanup
2024-08-14 16:29:50 -03:00
Benjamin Jackson
67010623a0 fix(Core): Adjustments to summoning ritual object handling. (#19600)
* Init.

* Allow self-summoning.

* Revert unintended change.

Self-summoning still works fine without this being removed, I see no harm in putting it back.
2024-08-13 12:12:05 -03:00
Saqra1
ad411b49b7 fix(Core/Spell) Ritual spells cooldown on cancel (#19604)
762f78b313

Co-authored-by: killerwife <killerwife@gmail.com>
2024-08-13 12:05:12 -03:00
Saqra1
ed824de7b8 fix(Core): Ritual animations (#19602)
Channel the same spell as the original caster when clicking on a ritual
portal, but ignore the effects of the spell.

Co-authored-by: killerwife <killerwife@gmail.com>
2024-08-13 11:54:17 -03:00
Yunfan Li
f5e44cd8a6 Merge branch 'master' into Playerbot 2024-08-01 15:41:23 +08:00
Francesco Borzì
02a05fbd4c refactor(src/common): remove unused imports (#19506)
* refactor(src/common): remove unused imports

* fix: build

* chore: fix build

* chore: size_t -> std::size_t

* chore: fix fuckup from previous commit

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build with std::size_t

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build
2024-07-30 20:06:46 -03:00
Yunfan Li
22132addce Merge branch 'master' into Playerbot 2024-07-19 17:25:43 +08:00
avarishd
ade4c2527f fix(Core/Spells): Restore sending SMSG_CAST_FAILED for spells in SPEL… (#19102)
* fix(Core/Spells): Restore sending SMSG_CAST_FAILED for spells in SPELL_STATE_PREPARING state (cast bar in progress) unintentionally removed

https: //github.com/TrinityCore/TrinityCore/commit/844efbfca84580f7b2bd700f40209515f2aaa959
Co-Authored-By: Shauren <shauren.trinity@gmail.com>

* ocd

* correct animation and castbar staying

---------

Co-authored-by: Shauren <shauren.trinity@gmail.com>
2024-07-17 09:14:06 -03:00
avarishd
cf7c015ea4 fix(Core/Spell): Implement SPELL_ATTR6_NO_PUSHBACK (#19292)
fix(Core/Spell): ImplementSPELL_ATTR6_NO_PUSHBACK
2024-07-17 09:09:34 -03:00
Yunfan Li
1f54cb14fa Merge branch 'master' into Playerbot 2024-07-07 13:33:14 +08:00
Kitzunu
385d7fd515 chore(Core/DBC): define unused unknown dbc fields (#19262)
* chore(Core/DBC): define unused unknown dbc fields

* Name unused unknown dbc fields using WDBX and wowdev.wiki

* rename SpellShapeshiftEntry to SpellShapeshiftFormEntry to properly match the DBC used

* rename sSpellShapeshiftStore to sSpellShapeshiftFormStore to properly match the DBC used

* Comment out unused field for GlyphPropertiesEntry

* Comment out unused field for MapEntry

* forgot one

* SpellShapeshiftfmt to SpellShapeshiftFormfmt

* SpellShapeshiftFormEntryfmt
2024-07-04 14:23:25 -03:00
Yunfan Li
cc5adebbe4 Merge branch 'master' into Playerbot 2024-07-03 16:04:51 +08:00
Kitzunu
f96d4c8670 Revert "Add (core\db): Support for Homebind Orientation (#13389)" (#19257)
* Revert "Add (core\db): Support for Homebind Orientation (#13389)"

This reverts commit 2e6f6e26da.

 Changes to be committed:
	modified:   src/server/database/Database/Implementation/CharacterDatabase.cpp
	modified:   src/server/game/DungeonFinding/LFGScripts.cpp
	modified:   src/server/game/Entities/Player/Player.cpp
	modified:   src/server/game/Entities/Player/Player.h
	modified:   src/server/game/Entities/Player/PlayerStorage.cpp
	modified:   src/server/game/Entities/Player/PlayerUpdates.cpp
	modified:   src/server/game/Handlers/CharacterHandler.cpp
	modified:   src/server/game/Handlers/MiscHandler.cpp
	modified:   src/server/game/Handlers/MovementHandler.cpp
	modified:   src/server/game/Maps/Map.cpp
	modified:   src/server/game/Spells/Spell.cpp
	modified:   src/server/scripts/Commands/cs_misc.cpp
	modified:   src/server/scripts/Commands/cs_tele.cpp
	modified:   src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp

 Untracked files:
	data/sql/updates/pending_db_world/rev_1719945200692175000.sql

* Revert "Add (core\db): Support for Homebind Orientation (#13389)"

* whoops
2024-07-02 22:02:15 +02:00
Jelle Meeus
75582eb34b fix(Core/Spell): implement taunt DR CREATURE_FLAG_EXTRA_OBEYS_TAUNT_DIMINISHING_RETURNS (#19128)
* skip other effects in case of taunt DR

* set flags_extra creature_template

fe38b78c87

Co-authored-by: offl <offl@users.noreply.github.com>

* update query to only entries found in acore_world.creature_template

* add name as comment

* fix ci codestyle

---------

Co-authored-by: offl <offl@users.noreply.github.com>
2024-06-29 11:59:16 -03:00
Yunfan Li
9a11d9dd5b Merge branch 'master' into Playerbot 2024-06-28 18:36:45 +08:00
Jelle Meeus
77d3eb52df fix(Core/Spell): Bladestorm remove reset swing and allow meleeSwingSpell during (#19093)
* remove reset swing

* allow meleeswingspell on PLAYER_ALLOW_ONLY_ABILITY
2024-06-26 22:23:09 +02:00
Yunfan Li
20f917c48f Merge branch 'master' into Playerbot 2024-06-22 16:09:16 +08:00
Benjamin Jackson
af722d4e88 fix(Core/Spells): Partially revert spell cancel behavior change. (#19101)
Init.
2024-06-20 14:16:21 -03:00
Yunfan Li
72725635ba Merge branch 'master' into Playerbot 2024-06-19 14:32:16 +08:00
avarishd
2cf95ca6cb fix(Core/Spells): Don't send SMSG_CAST_FAILED for interrupted spells … (#19082)
fix(Core/Spells): Don't send SMSG_CAST_FAILED for interrupted spells after they were launched or channelling was started (this clears cooldown on client)

https: //github.com/TrinityCore/TrinityCore/commit/63bc405faeb7afcf99de6f7531e4ea59065165f4

Co-authored-by: Shauren <shauren.trinity@gmail.com>
2024-06-17 21:26:18 -03:00
Yunfan Li
7c856eaf63 Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot 2024-02-24 22:48:16 +08:00
Elmsroth
729a1ff539 fix(Crash/Quest/Spell) : The Boon of Remulos (#18379)
Fix the spell : https://www.wowhead.com/wotlk/spell=57678/emerald-acorn-effect
Used in quest : https://www.wowhead.com/wotlk/quest=13075/the-boon-of-remulos

The crashed was caused by a nullptr Excception. It also could be throuwn in another similar test that has also been fixed.
If the spell did not have a CastTimeEntry a nullptr Exception was not checked.
2024-02-22 22:40:26 -03:00
Yunfan Li
5699c97d8c Merge branch 'master' into Playerbot 2024-02-11 23:45:22 +08:00
Nathan Handley
df33a57b78 feat(Core/Unit): New helper IsClass and script hook OnPlayerIsClass (#18243)
* Class Comparison Logic Encapsulation - Parity

* Add Context to IsClass

* Add Unit IsClass script hook

* Replace additional getClass with IsClass

* Update CanUseItem to replace getClass with IsClass

* Add separate context for pet vs ability

* Change Create to Init since not all referenced contexts are creation

* Align spacing in ClassContext

* Drop context on LFGManager max power

* Update IsClass context that wraps around Missle Barrage

* Rename context for swapping weapons

* Be more specific than CLASS_CONTEXT_TALENT

* Remove duplicate context

* Moved IsClass Hook to Player

* Removed unused parameter in virtual base function

* Added maybe_unused to IsClass virtual in order to compile

To match the override signature, the virtual base needs to include the parameter in question, so using [maybe_unused] to signal to the compiler to allow it

* Remove extra blank line

* Add ABILITY_REACTIVE context

* Add context for PET_CHARM

* Remove explicit nullopt check per review

* Code Readability - Change if to if else in pet

Due to the return pattern, this doesn't change functionality in any way

* Add OnPlayer to disambiguate

---------

Co-authored-by: NathanHandley <nathanhandley@protonmail.com>
2024-02-10 12:25:00 -03:00