Commit 0e2eef1f authored by wind2009's avatar wind2009

Merge remote-tracking branch 'vuryleo/revise-fusion-material' into develop

parents cfd4e832 aa0f5c05
...@@ -1918,14 +1918,26 @@ void field::get_fusion_material(uint8_t playerid, card_set* material_all, card_s ...@@ -1918,14 +1918,26 @@ void field::get_fusion_material(uint8_t playerid, card_set* material_all, card_s
material_base->insert(pcard); material_base->insert(pcard);
} }
} }
// Fullmetalfoes Alkahest etc
for(auto& pcard : player[playerid].list_szone) { for(auto& pcard : player[playerid].list_szone) {
if(pcard && pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL)) if(pcard && pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL))
material_all->insert(pcard); material_all->insert(pcard);
} }
// Lunalight Masquerade etc
for(auto& pcard : player[playerid].list_grave) { for(auto& pcard : player[playerid].list_grave) {
if(pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL)) if(pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL))
material_all->insert(pcard); material_all->insert(pcard);
} }
// Curse of the Shadow Prison
for (auto& pcard : player[1-playerid].list_mzone) {
if (pcard && pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL))
material_all->insert(pcard);
}
// Amazoness Secret Arts
for (auto& pcard : player[playerid].list_extra) {
if (pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL))
material_all->insert(pcard);
}
material_all->insert(material_base->begin(), material_base->end()); material_all->insert(material_base->begin(), material_base->end());
} }
void field::ritual_release(const card_set& material) { void field::ritual_release(const card_set& material) {
......
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