Commit 254984eb authored by VanillaSalt's avatar VanillaSalt

fix

parent 86121c09
......@@ -319,13 +319,9 @@ int32 card::is_pre_set_card(uint32 set_code) {
setcode = setcode >> 16;
}
//add set code
effect_set eset;
filter_effect(EFFECT_ADD_SETCODE, &eset);
for(int32 i = 0; i < eset.size(); ++i) {
uint32 value = eset[i]->get_value(this);
if ((value & 0xfff) == settype && (value & 0xf000 & setsubtype) == setsubtype)
return TRUE;
}
setcode = previous.setcode;
if (setcode && (setcode & 0xfff) == settype && (setcode & 0xf000 & setsubtype) == setsubtype)
return TRUE;
//another code
uint32 code2 = previous.code2;
uint64 setcode2;
......
......@@ -38,6 +38,7 @@ struct card_data {
struct card_state {
uint32 code;
uint32 code2;
uint16 setcode;
uint32 type;
uint32 level;
uint32 rank;
......
......@@ -3081,6 +3081,12 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
pcard->previous.attack = pcard->data.attack;
pcard->previous.defence = pcard->data.defence;
}
effect_set eset;
pcard->filter_effect(EFFECT_ADD_SETCODE, &eset);
if(eset.size())
pcard->previous.setcode = eset.get_last()->get_value(pcard);
else
pcard->previous.setcode = 0;
}
}
if(leave_p.size())
......
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