Skip to content

Y
ygopro-core
Commit 80f2f60f authored by DailyShana's avatar DailyShana
Browse files
Options

update aborting damage step

parent 3b3ade97
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 32 deletions
processor.cpp
View file @ 80f2f60f
...@@ -3142,11 +3142,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3142,11 +3142,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 21: { case 21: {
if(core.attacker->current.location != LOCATION_MZONE || core.attacker->fieldid_r != core.pre_field[0] if(core.attacker->is_status(STATUS_ATTACK_CANCELED)) {
|| core.attacker->current.controler != core.attacker->attack_controler
|| (core.attack_target && (core.attack_target->current.location != LOCATION_MZONE
|| core.attack_target->current.controler != core.attack_target->attack_controler
|| core.attack_target->fieldid_r != core.pre_field[1]))) {
core.units.begin()->step = 32; core.units.begin()->step = 32;
return FALSE; return FALSE;
} }
...@@ -3184,12 +3180,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3184,12 +3180,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 23: { case 23: {
if(core.attacker->current.location != LOCATION_MZONE || core.attacker->fieldid_r != core.pre_field[0] if(core.attacker->is_status(STATUS_ATTACK_CANCELED)) {
|| ((core.attacker->current.position & POS_DEFENSE) && !(core.attacker->is_affected_by_effect(EFFECT_DEFENSE_ATTACK)))
|| core.attacker->current.controler != core.attacker->attack_controler
|| (core.attack_target && (core.attack_target->current.location != LOCATION_MZONE
|| core.attack_target->current.controler != core.attack_target->attack_controler
|| core.attack_target->fieldid_r != core.pre_field[1]))) {
core.units.begin()->step = 32; core.units.begin()->step = 32;
return FALSE; return FALSE;
} }
...@@ -3219,11 +3210,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3219,11 +3210,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 25: { case 25: {
if(core.attacker->current.location != LOCATION_MZONE || core.attacker->fieldid_r != core.pre_field[0] if(core.attacker->is_status(STATUS_ATTACK_CANCELED)) {
|| core.attacker->current.controler != core.attacker->attack_controler
|| (core.attack_target && (core.attack_target->current.location != LOCATION_MZONE
|| core.attack_target->current.controler != core.attack_target->attack_controler
|| core.attack_target->fieldid_r != core.pre_field[1]))) {
reset_phase(PHASE_DAMAGE_CAL); reset_phase(PHASE_DAMAGE_CAL);
adjust_all(); adjust_all();
infos.phase = PHASE_DAMAGE; infos.phase = PHASE_DAMAGE;
...@@ -3472,7 +3459,6 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3472,7 +3459,6 @@ int32 field::process_battle_command(uint16 step) {
} }
case 33: { case 33: {
core.units.begin()->ptarget = 0; core.units.begin()->ptarget = 0;
// for unexpected end of damage step
core.damage_calculated = TRUE; core.damage_calculated = TRUE;
core.selfdes_disabled = FALSE; core.selfdes_disabled = FALSE;
core.flip_delayed = FALSE; core.flip_delayed = FALSE;
...@@ -4970,7 +4956,7 @@ int32 field::adjust_step(uint16 step) { ...@@ -4970,7 +4956,7 @@ int32 field::adjust_step(uint16 step) {
return FALSE; return FALSE;
} }
case 1: { case 1: {
//win check(deck=0 or lp=0) //win check
uint32 winp = 5, rea = 1; uint32 winp = 5, rea = 1;
if(player[0].lp <= 0 && player[1].lp > 0) { if(player[0].lp <= 0 && player[1].lp > 0) {
winp = 1; winp = 1;
...@@ -5229,21 +5215,31 @@ int32 field::adjust_step(uint16 step) { ...@@ -5229,21 +5215,31 @@ int32 field::adjust_step(uint16 step) {
return FALSE; return FALSE;
if(attacker->is_status(STATUS_ATTACK_CANCELED)) if(attacker->is_status(STATUS_ATTACK_CANCELED))
return FALSE; return FALSE;
if(!core.attacker->is_capable_attack() if(infos.phase != PHASE_DAMAGE && infos.phase != PHASE_DAMAGE_CAL) {
|| core.attacker->current.controler != core.attacker->attack_controler if(!core.attacker->is_capable_attack()
|| core.attacker->fieldid_r != core.pre_field[0]) { || core.attacker->current.controler != core.attacker->attack_controler
attacker->set_status(STATUS_ATTACK_CANCELED, TRUE); || core.attacker->fieldid_r != core.pre_field[0]) {
return FALSE; attacker->set_status(STATUS_ATTACK_CANCELED, TRUE);
} return FALSE;
if(core.attack_rollback) }
return FALSE; if(core.attack_rollback)
std::set<uint16> fidset; return FALSE;
for(auto& pcard : player[1 - infos.turn_player].list_mzone) { std::set<uint16> fidset;
if(pcard) for(auto& pcard : player[1 - infos.turn_player].list_mzone) {
fidset.insert(pcard->fieldid_r); if(pcard)
fidset.insert(pcard->fieldid_r);
}
if(fidset != core.opp_mzone || !confirm_attack_target())
core.attack_rollback = TRUE;
} else {
if(core.attacker->current.location != LOCATION_MZONE || core.attacker->fieldid_r != core.pre_field[0]
|| ((core.attacker->current.position & POS_DEFENSE) && !(core.attacker->is_affected_by_effect(EFFECT_DEFENSE_ATTACK)))
|| core.attacker->current.controler != core.attacker->attack_controler
|| (core.attack_target && (core.attack_target->current.location != LOCATION_MZONE
|| core.attack_target->current.controler != core.attack_target->attack_controler
|| core.attack_target->fieldid_r != core.pre_field[1])))
core.attacker->set_status(STATUS_ATTACK_CANCELED, TRUE);
} }
if(fidset != core.opp_mzone || !confirm_attack_target())
core.attack_rollback = TRUE;
return FALSE; return FALSE;
} }
case 15: { case 15: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment