Commit Graph
254 Commits
Author SHA1 Message Date
Spp 5cff9e0716 Merge branch 'master' into 4.x
Conflicts:
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/AI/CoreAI/CombatAI.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
	src/tools/vmap3_extractor/model.h
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/dbcfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
2012-02-23 13:06:35 +01:00
QAston f09b5a6bea Core/Db/Conditions:
-Drop condition CONDITION_SPELL_SCRIPT_TARGET, use other condition types instead
-Change CONDITION_SOURCE_TYPE_SPELL_SCRIPT_TARGET to CONDITION_SOURCE_TYPE_SPELL_IMPLICIT_TARGET:
--allow using this condition for more spell implicit target types (not just ENTRY)
--SourceGroup value for this src type is now effMask and it's now required

Core/Spells: Unify the way implicit targets are handled, fully implement some partially implemented target types, fix some minor bugs found on the way, general improvements and cleanup.
2012-02-21 20:17:45 +01:00
elecyb d585c68814 Core/Spells: Removed incorrect diminishing group check for Improved Hamstring. 2012-02-08 21:35:00 -03:00
Souler 43a74f0101 Scripts/Quests: "Mastery of Melee", "Mastery of Shield-Breaker" and "Master of Charge" 2012-02-05 13:17:10 +01:00
Spp 37b66384f3 Merge branch 'master' into 4.x
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
2012-01-31 11:49:53 +01:00
Souler 75992143c1 Scripts/Spells: Fix Argent Tournament mount spells:
* Break-Shield
 * Charge
 * Defend (visual)
 * Mounted duel
 * Faction Pennants when riding argent tournament mounts
Closes #4917.
2012-01-30 00:21:42 +01:00
Emo Norfik 6cb4950489 Scripts/Utgarde Pinnacle:
- Re-write Svala Sorrowgrave
- Scripted achievement The Incredible Hulk.

This script was writen basing on work and data:
- Original TC script.
- Albis fix for Arthas sounds and texts https://github.com/TrinityCore/TrinityCore/issues/4002 .
- Ric event start fix.
- Recorded encounters uploaded on YouTube.
- Data found on ScriptDev2 forums.
- Iov's custom SD2 repo and Svalas's script https://github.com/Iov/scriptdev2 .
Also thx to:
- ZxBiohazardZx for pointing how to fix looting problem when boss is killed when flying.
- Aokromes for confirmig how many times event "Ritual of the Sword" is performed.

- Mini event with Arthas.
- Call Flames: timers of cast and time between "Ball of Flame" (48246) can be wrong (based on videos).
- Ritual of the Sword works  and is performed once at 50% hp but:
  a) Still need retail data for teleport position of Svala floating above player.
  b) Need fully fixed spell Ritual of the Sword (48276), the triggering of spell Ritual Strike - Trigger Missile (48331) part was hardcoded.
- Spell Paralyze (48278) used by Ritual Channeler: fixed stacking and selection to ritual player only.
- Achievement "The Incredible Hulk": works but often Scourge Hulk don't get initial dmg from spell Ritual Strike (spell 48277 Effect #1 Value: 6650 to 7350).
- Looting problems when Svala was killed in air (require vmaps and option "vmap.enableHeight = 1" enabled in "worldserver.conf").
- Moved script_texts to creature_text.

