diff --git a/card.cpp b/card.cpp index 17e4ee491..e862d5d49 100644 --- a/card.cpp +++ b/card.cpp @@ -3419,7 +3419,7 @@ int32_t card::get_set_tribute_count() { return min + (max << 16); } int32_t card::is_can_be_flip_summoned(uint8_t playerid) { - if(is_status(STATUS_FORM_CHANGED)) + if(is_status(STATUS_CANNOT_CHANGE_FORM)) return FALSE; if(current.location != LOCATION_MZONE) return FALSE; @@ -3947,7 +3947,7 @@ int32_t card::is_capable_attack_announce(uint8_t playerid) { return TRUE; } int32_t card::is_capable_change_position(uint8_t playerid) { - if(is_status(STATUS_FORM_CHANGED)) + if(is_status(STATUS_CANNOT_CHANGE_FORM)) return FALSE; if(data.type & TYPE_LINK) return FALSE; diff --git a/common.h b/common.h index ecda182a7..2e997f7af 100644 --- a/common.h +++ b/common.h @@ -189,7 +189,7 @@ inline bool check_playerid(int32_t playerid) { #define STATUS_NO_LEVEL 0x0020 #define STATUS_BATTLE_RESULT 0x0040 #define STATUS_SPSUMMON_STEP 0x0080 -#define STATUS_FORM_CHANGED 0x0100 +#define STATUS_CANNOT_CHANGE_FORM 0x0100 #define STATUS_SUMMONING 0x0200 #define STATUS_EFFECT_ENABLED 0x0400 #define STATUS_SUMMON_TURN 0x0800 diff --git a/operations.cpp b/operations.cpp index 4b4317dba..bb7c79c52 100644 --- a/operations.cpp +++ b/operations.cpp @@ -1938,7 +1938,7 @@ int32_t field::summon(uint16_t step, uint8_t sumplayer, card* target, effect* pr target->set_status(STATUS_SUMMONING, FALSE); target->set_status(STATUS_FLIP_SUMMONING, FALSE); target->set_status(STATUS_SUMMON_TURN, TRUE); - target->set_status(STATUS_FORM_CHANGED, TRUE); + target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); target->enable_field_effect(true); if(target->is_status(STATUS_DISABLED)) target->reset(RESET_DISABLE, RESET_EVENT); @@ -2049,7 +2049,7 @@ int32_t field::flip_summon(uint16_t step, uint8_t sumplayer, card * target, uint if(target->is_status(STATUS_DISABLED)) target->reset(RESET_DISABLE, RESET_EVENT); target->set_status(STATUS_FLIP_SUMMON_TURN, TRUE); - target->set_status(STATUS_FORM_CHANGED, TRUE); + target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); return FALSE; } case 4: { @@ -2397,7 +2397,7 @@ int32_t field::mset(uint16_t step, uint8_t setplayer, card* target, effect* proc ++core.normalsummon_state_count[setplayer]; check_card_counter(target, ACTIVITY_NORMALSUMMON, setplayer); target->set_status(STATUS_SUMMON_TURN, TRUE); - target->set_status(STATUS_FORM_CHANGED, TRUE); + target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); pduel->write_buffer8(MSG_SET); pduel->write_buffer32(target->data.code); pduel->write_buffer32(target->get_info_location()); @@ -3139,7 +3139,7 @@ int32_t field::special_summon_rule(uint16_t step, uint8_t sumplayer, card* targe for(auto& pcard : pgroup->container) { pcard->set_status(STATUS_SUMMONING, FALSE); pcard->set_status(STATUS_SPSUMMON_TURN, TRUE); - pcard->set_status(STATUS_FORM_CHANGED, TRUE); + pcard->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); pcard->enable_field_effect(true); if(pcard->is_status(STATUS_DISABLED)) pcard->reset(RESET_DISABLE, RESET_EVENT); @@ -3356,7 +3356,7 @@ int32_t field::special_summon(uint16_t step, effect* reason_effect, uint8_t reas for(auto& pcard : targets->container) { pcard->set_status(STATUS_SPSUMMON_STEP, FALSE); pcard->set_status(STATUS_SPSUMMON_TURN, TRUE); - pcard->set_status(STATUS_FORM_CHANGED, TRUE); + pcard->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); if(pcard->is_position(POS_FACEUP)) pcard->enable_field_effect(true); } @@ -4272,7 +4272,7 @@ int32_t field::send_to(uint16_t step, group * targets, effect * reason_effect, u if(nloc == LOCATION_REMOVED || ((pcard->data.type & TYPE_TOKEN) && pcard->sendto_param.location == LOCATION_REMOVED)) { if(pcard->current.reason & REASON_TEMPORARY) { pcard->reset(RESET_TEMP_REMOVE, RESET_EVENT); - pcard->set_status(STATUS_FORM_CHANGED, FALSE); + pcard->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE); } else pcard->reset(RESET_REMOVE, RESET_EVENT); @@ -4654,7 +4654,7 @@ int32_t field::move_to_field(uint16_t step, card* target, uint32_t enable, uint3 target->clear_relate_effect(); if(ret == RETURN_TEMP_REMOVE_TO_FIELD) { target->current.reason &= ~REASON_TEMPORARY; - target->set_status(STATUS_FORM_CHANGED, FALSE); + target->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE); } if(ret == 0 && location != target->current.location || ret == RETURN_TEMP_REMOVE_TO_FIELD && target->turnid != infos.turn_id) { @@ -4662,7 +4662,7 @@ int32_t field::move_to_field(uint16_t step, card* target, uint32_t enable, uint3 target->set_status(STATUS_FLIP_SUMMON_TURN, FALSE); target->set_status(STATUS_SPSUMMON_TURN, FALSE); target->set_status(STATUS_SET_TURN, FALSE); - target->set_status(STATUS_FORM_CHANGED, FALSE); + target->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE); } target->temp.sequence = seq; if(location != LOCATION_MZONE) { diff --git a/processor.cpp b/processor.cpp index 6e2eda24a..e2e7d590e 100644 --- a/processor.cpp +++ b/processor.cpp @@ -2316,7 +2316,7 @@ int32_t field::process_idle_command(uint16_t step) { return FALSE; } else add_process(PROCESSOR_FLIP_SUMMON, 0, 0, (group*)target, target->current.controler, 0); - target->set_status(STATUS_FORM_CHANGED, TRUE); + target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); core.units.begin()->step = -1; return FALSE; } @@ -2375,7 +2375,7 @@ int32_t field::process_idle_command(uint16_t step) { adjust_all(); add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, 0); } - target->set_status(STATUS_FORM_CHANGED, TRUE); + target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); core.units.begin()->step = -1; return FALSE; } @@ -2665,7 +2665,7 @@ int32_t field::process_battle_command(uint16_t step) { } if(core.units.begin()->arg3) {//attack announce failed ++core.attacker->announce_count; - core.attacker->set_status(STATUS_FORM_CHANGED, TRUE); + core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); core.chain_attack = FALSE; core.units.begin()->step = -1; } @@ -2740,7 +2740,7 @@ int32_t field::process_battle_command(uint16_t step) { // go to damage step if(!core.attack_rollback) { ++core.attacker->announce_count; - core.attacker->set_status(STATUS_FORM_CHANGED, TRUE); + core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); core.attacker->announced_cards.addcard(core.attack_target); attack_all_target_check(); core.units.begin()->step = 18; @@ -2773,7 +2773,7 @@ int32_t field::process_battle_command(uint16_t step) { case 13: { if(core.attacker->fieldid_r == core.pre_field[0]) { ++core.attacker->announce_count; - core.attacker->set_status(STATUS_FORM_CHANGED, TRUE); + core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); core.attacker->announced_cards.addcard(core.attack_target); attack_all_target_check(); } @@ -3326,7 +3326,7 @@ int32_t field::process_damage_step(uint16_t step, uint32_t new_attack) { if(core.attacker) { core.attacker->set_status(STATUS_ATTACK_CANCELED, TRUE); ++core.attacker->announce_count; - core.attacker->set_status(STATUS_FORM_CHANGED, TRUE); + core.attacker->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE); core.attacker->announced_cards.addcard(core.attack_target); attack_all_target_check(); } @@ -3678,7 +3678,7 @@ int32_t field::process_turn(uint16_t step, uint8_t turn_player) { pcard->set_status(STATUS_FLIP_SUMMON_TURN, FALSE); pcard->set_status(STATUS_SPSUMMON_TURN, FALSE); pcard->set_status(STATUS_SET_TURN, FALSE); - pcard->set_status(STATUS_FORM_CHANGED, FALSE); + pcard->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE); pcard->indestructable_effects.clear(); pcard->attack_announce_count = 0; pcard->announce_count = 0;