Commit Graph
30447 Commits
Author SHA1 Message Date
blub 41817bc259 Merge pull request #8917 from joschiwald/spellscripts_reorder2
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-11 17:50:48 -08:00
Vincent_Michael 7fbd6d33dd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-12 02:38:34 +01:00
joschiwald 95f8068a6f Misc: Reorder more scripts in some script files and some cosmetic stuff 2013-01-12 02:16:30 +01:00
Spp e783349803 Use correct initialization of some vars 2013-01-12 02:15:10 +01:00
Malcrom 1b15bd1df2 DB/Scripts: Fix a few SAI errors. 2013-01-11 20:49:00 -03:30
Malcrom df0c72d4de DB/SAI: Fix a couple errors. Closes #8839 2013-01-11 19:37:42 -03:30
Shauren ab038078d2 Merge pull request #8915 from Therzok/4.3.4
DBC definitions and a warning fix.
2013-01-11 15:03:06 -08:00
Malcrom bdf8d2d5c3 DB/SAI: Some SAI for aq20. Closes #8866 2013-01-11 19:31:49 -03:30
Marius Ungureanu 95fba877fe *Core/DBC: Updated structs.
**AreaTableEntry
**CharStartOutfitEntry
**CurrencyTypesEntry
**FactionEntry
**GemPropertiesEntry
**GlyphPropertiesEntry
**LFGDungeonEntry
**MapEntry
**SkillLineAbilityEntry
**SpellEntry
**SpellPowerEntry
**SpellShapeshiftFormEntry
**TaxiNodesEntry
**Removed TeamContributionPoints.dbc parsing as it is deprecated since WotLK.
2013-01-12 00:42:33 +02:00
Marius Ungureanu c068adec52 Core/Opcodes: Warning fix. 2013-01-12 00:42:33 +02:00
Vincent_Michael 2fcd4c381c DB/Conditions: Convert shadowstep spell script in conditions 2013-01-11 23:37:54 +01:00
Vincent_Michael b13e5694b6 Core/Conditions: Implement CONDITION_UNIT_STATE = 21 2013-01-11 23:37:53 +01:00
Shauren 84553f168c Core/DataStores: Changed index on CharStartOutfit.dbc to allow lookups directly using race/class/gender combo instead having to iterate entire store to find the proper entry 2013-01-11 20:50:05 +01:00
Vincent_Michael 66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
2013-01-11 19:10:10 +01:00
kaelima cf5058c4e3 Core/BG: Corrected data sent in SMSG_BATTLEFIELD_STATUS packet.
*should* close #7994
2013-01-11 18:58:12 +01:00
Vincent_Michael d6d2cb0490 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-11 14:58:57 +01:00
Vincent_Michael ecbcca8794 Core: Whitespace cleanup 2013-01-11 14:49:38 +01:00
Vincent_Michael 6cd962ee71 Core: Fix non pch build 2013-01-11 14:21:39 +01:00
krofna dc30c63533 Script/AQ Implement Ayamiss the Hunter and fix screwup in my Ossirian
Closes #8862

Signed-off-by: Nay <dnpd.dd@gmail.com>
2013-01-11 12:52:19 +00:00
ille bb995fcad1 Core/maps: separate mutex for grid 2013-01-11 13:11:08 +01:00
Tuxity a6c64c8c7e Core/Formulas: Fix rounding problem in conquest rating calculator. 2013-01-11 10:42:00 +01:00
Nay efa094e893 Merge pull request #8581 from Butterfly69/patch-9
Core/Spells:Beacon of Light
2013-01-10 23:29:51 -08:00
Nay 471cae1251 Merge pull request #8903 from joschiwald/spellscripts_reorder
Misc: Reorder scripts in some script files and some cosmetic stuff
2013-01-10 23:26:21 -08:00
joschiwald 0c16b95905 Misc: Reorder scripts in some script files and some cosmetic stuff 2013-01-11 04:18:02 +01:00
Marius Ungureanu 95cf2585bd *Core/Currency: - Fixed Tuxity's latest revisions to currency fixes. - Compilation fix. /slap Tuxity? XD
Signed-off-by: Nay <dnpd.dd@gmail.com>
2013-01-11 00:51:56 +00:00
joschiwald 89490e4d7f Core/SpellScripts: implement Spell Proc Hooks and use it in old and new proc system
Hooks:
- DoCheckProc: executed when aura checks if it can proc
- DoPrepareProc: executed before aura procs (possibility to prevent charge drop/cooldown)
- OnProc: executed when aura procs
- OnEffectProc: executed when aura effect procs
- AfterEffectProc: executed after aura effect proced
- AfterProc: executed after aura proced and charges removed

