fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 基建 制造站、贸易站、控制中枢 新增支持干员编组配置 (#6249)

Browse Source
This commit is contained in:
MistEO
2023-09-11 22:47:06 +08:00
committed by GitHub
parent ccedbfb993 330b023a98
commit 5232d41369
17 changed files with 306 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/MaaCore/Task/Interface/InfrastTask.cpp
View File

@@ -177,6 +177,18 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
}
auto& cur_plan = all_plans.at(index);
// 录入干员编组
std::unordered_map<std::string, std::vector<std::string>> ori_operator_groups;
if (auto opt = cur_plan.find<json::array>("groups")) {
for (const auto& group_info : opt.value()) {
std::vector<std::string> oper_group;
for (const auto& oper_info : group_info.at("operators").as_array()) {
oper_group.emplace_back(oper_info.as_string());
}
ori_operator_groups.emplace(group_info.at("name").as_string(), std::move(oper_group));
}
}
for (const auto& [facility, facility_info] : cur_plan.at("rooms").as_object()) {
infrast::CustomFacilityConfig facility_config;
@@ -185,6 +197,8 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
room_config.skip = room_info.get("skip", false);
room_config.autofill = room_info.get("autofill", false);
room_config.sort = room_info.get("sort", false);
room_config.use_operator_groups = room_info.get("use_operator_groups", false);
static std::unordered_map<std::string, infrast::CustomRoomConfig::Product> ProductNames = {
{ "Battle Record", infrast::CustomRoomConfig::Product::BattleRecord },
{ "Pure Gold", infrast::CustomRoomConfig::Product::PureGold },
@@ -204,6 +218,7 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
}
}
// 设置干员
if (auto opers_opt = room_info.find<json::array>("operators")) {
for (const auto& oper_name : opers_opt.value()) {
std::string name = oper_name.as_string();
@@ -213,7 +228,21 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
}
room_config.names.emplace_back(std::move(name));
}
if (room_config.use_operator_groups) {
// 将引用了的干员编组，装载到对应房间配置
// name数组此后可以作废
std::set<std::string> name_set;
name_set.insert(room_config.names.begin(), room_config.names.end());
ranges::for_each(ori_operator_groups,
[name_set, &room_config](std::pair<std::string, std::vector<std::string>> pair) {
if (name_set.contains(pair.first)) {
room_config.operator_groups[pair.first] = std::move(pair.second);
}
});
}
}
// 备选干员
if (auto candidates_opt = room_info.find<json::array>("candidates")) {
for (const auto& candidate_name : candidates_opt.value()) {
std::string name = candidate_name.as_string();
@@ -227,6 +256,7 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
facility_config.emplace_back(std::move(room_config));
}
// 不同类型建筑配置
if (facility == "control") {
m_control_task_ptr->set_custom_config(facility_config);
}
@@ -257,6 +287,7 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
}
}
// 菲亚梅塔
bool Fia_is_pre = false;
do {
auto Fia_opt = cur_plan.find<json::object>("Fiammetta");
@@ -302,6 +333,7 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
}
} while (false);
// 无人机
do {
auto drones_opt = cur_plan.find<json::object>("drones");
if (!drones_opt) {