Skip to content

Y
ygopro-core
Commit edf3d41c authored by salix5's avatar salix5
Browse files
Options

Revert "EFFECT_INDESTRUCTABLE_COUNT" 

This reverts commit 25e8dd71.
parent 35e203de
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
operations.cpp
View file @ edf3d41c
......@@ -2654,7 +2654,6 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
eset[i]->dec_count();
indestructable_effect_set.insert(eset[i]);
is_destructable = false;
break;
}
} else {
pduel->lua->add_param(pcard->current.reason_effect, PARAM_TYPE_EFFECT);
......@@ -2662,11 +2661,10 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
pduel->lua->add_param(pcard->current.reason_player, PARAM_TYPE_INT);
int32 ct;
if(ct = eset[i]->get_value(3)) {
auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->owner->data.code, 0));
auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->id, 0));
if(++it.first->second <= ct) {
indestructable_effect_set.insert(eset[i]);
is_destructable = false;
break;
}
}
}
......@@ -2864,7 +2862,6 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
pduel->write_buffer8(0);
pduel->write_buffer32(eset[i]->owner->data.code);
indes = true;
break;
}
} else {
pduel->lua->add_param(pcard->current.reason_effect, PARAM_TYPE_EFFECT);
......@@ -2872,14 +2869,13 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
pduel->lua->add_param(pcard->current.reason_player, PARAM_TYPE_INT);
int32 ct;
if(ct = eset[i]->get_value(3)) {
auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->owner->data.code, 0));
auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->id, 0));
if(++it.first->second <= ct) {
pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_CARD);
pduel->write_buffer8(0);
pduel->write_buffer32(eset[i]->owner->data.code);
indes = true;
break;
}
}
}
......
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