Commit 25e8dd71 authored by salix5's avatar salix5
parent bd7d5021
...@@ -2654,6 +2654,7 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -2654,6 +2654,7 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
eset[i]->dec_count(); eset[i]->dec_count();
indestructable_effect_set.insert(eset[i]); indestructable_effect_set.insert(eset[i]);
is_destructable = false; is_destructable = false;
break;
} }
} else { } else {
pduel->lua->add_param(pcard->current.reason_effect, PARAM_TYPE_EFFECT); pduel->lua->add_param(pcard->current.reason_effect, PARAM_TYPE_EFFECT);
...@@ -2661,10 +2662,11 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -2661,10 +2662,11 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
pduel->lua->add_param(pcard->current.reason_player, PARAM_TYPE_INT); pduel->lua->add_param(pcard->current.reason_player, PARAM_TYPE_INT);
int32 ct; int32 ct;
if(ct = eset[i]->get_value(3)) { if(ct = eset[i]->get_value(3)) {
auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->id, 0)); auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->owner->data.code, 0));
if(++it.first->second <= ct) { if(++it.first->second <= ct) {
indestructable_effect_set.insert(eset[i]); indestructable_effect_set.insert(eset[i]);
is_destructable = false; is_destructable = false;
break;
} }
} }
} }
...@@ -2862,6 +2864,7 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -2862,6 +2864,7 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
pduel->write_buffer8(0); pduel->write_buffer8(0);
pduel->write_buffer32(eset[i]->owner->data.code); pduel->write_buffer32(eset[i]->owner->data.code);
indes = true; indes = true;
break;
} }
} else { } else {
pduel->lua->add_param(pcard->current.reason_effect, PARAM_TYPE_EFFECT); pduel->lua->add_param(pcard->current.reason_effect, PARAM_TYPE_EFFECT);
...@@ -2869,13 +2872,14 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -2869,13 +2872,14 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
pduel->lua->add_param(pcard->current.reason_player, PARAM_TYPE_INT); pduel->lua->add_param(pcard->current.reason_player, PARAM_TYPE_INT);
int32 ct; int32 ct;
if(ct = eset[i]->get_value(3)) { if(ct = eset[i]->get_value(3)) {
auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->id, 0)); auto it = pcard->indestructable_effects.insert(std::make_pair(eset[i]->owner->data.code, 0));
if(++it.first->second <= ct) { if(++it.first->second <= ct) {
pduel->write_buffer8(MSG_HINT); pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_CARD); pduel->write_buffer8(HINT_CARD);
pduel->write_buffer8(0); pduel->write_buffer8(0);
pduel->write_buffer32(eset[i]->owner->data.code); pduel->write_buffer32(eset[i]->owner->data.code);
indes = true; 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