hide_reward to not show anything on offer quest
alter table quests add column hide_reward tinyint(3) unsigned not null default 0;
This commit is contained in:
parent
71217ce0ec
commit
2a89989e0c
@ -320,6 +320,7 @@ Quest::Quest(int32 in_id){
|
|||||||
m_status = 0;
|
m_status = 0;
|
||||||
status_to_earn_min = 0;
|
status_to_earn_min = 0;
|
||||||
status_to_earn_max = 0;
|
status_to_earn_max = 0;
|
||||||
|
hide_reward = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Quest::Quest(Quest* old_quest){
|
Quest::Quest(Quest* old_quest){
|
||||||
@ -399,6 +400,7 @@ Quest::Quest(Quest* old_quest){
|
|||||||
can_delete_quest = old_quest->CanDeleteQuest();
|
can_delete_quest = old_quest->CanDeleteQuest();
|
||||||
status_to_earn_min = old_quest->GetStatusToEarnMin();
|
status_to_earn_min = old_quest->GetStatusToEarnMin();
|
||||||
status_to_earn_max = old_quest->GetStatusToEarnMax();
|
status_to_earn_max = old_quest->GetStatusToEarnMax();
|
||||||
|
hide_reward = old_quest->GetHideReward();
|
||||||
}
|
}
|
||||||
|
|
||||||
Quest::~Quest(){
|
Quest::~Quest(){
|
||||||
@ -906,14 +908,18 @@ EQ2Packet* Quest::OfferQuest(int16 version, Player* player){
|
|||||||
else
|
else
|
||||||
packet->setDataByName("unknown", 5);
|
packet->setDataByName("unknown", 5);
|
||||||
packet->setDataByName("level", level);
|
packet->setDataByName("level", level);
|
||||||
|
if(!GetHideReward()) {
|
||||||
if(reward_coins > 0){
|
if(reward_coins > 0){
|
||||||
packet->setDataByName("min_coin", reward_coins);
|
packet->setDataByName("min_coin", reward_coins);
|
||||||
if (reward_coins_max)
|
if (reward_coins_max)
|
||||||
packet->setDataByName("max_coin", reward_coins_max);
|
packet->setDataByName("max_coin", reward_coins_max);
|
||||||
}
|
}
|
||||||
packet->setDataByName("status_points", GetStatusEarned() > 0 ? GetStatusEarned() : reward_status);
|
packet->setDataByName("status_points", GetStatusEarned() > 0 ? GetStatusEarned() : reward_status);
|
||||||
|
}
|
||||||
if(reward_comment.length() > 0)
|
if(reward_comment.length() > 0)
|
||||||
packet->setDataByName("text", reward_comment.c_str());
|
packet->setDataByName("text", reward_comment.c_str());
|
||||||
|
|
||||||
|
if(!GetHideReward()) {
|
||||||
if(reward_items.size() > 0){
|
if(reward_items.size() > 0){
|
||||||
player->GetClient()->PopulateQuestRewardItems(&reward_items, packet);
|
player->GetClient()->PopulateQuestRewardItems(&reward_items, packet);
|
||||||
}
|
}
|
||||||
@ -921,6 +927,7 @@ EQ2Packet* Quest::OfferQuest(int16 version, Player* player){
|
|||||||
player->GetClient()->PopulateQuestRewardItems(&selectable_reward_items, packet, std::string("num_select_rewards"),
|
player->GetClient()->PopulateQuestRewardItems(&selectable_reward_items, packet, std::string("num_select_rewards"),
|
||||||
std::string("select_reward_id"), std::string("select_item"));
|
std::string("select_reward_id"), std::string("select_item"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
map<int32, sint32>* reward_factions = GetRewardFactions();
|
map<int32, sint32>* reward_factions = GetRewardFactions();
|
||||||
if (reward_factions && reward_factions->size() > 0) {
|
if (reward_factions && reward_factions->size() > 0) {
|
||||||
packet->setArrayLengthByName("num_factions", reward_factions->size());
|
packet->setArrayLengthByName("num_factions", reward_factions->size());
|
||||||
|
@ -331,6 +331,7 @@ public:
|
|||||||
|
|
||||||
void SetQuestShareableFlag(int32 flag) { quest_shareable_flag = flag; }
|
void SetQuestShareableFlag(int32 flag) { quest_shareable_flag = flag; }
|
||||||
void SetCanDeleteQuest(bool newval) { can_delete_quest = newval; }
|
void SetCanDeleteQuest(bool newval) { can_delete_quest = newval; }
|
||||||
|
void SetHideReward(bool newval) { hide_reward = newval; }
|
||||||
|
|
||||||
|
|
||||||
void SetStatusToEarnMin(int32 value_) { status_to_earn_min = value_; }
|
void SetStatusToEarnMin(int32 value_) { status_to_earn_min = value_; }
|
||||||
@ -341,6 +342,7 @@ public:
|
|||||||
|
|
||||||
int32 GetQuestShareableFlag() { return quest_shareable_flag; }
|
int32 GetQuestShareableFlag() { return quest_shareable_flag; }
|
||||||
bool CanDeleteQuest() { return can_delete_quest; }
|
bool CanDeleteQuest() { return can_delete_quest; }
|
||||||
|
bool GetHideReward() { return hide_reward; }
|
||||||
|
|
||||||
bool CanShareQuestCriteria(Client* quest_sharer, bool display_client_msg = true);
|
bool CanShareQuestCriteria(Client* quest_sharer, bool display_client_msg = true);
|
||||||
Mutex MQuestSteps;
|
Mutex MQuestSteps;
|
||||||
@ -428,6 +430,7 @@ protected:
|
|||||||
bool can_delete_quest;
|
bool can_delete_quest;
|
||||||
int32 status_to_earn_min;
|
int32 status_to_earn_min;
|
||||||
int32 status_to_earn_max;
|
int32 status_to_earn_max;
|
||||||
|
bool hide_reward;
|
||||||
};
|
};
|
||||||
|
|
||||||
class MasterQuestList{
|
class MasterQuestList{
|
||||||
|
@ -5349,7 +5349,7 @@ void WorldDatabase::FixBugReport(){
|
|||||||
int32 WorldDatabase::LoadQuests(){
|
int32 WorldDatabase::LoadQuests(){
|
||||||
Query query;
|
Query query;
|
||||||
MYSQL_ROW row;
|
MYSQL_ROW row;
|
||||||
std::string querystr = std::string("SELECT `quest_id`, `name`, `type`, `zone`, `level`, `enc_level`, `description`, `lua_script`, `completed_text`, `spawn_id`, `shareable_flag`, `deleteable`, `status_to_earn_min`, `status_to_earn_max` FROM `quests`");
|
std::string querystr = std::string("SELECT `quest_id`, `name`, `type`, `zone`, `level`, `enc_level`, `description`, `lua_script`, `completed_text`, `spawn_id`, `shareable_flag`, `deleteable`, `status_to_earn_min`, `status_to_earn_max`, `hide_reward` FROM `quests`");
|
||||||
MYSQL_RES* result = query.RunQuery2(Q_SELECT, querystr.c_str());
|
MYSQL_RES* result = query.RunQuery2(Q_SELECT, querystr.c_str());
|
||||||
Quest* quest = 0;
|
Quest* quest = 0;
|
||||||
char* name = 0;
|
char* name = 0;
|
||||||
@ -5399,6 +5399,7 @@ int32 WorldDatabase::LoadQuests(){
|
|||||||
quest->SetCanDeleteQuest(atoul(row[11]));
|
quest->SetCanDeleteQuest(atoul(row[11]));
|
||||||
quest->SetStatusToEarnMin(atoul(row[12]));
|
quest->SetStatusToEarnMin(atoul(row[12]));
|
||||||
quest->SetStatusToEarnMax(atoul(row[13]));
|
quest->SetStatusToEarnMax(atoul(row[13]));
|
||||||
|
quest->SetHideReward(atoul(row[14]));
|
||||||
total++;
|
total++;
|
||||||
master_quest_list.AddQuest(id, quest);
|
master_quest_list.AddQuest(id, quest);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user