mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7390] Implement heroic instance quest requirement in areatrigger_teleport.

Browse source 
Also more fixes for prev. sql update.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
NoFantasy 2009-03-06 18:18:19 +03:00 • committed by VladimirMangos
parent bda5dffcdb
commit 83affb51fd
8 changed files with 47 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/mangos.sql
View file

@ -22,7 +22,7 @@
DROP TABLE IF EXISTS `db_version`; DROP TABLE IF EXISTS `db_version`;
CREATE TABLE `db_version` ( CREATE TABLE `db_version` (
`version` varchar(120) default NULL, `version` varchar(120) default NULL,
`required_7388_01_mangos_mangos_string` bit(1) default NULL `required_7390_01_mangos_areatrigger_teleport` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
-- --
@ -135,6 +135,7 @@ CREATE TABLE `areatrigger_teleport` (
`heroic_key` mediumint(8) unsigned NOT NULL default '0', `heroic_key` mediumint(8) unsigned NOT NULL default '0',
`heroic_key2` mediumint(8) unsigned NOT NULL default '0', `heroic_key2` mediumint(8) unsigned NOT NULL default '0',
`required_quest_done` int(11) unsigned NOT NULL default '0', `required_quest_done` int(11) unsigned NOT NULL default '0',
`required_quest_done_heroic` int(11) unsigned NOT NULL default '0',
`required_failed_text` text, `required_failed_text` text,
`target_map` smallint(5) unsigned NOT NULL default '0', `target_map` smallint(5) unsigned NOT NULL default '0',
`target_position_x` float NOT NULL default '0', `target_position_x` float NOT NULL default '0',

4
sql/updates/7388_01_mangos_mangos_string.sql
View file

@ -1,3 +1,5 @@
DELETE FROM mangos_string WHERE entry = 726; ALTER TABLE db_version CHANGE COLUMN required_7382_01_mangos_creature_template required_7388_01_mangos_mangos_string bit;
DELETE FROM mangos_string WHERE entry IN (750,751);
INSERT INTO mangos_string VALUES (750,'Not enough players. This game will close in %u mins.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); INSERT INTO mangos_string VALUES (750,'Not enough players. This game will close in %u mins.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
INSERT INTO mangos_string VALUES (751,'Not enough players. This game will close in %u seconds.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); INSERT INTO mangos_string VALUES (751,'Not enough players. This game will close in %u seconds.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

4
sql/updates/7390_01_mangos_areatrigger_teleport.sql Normal file
View file

@ -0,0 +1,4 @@
ALTER TABLE db_version CHANGE COLUMN required_7388_01_mangos_mangos_string required_7390_01_mangos_areatrigger_teleport bit;
ALTER TABLE areatrigger_teleport
ADD COLUMN required_quest_done_heroic int(11) unsigned NOT NULL default '0' AFTER required_quest_done;

2
sql/updates/Makefile.am
View file

@ -192,6 +192,7 @@ pkgdata_DATA = \
7376_01_mangos_spell_area.sql \ 7376_01_mangos_spell_area.sql \
7382_01_mangos_creature_template.sql \ 7382_01_mangos_creature_template.sql \
7388_01_mangos_mangos_string.sql \ 7388_01_mangos_mangos_string.sql \
7390_01_mangos_areatrigger_teleport.sql \
README README
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
@ -364,4 +365,5 @@ EXTRA_DIST = \
7376_01_mangos_spell_area.sql \ 7376_01_mangos_spell_area.sql \
7382_01_mangos_creature_template.sql \ 7382_01_mangos_creature_template.sql \
7388_01_mangos_mangos_string.sql \ 7388_01_mangos_mangos_string.sql \
7390_01_mangos_areatrigger_teleport.sql \
README README

12
src/game/MiscHandler.cpp
View file

@ -859,8 +859,16 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
} }
uint32 missingQuest = 0; uint32 missingQuest = 0;
if(at->requiredQuest && !GetPlayer()->GetQuestRewardStatus(at->requiredQuest)) if(GetPlayer()->GetDifficulty() == DIFFICULTY_HEROIC)
missingQuest = at->requiredQuest; {
if (at->requiredQuestHeroic && !GetPlayer()->GetQuestRewardStatus(at->requiredQuestHeroic))
missingQuest = at->requiredQuestHeroic;
}
else
{
if(at->requiredQuest && !GetPlayer()->GetQuestRewardStatus(at->requiredQuest))
missingQuest = at->requiredQuest;
}
if(missingLevel || missingItem || missingKey || missingQuest) if(missingLevel || missingItem || missingKey || missingQuest)
{ {

38
src/game/ObjectMgr.cpp
View file

@ -4849,8 +4849,8 @@ void ObjectMgr::LoadAreaTriggerTeleports()
uint32 count = 0; uint32 count = 0;
// 0 1 2 3 4 5 6 7 8 9 10 11 12 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13
QueryResult *result = WorldDatabase.Query("SELECT id, required_level, required_item, required_item2, heroic_key, heroic_key2, required_quest_done, required_failed_text, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport"); QueryResult *result = WorldDatabase.Query("SELECT id, required_level, required_item, required_item2, heroic_key, heroic_key2, required_quest_done, required_quest_done_heroic, required_failed_text, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport");
if( !result ) if( !result )
{ {
@ -4877,18 +4877,19 @@ void ObjectMgr::LoadAreaTriggerTeleports()
AreaTrigger at; AreaTrigger at;
at.requiredLevel = fields[1].GetUInt8(); at.requiredLevel = fields[1].GetUInt8();
at.requiredItem = fields[2].GetUInt32(); at.requiredItem = fields[2].GetUInt32();
at.requiredItem2 = fields[3].GetUInt32(); at.requiredItem2 = fields[3].GetUInt32();
at.heroicKey = fields[4].GetUInt32(); at.heroicKey = fields[4].GetUInt32();
at.heroicKey2 = fields[5].GetUInt32(); at.heroicKey2 = fields[5].GetUInt32();
at.requiredQuest = fields[6].GetUInt32(); at.requiredQuest = fields[6].GetUInt32();
at.requiredFailedText = fields[7].GetCppString(); at.requiredQuestHeroic = fields[7].GetUInt32();
at.target_mapId = fields[8].GetUInt32(); at.requiredFailedText = fields[8].GetCppString();
at.target_X = fields[9].GetFloat(); at.target_mapId = fields[9].GetUInt32();
at.target_Y = fields[10].GetFloat(); at.target_X = fields[10].GetFloat();
at.target_Z = fields[11].GetFloat(); at.target_Y = fields[11].GetFloat();
at.target_Orientation = fields[12].GetFloat(); at.target_Z = fields[12].GetFloat();
at.target_Orientation = fields[13].GetFloat();
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
if(!atEntry) if(!atEntry)
@ -4945,6 +4946,15 @@ void ObjectMgr::LoadAreaTriggerTeleports()
} }
} }
if(at.requiredQuestHeroic)
{
if(!mQuestTemplates[at.requiredQuestHeroic])
{
sLog.outErrorDb("Required Quest %u not exist for trigger %u, remove quest done requirement.",at.requiredQuestHeroic,Trigger_ID);
at.requiredQuestHeroic = 0;
}
}
MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId); MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId);
if(!mapEntry) if(!mapEntry)
{ {

1
src/game/ObjectMgr.h
View file

@ -103,6 +103,7 @@ struct AreaTrigger
uint32 heroicKey; uint32 heroicKey;
uint32 heroicKey2; uint32 heroicKey2;
uint32 requiredQuest; uint32 requiredQuest;
uint32 requiredQuestHeroic;
std::string requiredFailedText; std::string requiredFailedText;
uint32 target_mapId; uint32 target_mapId;
float target_X; float target_X;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7389" #define REVISION_NR "7390"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__