Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,472 Commits 4 Branches 146 Tags
c4906ce60be52c9a678287672a6461c3068beea3
Commit Graph

640 Commits

Author SHA1 Message Date
offl
c4906ce60b Core/Misc: Rename UNIT_FLAG_NOT_SELECTABLE to UNIT_FLAG_UNINTERACTIBLE (#26913) 
(cherry picked from commit c4741a131a)
 2022-03-15 23:03:26 +01:00
offl
2d4f087f85 Scripts/Creature: Update Dancing Flames (#26883) 
(cherry picked from commit 70c3e58327)
 2022-03-15 00:11:06 +01:00
offl
94840f791c DB/GameObject: Update Toy Train Set 
(cherry picked from commit fd9d04062c)
 2022-03-14 23:51:23 +01:00
Gildor
20c8698bc4 Scripts/World: improve Training Dummy script (#26778) 
(cherry picked from commit c7ae9d761a)
 2022-03-12 14:45:19 +01:00
Giacomo Pozzoni
71c2f0af46 Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken (#26787) 
* Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken

* Update scripts

(cherry picked from commit 0800ab20a8)
 2022-03-12 14:45:04 +01:00
jackpoz
d0fe16b787 Core/Misc: Fix issues reported by static analysis 
(cherry picked from commit 33dace231c)
 2022-03-11 11:48:18 +01:00
offl
0408693646 Scripts/Spells: Add comments with id & name of spells part 3 
(cherry picked from commit 03c727326d)
 2022-03-10 23:52:03 +01:00
offl
f2777596a0 Scripts/Spells: Add comments with id & name of spells part 1 
(cherry picked from commit 80a4b7f1e2)
 2022-03-10 22:41:12 +01:00
offl
38476e51e7 DB/GameObject: Matrix Punchograph 
Closes #25881

(cherry picked from commit e5518b53fa)
 2022-03-06 19:41:58 +01:00
Kargatum
373ed8f46b Core: whitespace cleanup, reduce double blank line to single (#25795) 
* Core/Misc: fix double empty line

* worldserver.conf

(cherry picked from commit a32b6b8ac4)
 2022-03-05 20:07:57 +01:00
offl
3a4ce889ea DB/Creature: Properly apply CREATURE_FLAG_EXTRA_NO_SKILLGAIN 
Closes #25674

(cherry picked from commit cc98f68ac7)
 2022-03-05 00:55:29 +01:00
offl
39e9983205 DB/Creature: Convert & update support for Tonk Mine to SAI 
(cherry picked from commit ed8bf7f0e2)
 2022-03-01 00:00:39 +01:00
offl
c883c0ee1f DB/Quest: Update support for 'Merciful Freedom' (11676) 
(cherry picked from commit 05fa1a46b3)
 2022-02-28 23:59:55 +01:00
offl
0b0532e96a DB/Quest: Convert & update support for 'Prison Break' (11587) to SAI 
(cherry picked from commit dc4cb8f1d3)
 2022-02-28 23:59:23 +01:00
offl
c267c015ed DB/Quest: Convert & update support for 'The Spider God' & 'Hive in the Tower' to SAI 
(cherry picked from commit e5fd5cc031)
 2022-02-28 23:50:42 +01:00
Shauren
439b027d48 Core/Misc: Cleanup unused includes 2022-02-13 15:07:00 +01:00
Meji
27cba3f523 Core/Scripts: Added script hook to execute actions after completing an achievement (#27718) 2022-02-08 23:23:05 +01:00
Maks Szokalski
bc04acb726 Add "On" to some gossip methods in AI (#25415) 
* Add "On" to some methods

* Update npc_innkeeper.cpp

* Update zone_borean_tundra.cpp

(cherry picked from commit 41188eb535)
 2022-02-05 22:18:19 +01:00
offl
fc2f582d4f DB/Quest: Convert & update support for 'Ebon Blade Prisoners' to SAI 
Closes #24672

(cherry picked from commit 6611b71457)
 2022-02-04 00:27:12 +01:00
Ovahlord
785b6f294f Scripts/World: updated Training Dummy script to modern model and removed pointless GameTime shenanigans 
(cherry picked from commit 9bf57958e3)
 2022-01-26 14:37:31 +01:00
Giacomo Pozzoni
61bf51874d Core/Misc: Fix static analysis issues (#25178) 
(cherry picked from commit 7cf122fc2a)
 2022-01-24 20:21:25 +01:00
Carbenium
82fce41852 Core/WorldObject: Replace non-std::chrono SummonGameObject overloads 
Also fix intended despawn time of GOs used by the "Engineering a Disaster" quest

(cherry picked from commit 8642aaaf92)
 2022-01-24 12:55:43 +01:00
Carbenium
3bba8d50b1 Core/WorldObject: Remove non-std::chrono SummonCreature overload 
Remove
TempSummon* SummonCreature(uint32 entry, Position const& pos, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, uint32 despawnTime = 0, uint32 vehId = 0, uint32 spellId = 0);

(cherry picked from commit a41f599be7)
 2022-01-24 12:39:59 +01:00
Carbenium
eeffb310de Core/EventProcessor: std::chrono-ify CalculateTime 
uint64 CalculateTime(uint64 t_offset) has been replaced with Milliseconds CalculateTime(Milliseconds t_offset).
Also add the std::chrono-ified overload void AddEvent(BasicEvent*, Milliseconds, bool)

(cherry picked from commit 92a02a5c87)
 2022-01-24 12:00:35 +01:00
Carbenium
310f996b1d Core/WorldObject: Partially std::chrono-ify SummonCreature overloads 
TempSummon* SummonCreature(uint32 entry, float x, float y, float z, float o = 0, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, uint32 despawnTime = 0);
to
TempSummon* SummonCreature(uint32 entry, float x, float y, float z, float o = 0, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, Milliseconds despawnTime = 0s);

(cherry picked from commit 1131229ee9)
 2022-01-24 11:55:32 +01:00
Carbenium
38695b0943 Scripts/World+Outland+Spells: Use std::chrono overload of Creature::DespawnOrUnsummon 
(cherry picked from commit 5832790428)
 2022-01-23 23:58:48 +01:00
Peter Keresztes Schmidt
54d3110ca7 Scripts/World+Pet: Use std::chrono::duration overloads of EventMap (#25017) 
Contributes to #25012

(cherry picked from commit 0072fa922d)
 2022-01-23 16:02:35 +01:00
Peter Keresztes Schmidt
1e1679a1f7 Core/DataStores: Port refactors from Update DBC field names to generated ones (#24999) 
(cherry picked from commit c92950b3e1)
 2022-01-23 00:06:16 +01:00
Peter Keresztes Schmidt
c4098897a8 game/AI: Convert SelectAggroTarget to enum class (#24818) 
* game/AI: Convert SelectAggroTarget to enum class

* game/AI: Rename SelectAggroTarget to SelectTargetMethod

(cherry picked from commit 418c3b1fd5)
 2022-01-06 21:53:27 +01:00
ForesterDev
3171cd3fa9 Core/AI: refactor SpellHit and SpellHitTarget. (#24691) 
* Core/AI: refactor SpellHit and SpellHitTarget.

- now caster/target is WorldObject instead of Unit
- remove SpellHitByGameObject / SpellHitTargetGameObject (handled by SpellHit / SpellHitTarget)
- rename parameters in scripts according parent methods

* Restore logic in Algalon script

* Changed check for REMORSELESS_WINTER hit to avoid dublicate call, because it has TARGET_UNIT_CASTER for effects 0/1 and TARGET_GAMEOBJECT_SRC_AREA for effect 2

* Fix build after merge

(cherry picked from commit e3b232fe0e)
 2022-01-06 20:46:25 +01:00
offl
688c12fa5b DB/Quest: Convert & update support for 'Cuergo's Gold' to SAI 
Closes #24675

(cherry picked from commit 0e7cabd7f1)
 2022-01-06 19:13:39 +01:00
offl
164dcc4deb DB/Quest: Convert & update support for 'Prisoners of Wyrmskull' to SAI 
Closes #24650

(cherry picked from commit 2008cb7dd3)
 2022-01-06 18:53:52 +01:00
offl
f3e262a056 DB/GameObject: Convert & update support for Shrine of the Eagle / Falcon / Hawk to SAI 
Closes #24647

(cherry picked from commit 0cfd63fd26)
 2022-01-06 18:53:11 +01:00
offl
fbcfb505f4 DB/Creature: Convert Sayge to SAI 
Closes #24663

(cherry picked from commit 626aeb5817)
 2022-01-06 18:52:14 +01:00
offl
3f8b488071 DB/GameObject: Convert & update support for Tablet of Madness 
Closes #24670

(cherry picked from commit 9c1c34a794)
 2022-01-06 16:22:42 +01:00
Killyana
876d9f52ec DB/GameObject: Convert & update support for Jump-a-tron 4000 to DB script 
Closes #24668

(cherry picked from commit 6b9a14ca94)
 2022-01-06 16:06:40 +01:00
offl
6eb7ed4490 DB/GameObject: Convert & update support for Fel & Bash'ir crystalforges 
Closes #24643

(cherry picked from commit c3e4420a2b)
 2022-01-06 15:59:18 +01:00
offl
f32f812e29 DB/Quest: Becoming a Spellfire Tailor 
Closes #24522

(cherry picked from commit 9638f0ad0b)
 2022-01-01 23:22:09 +01:00
zartech22
c57c26d7fb Add realm ID for actions based ip logging (#24453) 
* Update SQL queries to insert realm id

* Insert the realm id when logging actions based on IP

* Adding the SQL update file

* Update 9999_99_99_99_auth.sql

* Update auth structure

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 56f20d69a6)
 2022-01-01 19:38:40 +01:00
jackpoz
95de1db5fc Scripts/Guards: Fix spell cast spam after killing npc_air_force_bots guards 
(cherry picked from commit 0844ad2ff0)
 2022-01-01 01:02:17 +01:00
jackpoz
ecdc387df2 Core/Misc: Remove whitespace at the end of lines 
(cherry picked from commit caae3886d2)
 2022-01-01 01:00:26 +01:00
Lewis Brumby
756ec4e43c Update action_ip_logger.cpp (#24371) 
(cherry picked from commit b48c50ba23)
 2021-12-31 19:05:27 +01:00
Rushor
862b0ad651 Scripts/Gameobject: Move Orb of Command script to SAI. (#24189) 
* Scripts/Gameobject: Move Orb of Command script to SAI.

* Scripts/Gameobject: Move Orb of Command script to SAI.

* Rename 2020_12_23_00_world.sql to 2020_02_28_03_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 0583445c05)
 2021-12-22 14:40:38 +01:00
schell244
460549799e Scripts/World: Hourly Bell sound, further improvements (#24147) 
* Improvements for hourly bell sound

* TC codestyle

* added missing breaks and improve codestyle

(cherry picked from commit baa87c43ba)
 2021-12-21 18:32:22 +01:00
Rushor
2326eac4f9 Scripts/Gameobject: Journal of Jandice Barov- Convert script to SAI. (#24157) 
* Scripts/Gameobject: Journal of Jandice Barov- Convert script to SAI. (Thanks to Sunwell)

* Scripts/Gameobject: Journal of Jandice Barov - Update script and move go spawn to bossscript

* Update boss_jandice_barov.cpp

Co-authored-by: Eridium <6587064+Killyana@users.noreply.github.com>
(cherry picked from commit f0bf447cd1)
 2021-12-21 16:33:47 +01:00
Rushor
41b10f4bb8 Scripts/Gameobject: Remove deprecated script for Cat Figurine (#24150) 
Scripts/Gameobject: Remove deprecated script for Cat Figurine

(cherry picked from commit 596b2d1ed7)
 2021-12-21 16:27:45 +01:00
Ovah
a91be4995b Core/Vehicles: implement vehicle seat addon table to specify seat ori… (#24112) 
* Core/Vehicles: implement vehicle seat addon table to specify seat orientation offsets and exit positions in form of offsets or absolute positions
* converted Traveler's Tundra Mammoth to seat addon table data

* first follow batch

* whoopsie

* Core/Vehicles: go from local copies to pointers

* Update and rename 2020_99_99_99_world.sql to 2020_02_08_01_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 98d6c501d7)
 2021-12-21 15:32:49 +01:00
schell244
eae7379417 Core/Scripting: fixed hourly bell sounds (#24127) 
* fixed hourly bell sounds

* use switch and moved variable

* fix typo

(cherry picked from commit f87a4543ad)
 2021-12-21 15:21:57 +01:00
Sorikoff
d37547e769 Scripts/Borean Tundra: Plug the Sinkholes (#24085) 
* Scripts/Borean Tundra: Plug the Sinkholes

* Scripts/Borean Tundra: Improve SQL

* Scripts/Borean Tundra: Remove item script

* Rename 9999_99_99_99_world.sql to 2020_01_26_03_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 552a638e31)
 2021-12-20 23:47:37 +01:00
Giacomo Pozzoni
493fe066f6 Core/Misc: Handle timezones for hour-specific events specifieds in worldserver.conf (#23540) 
* Core/Misc: Handle timezones for hour-specific events specifieds in worldserver.conf

* Handle Respawn.RestartQuietTime too

* Handle XP.Boost.Daymask too

* Core/Misc: Code cleanup

* Core/Misc: Code cleanup

* Update Util.cpp

* Update boosted_xp.cpp

(cherry picked from commit aeddd417c4)
 2021-12-16 22:35:44 +01:00