Skip to content

Y
ygopro-core
Commit 5a2958c6 authored by DailyShana's avatar DailyShana
Browse files
Options

remove EFFECT_FLAG_CHAIN_UNIQUE

parent 510b99df
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 68 deletions
effect.h
View file @ 5a2958c6
...@@ -184,10 +184,10 @@ enum effect_flag : uint32 { ...@@ -184,10 +184,10 @@ enum effect_flag : uint32 {
EFFECT_FLAG_OWNER_RELATE = 0x1000000, EFFECT_FLAG_OWNER_RELATE = 0x1000000,
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_NAGA = 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,
}; };
enum effect_flag2 : uint32 { enum effect_flag2 : uint32 {
......
processor.cpp
View file @ 5a2958c6
...@@ -1706,14 +1706,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free ...@@ -1706,14 +1706,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
&& (peffect->code == EVENT_FLIP && infos.phase == PHASE_DAMAGE && (peffect->code == EVENT_FLIP && infos.phase == PHASE_DAMAGE
|| (clit->triggering_location & 0x43) && (clit->triggering_position & POS_FACEDOWN) || (clit->triggering_location & 0x43) && (clit->triggering_position & POS_FACEDOWN)
|| !(phandler->current.location & 0x43) || phandler->is_position(POS_FACEUP))) { || !(phandler->current.location & 0x43) || phandler->is_position(POS_FACEUP))) {
if(peffect->is_flag(EFFECT_FLAG_CHAIN_UNIQUE)) {
for(auto tpit = core.current_chain.begin(); tpit != core.current_chain.end(); ++tpit) {
if(tpit->triggering_effect->get_handler()->data.code == phandler->data.code && tpit->triggering_player == tp) {
act = false;
break;
}
}
}
} else } else
act = false; act = false;
if(act) { if(act) {
...@@ -1803,14 +1796,6 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free ...@@ -1803,14 +1796,6 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
} }
} }
} }
if(peffect->is_flag(EFFECT_FLAG_CHAIN_UNIQUE)) {
for(auto tpit = core.current_chain.begin(); tpit != core.current_chain.end(); ++tpit) {
if(tpit->triggering_player == tp && tpit->triggering_effect->get_handler()->data.code == phandler->data.code) {
act = false;
break;
}
}
}
} else } else
act = false; act = false;
} else act = false; } else act = false;
...@@ -2020,49 +2005,13 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori ...@@ -2020,49 +2005,13 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
if(peffect->is_chainable(ifit->second.triggering_player) && peffect->check_count_limit(ifit->second.triggering_player) if(peffect->is_chainable(ifit->second.triggering_player) && peffect->check_count_limit(ifit->second.triggering_player)
&& phandler->is_has_relation(ifit->second)) { && phandler->is_has_relation(ifit->second)) {
if(ifit->second.triggering_player == infos.turn_player) { if(ifit->second.triggering_player == infos.turn_player) {
act = true; core.tpchain.push_back(ifit->second);
if(peffect->is_flag(EFFECT_FLAG_CHAIN_UNIQUE)) { phandler->set_status(STATUS_CHAINING, TRUE);
for (auto cait = core.tpchain.begin(); cait != core.tpchain.end(); ++cait) { peffect->dec_count(infos.turn_player);
if (cait->triggering_effect->get_handler()->data.code == phandler->data.code) {
act = false;
break;
}
}
for (auto cait = core.current_chain.begin(); cait != core.current_chain.end(); ++cait) {
if ((cait->triggering_effect->get_handler()->data.code == phandler->data.code)
&& (cait->triggering_player == infos.turn_player)) {
act = false;
break;
}
}
}
if(act) {
core.tpchain.push_back(ifit->second);
phandler->set_status(STATUS_CHAINING, TRUE);
peffect->dec_count(infos.turn_player);
}
} else { } else {
act = true; core.ntpchain.push_back(ifit->second);
if(peffect->is_flag(EFFECT_FLAG_CHAIN_UNIQUE)) { phandler->set_status(STATUS_CHAINING, TRUE);
for (auto cait = core.ntpchain.begin(); cait != core.ntpchain.end(); ++cait) { peffect->dec_count(1 - infos.turn_player);
if (cait->triggering_effect->get_handler()->data.code == phandler->data.code) {
act = false;
break;
}
}
for (auto cait = core.current_chain.begin(); cait != core.current_chain.end(); ++cait) {
if ((cait->triggering_effect->get_handler()->data.code == phandler->data.code)
&& (cait->triggering_player != infos.turn_player)) {
act = false;
break;
}
}
}
if(act) {
core.ntpchain.push_back(ifit->second);
phandler->set_status(STATUS_CHAINING, TRUE);
peffect->dec_count(1 - infos.turn_player);
}
} }
} }
} }
...@@ -2146,14 +2095,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori ...@@ -2146,14 +2095,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
} }
} }
} }
if(peffect->is_flag(EFFECT_FLAG_CHAIN_UNIQUE)) {
for(auto cait = core.current_chain.begin(); cait != core.current_chain.end(); ++cait) {
if(cait->triggering_player == priority && cait->triggering_effect->get_handler()->data.code == phandler->data.code) {
act = false;
break;
}
}
}
} else } else
act = false; act = false;
if(act) if(act)
......
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