Skip to content

Commit

Permalink
clear code by chat gtp
Browse files Browse the repository at this point in the history
  • Loading branch information
luhailong committed Jul 24, 2024
1 parent 417beb8 commit 6744069
Showing 1 changed file with 18 additions and 20 deletions.
38 changes: 18 additions & 20 deletions pkg/logic/src/system/mission/mission_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ bool MissionSystem::UpdateMissionProgress(const MissionConditionEvent& condition
return missionUpdated;
}

// Update mission progress if condition matches event
// Update mission progress if conditions match the event
bool MissionSystem::UpdateProgressIfConditionMatches(const MissionConditionEvent& conditionEvent, MissionPbComp& mission, int index, const condition_row* conditionRow) {
// Retrieve old progress value
const auto oldProgress = mission.progress(index);
Expand All @@ -376,26 +376,23 @@ bool MissionSystem::UpdateProgressIfConditionMatches(const MissionConditionEvent
size_t matchConditionCount = 0;

auto countMatchingConditions = [&matchConditionCount, &conditionEvent, &configConditionCount](const auto& configConditions, size_t index) {
if (configConditions.size() > 0)
{
++configConditionCount;
}
if (conditionEvent.condtion_ids().size() <= index)
{
return;
}
//验证条件和表里面的每列的多个条件是否有一项匹配
for (int32_t ci = 0; ci < configConditions.size(); ++ci)
{
if (conditionEvent.condtion_ids(index) != configConditions.Get(ci))
{
continue;
}
//在这列中有一项匹配
++matchConditionCount;
break;
if (!configConditions.empty()) {
++configConditionCount;
}
if (index >= conditionEvent.condtion_ids().size()) {
return;
}
auto eventConditionId = conditionEvent.condtion_ids(index);
// Check if any condition in the table's columns matches any of the event's conditions
for (int32_t ci = 0; ci < configConditions.size(); ++ci) {
if (configConditions.Get(ci) != eventConditionId) {
continue;
}
};
// Found a match in this column
++matchConditionCount;
break;
}
};

// Count matching conditions for up to four condition slots
countMatchingConditions(conditionRow->condition1(), 0);
Expand All @@ -413,6 +410,7 @@ bool MissionSystem::UpdateProgressIfConditionMatches(const MissionConditionEvent
return true;
}


// Update mission status based on progress
void MissionSystem::UpdateMissionStatus(MissionPbComp& mission, const google::protobuf::RepeatedField<uint32_t>& missionConditions) {
// Iterate through mission conditions and update progress
Expand Down

0 comments on commit 6744069

Please sign in to comment.