Skip to content

Y
ygopro-core
Commit 223576fd authored by DailyShana's avatar DailyShana
Browse files
Options

RESET_MSCHANGE for trap monster

parent 54f3e946
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
operations.cpp
View file @ 223576fd
...@@ -3844,7 +3844,8 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret ...@@ -3844,7 +3844,8 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
resetflag |= RESET_TOFIELD; resetflag |= RESET_TOFIELD;
if(target->current.location & LOCATION_ONFIELD) if(target->current.location & LOCATION_ONFIELD)
resetflag |= RESET_LEAVE; resetflag |= RESET_LEAVE;
if((location & LOCATION_ONFIELD) && (target->current.location & LOCATION_ONFIELD)) effect* peffect = target->is_affected_by_effect(EFFECT_PRE_MONSTER);
if((location & LOCATION_ONFIELD) && (target->current.location & LOCATION_ONFIELD) && !(peffect && (peffect->value & TYPE_TRAP)))
resetflag |= RESET_MSCHANGE; resetflag |= RESET_MSCHANGE;
target->reset(resetflag, RESET_EVENT); target->reset(resetflag, RESET_EVENT);
} }
......
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