Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,408 Commits 4 Branches 146 Tags
28caabfddaedfd8344ef1fbab60fe2846c173729
Commit Graph

970 Commits

Author SHA1 Message Date
Duarte Duarte
28caabfdda Scripts/SWP: Remove unused #defines 
(cherry picked from commit 71a7f96e22)
 2016-05-12 09:14:23 +02:00
Shauren
af17e23204 Core/Misc: Fixed -Wmisleading-indentation warnings 
(cherry picked from commit 3ac33163db)

# Conflicts:
#	src/server/game/Server/Protocol/PacketLog.cpp
 2016-05-12 09:10:53 +02:00
sirikfoll
5ebbfc63b5 Core/Spells Fix Spell Inferno, used by boss Baron Geddon 
This is based on the cmangos fix 7556165b3e

Also correct the spellId of Armageddon spell
 2016-05-12 08:35:21 +02:00
treeston
32e4388a8c Scripts/Karazhan: Hackfix the Opera event script to make Wizard of Oz actually completable. 
Doing it in script instead of removing the flags from DB because I'm pretty sure that the DB flags are correct and there's some RP event missing before she becomes attackable.
 2016-05-12 08:16:41 +02:00
Aokromes
a7fe9aecc4 Merge branch 'patch-1' into '4.3.4' 
Now Nalorakk can be attacked after his last waypoint.



See merge request !7
 2016-05-08 12:33:46 +00:00
Aokromes
41e7c525f6 Build fix 2016-05-01 16:12:56 +02:00
Carbenium
dd917e4214 Merge branch 'patch-3' into '4.3.4' 
Raid/Baradin Hold: Pit Lord Argaloth

Pit Lord Argaloth should cast one time Fel Firestom at 66% Health and 33% Health. The way it was scripted made boss cast continuosly Fel Firestom from 66% to 0%. Now it is ok.

See merge request !9
 2016-04-30 22:48:49 +00:00
Girip Dragos
219d248a00 Type: So adding removeflag on reset makes boss to remove that flag after last waypoint and adding the removeflag on reset makes him attackable after wipe too. 2016-04-23 22:45:54 +00:00
Girip Dragos
93bd30d9e4 Diff 2016-04-23 22:37:08 +00:00
Girip Dragos
6364655d63 Typo 2016-04-23 22:13:45 +00:00
Girip Dragos
88ba2d4ebd Typo 2016-04-19 22:23:03 +00:00
Girip Dragos
e909652eba Everything should be fine now. 2016-04-09 19:21:22 +00:00
Girip Dragos
b6e2285289 My bad. 2016-04-09 19:15:31 +00:00
Girip Dragos
07551d62b0 Raid/Baradin Hold: Pit Lord Argaloth 2016-04-09 19:05:00 +00:00
Girip Dragos
74dfec580c Zul'Aman/Hexlord : Deleted unused code and improoved for 4.3.4 2016-04-08 23:04:48 +00:00
Girip Dragos
411cd3fdb3 Now Nalorakk can be attacked after his last waypoint. 2016-04-08 22:53:51 +00:00
Aokromes
70697c6fce Core: fixed few coverity issues and warnings 2016-04-03 08:04:26 +02:00
Aokromes
30b80d6e82 Core: fixed few coverity issues and warnings 
Partial port of b68b6417f6 by joschiwald
 2016-04-03 07:36:50 +02:00
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00
jackpoz
510bb30b2c Scripts/Misc: Fix issues reported by static analysis 2016-03-06 16:11:55 +01:00
treeston
f46a0e7eb3 Instance/SunkenTemple: Some cleanup. 2016-03-04 17:52:07 +01:00
durotar
768a5cf354 Scripts/SunkenTemple: Quest 3447 Secret of the Circle Thanks to Tkrokli, Kilyana and Nayd Closes #808 
Signed-off-by: MitchesD

Closes https://github.com/TrinityCore/TrinityCore/pull/16367
 2016-03-04 00:05:52 +01:00
Nyeriah
ecd9dec384 Scripts/Karazhan: Use the correct method to access Opera's side entrance door 2016-03-01 12:38:09 -03:00
tkrokli
c897988a7e Core/Scripts/Zul'Aman: sound handled in creature_text 
- Sound playback is handled via creature_text
- remove `DoPlaySoundToSet()` to avoid duplicate playback
- remove redundant 'me' parameter from `Talk()` entries
 2016-02-29 19:31:47 +01:00
Aokromes
b646bcbb91 Update boss_nalorakk.cpp 2016-02-29 03:45:14 +01:00
tkrokli
9806f7812a Core/Scripts: Zul'Aman boss script text cleanup 
Replacing more hardcoded text with DB entries.
A little bit extra enum alignment and sorting.
 2016-02-29 03:16:23 +01:00
Nyeriah
f9eff81388 Scripts/Karazhan: Clean up instance script 
Closes: #16533
 2016-02-28 11:49:48 -03:00
Aokromes
5accd69863 Merge pull request #16692 from tkrokli/headless_horseman_emote 
Core/Scripts/boss_headless_horseman: remove hardcoded text
 2016-02-28 13:32:54 +01:00
tkrokli
6ffac018dd Core/Scripts: triple zone cleanup 
Remove hardcoded (as well as deprecated) text in the following places:
- blackrock_depths.cpp
- zone_burning_steppes.cpp
- zone_stormwind_city.cpp

Updates https://github.com/velinath/TrinityCore/issues/2
 2016-02-28 12:25:23 +01:00
tkrokli
1602be1253 Core/Scripts/boss_headless_horseman: remove hardcoded text 
Remove the old
`#define EMOTE_LAUGHS    "Headless Horseman laughs"`

No emote is ever used on retail. It would have created log spam.
 2016-02-28 03:23:36 +01:00
