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

perf: 整理肉鸽强制放空的一些结构

Browse Source
This commit is contained in:
MistEO
2022-10-11 00:49:20 +08:00
parent 8400ea43c7
commit bdcf884742
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp
View File

@@ -151,8 +151,8 @@ bool asst::RoguelikeBattleTaskPlugin::get_stage_info()
m_blacklist_location = opt->blacklist_location;
m_stage_use_dice = opt->use_dice_stage;
m_role_order = opt->role_order;
m_stop_blocking_deploy_num = opt->stop_deploy_blocking_num;
m_deploy_ranged_num = opt->force_deploy_air_defense_num;
m_force_air_defense.stop_blocking_deploy_num = opt->stop_deploy_blocking_num;
m_force_air_defense.deploy_air_defense_num = opt->force_deploy_air_defense_num;
m_force_deploy_direction = opt->force_deploy_direction;
}
else {
@@ -394,7 +394,7 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
}
if (auto del_pos_tiles = m_used_tiles.find(iter->second); del_pos_tiles != m_used_tiles.end()) {
if (m_normal_tile_info[del_pos_tiles->first].buildable == BattleLocationType::Melee) {
m_has_deployed_blocking_num--;
m_force_air_defense.has_deployed_blocking_num--;
}
m_used_tiles.erase(del_pos_tiles);
}
@@ -446,8 +446,10 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
bool has_medic = false;
bool wait_blocking = m_wait_blocking[m_cur_home_index];
bool wait_medic = m_wait_medic[m_cur_home_index];
bool force_need_air_defense = (!m_has_finished_deploy_air_defense) &&
(m_has_deployed_blocking_num >= m_stop_blocking_deploy_num) && (!m_use_dice);
bool force_need_air_defense =
(!m_force_air_defense.has_finished_deploy_air_defense) &&
(m_force_air_defense.has_deployed_blocking_num >= m_force_air_defense.stop_blocking_deploy_num) &&
(!m_use_dice);
if (m_use_dice) {
opt_oper = std::move(dice);
oper_found = true;
@@ -481,7 +483,7 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
if (force_need_air_defense) {
Log.info("RANGED ROLE IS NEEDED UNDER FORCE");
if (!has_air_defense) {
m_has_finished_deploy_air_defense = true;
m_force_air_defense.has_finished_deploy_air_defense = true;
Log.info("FORCE RANGED OPER DEPLOY END");
return true;
}
@@ -527,7 +529,7 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
if (available_locations(opt_oper.role).empty()) {
Log.info("Tiles full");
if (force_need_air_defense) {
m_has_finished_deploy_air_defense = true;
m_force_air_defense.has_finished_deploy_air_defense = true;
Log.info("FORCE RANGED OPER DEPLOY END");
}
return true;
@@ -650,12 +652,12 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
m_opers_in_field.emplace(opt_oper.name, placed_loc);
m_retreated_opers.erase(opt_oper.name);
if (get_role_position(opt_oper.role) == BattleOperPosition::Blocking) {
m_has_deployed_blocking_num++;
m_force_air_defense.has_deployed_blocking_num++;
}
if (force_need_air_defense) {
m_has_deployed_ranged_num++;
if (m_has_deployed_ranged_num >= m_deploy_ranged_num) {
m_has_finished_deploy_air_defense = true;
m_force_air_defense.has_deployed_air_defense_num++;
if (m_force_air_defense.has_deployed_air_defense_num >= m_force_air_defense.deploy_air_defense_num) {
m_force_air_defense.has_finished_deploy_air_defense = true;
Log.info("FORCE RANGED OPER DEPLOY END");
}
// 不改变当前index，直接进入下一步
@@ -777,11 +779,7 @@ void asst::RoguelikeBattleTaskPlugin::clear()
m_stage_use_dice = true;
m_dice_image = cv::Mat();
m_first_deploy = true;
m_stop_blocking_deploy_num = INT_MAX;
m_deploy_ranged_num = 0;
m_has_deployed_blocking_num = 0;
m_has_deployed_ranged_num = 0;
m_has_finished_deploy_air_defense = false;
m_force_air_defense.clear();
m_last_cooling_count = 0;
m_force_deploy_direction.clear();

23
src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h
View File

@@ -90,12 +90,25 @@ namespace asst
int m_pre_hp = 0;
int m_kills = 0;
int m_total_kills = 0;
int m_stop_blocking_deploy_num = INT_MAX;
int m_has_deployed_blocking_num = 0;
int m_deploy_ranged_num = 0;
int m_has_deployed_ranged_num = 0;
struct
{
int stop_blocking_deploy_num = INT_MAX;
int has_deployed_blocking_num = 0;
int deploy_air_defense_num = 0;
int has_deployed_air_defense_num = 0;
bool has_finished_deploy_air_defense = false;
void clear() noexcept
{
stop_blocking_deploy_num = INT_MAX;
deploy_air_defense_num = 0;
has_deployed_blocking_num = 0;
has_deployed_air_defense_num = 0;
has_finished_deploy_air_defense = false;
}
} m_force_air_defense;
int m_last_cooling_count = 0;
bool m_has_finished_deploy_air_defense = false;
size_t m_cur_home_index = 0;
cv::Mat m_dice_image;