Skip to content

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

revert Card.RegisterEffect()

parent e53f2c95
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
effect.h
View file @ bd7d5021
...@@ -169,7 +169,7 @@ enum effect_flag : uint32 { ...@@ -169,7 +169,7 @@ enum effect_flag : uint32 {
EFFECT_FLAG_AVAILABLE_BD = 0x2000000, EFFECT_FLAG_AVAILABLE_BD = 0x2000000,
EFFECT_FLAG_CLIENT_HINT = 0x4000000, EFFECT_FLAG_CLIENT_HINT = 0x4000000,
EFFECT_FLAG_CHAIN_UNIQUE = 0x8000000, EFFECT_FLAG_CHAIN_UNIQUE = 0x8000000,
EFFECT_FLAG_PHASE_MULTIPLE = 0x10000000, // EFFECT_FLAG_NAGA = 0x10000000,
// EFFECT_FLAG_COF = 0x20000000, // EFFECT_FLAG_COF = 0x20000000,
EFFECT_FLAG_CVAL_CHECK = 0x40000000, EFFECT_FLAG_CVAL_CHECK = 0x40000000,
EFFECT_FLAG_IMMEDIATELY_APPLY = 0x80000000, EFFECT_FLAG_IMMEDIATELY_APPLY = 0x80000000,
......
libcard.cpp
View file @ bd7d5021
...@@ -981,15 +981,8 @@ int32 scriptlib::card_register_effect(lua_State *L) { ...@@ -981,15 +981,8 @@ int32 scriptlib::card_register_effect(lua_State *L) {
int32 id; int32 id;
if (peffect->handler) if (peffect->handler)
id = -1; id = -1;
else { else
if((peffect->type & (EFFECT_TYPE_TRIGGER_O | EFFECT_TYPE_TRIGGER_F))
&& !(peffect->code & 0x10032000) && (peffect->code & EVENT_PHASE)
&& !peffect->is_flag(EFFECT_FLAG_COUNT_LIMIT | EFFECT_FLAG_PHASE_MULTIPLE)) {
peffect->flag[0] |= EFFECT_FLAG_COUNT_LIMIT;
peffect->reset_count |= ((1 << 12) & 0xf000) | ((1 << 8) & 0xf00);
}
id = pcard->add_effect(peffect); id = pcard->add_effect(peffect);
}
lua_pushinteger(L, id); lua_pushinteger(L, id);
return 1; return 1;
} }
......
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