It require option "vmap.enableHeight = 1" to work properly.
2012-01-08 23:07:31 +00:00
Nay 9c26ce8da5 Merge branch 'master' into 4.x
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
2012-01-07 17:13:42 +00:00
Souler 2d8a6fdf15 Scripts/Quests: An Apexis Relic, The Relic's Emanation and Guardian of the Monument. 2012-01-06 01:19:07 +01:00
kiper 8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
Spp fa9daaf95b Merge branch 'master' into 4.x and some warning fixes 2011-12-27 10:15:27 +01:00
Nay 0d98ecc6c1 Merge pull request #4463 from Warpten/stings
Core/Spells: Fixed Improved Stings Rank 2 Dispel resist chance
2011-12-24 15:09:52 -08:00
Kapoeira c89c007f9f Core/Spells: Fixed Improved Stings Rank 2 Dispel resist chance (crazy targeting typo) 2011-12-23 19:49:59 -05:00
nelegalno 133c3304d8 DB/Quest: Fix quest The Black Knight's Orders
Closes #1832
Closes #3206
Closes #1299
Closes #1700
Closes #4347
2011-12-18 23:44:15 +00:00
Machiavelli fe69bd654a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
2011-12-06 12:01:51 +01:00
Shocker f43e8a937f Core/Spells: Typo fix in recent commit 2011-12-05 23:11:53 +02:00
Shauren 0cc62432e8 Merge pull request #4196 from kandera/fix_Ravage
Core/Spells: Fix Ravage positioning requirement
2011-12-05 10:36:00 -08:00
kandera d6f2359e20 Core/Spells: Fix Ravage (was able to attack from any side. now only from back) 2011-12-05 10:20:06 -05:00
Svannon 9876ef723e [Spell] Make Spell 29200 (Purify Helboar Meat) use caster as casting target 2011-11-26 15:33:05 -07:00
Shocker ed55fc3567 Merge branch 'master' into 4.x
Conflicts:
	src/server/game/Spells/Auras/SpellAuraEffects.h
2011-11-26 23:50:15 +02:00
Shocker 80f8791907 Core/Misc: Small cleanup in SpellMgr 2011-11-26 21:42:40 +02:00
Rat 5d39e09d89 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2011-11-23 20:23:26 +01:00
Shauren 358b33239a Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit 2011-11-23 19:17:33 +01:00
Rat dd80a880dc updated all remaining dbc structures 2011-11-23 13:16:45 +01:00
kaelima 79903f31ce Core/Spells: Add own diminishing category for Dragon's Breath.
Will no longer share diminishing with Polymorph
Closes #3081
2011-11-13 00:51:33 +01:00
Bootz d1334624da Core: Codestyle clean-up
"pl"->"player"

 Note: codestyle methods needs maintained, Player* player.
still to do properly clean-up chat.cpp.
2011-11-07 11:18:00 -06:00
draco 96c63fdf90 Change magic numbers for EffectRadiusIndex into enum with actual effect radius 2011-10-27 21:30:23 +02:00
Liberate 1431a5d15c Core/Spells: Revert d7e0190726 and solve it differently.
All totems have TARGET_UNIT_CASTER as implicit target except from Wrath of Air and Flametongue.
To make Glyph of Totem of Wrath work again modified these 2 totems to be the same as the other totems.
This still makes the 2 totems not stackable.
Fixes #3293
2011-10-19 18:35:21 +02:00
Liberate 8cc13ff838 And I forgot to turn on tabs to spaces. Also fixed... 2011-10-18 23:38:55 +02:00
Liberate 89bae3b51c Core/Spells: Add a new stack rule for spellgroups: SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT
This stack rule makes the effects of the spells in the spellgroup non-stackable, but the spells/auras itself are stackable.
a spell should be in only 1 group with this stack rule.
Fixes #2243
2011-10-18 23:27:39 +02:00
megamage 0184720df6 Merge pull request #3444 from Havenard/fix0008
Fix Elemental Oath
2011-10-12 08:44:47 -07:00
Chaplain 3e9611578c Core/Spells: SPELL_AURA_MOD_INCREASE_ENERGY_PERCENT improvement
*Now it'll correctly increase\decrease % of power
*Added helper function for modify power with percent ammount
2011-10-12 01:11:52 +03:00
Havenard 61f468d5a1 Fix Elemental Oath
Remove hacky implementation of Elemental Oath
Properly fix it by correcting DBC data
Fix Clearcasting from Elemental Oath damage bonus being displayed twice in Spell ToolTips by damage Addons like DrDamage (displaying 10.25% instead of 5%, 21% instead of 10%)
2011-10-10 18:01:02 -03:00
Machiavelli 1eb5bf1a65 Scripts/Ulduar/Flame Leviathan: Make both dummy effects apply on the same target, and boost range of spell Pursue to 50000yds to prevent boss reseting during the encounter. 2011-10-07 13:47:03 +02:00
Shauren fc9926a97e Scripts/Icecrown Citadel
* Properly remove glow aura during outro from Tirion
* Improved Wicked Spirit behaviour & visibility on heroic mode
* Removed gossip npcflag from Tirion after LK death
2011-10-06 17:57:28 +02:00
Shauren 4eaa4ce401 Scripts/Icecrown Citadel: Fury of Frostmourne debuff will now be removed correctly 2011-10-06 14:30:33 +02:00
Shauren 2ff1c28c4c Scripts/Icecrown Citadel
* The Lich King
2011-10-05 20:48:34 +02:00
Spp b16d2245bb Cosmetic: Multiple cosmetic changes
- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '('
- Added missing space after a comma and remove space before comma (with some exceptions)
- Remove trailing spaces
- Convert tab to spaces

