Commit Graph
17060 Commits
Author SHA1 Message Date
treeston 815f43be7a Scripts/UtgardeKeep: Bonus Ingvar the Plunderer fixes to reset behavior. There should no longer be weirdness if a reset happens during the RP phase. 2016-01-31 15:14:01 +01:00
treeston c829fc7de4 Scripts/UtgardeKeep: Ingvar updates:
- Roar at start of phase two
- Ingvar no longer does a weird move-jump towards his target when resurrecting
- Fixed a duplicate yell on phase one end
2016-01-31 14:27:18 +01:00
Killyana 789470ccf1 Spell/Script: Safirdrang's Chill
Updates #4841
2016-01-30 15:20:14 +01:00
treeston f0b9ee157b Fix warning. 2016-01-30 00:48: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
sirikfoll 5cf794b379 Fix Achievement Defense of the Ancients
The spell that trigger the achievement check, needs to be cast before setting up the variables used for the second round, otherwise the achievement will be granted to the wrong team.
Also, SPELL_END_OF_ROUND needs to be casted on the end of the second round too, this was confirmed in retail.
2016-01-28 21:46:03 -02:00
Keader 36648d1079 Fix Kinetic Bomb stuck after knockback effect. 2016-01-28 17:20:41 -03:00
Treeston 942403be0c Merge pull request #16314 from Treeston/3.3.5-fixgroupcredit
Player/Quest: Fix GO group credit
2016-01-28 13:39:29 +01:00
Treeston af62cf5939 Merge pull request #15033 from tkrokli/absorb_ignoring_damage
Unit/CalcAbsorbResist: Sanctified Wrath should pierce absorb effects
2016-01-28 13:32:53 +01:00
treeston dbf9f58351 Merge remote-tracking branch 'ariel-/soothsaying_for_dummies' into 3.3.5-base (PR #16152) 2016-01-28 13:21:03 +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
Treeston 7e42503244 Merge pull request #16264 from Treeston/3.3.5-noffalooter
Looting/Group: Do not display looter in tooltip when FFA loot is enabled
2016-01-28 11:45:17 +01:00
ariel- 8baa447ed0 Implemented Book "Soothsaying for dummies", change of engineering/leatherworking specs possible! 2016-01-26 21:38:24 -03:00
Francesco Borzì d0e4f281a3 Merge pull request #16287 from GigaDev90/fix_bug_duel_abuse
Core/Script: fix bug that prevent double spending reset cooldown
2016-01-26 20:58:09 +01:00
DDuarte 7a252fc648 Core/SAI: Typo fix of 77087db793
There's no %b, silly
2016-01-26 03:43:15 +00:00
DDuarte 77087db793 Core/SAI: Code improvements to SMART_ACTION_RANDOM_SOUND
Warning fixes and extra sanity checks

Ref #16376
2016-01-26 03:37:07 +00:00
Lopfest e4af2baa7e Core/SAI: added SMART_ACTION_RANDOM_SOUND
Closes #16376
2016-01-26 03:26:41 +00: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
ariel- bcc0073f47 Core/Scripts: Remove both shadowform visuals, caused an issue of permanent visual if glyph was added/removed while Shadowform was active.
Closes #10
2016-01-24 13:30:52 -03:00
ariel- a65a34ad17 Core/Pets: fixed command move to 2016-01-24 13:05:21 -03:00
Trisjdc 132be2d25a Core/Creatures: Reset unit flags/dynamic flags on Creature::SetDeathState(JUST_RESPAWNED) 2016-01-24 01:11:19 +00:00
MitchesD cb8faad211 Merge pull request #16327 from Exodius/BWL-door
Core/Scripts: Change door ID and name in Blackwing Lair
2016-01-23 23:43:05 +01:00
jackpoz 0e76d67e49 Scripts/Misc: Fix issues reported by static analysis 2016-01-23 17:42:37 +01:00
treeston d240ccb38c DB/Creature: Add a new extra_flag CREATURE_FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ (0x00200000) that awards players credit for killing the creature even if less than 50% of damage was dealt by players.
This can be used to fix quests such as "Heated Battle" or "If Valgarde Falls..." that are currently very hard to complete at the appropriate level due to "friendly" NPCs killing off the required targets too quickly for players to get 50% of damage in.
2016-01-23 16:41:25 +01:00
treeston f5bd7b903c Coverity fix for CID 1349782. 2016-01-23 13:30:07 +01:00
Aokromes f47fc4cc85 Scripts/quest: missing part 2016-01-23 10:55:31 +01:00
Aokromes d36207ba97 Scripts/quest: Remove no longer existing quest script 2016-01-23 10:52:57 +01:00
Aokromes 36600281ba Scripts/quest: Remove no longer existing quest script 2016-01-23 10:43:30 +01:00
Aokromes 26389dbab3 Scripts/quest: Remove no longer existing quest script 2016-01-23 10:39:18 +01:00
Aokromes b629ef8116 Script/Ulduar: Remove no longer existing achievement 2016-01-23 10:24:13 +01:00
Carbenium c9a462c693 Authserver: Fix a memory leak 2016-01-23 01:05:43 +01:00
Shauren 3f886025a2 Core/Spells: Ignore category cooldowns for triggered spells.
* This fixes weird issues where triggered spell fails because it has the same category as the spell triggering it

Closes #15794
Closes #15048

(cherry picked from commit 044edced9a5b8f0a53640bfea4727eb9d38eae7f)
2016-01-22 22:14:28 +01:00
Aokromes 21a41fd385 Scripts/Spells: Hand of Reins - Questsupport for 'Mounting Up'
by @untaught
2016-01-22 16:43:40 +01:00
Aokromes 2a8ee2e461 Core/Misc: Enable one script 2016-01-22 16:41:23 +01: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
treeston cd625a12e2 Player/Quest: Credit group for gameobject activation if they are in proximity. 2016-01-21 00:00:33 +01:00
treeston cebdf03349 Fix warning. 2016-01-20 23:20:18 +01:00
Shauren b605f1cc81 Core/Maps: Restored DataDir functionality accidendally removed earlier
(cherry picked from commit 7e801595f42be692fcbd8cbfd3cf6652c75e5db6)
2016-01-20 08:04:58 -03:00
ariel- 47eba9ce1d Core/Scripts: Fixed Death and Decay
Closes #46
2016-01-20 01:35:02 -03:00
ariel- 93b31eeb4e Scripts/Spells: Merged 6.x beacon of Light instead of 3.3.5 2016-01-20 01:34:19 -03:00
ariel- 52b60d51e7 Core/Maps: fixed map loading after merge if datadir was different from local 2016-01-19 23:34:36 -03:00
ariel- 44261652ec Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 2016-01-19 22:27:29 -03:00
ariel- 9d351b5878 Core/Maps: backport ed75b0649add23e082976fa4e5d504bc0c312602
** No reextraction of maps needed **
2016-01-19 22:25:27 -03:00
ariel- 67bb4c0c3c Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
Conflicts:
	sql/updates/world/2015_11_09_02_world335.sql
	sql/updates/world/2015_11_09_02_world_335.sql
	sql/updates/world/2015_11_11_24_world_from_335_was_2015_11_09_02_world.sql
	sql/updates/world/2015_12_16_02_world335.sql
	sql/updates/world/2015_12_16_02_world_335.sql
	sql/updates/world/2015_12_18_19_world_from_335_was_2015_12_16_02_world_335.sql
	sql/updates/world/2016_01_02_00_world335.sql
	sql/updates/world/2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_04_28_world_from_335_was_2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_10_05_world335.sql
	sql/updates/world/2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_12_01_world335.sql
	sql/updates/world/2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_12_02_world335.sql
	sql/updates/world/2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_14_12_world_from_335_was_2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_14_14_world_from_335_was_2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_14_15_world_from_335_was_2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_15_00_world.sql
	sql/updates/world/2016_01_17_10_world.sql
	sql/updates/world/2016_01_17_11_world.sql
	sql/updates/world/2016_01_17_12_world.sql
	sql/updates/world/2016_01_17_13_world.sql
	sql/updates/world/2016_01_17_14_world.sql
	sql/updates/world/2016_01_17_15_world.sql
	sql/updates/world/2016_01_18_00_world.sql
	sql/updates/world/2016_01_19_00_world.sql
	sql/updates/world/2016_01_19_01_world.sql
	sql/updates/world/2016_01_19_02_world.sql
	sql/updates/world/2016_01_19_03_world.sql
	src/server/scripts/Spells/spell_paladin.cpp
2016-01-19 22:24:14 -03:00
joschiwald ea38a7d95b Scripts/ICC/Teleporter: moved gossips to db 2016-01-20 00:32:30 +01:00
Nick a35a6279fe Core/Scripts: Change door ID in Blackwing Lair
as per 7d454c66f7

Change the name as well.
2016-01-19 22:18:32 +01:00
treeston e8a79737a5 Merge branch '3.3.5-horsemen' into 3.3.5-base (PR #16194) 2016-01-19 21:39:23 +01:00
treeston d23ef5d6d0 Merge branch '3.3.5-gothik' into 3.3.5-base (PR #16142) 2016-01-19 21:38:24 +01:00