Commit e25878de authored by salix5's avatar salix5

field::move_to_field()

parent 93ccb0ce
...@@ -1190,6 +1190,7 @@ int32 card::copy_effect(uint32 code, uint32 reset, uint32 count) { ...@@ -1190,6 +1190,7 @@ int32 card::copy_effect(uint32 code, uint32 reset, uint32 count) {
pduel->uncopy.clear(); pduel->uncopy.clear();
return pduel->game_field->infos.copy_id - 1; return pduel->game_field->infos.copy_id - 1;
} }
// add EFFECT_SET_CONTROL
void card::reset(uint32 id, uint32 reset_type) { void card::reset(uint32 id, uint32 reset_type) {
effect* peffect; effect* peffect;
if (reset_type != RESET_EVENT && reset_type != RESET_PHASE && reset_type != RESET_CODE && reset_type != RESET_COPY && reset_type != RESET_CARD) if (reset_type != RESET_EVENT && reset_type != RESET_PHASE && reset_type != RESET_CODE && reset_type != RESET_COPY && reset_type != RESET_CARD)
......
...@@ -376,6 +376,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc ...@@ -376,6 +376,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc
} }
add_card(playerid, pcard, location, sequence); add_card(playerid, pcard, location, sequence);
} }
// add EFFECT_SET_CONTROL
void field::set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 reset_count) { void field::set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 reset_count) {
if((core.remove_brainwashing && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) || pcard->refresh_control_status() == playerid) if((core.remove_brainwashing && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) || pcard->refresh_control_status() == playerid)
return; return;
......
...@@ -3727,7 +3727,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret ...@@ -3727,7 +3727,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
target->unequip(); target->unequip();
if(enable || ((ret == 1) && target->is_position(POS_FACEUP))) if(enable || ((ret == 1) && target->is_position(POS_FACEUP)))
target->enable_field_effect(TRUE); target->enable_field_effect(TRUE);
adjust_instant(); adjust_disable_check_list();
return FALSE; return FALSE;
} }
case 3: { case 3: {
......
...@@ -5103,6 +5103,7 @@ int32 field::adjust_step(uint16 step) { ...@@ -5103,6 +5103,7 @@ int32 field::adjust_step(uint16 step) {
for(uint8 p = 0; p < 2; ++p) { for(uint8 p = 0; p < 2; ++p) {
for(uint8 i = 0; i < 5; ++i) { for(uint8 i = 0; i < 5; ++i) {
pcard = player[p].list_mzone[i]; pcard = player[p].list_mzone[i];
// remove EFFECT_SET_CONTROL
if(pcard && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) if(pcard && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING))
pcard->reset(EFFECT_SET_CONTROL, RESET_CODE); pcard->reset(EFFECT_SET_CONTROL, RESET_CODE);
} }
......
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