Skip to content

Y
ygopro
Commit a9787cb8 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent e1ef38bc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 92 deletions
gframe/client_field.cpp
View file @ a9787cb8
This diff is collapsed.
ocgcore/card.cpp
View file @ a9787cb8
...@@ -2072,6 +2072,8 @@ int32 card::is_capable_cost_to_grave(uint8 playerid) { ...@@ -2072,6 +2072,8 @@ 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))
return FALSE;
if(current.location == LOCATION_GRAVE) if(current.location == LOCATION_GRAVE)
return FALSE; return FALSE;
if(is_affected_by_effect(EFFECT_CANNOT_USE_AS_COST)) if(is_affected_by_effect(EFFECT_CANNOT_USE_AS_COST))
......
ocgcore/field.cpp
View file @ a9787cb8
...@@ -143,7 +143,9 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence ...@@ -143,7 +143,9 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence
location = LOCATION_EXTRA; location = LOCATION_EXTRA;
pcard->operation_param = (pcard->operation_param & 0x00ffffff) | (POS_FACEDOWN_DEFENCE << 24); pcard->operation_param = (pcard->operation_param & 0x00ffffff) | (POS_FACEDOWN_DEFENCE << 24);
} }
if ((pcard->data.type & TYPE_PENDULUM) && (location == LOCATION_GRAVE) && (pcard->previous.location & LOCATION_ONFIELD) && !pcard->is_status(STATUS_SUMMON_DISABLED)) { if ((pcard->data.type & TYPE_PENDULUM) && (location == LOCATION_GRAVE)
&& (((pcard->previous.location & LOCATION_MZONE) && !pcard->is_status(STATUS_SUMMON_DISABLED))
|| ((pcard->previous.location & LOCATION_SZONE) && !pcard->is_status(STATUS_ACTIVATE_DISABLED)))) {
location = LOCATION_EXTRA; location = LOCATION_EXTRA;
pcard->operation_param = (pcard->operation_param & 0x00ffffff) | (POS_FACEUP_DEFENCE << 24); pcard->operation_param = (pcard->operation_param & 0x00ffffff) | (POS_FACEUP_DEFENCE << 24);
} }
......
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