using PreventDefaultAction() in DoPrepareProc will prevent charge drop and cooldown

default execution of a proc can prevented in OnEffectProc with PreventDefaultAction()

Now we should be able to convert almost all procs from Unit::ProcDamageAndSpellFor to SpellScripts

Notes to old proc system:
- if a proc has a cooldown we must check it in spellscript and add it when we handle the proc
- behavior with charge drops is possible undefined (use PreventDefaultAction() in OnEffectProc to notify that the script is executed)
2013-01-11 01:21:44 +01:00
Malcrom ddea01290c Core/Scriptd: Rewrite :) 2013-01-10 20:50:32 -03:30
Malcrom 0b50520df7 Core/scripting: Updating Scholomance scripts 2013-01-10 20:08:30 -03:30
Blipi ed21a589bb Quest 4901 "Guardians of the Altar" 2013-01-11 00:26:26 +01:00
Nay 9da1ff45b7 DB/Addon: Delete 1026 creature_addon rows and overwrite 98 creature_template_addon (phase 2.1)
Conversion done with https://gist.github.com/4505135 (C#)
Thanks to Aokromes for the idea
2013-01-10 19:42:24 +00:00
Nay 0ee5170552 DB/Addon: Delete 4012 redundant creature_addon rows (phase 2)
Conversion done with https://gist.github.com/4504839 (C#)
Thanks to Aokromes for the idea
2013-01-10 19:13:22 +00:00
Nay fd4767bcd0 DB/Addon: Convert 43637 creature_addon rows to 2429 creature_template_addon rows
Conversion done with https://gist.github.com/4504302 (C#)
Thanks to Aokromes for the idea
2013-01-10 18:11:29 +00:00
Nay fff86b7729 DB/SAI: Remove some redundant creature_texts using SMART_ACTION_CALL_FOR_HELP 2013-01-10 15:41:10 +00:00
Nay 8274e42e3d Core/SAI: Add 2nd parameter to SMART_ACTION_CALL_FOR_HELP to say "%s calls for help!" if enabled
Similar to SMART_ACTION_FLEE_FOR_ASSIST "%s attempts to run away in fear!"
2013-01-10 15:09:12 +00:00
Tuxity 91c4f2c2fb Core/Battleground: Fix asynch countdown timer for new players. close #8761 2013-01-10 15:38:39 +01:00
Spp dfbf318a4f Typo fix 2013-01-10 15:29:08 +01:00
Vincent_Michael e6c8cc91ca Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-10 14:52:34 +01:00
Tuxity 2f48fe7cf1 Core/Currency:
- Fix a typo in conquest points formulas
- Correctly fix max justice and honor points
- Remove a previous fix when refunding an item, my mistake
ref #8892
2013-01-10 14:18:14 +01:00
Vincent_Michael 1154c62b65 Core/Tools: Fix logic fail for mmaps generator (thx armano2) 2013-01-10 12:40:26 +01:00
Warpten 3c8a957692 Core/GuildFinder: Fixed a missing typecast. Also correctly display the guild's achievement points. 2013-01-10 12:00:11 +01:00
Warpten c9650de789 Scripts/ZulAman: Fixed a crash caused by the grid.
Closes #8885.
2013-01-10 10:41:46 +01:00
Tuxity d754ca16fb Core/Battleground: Fix team logo at countdown timer expire by @Vincent-Michael
Fix typo when refunding currencies, thx @kennylive
2013-01-10 10:02:32 +01:00
Vincent_Michael 899ffde1f9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-09 21:15:41 +01:00
Vincent_Michael 7210ffe34d Core: Fix warnings 2013-01-09 21:14:12 +01:00
Vincent_Michael cbf9324f61 Core: Fix build 2013-01-09 21:01:39 +01:00
Tuxity 71b0b30712 Core/Battleground:
- Fix team logo after countdown timer expire. close #8887
- Add more options with justice and honor points in conf file, also fix a wrong cap value.
- Grant back currencies when refunding an item and fix price.
ref #8892
2013-01-09 20:37:02 +01:00
Vincent_Michael f9c193d27d DB/Spells: Add missing sql in 669e2ed20f 2013-01-09 17:29:27 +01:00
ZxBiohazardZx d9339cea60 DB/SAI: Fix startup DB errors 2013-01-09 15:59:15 +00:00
Spp 25d35bacf9 Fix incorrect sql name 2013-01-09 16:39:57 +01:00
Spp 677ed18080 Core/Dungeon Finder: Fix group (5) unable to do new dungeon after finished last dungeon
- Some optimizations here and there
- Drop unused columns related to dungeon rewards
- Simplify Group reward. All people inside the dungeon should get the reward, no matter how far it's from the boss
2013-01-09 15:15:42 +01:00