tkrokli
7c9a26c608 Core/Scripts: move npc_tirion_fordring to DB/SAI 
This removes the current core script npc_tirion_fordring
and replaces it with database entries in:

- `conditions` 9 (quest taken) + 41 (unit_state)
- `gossip_menu_option` (3502,3681,3682,3683)
- `smart_scripts` (SmartAI)

Gossip text / `npc_text` is already in the database.

Closes  #16430 (my old attempt at removing hardcoded text)
 2016-02-25 20:06:16 +01:00
Naios
9e43365b3d Core/Scripts: Split the huge scriptloader into smaller pieces 
* Each subdirectory contains it's own translation unit now
  which is responsible for loading it's directory
* Improves merging & decoupling between 3.3.5 <-> 6.x
* Removes unused Battleground loader
* Ref #15671

(cherry picked from commit 5534915f74)
 2016-02-22 16:25:54 +01:00
ariel-
8bc477a2de Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	sql/updates/world/2016_01_26_00_world.sql
	sql/updates/world/2016_01_31_00_world.sql
	sql/updates/world/2016_02_07_00_world.sql
	src/server/authserver/Server/AuthSession.cpp
	src/server/database/Database/Implementation/LoginDatabase.cpp
	src/server/database/Database/Implementation/LoginDatabase.h
	src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
	src/server/game/AI/ScriptedAI/ScriptedCreature.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Networking/AsyncAcceptor.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/adt.h
	src/tools/mmaps_generator/MapBuilder.cpp
 2016-02-21 07:02:53 -03:00
Kittnz
2d753cd783 Merge pull request #16132 from henhouse/smitefix 
Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switch…
 2016-02-18 20:07:22 +01:00
Henry
5ee2be21bf Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switching. 
* Fixes Mr. Smite announcing to instance once doors have been destroyed.
* Add missing dialogue to encounter phases.
* Now properly runs in front of his chest, kneels down and equips items, stands, and reengages like he's supposed to.
* Fix weapon model for first phase when he switched to double axes.
 2016-02-16 17:07:09 -05:00
treeston
cfed2d7a3d Merge remote-tracking branch 'Eliminationzx/FixJumpDestOrientation' into 3.3.5 (PR #16450) with some minor CS adjustments 2016-02-10 17:41:19 +01:00
Elimination
ff80f249a7 Fix jump dest orientation 2016-02-10 20:25:29 +07:00
Nyeriah
e9db04a92c Scripts: Fix no-PCH build MKII 
Bah
(cherry picked from commit 781152a30c)
 2016-02-10 04:07:33 -02:00
Nyeriah
130f744c29 Scripts: Fix no-PCH 2016-02-10 03:19:02 -02:00
Nyeriah
6a56ede179 Scripts/Magister's Terrace: Script Kalecgos' appearance after using the Scryer's Orb 
- Added missing waypoints, spells, emotes, proper timing... and prevent him from being summoned multiple times
Closes #13208, #16522
 2016-02-10 03:03:59 -02:00
treeston
e5e97bedc0 Merge remote-tracking branch 'sirikfoll/npcMyranda' into 3.3.5 (PR #16438) 2016-02-09 23:44:01 +01:00
sirikfoll
9f78dc37f7 Core/Scripts/DB Move script npc_myranda_the_hag to SAI 
Moves the entire NPC script to the database and corrects a logic error where players who have rewarded the quest Scarlet Subterfuge and lost the disguise before taking the quest In Dreams were no longer able to get the disguise.
 2016-02-09 20:16:41 -02:00
Rushor
86a821561a Scripts/Karazhan: Implement Optional Boss Spawn 
* closes #15756
 2016-02-06 22:03:44 +01:00
tkrokli
627ec0e35e Core/Scripts/Uldaman: change hardcoded text to enum 
Change #define to enum {with brackets}

Possibly the smallest change so far in this series of core script changes.
 2016-02-01 22:07:47 +01:00
treeston
d795bd8040 Merge remote-tracking branch 'tkrokli/npc_parqual_fintallas' into 3.3.5-base (PR #16384) 2016-01-30 00:31:38 +01:00
jackpoz
d75469e31f Scripts/Deadmines: Fix issues reported by static analysis 
Fix Coverity issue id 1022474
 2016-01-30 00:13:22 +01:00
tkrokli
7a101bcf00 [3.3.5] Core/Scripts/DB: move core script 'npc_parqual_fintallas' to SAI 
Additional change: menu options are changed from containing only names
to include the text " is my answer.", based on the lines in `broadcast_text`.

- replaced core text with DB SAI script
- created DB creature_text entries for Parqual Fintallas
- created DB gossip_menu_option entries for the NPC
- implemented NPC say lines in reply to all the answers
- added conditions for which gossip should show, depending on quest status
- added conditions to avoid exploits in the time it takes for NPC to say his texts

This PR is tested several times on a horde character (horde-only quest).
It now works as originally intended, with option-specific NPC replies.
 2016-01-29 23:26:08 +01:00
treeston
81baffec80 Merge remote-tracking branch 'tkrokli/npcs_dithers_and_arbington' into 3.3.5-base (PR #16276) 2016-01-28 12:39:51 +01:00
ariel-
60e04b7f85 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/updates/world/2016_01_23_00_world.sql
	sql/updates/world/2016_01_24_00_world.sql
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2016-01-24 16:00:06 -03:00
tkrokli
29c2a42324 Core/Scripts/DB: remove hardcoded text from 'npcs_dithers_and_arbington' 
- created DB gossip_menu_option entries for both NPCs
- added enum section instead of "magic numbers" in script
- replaced core text with pointers to DB text
- zone_western_plaguelands.cpp is now cleaned up
 2016-01-21 15:02:38 +01:00