Skip to content

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

update EFFECT_CANNOT_TO_DECK

parent 13bcca50
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
card.cpp
View file @ 779170a6
...@@ -3410,6 +3410,8 @@ int32 card::is_capable_send_to_hand(uint8 playerid) { ...@@ -3410,6 +3410,8 @@ int32 card::is_capable_send_to_hand(uint8 playerid) {
return FALSE; return FALSE;
if(is_affected_by_effect(EFFECT_CANNOT_TO_HAND)) if(is_affected_by_effect(EFFECT_CANNOT_TO_HAND))
return FALSE; return FALSE;
if(data.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK) && !is_capable_send_to_deck(playerid))
return FALSE;
if(!pduel->game_field->is_player_can_send_to_hand(playerid, this)) if(!pduel->game_field->is_player_can_send_to_hand(playerid, this))
return FALSE; return FALSE;
return TRUE; return TRUE;
......
field.cpp
View file @ 779170a6
...@@ -3272,6 +3272,8 @@ int32 field::is_player_can_send_to_hand(uint8 playerid, card * pcard) { ...@@ -3272,6 +3272,8 @@ int32 field::is_player_can_send_to_hand(uint8 playerid, card * pcard) {
if (pduel->lua->check_condition(eset[i]->target, 3)) if (pduel->lua->check_condition(eset[i]->target, 3))
return FALSE; return FALSE;
} }
if((pcard->data.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)) && !is_player_can_send_to_deck(playerid, pcard))
return FALSE;
return TRUE; return TRUE;
} }
int32 field::is_player_can_send_to_deck(uint8 playerid, card * pcard) { int32 field::is_player_can_send_to_deck(uint8 playerid, card * pcard) {
......
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