Skip to content

Commit

Permalink
perf: wheel
Browse files Browse the repository at this point in the history
  • Loading branch information
@phacUFPE
phacUFPE committed Dec 13, 2024
1 parent 147c823 commit cf77e71
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 70 deletions.
134 changes: 64 additions & 70 deletions src/creatures/players/wheel/player_wheel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,33 +855,7 @@ uint16_t PlayerWheel::getUnusedPoints() const {
const auto vocationBaseId = m_player.getVocation()->getBaseId();
const auto modsSupremeIt = modsSupremePositionByVocation.find(vocationBaseId);

for (const auto &modPosition : modsBasicPosition) {
const auto pos = static_cast<uint8_t>(modPosition);
uint8_t grade = 0;
auto gradeKV = gemsGradeKV(WheelFragmentType_t::Lesser, pos)->get("grade");

if (gradeKV.has_value()) {
grade = static_cast<uint8_t>(gradeKV->get<IntType>());
}

totalPoints += grade == 3 ? 1 : 0;
}

if (modsSupremeIt != modsSupremePositionByVocation.end()) {
for (const auto &modPosition : modsSupremeIt->second.get()) {
const auto pos = static_cast<uint8_t>(modPosition);
uint8_t grade = 0;
auto gradeKV = gemsGradeKV(WheelFragmentType_t::Greater, pos)->get("grade");

if (gradeKV.has_value()) {
grade = gradeKV->get<IntType>();
}

totalPoints += grade == 3 ? 1 : 0;
}
} else {
g_logger().error("[{}] supreme modifications not found for vocation base id: {}", std::source_location::current().function_name(), vocationBaseId);
}
totalPoints += m_modsMaxGrade;

for (uint8_t i = WheelSlots_t::SLOT_FIRST; i <= WheelSlots_t::SLOT_LAST; ++i) {
totalPoints -= getPointsBySlotType(static_cast<WheelSlots_t>(i));
Expand Down Expand Up @@ -1028,13 +1002,7 @@ std::shared_ptr<KV> PlayerWheel::gemsGradeKV(WheelFragmentType_t type, uint8_t p
}

uint8_t PlayerWheel::getGemGrade(WheelFragmentType_t type, uint8_t pos) const {
uint8_t grade = 0;
const auto gradeKV = gemsGradeKV(type, pos)->get("grade");

if (gradeKV.has_value()) {
grade = static_cast<uint8_t>(gradeKV->get<IntType>());
}
return grade;
return type == WheelFragmentType_t::Lesser ? m_basicGrades[pos] : m_supremeGrades[pos];
}

std::vector<PlayerWheelGem> PlayerWheel::getRevealedGems() const {
Expand Down Expand Up @@ -1384,16 +1352,11 @@ void PlayerWheel::addGems(NetworkMessage &msg) const {

void PlayerWheel::addGradeModifiers(NetworkMessage &msg) const {
msg.addByte(0x2E); // Modifiers for all Vocations

for (const auto &modPosition : modsBasicPosition) {
const auto pos = static_cast<uint8_t>(modPosition);
msg.addByte(pos);
uint8_t grade = 0;
auto gradeKV = gemsGradeKV(WheelFragmentType_t::Lesser, pos)->get("grade");

if (gradeKV.has_value()) {
grade = static_cast<uint8_t>(gradeKV->get<IntType>());
}
msg.addByte(grade);
msg.addByte(m_basicGrades[pos]);
}

msg.addByte(0x17); // Modifiers for specific per Vocations
Expand All @@ -1405,13 +1368,7 @@ void PlayerWheel::addGradeModifiers(NetworkMessage &msg) const {
for (const auto &modPosition : modsSupremeIt->second.get()) {
const auto pos = static_cast<uint8_t>(modPosition);
msg.addByte(pos);
uint8_t grade = 0;
auto gradeKV = gemsGradeKV(WheelFragmentType_t::Greater, pos)->get("grade");

if (gradeKV.has_value()) {
grade = gradeKV->get<IntType>();
}
msg.addByte(grade);
msg.addByte(m_supremeGrades[pos]);
}
} else {
g_logger().error("[{}] vocation base id: {}", std::source_location::current().function_name(), m_player.getVocation()->getBaseId());
Expand All @@ -1424,9 +1381,10 @@ void PlayerWheel::improveGemGrade(WheelFragmentType_t fragmentType, uint8_t pos)
uint8_t quantity = 0;
uint8_t grade = 0;

auto gradeKV = gemsGradeKV(fragmentType, pos)->get("grade");
if (gradeKV.has_value()) {
grade = gradeKV->get<IntType>();
if (fragmentType == WheelFragmentType_t::Lesser) {
grade = m_basicGrades[pos];
} else {
grade = m_supremeGrades[pos];
}

++grade;
Expand Down Expand Up @@ -1465,7 +1423,14 @@ void PlayerWheel::improveGemGrade(WheelFragmentType_t fragmentType, uint8_t pos)
return;
}

gemsGradeKV(fragmentType, pos)->set("grade", grade);
if (fragmentType == WheelFragmentType_t::Lesser) {
m_basicGrades[pos] = grade;
} else {
m_supremeGrades[pos] = grade;
}

m_modsMaxGrade += grade == 3 ? 1 : 0;

loadPlayerBonusData();
sendOpenWheelWindow(m_player.getID());
}
Expand Down Expand Up @@ -1676,6 +1641,52 @@ void PlayerWheel::saveSlotPointsOnPressSaveButton(NetworkMessage &msg) {
g_logger().debug("Player: {} is saved the all slots info in: {} milliseconds", m_player.getName(), bm_saveSlot.duration());
}

void PlayerWheel::loadKVModGrades() {
for (const auto &modPosition : modsBasicPosition) {
const auto pos = static_cast<uint8_t>(modPosition);
auto gradeKV = gemsGradeKV(WheelFragmentType_t::Lesser, pos)->get("grade");

if (gradeKV.has_value()) {
uint8_t grade = gradeKV->get<IntType>();
m_basicGrades[pos] = grade;
m_modsMaxGrade += grade == 3 ? 1 : 0;
}
}

const auto vocationBaseId = m_player.getVocation()->getBaseId();
const auto modsSupremeIt = modsSupremePositionByVocation.find(vocationBaseId);
for (const auto &modPosition : modsSupremeIt->second.get()) {
const auto pos = static_cast<uint8_t>(modPosition);
auto gradeKV = gemsGradeKV(WheelFragmentType_t::Greater, pos)->get("grade");

if (gradeKV.has_value()) {
uint8_t grade = gradeKV->get<IntType>();
m_supremeGrades[pos] = grade;
m_modsMaxGrade += grade == 3 ? 1 : 0;
}
}
}

void PlayerWheel::saveKVModGrades() const {
for (const auto &modPosition : modsBasicPosition) {
const auto pos = static_cast<uint8_t>(modPosition);
uint8_t grade = m_basicGrades[pos];
if (grade > 0) {
gemsGradeKV(WheelFragmentType_t::Lesser, pos)->set("grade", grade);
}
}

const auto vocationBaseId = m_player.getVocation()->getBaseId();
const auto modsSupremeIt = modsSupremePositionByVocation.find(vocationBaseId);
for (const auto &modPosition : modsSupremeIt->second.get()) {
const auto pos = static_cast<uint8_t>(modPosition);
uint8_t grade = m_supremeGrades[pos];
if (grade > 0) {
gemsGradeKV(WheelFragmentType_t::Greater, pos)->set("grade", grade);
}
}
}

/*
* Functions for load and save player database informations
*/
Expand Down Expand Up @@ -2555,24 +2566,7 @@ WheelStageEnum_t PlayerWheel::getPlayerSliceStage(const std::string &color) cons
}
}

const auto vocationBaseId = m_player.getVocation()->getBaseId();
const auto modsSupremeIt = modsSupremePositionByVocation.find(vocationBaseId);

if (modsSupremeIt != modsSupremePositionByVocation.end()) {
for (const auto &modPosition : modsSupremeIt->second.get()) {
const auto pos = static_cast<uint8_t>(modPosition);
uint8_t grade = 0;
auto gradeKV = gemsGradeKV(WheelFragmentType_t::Greater, pos)->get("grade");

if (gradeKV.has_value()) {
grade = gradeKV->get<IntType>();
}

totalPoints += grade == 3 ? 1 : 0;
}
} else {
g_logger().error("[{}] supreme modifications not found for vocation base id: {}", std::source_location::current().function_name(), vocationBaseId);
}
totalPoints += m_modsMaxGrade;

if (totalPoints >= static_cast<int>(WheelStagePointsEnum_t::THREE)) {
return WheelStageEnum_t::THREE;
Expand Down
7 changes: 7 additions & 0 deletions src/creatures/players/wheel/player_wheel.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ class PlayerWheel {
public:
explicit PlayerWheel(Player &initPlayer);

void loadKVModGrades();
void saveKVModGrades() const;

/*
* Functions for load and save player database informations
*/
Expand Down Expand Up @@ -421,6 +424,10 @@ class PlayerWheel {
PlayerWheelMethodsBonusData m_playerBonusData;
std::unique_ptr<WheelModifierContext> m_modifierContext;

uint8_t m_modsMaxGrade = {};
std::array<uint8_t, 49> m_basicGrades = { 0 };
std::array<uint8_t, 76> m_supremeGrades = { 0 };

std::array<uint8_t, static_cast<size_t>(WheelStage_t::STAGE_COUNT)> m_stages = { 0 };
std::array<int64_t, static_cast<size_t>(WheelOnThink_t::TOTAL_COUNT)> m_onThink = { 0 };
std::array<int32_t, static_cast<size_t>(WheelStat_t::TOTAL_COUNT)> m_stats = { 0 };
Expand Down
1 change: 1 addition & 0 deletions src/io/functions/iologindata_load_player.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,7 @@ void IOLoginDataLoad::loadPlayerInitializeSystem(const std::shared_ptr<Player> &

// Wheel loading
player->wheel()->loadDBPlayerSlotPointsOnLogin();
player->wheel()->loadKVModGrades();
player->wheel()->initializePlayerData();

player->achiev()->loadUnlockedAchievements();
Expand Down

0 comments on commit cf77e71

Please sign in to comment.