Skip to content

Y
ygopro-core
Commit 60eb1801 authored by nanahira's avatar nanahira
Browse files
Options

fix

parent 7f5e610e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
field.cpp
View file @ 60eb1801
...@@ -1815,7 +1815,7 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater ...@@ -1815,7 +1815,7 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater
if((pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_EXTRA_RITUAL_MATERIAL) && pcard->is_removeable(playerid)) if((pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_EXTRA_RITUAL_MATERIAL) && pcard->is_removeable(playerid))
material->insert(pcard); material->insert(pcard);
for(auto& pcard : player[playerid].list_extra) for(auto& pcard : player[playerid].list_extra)
if(pcard && (pcard->get_level() || pcard->is_affected_by_effect(EFFECT_MINIATURE_GARDEN_GIRL)) && (pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_MAP_OF_HEAVEN) && pcard->is_releasable_by_nonsummon(playerid)) if(pcard && (pcard->get_level() || pcard->is_affected_by_effect(EFFECT_MINIATURE_GARDEN_GIRL)) && (pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_MAP_OF_HEAVEN) && pcard->is_capable_send_to_grave(playerid))
material->insert(pcard); material->insert(pcard);
} }
void field::get_fusion_material(uint8 playerid, card_set* material) { void field::get_fusion_material(uint8 playerid, card_set* material) {
...@@ -1834,13 +1834,17 @@ void field::get_fusion_material(uint8 playerid, card_set* material) { ...@@ -1834,13 +1834,17 @@ void field::get_fusion_material(uint8 playerid, card_set* material) {
void field::ritual_release(card_set* material) { void field::ritual_release(card_set* material) {
card_set rel; card_set rel;
card_set rem; card_set rem;
card_set tg;
for(auto& pcard : *material) { for(auto& pcard : *material) {
if(pcard->current.location == LOCATION_GRAVE) if(pcard->current.location == LOCATION_GRAVE)
rem.insert(pcard); rem.insert(pcard);
else if (pcard->current.location == LOCATION_EXTRA && pcard->is_affected_by_effect(EFFECT_MAP_OF_HEAVEN))
tg.insert(pcard);
else else
rel.insert(pcard); rel.insert(pcard);
} }
release(&rel, core.reason_effect, REASON_RITUAL + REASON_EFFECT + REASON_MATERIAL, core.reason_player); release(&rel, core.reason_effect, REASON_RITUAL + REASON_EFFECT + REASON_MATERIAL, core.reason_player);
send_to(&tg, core.reason_effect, REASON_RITUAL + REASON_EFFECT + REASON_MATERIAL, core.reason_player, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
send_to(&rem, core.reason_effect, REASON_RITUAL + REASON_EFFECT + REASON_MATERIAL, core.reason_player, PLAYER_NONE, LOCATION_REMOVED, 0, POS_FACEUP); send_to(&rem, core.reason_effect, REASON_RITUAL + REASON_EFFECT + REASON_MATERIAL, core.reason_player, PLAYER_NONE, LOCATION_REMOVED, 0, POS_FACEUP);
} }
void field::get_xyz_material(card* scard, int32 findex, uint32 lv, int32 maxc, group* mg) { void field::get_xyz_material(card* scard, int32 findex, uint32 lv, int32 maxc, group* mg) {
......
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