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

[7945] Implement support quest data for DetailsEmoteDelay and OfferRewardEmoteDelay value for set time ordering details and reward emotes.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
NoFantasy 2009-06-02 14:42:43 +04:00 • committed by VladimirMangos
parent afdcc2bbfe
commit 82f16a6579
8 changed files with 48 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/mangos.sql
View file

@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
CREATE TABLE `db_version` ( CREATE TABLE `db_version` (
`version` varchar(120) default NULL, `version` varchar(120) default NULL,
`creature_ai_version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL,
`required_7908_03_mangos_creature_template_addon` bit(1) default NULL `required_7945_01_mangos_quest_template` 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';
-- --
@ -13264,12 +13264,20 @@ CREATE TABLE `quest_template` (
`DetailsEmote2` smallint(5) unsigned NOT NULL default '0', `DetailsEmote2` smallint(5) unsigned NOT NULL default '0',
`DetailsEmote3` smallint(5) unsigned NOT NULL default '0', `DetailsEmote3` smallint(5) unsigned NOT NULL default '0',
`DetailsEmote4` smallint(5) unsigned NOT NULL default '0', `DetailsEmote4` smallint(5) unsigned NOT NULL default '0',
`DetailsEmoteDelay1` int(11) unsigned NOT NULL default '0',
`DetailsEmoteDelay2` int(11) unsigned NOT NULL default '0',
`DetailsEmoteDelay3` int(11) unsigned NOT NULL default '0',
`DetailsEmoteDelay4` int(11) unsigned NOT NULL default '0',
`IncompleteEmote` smallint(5) unsigned NOT NULL default '0', `IncompleteEmote` smallint(5) unsigned NOT NULL default '0',
`CompleteEmote` smallint(5) unsigned NOT NULL default '0', `CompleteEmote` smallint(5) unsigned NOT NULL default '0',
`OfferRewardEmote1` smallint(5) unsigned NOT NULL default '0', `OfferRewardEmote1` smallint(5) unsigned NOT NULL default '0',
`OfferRewardEmote2` smallint(5) unsigned NOT NULL default '0', `OfferRewardEmote2` smallint(5) unsigned NOT NULL default '0',
`OfferRewardEmote3` smallint(5) unsigned NOT NULL default '0', `OfferRewardEmote3` smallint(5) unsigned NOT NULL default '0',
`OfferRewardEmote4` smallint(5) unsigned NOT NULL default '0', `OfferRewardEmote4` smallint(5) unsigned NOT NULL default '0',
`OfferRewardEmoteDelay1` int(11) unsigned NOT NULL default '0',
`OfferRewardEmoteDelay2` int(11) unsigned NOT NULL default '0',
`OfferRewardEmoteDelay3` int(11) unsigned NOT NULL default '0',
`OfferRewardEmoteDelay4` int(11) unsigned NOT NULL default '0',
`StartScript` mediumint(8) unsigned NOT NULL default '0', `StartScript` mediumint(8) unsigned NOT NULL default '0',
`CompleteScript` mediumint(8) unsigned NOT NULL default '0', `CompleteScript` mediumint(8) unsigned NOT NULL default '0',
PRIMARY KEY (`entry`) PRIMARY KEY (`entry`)

11
sql/updates/7945_01_mangos_quest_template.sql Normal file
View file

@ -0,0 +1,11 @@
ALTER TABLE db_version CHANGE COLUMN required_7908_03_mangos_creature_template_addon required_7945_01_mangos_quest_template bit;
ALTER TABLE quest_template
ADD COLUMN `DetailsEmoteDelay1` int(11) unsigned NOT NULL default '0' AFTER `DetailsEmote4`,
ADD COLUMN `DetailsEmoteDelay2` int(11) unsigned NOT NULL default '0' AFTER `DetailsEmoteDelay1`,
ADD COLUMN `DetailsEmoteDelay3` int(11) unsigned NOT NULL default '0' AFTER `DetailsEmoteDelay2`,
ADD COLUMN `DetailsEmoteDelay4` int(11) unsigned NOT NULL default '0' AFTER `DetailsEmoteDelay3`,
ADD COLUMN `OfferRewardEmoteDelay1` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmote4`,
ADD COLUMN `OfferRewardEmoteDelay2` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmoteDelay1`,
ADD COLUMN `OfferRewardEmoteDelay3` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmoteDelay2`,
ADD COLUMN `OfferRewardEmoteDelay4` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmoteDelay3`;

2
sql/updates/Makefile.am
View file

@ -210,6 +210,7 @@ pkgdata_DATA = \
7908_03_mangos_creature_template_addon.sql \ 7908_03_mangos_creature_template_addon.sql \
7932_01_characters_character_pet.sql \ 7932_01_characters_character_pet.sql \
7938_01_realmd_account.sql \ 7938_01_realmd_account.sql \
7945_01_mangos_quest_template.sql \
README README
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
@ -400,4 +401,5 @@ EXTRA_DIST = \
7908_03_mangos_creature_template_addon.sql \ 7908_03_mangos_creature_template_addon.sql \
7932_01_characters_character_pet.sql \ 7932_01_characters_character_pet.sql \
7938_01_realmd_account.sql \ 7938_01_realmd_account.sql \
7945_01_mangos_quest_template.sql \
README README

10
src/game/GossipDef.cpp
View file

@ -503,7 +503,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
for (uint32 i=0; i < QUEST_EMOTE_COUNT; ++i) for (uint32 i=0; i < QUEST_EMOTE_COUNT; ++i)
{ {
data << uint32(pQuest->DetailsEmote[i]); data << uint32(pQuest->DetailsEmote[i]);
data << uint32(0); // DetailsEmoteDelay data << uint32(pQuest->DetailsEmoteDelay[i]); // DetailsEmoteDelay (in ms)
} }
pSession->SendPacket( &data ); pSession->SendPacket( &data );
@ -641,7 +641,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
sLog.outDebug( "WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", pQuest->GetQuestId() ); sLog.outDebug( "WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", pQuest->GetQuestId() );
} }
void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, bool EnbleNext ) void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, bool EnableNext )
{ {
std::string Title = pQuest->GetTitle(); std::string Title = pQuest->GetTitle();
std::string OfferRewardText = pQuest->GetOfferRewardText(); std::string OfferRewardText = pQuest->GetOfferRewardText();
@ -666,7 +666,7 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
data << Title; data << Title;
data << OfferRewardText; data << OfferRewardText;
data << uint32( EnbleNext ); data << uint32( EnableNext );
data << uint32(0); // unk data << uint32(0); // unk
uint32 EmoteCount = 0; uint32 EmoteCount = 0;
@ -680,8 +680,8 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
data << EmoteCount; // Emote Count data << EmoteCount; // Emote Count
for (uint32 i = 0; i < EmoteCount; ++i) for (uint32 i = 0; i < EmoteCount; ++i)
{ {
data << uint32(0); // Delay Emote data << uint32(pQuest->OfferRewardEmoteDelay[i]); // Delay Emote
data << pQuest->OfferRewardEmote[i]; data << uint32(pQuest->OfferRewardEmote[i]);
} }
ItemPrototype const *pItem; ItemPrototype const *pItem;

10
src/game/ObjectMgr.cpp
View file

@ -2850,9 +2850,13 @@ void ObjectMgr::LoadQuests()
"RewRepFaction1, RewRepFaction2, RewRepFaction3, RewRepFaction4, RewRepFaction5, RewRepValue1, RewRepValue2, RewRepValue3, RewRepValue4, RewRepValue5," "RewRepFaction1, RewRepFaction2, RewRepFaction3, RewRepFaction4, RewRepFaction5, RewRepValue1, RewRepValue2, RewRepValue3, RewRepValue4, RewRepValue5,"
// 97 98 99 100 101 102 103 104 105 106 107 // 97 98 99 100 101 102 103 104 105 106 107
"RewHonorableKills, RewOrReqMoney, RewMoneyMaxLevel, RewSpell, RewSpellCast, RewMailTemplateId, RewMailDelaySecs, PointMapId, PointX, PointY, PointOpt," "RewHonorableKills, RewOrReqMoney, RewMoneyMaxLevel, RewSpell, RewSpellCast, RewMailTemplateId, RewMailDelaySecs, PointMapId, PointX, PointY, PointOpt,"
// 108 109 110 111 112 113 114 115 116 117 // 108 109 110 111 112 113 114 115
"DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4, IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4," "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4, DetailsEmoteDelay1, DetailsEmoteDelay2, DetailsEmoteDelay3, DetailsEmoteDelay4,"
// 118 119 // 116 117 118 119 120 121
"IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4,"
// 122 123 124 125
"OfferRewardEmoteDelay1, OfferRewardEmoteDelay2, OfferRewardEmoteDelay3, OfferRewardEmoteDelay4,"
// 126 127
"StartScript, CompleteScript" "StartScript, CompleteScript"
" FROM quest_template"); " FROM quest_template");
if(result == NULL) if(result == NULL)

16
src/game/QuestDef.cpp
View file

@ -115,14 +115,20 @@ Quest::Quest(Field * questRecord)
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
DetailsEmote[i] = questRecord[108+i].GetUInt32(); DetailsEmote[i] = questRecord[108+i].GetUInt32();
IncompleteEmote = questRecord[112].GetUInt32(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
CompleteEmote = questRecord[113].GetUInt32(); DetailsEmoteDelay[i] = questRecord[112+i].GetUInt32();
IncompleteEmote = questRecord[116].GetUInt32();
CompleteEmote = questRecord[117].GetUInt32();
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
OfferRewardEmote[i] = questRecord[114+i].GetInt32(); OfferRewardEmote[i] = questRecord[118+i].GetInt32();
QuestStartScript = questRecord[118].GetUInt32(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
QuestCompleteScript = questRecord[119].GetUInt32(); OfferRewardEmoteDelay[i] = questRecord[122+i].GetInt32();
QuestStartScript = questRecord[126].GetUInt32();
QuestCompleteScript = questRecord[127].GetUInt32();
QuestFlags |= SpecialFlags << 16; QuestFlags |= SpecialFlags << 16;

2
src/game/QuestDef.h
View file

@ -239,7 +239,9 @@ class Quest
uint32 RewRepFaction[QUEST_REPUTATIONS_COUNT]; uint32 RewRepFaction[QUEST_REPUTATIONS_COUNT];
int32 RewRepValue[QUEST_REPUTATIONS_COUNT]; int32 RewRepValue[QUEST_REPUTATIONS_COUNT];
uint32 DetailsEmote[QUEST_EMOTE_COUNT]; uint32 DetailsEmote[QUEST_EMOTE_COUNT];
uint32 DetailsEmoteDelay[QUEST_EMOTE_COUNT];
uint32 OfferRewardEmote[QUEST_EMOTE_COUNT]; uint32 OfferRewardEmote[QUEST_EMOTE_COUNT];
uint32 OfferRewardEmoteDelay[QUEST_EMOTE_COUNT];
uint32 GetReqItemsCount() const { return m_reqitemscount; } uint32 GetReqItemsCount() const { return m_reqitemscount; }
uint32 GetReqCreatureOrGOcount() const { return m_reqCreatureOrGOcount; } uint32 GetReqCreatureOrGOcount() const { return m_reqCreatureOrGOcount; }

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 "7944" #define REVISION_NR "7945"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__