Commit Graph
6539 Commits
Author SHA1 Message Date
Kittnz 57a5879070 Fix build & tabs 2016-02-06 15:17:09 +01:00
Kittnz 859b617613 Pet/Misc: Implement Egbert's running around
Closes #16479
2016-02-06 15:06:17 +01:00
Vincent-Michael d1a185e3d5 Scripts: Added missing override 2016-02-05 21:57:05 +01:00
Rushor f3fbb49df5 Merge pull request #16472 from Rushor/immunity
Core/Creature: Implement CREATURE_FLAG_EXTRA_IMMUNITY_KNOCKBACK
2016-02-05 21:46:37 +01:00
treeston 0813261c6f Merge branch '3.3.5-toytrain' into 3.3.5 (PR #16218) 2016-02-05 15:11:22 +01:00
MitchesD ccad18b62d Merge pull request #16262 from sirikfoll/Torch
Core/Scripts Script Npc needed for Quest Torch Tossing, Part 2
2016-02-04 21:10:22 +01:00
joschiwald 8b6954e81b Core/Gossips: added some sanity checks to prevent duplicate interaction 2016-02-04 20:43:28 +01:00
Rushor 110e0fd092 Game/Creature: Implement CREATURE_FLAG_EXTRA_IMMUNITY_KNOCKBACK
* updates #16423
2016-02-04 15:46:23 +01:00
treeston 9d932e7f0c Merge remote-tracking branch 'tkrokli/npc_disciple_of_naralex' into 3.3.5-base (PR #16437) 2016-02-02 18:15:00 +01:00
treeston bac463c481 Merge branch '3.3.5-noplayerdamagereq' into 3.3.5-base (PR #16257) 2016-02-02 18:10:18 +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
tkrokli bc03fedf6d Core/Scripts/DB: remove hardcoded text from 'npc_disciple_of_naralex'
- moved 2 #define text lines to enum, already in npc_text
- new gossip_menu_option for NPC 3678 Disciple of Naralex
- using `ADD_GOSSIP_ITEM_DB` instead of `ADD_GOSSIP_ITEM`

Tested on both alliance and horde characters, works just like before.
2016-02-01 02:31:19 +01:00
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
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
Keader 36648d1079 Fix Kinetic Bomb stuck after knockback effect. 2016-01-28 17:20:41 -03: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
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
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
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
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 cebdf03349 Fix warning. 2016-01-20 23:20:18 +01: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- 44261652ec Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 2016-01-19 22:27:29 -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
Saben65 ccf3ed40e2 Scripts/Zangarmarsh: Removes empty gossip_text that resulted in NPCs saying blank text to players after buffing them
Closes #12697
Closes #16300
2016-01-19 21:17:10 +01:00
DDuarte ac727ab208 Scripts: Add override to CheckInRoom() definitions
Fixes -Winconsistent-missing-override
2016-01-19 13:06:04 +00:00
ariel- 2961a6baaf Core/DB: Fix spellscript validation startup errors
Closes #44
2016-01-19 01:42:42 -03:00
ariel- 39fb6f1d6d Core/Spells: Fix Raise Dead
- Also corrected issue where summoned ghoul didn't have energy bar.

Updates #44
2016-01-18 23:19:13 -03:00
ariel- d797741116 Core/Spells: Fix Pestilence
Updates #44
2016-01-18 21:07:54 -03:00