Skip to content

Y
ygopro-2pick
Commit 7bbc76ba authored by Momobako's avatar Momobako
Browse files
Options

Merge branch 'master' of /root/7210

parents c60186b2 61fdb1e8
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
cards.cdb
View file @ 7bbc76ba
No preview for this file type
ocgcore/field.cpp
View file @ 7bbc76ba
...@@ -731,6 +731,14 @@ uint32 field::get_linked_zone(int32 playerid) { ...@@ -731,6 +731,14 @@ uint32 field::get_linked_zone(int32 playerid) {
zones |= 1u << (i * 2 + 2); zones |= 1u << (i * 2 + 2);
} }
} }
if((player[1 - playerid].list_mzone[2] && player[1 - playerid].list_mzone[2]->is_link_marker(LINK_MARKER_TOP_RIGHT))
|| (player[1 - playerid].list_mzone[3] && player[1 - playerid].list_mzone[3]->is_link_marker(LINK_MARKER_TOP))
|| (player[1 - playerid].list_mzone[4] && player[1 - playerid].list_mzone[4]->is_link_marker(LINK_MARKER_TOP_LEFT)))
zones |= 1u << 5;
if((player[1 - playerid].list_mzone[0] && player[1 - playerid].list_mzone[0]->is_link_marker(LINK_MARKER_TOP_RIGHT))
|| (player[1 - playerid].list_mzone[1] && player[1 - playerid].list_mzone[1]->is_link_marker(LINK_MARKER_TOP))
|| (player[1 - playerid].list_mzone[2] && player[1 - playerid].list_mzone[2]->is_link_marker(LINK_MARKER_TOP_LEFT)))
zones |= 1u << 6;
for(uint32 i = 0; i < 2; ++i) { for(uint32 i = 0; i < 2; ++i) {
card* pcard = player[1 - playerid].list_mzone[i + 5]; card* pcard = player[1 - playerid].list_mzone[i + 5];
if(pcard) { if(pcard) {
......
ocgcore/operations.cpp
View file @ 7bbc76ba
...@@ -1801,6 +1801,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui ...@@ -1801,6 +1801,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
deffect->description = 64; deffect->description = 64;
deffect->reset_flag = RESET_EVENT + 0x1fe0000; deffect->reset_flag = RESET_EVENT + 0x1fe0000;
target->add_effect(deffect); target->add_effect(deffect);
core.summoning_card = target;
return FALSE; return FALSE;
} }
case 10: { case 10: {
...@@ -1821,7 +1822,6 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui ...@@ -1821,7 +1822,6 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
add_process(PROCESSOR_EXECUTE_OPERATION, 0, pextra, 0, sumplayer, 0); add_process(PROCESSOR_EXECUTE_OPERATION, 0, pextra, 0, sumplayer, 0);
} }
} }
core.summoning_card = target;
return FALSE; return FALSE;
} }
case 11: { case 11: {
......
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