Revise field::get_fusion_material

card.cpp

@@ -4066,14 +4066,6 @@ int32_t card::is_can_be_fusion_material(card* fcard, uint32_t summon_type) {
 		if(eset[i]->get_value(fcard, 1))
 			return FALSE;
 	}
-	eset.clear();
-	filter_effect(EFFECT_EXTRA_FUSION_MATERIAL, &eset);
-	if(eset.size()) {
-		for(effect_set::size_type i = 0; i < eset.size(); ++i)
-			if(eset[i]->get_value(fcard))
-				return TRUE;
-		return FALSE;
-	}
 	return TRUE;
 }
 int32_t card::is_can_be_synchro_material(card* scard, card* tuner) {

field.cpp

@@ -1916,14 +1916,26 @@ void field::get_fusion_material(uint8_t playerid, card_set* material_all, card_s
 				material_base->insert(pcard);
 		}
 	}
+	// Fullmetalfoes Alkahest etc
 	for(auto& pcard : player[playerid].list_szone) {
 		if(pcard && pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL))
 			material_all->insert(pcard);
 	}
+	// Lunalight Masquerade etc
 	for(auto& pcard : player[playerid].list_grave) {
 		if(pcard->is_affected_by_effect(EFFECT_EXTRA_FUSION_MATERIAL))
 			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());
 }
 void field::ritual_release(const card_set& material) {