Commit 9906c04b authored by Chen Bill's avatar Chen Bill

get_fusion_material: exclude STATUS_SUMMONING

parent e65b5424
...@@ -533,10 +533,10 @@ card* field::get_field_card(uint32 playerid, uint32 location, uint32 sequence) { ...@@ -533,10 +533,10 @@ card* field::get_field_card(uint32 playerid, uint32 location, uint32 sequence) {
case LOCATION_PZONE: { case LOCATION_PZONE: {
if(sequence == 0) { if(sequence == 0) {
card* pcard = player[playerid].list_szone[core.duel_rule >= 4 ? 0 : 6]; card* pcard = player[playerid].list_szone[core.duel_rule >= 4 ? 0 : 6];
return pcard && pcard->current.pzone ? pcard : 0; return (pcard && pcard->current.pzone) ? pcard : 0;
} else if(sequence == 1) { } else if(sequence == 1) {
card* pcard = player[playerid].list_szone[core.duel_rule >= 4 ? 4 : 7]; card* pcard = player[playerid].list_szone[core.duel_rule >= 4 ? 4 : 7];
return pcard && pcard->current.pzone ? pcard : 0; return (pcard && pcard->current.pzone) ? pcard : 0;
} else } else
return nullptr; return nullptr;
break; break;
...@@ -1894,7 +1894,7 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater ...@@ -1894,7 +1894,7 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater
void field::get_fusion_material(uint8 playerid, card_set* material_all, card_set* material_base, uint32 location) { void field::get_fusion_material(uint8 playerid, card_set* material_all, card_set* material_base, uint32 location) {
if(location & LOCATION_MZONE) { if(location & LOCATION_MZONE) {
for(auto& pcard : player[playerid].list_mzone) { for(auto& pcard : player[playerid].list_mzone) {
if(pcard) if(pcard && !pcard->is_status(STATUS_SUMMONING))
material_base->insert(pcard); material_base->insert(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