Skip to content

Y
ygopro-core
Commit ad168b75 authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'jwyxym/master' into develop

parents 2a6753d7 0ffb1fa0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
operations.cpp
View file @ ad168b75
...@@ -4565,9 +4565,9 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret, ...@@ -4565,9 +4565,9 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
} }
} else if(pzone && location == LOCATION_SZONE && (target->data.type & TYPE_PENDULUM)) { } else if(pzone && location == LOCATION_SZONE && (target->data.type & TYPE_PENDULUM)) {
uint32 flag = 0; uint32 flag = 0;
if(is_location_useable(playerid, LOCATION_PZONE, 0)) if (is_location_useable(playerid, LOCATION_PZONE, 0) && zone & 0x1)
flag |= 0x1u << (core.duel_rule >= NEW_MASTER_RULE ? 8 : 14); flag |= 0x1u << (core.duel_rule >= NEW_MASTER_RULE ? 8 : 14);
if(is_location_useable(playerid, LOCATION_PZONE, 1)) if (is_location_useable(playerid, LOCATION_PZONE, 1) && zone & 0x10)
flag |= 0x1u << (core.duel_rule >= NEW_MASTER_RULE ? 12 : 15); flag |= 0x1u << (core.duel_rule >= NEW_MASTER_RULE ? 12 : 15);
if(!flag) { if(!flag) {
core.units.begin()->step = 3; core.units.begin()->step = 3;
......
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