Skip to content

Commit

Permalink
refactor: Use StringFormat()
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nyeriah
Nyeriah committed Sep 14, 2024
1 parent 8ca0dff commit f0330c4
Showing 1 changed file with 17 additions and 46 deletions.
63 changes: 17 additions & 46 deletions src/mod_zone_difficulty_scripts.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,28 +767,23 @@ class mod_zone_difficulty_rewardnpc : public CreatureScript
{
npcText = NPC_TEXT_DENIED;
SendGossipMenuFor(player, npcText, creature);
std::string whisper;
whisper.append("I am sorry, time-traveler. This reward costs ");
whisper.append(std::to_string(sZoneDifficulty->TierRewards[category].Price));
whisper.append(" score but you only have ");
whisper.append(std::to_string(availableScore));
whisper.append(" ");
whisper.append(sZoneDifficulty->GetContentTypeString(category));
std::string whisper = Acore::StringFormat("I am sorry, time-traveler. This reward costs {} score but you only have {} {}",
sZoneDifficulty->TierRewards[category].Price,
availableScore,
sZoneDifficulty->GetContentTypeString(category));

creature->Whisper(whisper, LANG_UNIVERSAL, player);
return true;
}
npcText = NPC_TEXT_CONFIRM;
ItemTemplate const* proto = sObjectMgr->GetItemTemplate(sZoneDifficulty->TierRewards[category].Entry);
std::string gossip;
std::string name = proto->Name1;

if (ItemLocale const* leftIl = sObjectMgr->GetItemLocale(sZoneDifficulty->TierRewards[category].Entry))
ObjectMgr::GetLocaleString(leftIl->Name, player->GetSession()->GetSessionDbcLocale(), name);

gossip.append("Yes, ").append(name).append(" is the item i want.");
AddGossipItemFor(player, GOSSIP_ICON_CHAT, "No!", GOSSIP_SENDER_MAIN, 999998);
AddGossipItemFor(player, GOSSIP_ICON_VENDOR, gossip, GOSSIP_SENDER_MAIN, 99001000 + category);
//LOG_INFO("module", "MOD-ZONE-DIFFICULTY: AddingGossipItem with action {}", 99001000 + category);
AddGossipItemFor(player, GOSSIP_ICON_VENDOR, Acore::StringFormat("Yes, {} is the item I want.", name), GOSSIP_SENDER_MAIN, 99001000 + category);
SendGossipMenuFor(player, npcText, creature);
return true;
}
Expand All @@ -800,24 +795,16 @@ class mod_zone_difficulty_rewardnpc : public CreatureScript
{
npcText = NPC_TEXT_CATEGORY;
if (sZoneDifficulty->HasCompletedFullTier(action, player->GetGUID().GetCounter()))
{
std::string gossip = "I want to redeem the ultimate Mythicmode reward ";
gossip.append(sZoneDifficulty->GetContentTypeString(action));
AddGossipItemFor(player, GOSSIP_ICON_MONEY_BAG, gossip, GOSSIP_SENDER_MAIN, 99000000 + action);
}
AddGossipItemFor(player, GOSSIP_ICON_MONEY_BAG, Acore::StringFormat("I want to redeem the ultimate Mythicmode reward {}", sZoneDifficulty->GetContentTypeString(action)), GOSSIP_SENDER_MAIN, 99000000 + action);

uint32 i = 1;
for (auto& itemType : sZoneDifficulty->Rewards[action])
{
//LOG_INFO("module", "MOD-ZONE-DIFFICULTY: typedata.first is {}", itemType.first);
std::string gossip;
std::string typestring = sZoneDifficulty->GetItemTypeString(itemType.first);
if (sZoneDifficulty->ItemIcons.find(i) != sZoneDifficulty->ItemIcons.end())
{
gossip.append(sZoneDifficulty->ItemIcons[i]);
}
gossip.append("I am interested in items from the ").append(typestring).append(" category.");
AddGossipItemFor(player, GOSSIP_ICON_CHAT, gossip, GOSSIP_SENDER_MAIN, itemType.first + (action * 100));
AddGossipItemFor(player, GOSSIP_ICON_CHAT, Acore::StringFormat("{} I am interested in items from the {} category.", sZoneDifficulty->ItemIcons[i], typestring), GOSSIP_SENDER_MAIN, itemType.first + (action * 100));
else
AddGossipItemFor(player, GOSSIP_ICON_CHAT, Acore::StringFormat("I am interested in items from the {} category.", typestring), GOSSIP_SENDER_MAIN, itemType.first + (action * 100));
++i;
}
}
Expand Down Expand Up @@ -871,29 +858,23 @@ class mod_zone_difficulty_rewardnpc : public CreatureScript
{
npcText = NPC_TEXT_DENIED;
SendGossipMenuFor(player, npcText, creature);
std::string whisper;
whisper.append("I am sorry, time-traveler. This item costs ");
whisper.append(std::to_string(sZoneDifficulty->Rewards[category][itemType][counter].Price));
whisper.append(" score but you only have ");
whisper.append(std::to_string(sZoneDifficulty->MythicmodeScore[category][player->GetGUID().GetCounter()]));
whisper.append(" ");
whisper.append(sZoneDifficulty->GetContentTypeString(category));
std::string whisper = Acore::StringFormat("I am sorry, time-traveler. This item costs {} but you only have {} {}",
sZoneDifficulty->Rewards[category][itemType][counter].Price,
sZoneDifficulty->MythicmodeScore[category][player->GetGUID().GetCounter()],
sZoneDifficulty->GetContentTypeString(category));
creature->Whisper(whisper, LANG_UNIVERSAL, player);
return true;
}

