Commit 2bb516bb authored by tianchenglipu's avatar tianchenglipu

changes

parent a785e260
...@@ -361,6 +361,13 @@ int32 card::is_fusion_set_card(uint32 set_code) { ...@@ -361,6 +361,13 @@ int32 card::is_fusion_set_card(uint32 set_code) {
setcode = setcode >> 16; setcode = setcode >> 16;
} }
} }
effect_set eset2;
filter_effect(EFFECT_ADD_FUSION_SETCODE, &eset2);
for(int32 i = 0; i < eset2.size(); ++i) {
uint32 setcode = eset2[i]->get_value(this);
if ((setcode & 0xfff) == settype && (setcode & 0xf000 & setsubtype) == setsubtype)
return TRUE;
}
return FALSE; return FALSE;
} }
uint32 card::get_type() { uint32 card::get_type() {
......
...@@ -395,6 +395,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2) ...@@ -395,6 +395,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
#define EFFECT_DISCARD_COST_CHANGE 338 #define EFFECT_DISCARD_COST_CHANGE 338
#define EFFECT_HAND_SYNCHRO 339 #define EFFECT_HAND_SYNCHRO 339
#define EFFECT_ADD_FUSION_CODE 340 #define EFFECT_ADD_FUSION_CODE 340
#define EFFECT_ADD_FUSION_SETCODE 341
#define EVENT_STARTUP 1000 #define EVENT_STARTUP 1000
#define EVENT_FLIP 1001 #define EVENT_FLIP 1001
......
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