Commit 2e3cc636 authored by salix5's avatar salix5

add EFFECT_FLAG_CANNOT_INACTIVATE

Now is_chain_negatable() uses EFFECT_FLAG_CANNOT_INACTIVATE.
EFFECT_FLAG_CANNOT_INACTIVATE: activation cannot be negated
parent 091ec4df
......@@ -168,7 +168,6 @@ int32 effect::check_count_limit(uint8 playerid) {
}
// check if an EFFECT_TYPE_ACTIONS effect can be activated
// for triggering effects, it checks EFFECT_FLAG_DAMAGE_STEP, EFFECT_FLAG_SET_AVAILABLE
// for continuous effect, it checks EFFECT_FLAG_AVAILABLE_BD
int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_cond, int32 neglect_cost, int32 neglect_target, int32 neglect_loc, int32 neglect_faceup) {
if(!(type & EFFECT_TYPE_ACTIONS))
return FALSE;
......
......@@ -184,7 +184,7 @@ enum effect_flag : uint32 {
EFFECT_FLAG_NO_TURN_RESET = 0x400000,
EFFECT_FLAG_EVENT_PLAYER = 0x800000,
EFFECT_FLAG_OWNER_RELATE = 0x1000000,
// EFFECT_FLAG_AVAILABLE_BD = 0x2000000,
EFFECT_FLAG_CANNOT_INACTIVATE = 0x2000000,
EFFECT_FLAG_CLIENT_HINT = 0x4000000,
// EFFECT_FLAG_CHAIN_UNIQUE = 0x8000000,
EFFECT_FLAG_LIMIT_ZONE = 0x10000000,
......
......@@ -3129,7 +3129,7 @@ int32 field::is_chain_negatable(uint8 chaincount) {
peffect = core.current_chain.back().triggering_effect;
else
peffect = core.current_chain[chaincount - 1].triggering_effect;
if(peffect->is_flag(EFFECT_FLAG_CANNOT_DISABLE))
if(peffect->is_flag(EFFECT_FLAG_CANNOT_INACTIVATE))
return FALSE;
filter_field_effect(EFFECT_CANNOT_INACTIVATE, &eset);
for(int32 i = 0; i < eset.size(); ++i) {
......
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