Commit Graph

6447 Commits

Author SHA1 Message Date
DDuarte c19fcec814 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-01 19:13:29 +01:00
Dr-J fe9c376214 DB/Misc Greatmother Geyah
Now as have sniffed all the gossip menu ids for this moving script for Greatmother Geyah to db, and the current script started not working correctly sometime ago ie failing to display npc_text (only options)

* Adds all gossip options to db
* SAI to complete both quests from gossip
* Missing npc_texts
2014-09-01 03:19:30 +01:00
joschiwald 681cf8f27c Core/Scripts: rename files, remove whitespace and some other small changes after recent pull requests 2014-08-31 20:33:46 +02:00
joschiwald 251e283008 Merge pull request #12978 from Nyeriah/patch-auchi
Scripts/Auchindoun: Update Talon King Ikiss' script to EventMaps
2014-08-31 19:58:06 +02:00
Vincent-Michael cc6ca22fbc Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-31 18:38:03 +02:00
Dr-J 9070d433c2 DB/Misc: Random fixes
A few random fixes,

* Manaforge Coruu Credit
* Summon time for creatures summoned at at to prevent premature despawn (occured only with tirion on 3rd set of wp)
* Script for Destroy the Forges, closes #12825
2014-08-31 12:39:15 +01:00
Aokromes 0be9565950 Update and rename 2014_08_30_00_world_game_tele.sql to 2014_08_31_00_world_game_tele.sql 2014-08-31 04:34:40 +02:00
Aokromes 27e1a14003 DB/Teleport: Add teleport to jail 2014-08-31 04:33:47 +02:00
Vincent-Michael 141df45864 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-31 01:08:42 +02:00
Nyeriah 04cfcf523d Scripts/Auchindoun: Update Talon King Ikiss' script to EventMaps
Codestyle

Missing include
2014-08-30 18:43:50 -03:00
Dr-J e74f311d1f DB/Misc: Argent Tournament Scripts
Scripts Hourly Events for

* Tirion welcoming King Varian Wrynn and Lady Jaina Proudmore at 00:10 each hour
* Tirion welcoming Thrall and Garrosh Hellscream at 00:55 each hour
* Tirions speech to combatants at 00:40 each hour

OOC texts for Broxel Goldgrasp
Quest complete script for the seers crystal
2014-08-30 15:58:07 +01:00
Vincent-Michael 56e0459b07 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-30 16:36:24 +02:00
DDuarte 2086ba46cf Scripts/Commands: Add optional reason to server shutdown/restart commands
Display a "reason" ingame in the server shutdown ingame messages
Fix multiple typos in the .server idlerestart/idleshutdown/restart/shutdown commands

Closes #2671
2014-08-30 14:07:52 +01:00
Aokromes 6a8e935e31 DB/Creature: Remove startup error
Closes #12980
2014-08-30 10:10:47 +02:00
Vincent-Michael f89739dab5 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-30 05:03:47 +02:00
joschiwald 831a6603d4 Core/Battleground/AV: convert trinity_strings to proper creature_text
Closes #12861
2014-08-30 03:34:35 +02:00
Duarte Duarte aeae32089a Rename 2014_08_29_07_world_creature_template.sql to 2014_08_29_07_world_creature_template_335.sql
This one should not be in the 4.3.4 DB, the factions might exist there since the source of this data was taken from recent patches.
2014-08-29 22:07:33 +01:00
DDuarte 96cfdcce9d DB/NPCs: Revert some recent faction changes
These factions do not exist in 3.x dbcs and might have changed in >4.x
2014-08-29 22:02:07 +01:00
DDuarte 730136ab4f DB/NPCs: Update factions of wrong difficulty entries 2014-08-29 20:30:18 +01:00
DDuarte bd9d3dedef DB/NPCs: Multiple updates to faction 2014-08-29 20:23:24 +01:00
Vincent-Michael 06daf22e1e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/scripts/Commands/cs_guild.cpp
2014-08-29 21:18:23 +02:00
Shauren f5115328c5 Merge pull request #12970 from Golrag/marrowgar
Scripts/ICC: Fixed Impale (Lord Marrowgar)
2014-08-29 21:12:17 +02:00
Vincent-Michael e8d0de6778 Scripts/Commands: Added for guild info guild level output 2014-08-29 21:09:06 +02:00
Golrag 6658d41575 Scripts/ICC: Fixed Impale (Lord Marrowgar) 2014-08-29 19:00:11 +02:00
Aokromes fb4a8afa12 DB/Creature: Fix even more factions
(This also fixes 4.3.4 startup errors)
2014-08-29 13:32:38 +02:00
Aokromes 6489e71328 DB/Creature: Fix more factions
(Fixes also 4.3.4 database startup errors)
2014-08-29 13:17:57 +02:00
Aokromes f2210e4966 DB/Creature: Add trigger and civilian flags to the other difficulty entries of the Soul Consumption trigger
By Nyeriah, closes #12957
2014-08-29 09:46:05 +02:00
Aokromes 33d09e35ca DB/Creature: Fix more factions 2014-08-29 03:13:11 +02:00
DDuarte 82f67fd09b DB/Commands: Fix a typo in help text of .guild info 2014-08-28 23:59:58 +01:00
Dr-J a9f52cd33b DB/SAI: Grizzly Hills quest complete scripts
Turn in scripts for: -

12195 The Unexpected 'Guest'
12199 Bringing Down the Iron Thane
12279 A Bear of an Appetite

And one I had already scripted thinking was ooc text but event for turn in of 12484 Scourgekabob and added the missing emotes.
2014-08-28 23:15:47 +01:00
Odyssey 8adde791d8 Scripts/Commands: Implement .guild info command
Displays a information summary about the selected player guild or a given guildId or Name

Closes #12949

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-08-28 23:04:52 +01:00
Aokromes 37c150a74b DB/Creature: Fix faction of Mutated Abomination 2014-08-28 23:34:23 +02:00
Unholychick 7c13b383cd Scripts/Ulduar: Implement Mimiron
Closes #12894
Fixes #7652
Fixes #4736

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-08-28 22:04:01 +01:00
Aokromes 09569521f7 DB/Creature: Fix Veridian Broodling
By Pitcrawler, closes #8990
2014-08-28 22:31:04 +02:00
jackpoz 9cceb458d9 Merge branch 'Rochet2/ahbot' into master
Close pull request #12917
2014-08-28 22:01:58 +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
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
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
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