Skip to content

Y
ygopro-core
Commit 7dce06cb authored by salix5's avatar salix5
Browse files
Options

update field::get_control(uint16 step, ...

parent 232566b7
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
operations.cpp
View file @ 7dce06cb
...@@ -875,25 +875,28 @@ int32 field::get_control(uint16 step, effect* reason_effect, uint8 reason_player ...@@ -875,25 +875,28 @@ int32 field::get_control(uint16 step, effect* reason_effect, uint8 reason_player
card_set* destroy_set = new card_set; card_set* destroy_set = new card_set;
core.units.begin()->ptr1 = destroy_set; core.units.begin()->ptr1 = destroy_set;
for(auto cit = targets->container.begin(); cit != targets->container.end();) { for(auto cit = targets->container.begin(); cit != targets->container.end();) {
card* pcard = *cit++; card* pcard = *cit;
pcard->filter_disable_related_cards(); pcard->filter_disable_related_cards();
bool change = true; bool change = true;
if(pcard->overlay_target) if(pcard->overlay_target)
change = false; change = false;
if(pcard->current.controler == playerid) else if(pcard->current.controler == playerid)
change = false; change = false;
if(pcard->current.controler == PLAYER_NONE) else if(pcard->current.controler == PLAYER_NONE)
change = false; change = false;
if(pcard->current.location != LOCATION_MZONE) else if(pcard->current.location != LOCATION_MZONE)
change = false; change = false;
if(!pcard->is_capable_change_control()) else if(!pcard->is_capable_change_control())
change = false; change = false;
if(!pcard->is_affect_by_effect(reason_effect)) else if(!pcard->is_affect_by_effect(reason_effect))
change = false; change = false;
if(core.duel_rule <= 4 && (pcard->get_type() & TYPE_TRAPMONSTER) && get_useable_count(pcard, playerid, LOCATION_SZONE, reason_player, LOCATION_REASON_CONTROL) <= 0) else if(core.duel_rule <= 4 && (pcard->get_type() & TYPE_TRAPMONSTER)
&& get_useable_count(pcard, playerid, LOCATION_SZONE, reason_player, LOCATION_REASON_CONTROL) <= 0)
change = false; change = false;
if(!change) if (!change)
targets->container.erase(pcard); cit = targets->container.erase(cit);
else
++cit;
} }
int32 fcount = get_useable_count(NULL, playerid, LOCATION_MZONE, reason_player, LOCATION_REASON_CONTROL, zone); int32 fcount = get_useable_count(NULL, playerid, LOCATION_MZONE, reason_player, LOCATION_REASON_CONTROL, zone);
if(fcount <= 0) { if(fcount <= 0) {
......
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