Skip to content

Y
ygopro-core
Commit f3f01cc1 authored by nanahira's avatar nanahira
Browse files
Options

add available_bd back

parent 83a3e621
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
effect.cpp
View file @ f3f01cc1
...@@ -129,7 +129,7 @@ int32 effect::is_available() { ...@@ -129,7 +129,7 @@ int32 effect::is_available() {
return FALSE; return FALSE;
if(powner == phandler && !is_flag(EFFECT_FLAG_CANNOT_DISABLE) && phandler->get_status(STATUS_DISABLED)) if(powner == phandler && !is_flag(EFFECT_FLAG_CANNOT_DISABLE) && phandler->get_status(STATUS_DISABLED))
return FALSE; return FALSE;
if(phandler->is_status(STATUS_BATTLE_DESTROYED)) if(phandler->is_status(STATUS_BATTLE_DESTROYED) && !is_flag(EFFECT_FLAG2_AVAILABLE_BD))
return FALSE; return FALSE;
} }
} }
...@@ -285,7 +285,7 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con ...@@ -285,7 +285,7 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con
return FALSE; return FALSE;
} else { } else {
card* phandler = get_handler(); card* phandler = get_handler();
if((type & EFFECT_TYPE_FIELD) && phandler->is_status(STATUS_BATTLE_DESTROYED)) if(!is_flag(EFFECT_FLAG2_AVAILABLE_BD) && (type & EFFECT_TYPE_FIELD) && phandler->is_status(STATUS_BATTLE_DESTROYED))
return FALSE; return FALSE;
if(((type & EFFECT_TYPE_FIELD) || ((type & EFFECT_TYPE_SINGLE) && is_flag(EFFECT_FLAG_SINGLE_RANGE))) && (phandler->current.location & LOCATION_ONFIELD) if(((type & EFFECT_TYPE_FIELD) || ((type & EFFECT_TYPE_SINGLE) && is_flag(EFFECT_FLAG_SINGLE_RANGE))) && (phandler->current.location & LOCATION_ONFIELD)
&& (!phandler->is_position(POS_FACEUP) || !phandler->is_status(STATUS_EFFECT_ENABLED))) && (!phandler->is_position(POS_FACEUP) || !phandler->is_status(STATUS_EFFECT_ENABLED)))
......
effect.h
View file @ f3f01cc1
...@@ -212,6 +212,7 @@ enum effect_flag2 : uint32 { ...@@ -212,6 +212,7 @@ enum effect_flag2 : uint32 {
// EFFECT_FLAG2_NAGA = 0x0001, // EFFECT_FLAG2_NAGA = 0x0001,
EFFECT_FLAG2_COF = 0x0002, EFFECT_FLAG2_COF = 0x0002,
EFFECT_FLAG2_SPOSITCH = 0x0100, // flag2 from 0x0100 are koishipro use EFFECT_FLAG2_SPOSITCH = 0x0100, // flag2 from 0x0100 are koishipro use
EFFECT_FLAG2_AVAILABLE_BD = 0x0101,
}; };
inline effect_flag operator|(effect_flag flag1, effect_flag flag2) inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
{ {
......
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