Commit Graph

7483 Commits

Author SHA1 Message Date
Vincent-Michael
3a248fbfec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
2014-08-28 21:00:53 +02:00
Vincent-Michael
d6dbe52e64 SQL: Fix fail ... 2014-08-28 20:19:14 +02:00
Vincent-Michael
eccb0ed3da Scripts/Quest: Fix some movement stuff for Quest "Death Comes From On High" 2014-08-28 20:17:43 +02:00
Gacko
51418b76ae SQL: Rename file 2014-08-28 18:05:54 +02:00
ShinDarth
b65172910c Core/BattleGrounds: store data about BGs victories
Enable in worldserver.conf

Closes #12944

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-08-28 15:32:38 +01:00
Aokromes
cbeaa6703c DB/Creature: Remove unused ScriptName
Closes #7441
2014-08-28 12:17:13 +02:00
Vincent-Michael
c0c708cf02 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Scripting/ScriptMgr.h
2014-08-27 23:06:40 +02:00
Dr-J
00475facf2 DB/SAI: Xarantaur
Original update by @Pitcrawler 

Scripts turn in events for : -

13034 The Witness and the Hero
13038 Distortions in Time
13058 Changing the Wind's Course

Also some script updates for Changing the Wind's Course

Closes #12946
2014-08-27 21:31:26 +01:00
Vincent-Michael
b56e7f2ec6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-27 17:29:34 +02:00
DDuarte
55a501c1ca SQLs: Update /dev/world_database.sql
Again, do NOT import this file.
2014-08-27 14:13:51 +01:00
Dr-J
3abdcc588d DB/Misc: Couple of fixes for Stormpeaks
1) Script event with Zeev Fizzlespark when Agnetta Tyrsdottar Dies
2) Respawn spawns of http://www.wowhead.com/object=191844/enchanted-earth and http://www.wowhead.com/object=191845/enchanted-earth as previousy tc only had 5 spawns between these 2 gos.
2014-08-27 13:28:45 +01:00
Malcrom
5e18cf9220 DB/Creature_template: Gruul's Lair Damage Update 2014-08-26 23:50:10 -02:30
Malcrom
45b149b91e DB/Creature Stats: Armor update for Paladin class from Bestiary 2014-08-26 22:29:36 -02:30
Malcrom
cba59eb874 DB/Creature Stats: Armor update for Warrior class from Bestiary 2014-08-26 20:05:58 -02:30
Dr-J
3289393b3f DB/SAI: Archivist Mechaton
Blizzlike script for Archivist Mechaton
2014-08-26 22:13:16 +01:00
Vincent-Michael
741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
2014-08-26 19:21:22 +02:00
Dr-J
dbfc52f6a2 DB/SAI: Some corrections
Wiki said despawn time for gobjects spawned using smart action 50 was in ms, which was wrong its actually in seconds,
2014-08-26 13:04:24 +01:00
Aokromes
f5d486bee2 DB/Fishing: Add fishing level to Undercity
By AriDEV, closes #12929
2014-08-26 13:22:33 +02:00
joschiwald
bc42c48d97 DB/Spells: added a few spells to spelldifficulty_dbc 2014-08-26 04:35:37 +02:00
Dr-J
4bec4025c4 DB/SAI: Kill SAI Errors
NPCS in Sunken temple do not need difficulty flags as there is only one mode
2014-08-26 01:47:58 +01:00
untaught
d0daafeb87 DB/Misc: Add Cosmetic Explosion Trap spawns and SAI to despawn Unstable Explosives on use.
Closes #12243
2014-08-25 22:14:14 +01:00
Dr-J
f347b56fbe Correction
I had already tested script without broadcast ids but failed on pasting column name in right place when I did add them xd.
2014-08-25 20:20:25 +01:00
Dr-J
3d84f902fd DB/SAI: Zul'drak scripts
several quest complete scripts for quests in Zul'drak

rescripts Explosive Charges Bunny to include the countdown text,
2014-08-25 20:17:02 +01:00
hamcake9
16f3e6597d DB/Items: Fixed some random suffix ids
Fixed suffix ids for some items with sub-60 itemlevel

Fixes #12898
2014-08-25 17:01:22 +01:00
Vincent-Michael
4bdedcb878 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
2014-08-24 22:42:47 +02:00
Dr-J
1c1f4fe33d DB/Conditions: Injured rainspeaker oracle
Rewrite of conditions I used in 0c1587cc91 for a few things I overlooked when I writ original conditions, like fix the issue where someone without quest could click gossip menus and select the gossip menu to get the injured oracle to his feet and then make it impossible to turn in just following orders, gossip is now only displayed if player has or needs to take quest or select gossip option to start event.

