Skip to content

Y
ygopro-core
Commit ee71e253 authored by VanillaSalt's avatar VanillaSalt Committed by GitHub
Browse files
Options

Merge pull request #50 from edo9300/master 

Added EFFECT_TRIPLE_TRIBUTE
parents 4ba2a90f a1f57c52
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
effect.h
View file @ ee71e253
...@@ -311,6 +311,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2) ...@@ -311,6 +311,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
#define EFFECT_EXTRA_RELEASE 153 #define EFFECT_EXTRA_RELEASE 153
#define EFFECT_TRIBUTE_LIMIT 154 #define EFFECT_TRIBUTE_LIMIT 154
#define EFFECT_EXTRA_RELEASE_SUM 155 #define EFFECT_EXTRA_RELEASE_SUM 155
#define EFFECT_TRIPLE_TRIBUTE 156
#define EFFECT_PUBLIC 160 #define EFFECT_PUBLIC 160
#define EFFECT_COUNTER_PERMIT 0x10000 #define EFFECT_COUNTER_PERMIT 0x10000
#define EFFECT_COUNTER_LIMIT 0x20000 #define EFFECT_COUNTER_LIMIT 0x20000
......
field.cpp
View file @ ee71e253
...@@ -1216,7 +1216,9 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_ ...@@ -1216,7 +1216,9 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_
continue; continue;
if(release_list) if(release_list)
release_list->insert(pcard); release_list->insert(pcard);
if(pcard->is_affected_by_effect(EFFECT_DOUBLE_TRIBUTE, target)) if(pcard->is_affected_by_effect(EFFECT_TRIPLE_TRIBUTE, target))
pcard->operation_param = 3;
else if(pcard->is_affected_by_effect(EFFECT_DOUBLE_TRIBUTE, target))
pcard->operation_param = 2; pcard->operation_param = 2;
else else
pcard->operation_param = 1; pcard->operation_param = 1;
...@@ -1233,7 +1235,9 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_ ...@@ -1233,7 +1235,9 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_
if(ex || pcard->is_affected_by_effect(EFFECT_EXTRA_RELEASE)) { if(ex || pcard->is_affected_by_effect(EFFECT_EXTRA_RELEASE)) {
if(ex_list) if(ex_list)
ex_list->insert(pcard); ex_list->insert(pcard);
if(pcard->is_affected_by_effect(EFFECT_DOUBLE_TRIBUTE, target)) if(pcard->is_affected_by_effect(EFFECT_TRIPLE_TRIBUTE, target))
pcard->operation_param = 3;
else if(pcard->is_affected_by_effect(EFFECT_DOUBLE_TRIBUTE, target))
pcard->operation_param = 2; pcard->operation_param = 2;
else else
pcard->operation_param = 1; pcard->operation_param = 1;
...@@ -1244,7 +1248,9 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_ ...@@ -1244,7 +1248,9 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_
continue; continue;
if(ex_list_sum) if(ex_list_sum)
ex_list_sum->insert(pcard); ex_list_sum->insert(pcard);
if(pcard->is_affected_by_effect(EFFECT_DOUBLE_TRIBUTE, target)) if(pcard->is_affected_by_effect(EFFECT_TRIPLE_TRIBUTE, target))
pcard->operation_param = 3;
else if(pcard->is_affected_by_effect(EFFECT_DOUBLE_TRIBUTE, target))
pcard->operation_param = 2; pcard->operation_param = 2;
else else
pcard->operation_param = 1; pcard->operation_param = 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