Note: Only affects files with extension "cpp" and "h" under /src/server
2011-09-29 12:43:05 +02:00
Shauren 7040ef5877 Scripts/Icecrown Citadel: Mark of the Fallen Champion will ignore armor now 2011-09-27 21:44:29 +02:00
Chaplain 5bbd8dcf33 Core/Spell: Hymn of Hope fix.
*fixed mess with temporary increase max/current power (percent).
*thx Shocker for advice
2011-09-26 20:12:25 +03:00
Shauren 062e645637 Scripts/Spells: Bloodlust/Heroism handling changed, it is now possible to use these spells even if caster is under Sated/Exhaustion debuff 2011-09-25 15:08:48 +02:00
QAston e949ad3adb Core/Spells: spell effect handling improvements
* Call spell effect handlers in 4 modes:
   - SPELL_EFFECT_HANDLE_LAUNCH - called when spell is launched (cast just finished)
   - SPELL_EFFECT_HANDLE_LAUNCH_TARGET - called when spell is launched for each target in spell target map
   - SPELL_EFFECT_HANDLE_HIT - called when spell hits its destination
   - SPELL_EFFECT_HANDLE_HIT_TARGET - called when spell hits it's target from spell target map
*Correctly implement SPELL_EFFECT_TRIGGER_SPELL, SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE, SPELL_EFFECT_TRIGGER_MISSILE_SPELL_WITH_VALUE, SPELL_EFFECT_TRIGGER_MISSILE_SPELL
*Remove spell system hacks which became obsolete with this commit
Core/SpellScripts:
add OnEffectLaunch, OnEffectLaunchTarget, OnEffectHit, OnEffectHitTarget hooks for new effect handle modes and remove OnEffect hook.
A generic rule of thumb how to update your scripts (will work for nearly all cases) for spell system noobs:
if your spell script used GetHitXXXX function, you need to use OnEffectHitTarget, otherwise use
OnEffectHit
2011-09-25 13:29:50 +02:00
Shauren c93c27d056 Scripts/Icecrown Citadel:
* Mark of the Fallen Champion should be a debuff
* Fixed periodic damage taken from Twisted Nightmare on heroic difficulties of Valithria Dreamwalker encounter
2011-09-16 11:29:35 +02:00
Nay 791acfebac Core/Spells&GOs: Fix Ritual of Doom.
Thanks QAston and Shocker for helping.
Closes #2535
2011-09-15 17:52:35 +01:00
Spp af05915b9e [Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions) 2011-09-15 14:12:57 +02:00
Spp- 33ce07bdde Core: Minor cleanups (here and there)
- Fix warning
- Fix some typos
- Correct upper 'for' limit in LoadSkillLineAbilityMap
- Remove use of magic number in a query related to security levels
2011-09-13 14:15:35 +02:00
Lopin d5cbc97373 Core/Spells: Changed targets of Lifebinder's Gift (search for entry instead of area ally). For conditions thanks Anubisss 2011-09-08 13:50:01 +02:00
Nay dc123820ad Core/Spells: Correct a DBC mistake in Improved Stings (R2) 2011-09-06 18:12:09 +01:00
hacknowledge 9d85446e30 Core/Spells: Fixed misdirection ability of hunters to end 4 seconds after first damage proc - fixes #114 2011-09-03 18:26:39 +02:00
QAston f31e676199 Fix build after recent pull merges. 2011-09-03 18:07:27 +02:00