conditions to prevent gossip option been selected to start wp while has feign death.
2014-08-24 21:25:30 +01:00
Vincent-Michael
2433a184ca TDB 434.07 - 2014/08/24 2014-08-24 17:53:12 +02:00
Vincent-Michael
b086b21207 SQL: Fix typo 2014-08-24 17:27:12 +02:00
Vincent-Michael
10e00f32fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-24 17:24:20 +02:00
Vincent-Michael
d088a368f1 TDB 335.55 - 2014/08/24 2014-08-24 17:22:24 +02:00
jackpoz
42c230adab Core/Spells: Fix Prayer of Mending visual bounce
Close #12855 , thanks @P-Kito
2014-08-24 17:05:59 +02:00
Vincent-Michael
98e27a4f15 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/tools/map_extractor/System.cpp
2014-08-24 16:33:29 +02:00
Dr-J
01a694886e Rename 2014_08_24_00_world_sai.sql to 2014_08_24_00_world_sai_335.sql
Rename of file to reflect this commit is only for 3.3.5
2014-08-24 13:15:27 +01:00
Aokromes
c496979e1c Update 2014_07_10_00_world_creature_434.sql 2014-08-24 14:12:47 +02:00
jackpoz
54d28af46d Merge branch 'PortgasDAce/1' into 4.3.4
Close pull request #12731
2014-08-24 14:04:54 +02:00
jackpoz
05d9dcd37f Merge branch 'Xanvia/ShoR' into 4.3.4
Close pull request #9071
2014-08-24 13:38:54 +02:00
Dr-J
dd985a8c26 DB/SAI: Betrayal
Script by me closes #4172

Also slight modifications to script for the lich kings script as part of the cleansing drak'tharon event as its the same entry of the lich king what is used there that is also used for this quest, so have had to condition the on just summoned events to area and specify wp in the on reached wp events rather than any.
2014-08-24 12:14:07 +01:00
Dr-J
1ae55c5f85 DB/SAI: Supplies To Auberdine
Working version, WP are not sniffed but we have little choice since this quest was removed from game by Blizzard in cata and no known sniffs/videos of this quest exist.

Closes #1610
2014-08-24 12:09:47 +01:00
Vincent-Michael
4a29c73403 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-23 16:41:54 +02:00
Dr-J
a63aa858dc Fix some DB errors I am responsible for.
Grr, I was going to script these but found was already scripted, but I left the ids in the line to set ai name in the commit I did make

Closes #12912
2014-08-22 19:52:49 +01:00
Dr-J
a8ff0c990b DB/Misc: Fix Conqueror Krenna/Gorgonna Phasing
Fix phasing on Conqueror Krenna/Gorgonna in Conquest Hold (Grizzly Hills) so once The Conquest Pit: Final Showdown is turned in Conqueror Krenna and her 2 side parts disappear and Gorgonna replaces Conqueror Krenna as leader of conquest hold.
2014-08-22 12:36:35 +01:00
Kinzcool
dae9be08c3 Added a missing comma in d90d0fb614 2014-08-21 20:37:00 -04:00
Kinzcool
d90d0fb614 DB/Creatures: Fixed the InhabitType of some water creatures (fishes shouldn't walk) 2014-08-21 20:33:38 -04:00
Dr-J
bf526c0797 DB/Misc: The Spirit of Gnomeregan
* Proper Phasing for The Spirit of Gnomeregan (Flight Master
* Script turn in event for Have a Part, Give a Part
2014-08-22 00:53:47 +01:00
Aokromes
d3b5996408 DB/Conditions: Master Smith Burninate
By Rushor, closes #12713
2014-08-22 00:17:01 +02:00
Shauren
42cac6796a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Server/WorldSocket.cpp
2014-08-21 23:59:00 +02:00
Dr-J
a2365939a2 DB/SAI: Son of Cenarius
delete the permament spawns of Treant Ally at each Son of Cenarius and script Son of Cenerius to summon these using the proper spell.
2014-08-21 22:37:00 +01:00
Dr-J
b56229b186 Change of guid, as was erroring 2014-08-21 22:26:53 +01:00
Dr-J
558f6e17b9 DB/Misc: Various Frenzyheart/Oracles Chain fixes
* Rescripted Injured Rainspeaker oracle and both Just Following Orders and Fortunate Misunderstandings and works properly now ie when you find the injured rainspeaker oracle you find lying on ground, you select gossip option to pull injured rainspeaker oracle to his feet crocodile attacks, once crocodile is killed Shaman Vekjik turns up and says a few lines
* New waypoints for a Rough Ride from sniff, the crocofile no longer goes through texture but camera is still glitchy
* Mosswalker victims will now summon mosswalker pocessions if the event of them deciding to die while doing the mosswalker saviour
* Correct text for softknuckle matrat for when summoned
* Spawn Shaman Jakjek and Lightningcaller Soo-met and phasing for these, however phasing does not work exactly as should do as you should only be able to see these two npcs while you are working towards that faction but since quests stay rewarded even after you change faction there is no way of doing this using quest and spell area is limited, there are two faction choice tracker quests (hidden) for wolvar and gorloc and spells which add this quests to player but also once these are rewarded they stay rewarded.
2014-08-21 21:14:59 +01:00
Aokromes
c8e8d3396c DB/Warsong Gulch: Supreme Defender
By horn, closes #3859
2014-08-21 15:44:00 +02:00