npcText = NPC_TEXT_CONFIRM;
ItemTemplate const* proto = sObjectMgr->GetItemTemplate(sZoneDifficulty->Rewards[category][itemType][counter].Entry);
std::string gossip;
std::string name = proto->Name1;

if (ItemLocale const* leftIl = sObjectMgr->GetItemLocale(sZoneDifficulty->Rewards[category][itemType][counter].Entry))
ObjectMgr::GetLocaleString(leftIl->Name, player->GetSession()->GetSessionDbcLocale(), name);

gossip.append("Yes, ").append(name).append(" is the item i want.");
AddGossipItemFor(player, GOSSIP_ICON_CHAT, "No!", GOSSIP_SENDER_MAIN, 999998);
AddGossipItemFor(player, GOSSIP_ICON_VENDOR, gossip, GOSSIP_SENDER_MAIN, 100000 + (1000 * category) + (100 * itemType) + counter);
//LOG_INFO("module", "MOD-ZONE-DIFFICULTY: AddingGossipItem with action {}", 100000 + (1000 * category) + (100 * itemType) + counter);
AddGossipItemFor(player, GOSSIP_ICON_VENDOR, Acore::StringFormat("Yes, {} is the item I want.", name), GOSSIP_SENDER_MAIN, 100000 + (1000 * category) + (100 * itemType) + counter);
}
else if (action > 100000)
{
Expand Down Expand Up @@ -923,19 +904,14 @@ class mod_zone_difficulty_rewardnpc : public CreatureScript
return true;

// Check if the player has the neccesary achievement
if (sZoneDifficulty->Rewards[category][itemType][counter].Achievement != 0)
if (sZoneDifficulty->Rewards[category][itemType][counter].Achievement)
{
if (!player->HasAchieved(sZoneDifficulty->Rewards[category][itemType][counter].Achievement))
{
std::string gossip = "You do not have the required achievement with ID ";
gossip.append(std::to_string(sZoneDifficulty->Rewards[category][itemType][counter].Achievement));
gossip.append(" to receive this item. Before i can give it to you, you need to complete the whole dungeon where it can be obtained.");
creature->Whisper(gossip, LANG_UNIVERSAL, player);
/* debug
* LOG_INFO("module", "MOD-ZONE-DIFFICULTY: Player missing achiement with ID {} to obtain item with category {}, itemType {}, counter {}",
* sZoneDifficulty->Rewards[category][itemType][counter].Achievement, category, itemType, counter);
* end debug
*/
CloseGossipMenuFor(player);
return true;
}
Expand All @@ -958,15 +934,10 @@ class mod_zone_difficulty_rewardnpc : public CreatureScript

for (auto& typedata : sZoneDifficulty->Rewards)
{
//LOG_INFO("module", "MOD-ZONE-DIFFICULTY: typedata.first is {}", typedata.first);
if (typedata.first != 0)
{
std::string gossip;
std::string typestring = sZoneDifficulty->GetContentTypeString(typedata.first);
gossip.append("I want to redeem rewards ").append(typestring);
//LOG_INFO("module", "MOD-ZONE-DIFFICULTY: typestring is: {} gossip is: {}", typestring, gossip);
// typedata.first is the ContentType
AddGossipItemFor(player, GOSSIP_ICON_INTERACT_1, gossip, GOSSIP_SENDER_MAIN, typedata.first);
AddGossipItemFor(player, GOSSIP_ICON_INTERACT_1, Acore::StringFormat("I want to redeem rewards {}", sZoneDifficulty->GetContentTypeString(typedata.first)), GOSSIP_SENDER_MAIN, typedata.first);
}
}

Expand Down

0 comments on commit f0330c4

Please sign in to comment.