Skip to content

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

control-changing contunous effect 

Now these effects does not use EFFECT_FLAG_SINGLE_RANGE anymore.
parent 3a099257
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
card.cpp
View file @ df431baf
...@@ -2730,6 +2730,7 @@ effect* card::is_affected_by_effect(int32 code, card* target) { ...@@ -2730,6 +2730,7 @@ effect* card::is_affected_by_effect(int32 code, card* target) {
} }
return 0; return 0;
} }
// return the last control-changing continous effect
effect* card::check_control_effect() { effect* card::check_control_effect() {
effect* ret_effect = 0; effect* ret_effect = 0;
for (auto& pcard : equiping_cards) { for (auto& pcard : equiping_cards) {
...@@ -2753,7 +2754,7 @@ effect* card::check_control_effect() { ...@@ -2753,7 +2754,7 @@ effect* card::check_control_effect() {
auto rg = single_effect.equal_range(EFFECT_SET_CONTROL); auto rg = single_effect.equal_range(EFFECT_SET_CONTROL);
for (; rg.first != rg.second; ++rg.first) { for (; rg.first != rg.second; ++rg.first) {
effect* peffect = rg.first->second; effect* peffect = rg.first->second;
if(!peffect->is_flag(EFFECT_FLAG_SINGLE_RANGE)) if(!peffect->is_flag(EFFECT_FLAG_OWNER_RELATE))
continue; continue;
if(!ret_effect || peffect->id > ret_effect->id) if(!ret_effect || peffect->id > ret_effect->id)
ret_effect = peffect; ret_effect = peffect;
......
effect.cpp
View file @ df431baf
...@@ -545,7 +545,7 @@ int32 effect::is_chainable(uint8 tp) { ...@@ -545,7 +545,7 @@ int32 effect::is_chainable(uint8 tp) {
return TRUE; return TRUE;
} }
//return: this can be reset by reset_level or not //return: this can be reset by reset_level or not
//RESET_CODE can only reset single effects without EFFECT_FLAG_SINGLE_RANGE //RESET_CODE can only reset single effects without EFFECT_FLAG_SINGLE_RANGE, EFFECT_FLAG_OWNER_RELATE
//RESET_DISABLE is valid only when owner == handler //RESET_DISABLE is valid only when owner == handler
int32 effect::reset(uint32 reset_level, uint32 reset_type) { int32 effect::reset(uint32 reset_level, uint32 reset_type) {
switch (reset_type) { switch (reset_type) {
...@@ -578,7 +578,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) { ...@@ -578,7 +578,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) {
} }
case RESET_CODE: { case RESET_CODE: {
return (code == reset_level) && (type & EFFECT_TYPE_SINGLE) && !(type & EFFECT_TYPE_ACTIONS) return (code == reset_level) && (type & EFFECT_TYPE_SINGLE) && !(type & EFFECT_TYPE_ACTIONS)
&& !is_flag(EFFECT_FLAG_SINGLE_RANGE); && !is_flag(EFFECT_FLAG_SINGLE_RANGE) && !is_flag(EFFECT_FLAG_OWNER_RELATE);
break; break;
} }
case RESET_COPY: { case RESET_COPY: {
......
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