Skip to content

Y
ygopro-core
Commit 60c70bea authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:Fluorohydride/ygopro-core

parents d2cbf8a7 f875d51e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
card.cpp
View file @ 60c70bea
...@@ -3713,7 +3713,7 @@ int32 card::is_capable_send_to_hand(uint8 playerid) { ...@@ -3713,7 +3713,7 @@ 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(is_extra_deck_monster() && !is_capable_send_to_extra(playerid)) if(is_extra_deck_monster() && !is_capable_send_to_deck(playerid))
return FALSE; 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;
...@@ -3733,7 +3733,7 @@ int32 card::is_capable_send_to_deck(uint8 playerid) { ...@@ -3733,7 +3733,7 @@ int32 card::is_capable_send_to_deck(uint8 playerid) {
int32 card::is_capable_send_to_extra(uint8 playerid) { int32 card::is_capable_send_to_extra(uint8 playerid) {
if(!is_extra_deck_monster() && !(data.type & TYPE_PENDULUM)) if(!is_extra_deck_monster() && !(data.type & TYPE_PENDULUM))
return FALSE; return FALSE;
if(is_extra_deck_monster() && is_affected_by_effect(EFFECT_CANNOT_TO_DECK)) if(is_affected_by_effect(EFFECT_CANNOT_TO_DECK))
return FALSE; return FALSE;
if(!pduel->game_field->is_player_can_send_to_deck(playerid, this)) if(!pduel->game_field->is_player_can_send_to_deck(playerid, this))
return FALSE; return FALSE;
...@@ -3744,7 +3744,7 @@ int32 card::is_capable_cost_to_grave(uint8 playerid) { ...@@ -3744,7 +3744,7 @@ int32 card::is_capable_cost_to_grave(uint8 playerid) {
uint32 dest = LOCATION_GRAVE; uint32 dest = LOCATION_GRAVE;
if(data.type & TYPE_TOKEN) if(data.type & TYPE_TOKEN)
return FALSE; return FALSE;
if((data.type & TYPE_PENDULUM) && (current.location & LOCATION_ONFIELD)) if((data.type & TYPE_PENDULUM) && (current.location & LOCATION_ONFIELD) && !is_affected_by_effect(EFFECT_CANNOT_TO_DECK))
return FALSE; return FALSE;
if(current.location == LOCATION_GRAVE) if(current.location == LOCATION_GRAVE)
return FALSE; return FALSE;
......
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