Skip to content

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

fix 

trap monster become face down will not cause RESET_MSCHANGE
parent 6f0ed26c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
operations.cpp
View file @ f6e773d4
...@@ -3825,7 +3825,8 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret ...@@ -3825,7 +3825,8 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
if(target->current.location & LOCATION_ONFIELD) if(target->current.location & LOCATION_ONFIELD)
resetflag |= RESET_LEAVE; resetflag |= RESET_LEAVE;
effect* peffect = target->is_affected_by_effect(EFFECT_PRE_MONSTER); effect* peffect = target->is_affected_by_effect(EFFECT_PRE_MONSTER);
if((location & LOCATION_ONFIELD) && (target->current.location & LOCATION_ONFIELD) && !(peffect && (peffect->value & TYPE_TRAP))) if((location & LOCATION_ONFIELD) && (target->current.location & LOCATION_ONFIELD)
&& !(peffect && (peffect->value & TYPE_TRAP)) && !(target->get_type() & TYPE_TRAPMONSTER))
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