Commit Graph

6393 Commits

Author SHA1 Message Date
Aokromes
077bdf3b89 Misc: remove incorrectly readded code 2016-05-12 08:12:30 +02:00
Aokromes
295b152833 Misc: remove useless row 2016-05-12 08:09:32 +02:00
MitchesD
86ed1a8f7b Scripts/TheEye: updated Void Reaver to EventMap
(cherry picked from commit 8a7ae9d16c)
2016-05-12 08:05:28 +02:00
joschiwald
8241b71a78 Scripts: Added combat abilities to trash mobs in Ruby Sanctum
Thx @sirikfoll

SAI by @Keader

Closes #16703
2016-05-12 08:01:17 +02:00
Aokromes
34d78137e0 Scripts/Commands: Modify .debug anim command to target any selected unit 2016-05-12 00:25:01 +02:00
Keader
27ed37ee39 Fix Living Constellation not activating during Algalon encounter. 2016-05-12 00:18:19 +02:00
Golrag
f98281909f Scripts/Icecrown Citadel: Fixed Sindragosa ice tomb targets
* Also changed the way NonTankTargetSelector checks who is the tank.
2016-05-12 00:02:27 +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
Vincent-Michael
dd02d8b004 Scripts: Added missing overrides
(cherry picked from commit 00b4e8b6cc)

Conflicts:
	src/server/scripts/Kalimdor/zone_desolace.cpp
2016-05-04 03:04:51 +02:00
Vincent-Michael
f42e6647e4 Core/Commands: Added transport position for command .gps
(cherry picked from commit 9c99a1d0c7)
2016-05-04 02:59:13 +02: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
Dr-J
c9f9e93c22 Remove Lady Jaina Proudmores CPP script from zone_dustwallow_marsh.cpp 2016-03-09 23:31:36 +00:00
Nyeriah
c1905771f0 Scripts/Command: Solve several format exception crashes introduced in a recent commit
Ref #16648
Closes #16751
2016-03-09 00:42:45 -03:00
DDuarte
2ea31027e5 Core: Backport 6.x realm changes
Make acessible all the info about current realm (e.g name) anywhere, not only realm id
Reduce the number of differences between the two branches

Original changes by Shauren

Partial port of bacc90b6ba and 63def8aa32
2016-03-06 19:46:59 +00:00
jackpoz
510bb30b2c Scripts/Misc: Fix issues reported by static analysis 2016-03-06 16:11:55 +01:00
Shauren
7fe5a77f5e Warning fix 2016-03-05 20:17:37 +01:00
Shauren
3d0b065135 Core/Commands: Fixed a crash in .wp mod by @Magnifikator
Closes #16732
2016-03-05 20:16:42 +01:00
Shauren
e73d5a7bf4 Core/Commands: Fixed incorrect use of GetGUID instead of GetSpawnId in waypoint commands
Updates #16732
2016-03-05 20:14:58 +01:00
sirikfoll
c4e4ee3ae1 Core/Scripts: Fixed Yogg-Saron Portals
Closes #16390
Closes #16708
2016-03-04 20:45:28 +01:00
treeston
f46a0e7eb3 Instance/SunkenTemple: Some cleanup. 2016-03-04 17:52:07 +01:00
MitchesD
e081bc36dc Merge pull request #16720 from tkrokli/npc_thrall_warchief
Core/Scripts: npc_thrall_warchief hardcoded text
2016-03-04 10:49:57 +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
tkrokli
2bbe00e5f4 Core/Scripts: npc_thrall_warchief hardcoded text
7 more text lines removed in the ongoing series:
"Remove hardcoded text from core scripts".

Core script for quest 6566, What The Wind Carries
(part of the Horde Onyxia quest chain)

- create new gossip_menu_option entries
- link the options via the table gossip_menu
- remove hardcoded text from the script
2016-03-03 21:40:39 +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
joschiwald
ffdf75a233 Scripts/Spells: Glyph of Arcane Shot is affected by own debuffs on target only 2016-02-27 17:55:43 +01:00
jackpoz
31cd082833 Scripts/Ulduar: Fix crash
Change an assert to a NULL check on Flame Leviathan vehicle kit, it can be NULL on map unload.
Close #16662
2016-02-27 12:02:32 +01:00
treeston
d1a9d7765c Merge remote-tracking branch 'tkrokli/redemption_tirions_tale' into 3.3.5 (PR #16680) 2016-02-25 20:47:54 +01:00
MitchesD
b7e93f68c3 Merge pull request #16671 from tkrokli/zone_terokkar_forest
Core/Scripts: zone_terokkar_forest cleanup
2016-02-25 20:41:39 +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
eee75b80ac Core/Scripts: Prepare commands once
* Thanks @joschiwald pointing this out
2016-02-24 23:26:11 +01:00