Skip to content

Y
ygopro-core
Commit fe05c074 authored by salix5's avatar salix5 Committed by GitHub
Browse files
Options

add EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE (#400)

parent c036f2fc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
effect.h
View file @ fe05c074
...@@ -415,7 +415,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2) ...@@ -415,7 +415,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
#define EFFECT_QP_ACT_IN_NTPHAND 311 #define EFFECT_QP_ACT_IN_NTPHAND 311
#define EFFECT_MUST_BE_SMATERIAL 312 #define EFFECT_MUST_BE_SMATERIAL 312
#define EFFECT_TO_GRAVE_REDIRECT_CB 313 #define EFFECT_TO_GRAVE_REDIRECT_CB 313
//#define EFFECT_CHANGE_LEVEL_FINAL 314 #define EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE 314
//#define EFFECT_CHANGE_RANK_FINAL 315 //#define EFFECT_CHANGE_RANK_FINAL 315
#define EFFECT_MUST_BE_FMATERIAL 316 #define EFFECT_MUST_BE_FMATERIAL 316
#define EFFECT_MUST_BE_XMATERIAL 317 #define EFFECT_MUST_BE_XMATERIAL 317
......
processor.cpp
View file @ fe05c074
...@@ -3420,7 +3420,7 @@ void field::calculate_battle_damage(effect** pdamchange, card** preason_card, ui ...@@ -3420,7 +3420,7 @@ void field::calculate_battle_damage(effect** pdamchange, card** preason_card, ui
} }
effect_set eset; effect_set eset;
core.attacker->filter_effect(EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); core.attacker->filter_effect(EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE);
core.attack_target->filter_effect(EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); core.attack_target->filter_effect(EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE, &eset, FALSE);
filter_player_effect(pa, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); filter_player_effect(pa, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE);
filter_player_effect(1 - pa, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); filter_player_effect(1 - pa, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE);
eset.sort(); eset.sort();
...@@ -3540,7 +3540,7 @@ void field::calculate_battle_damage(effect** pdamchange, card** preason_card, ui ...@@ -3540,7 +3540,7 @@ void field::calculate_battle_damage(effect** pdamchange, card** preason_card, ui
effect_set eset; effect_set eset;
reason_card->filter_effect(EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); reason_card->filter_effect(EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE);
if(dam_card) if(dam_card)
dam_card->filter_effect(EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); dam_card->filter_effect(EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE, &eset, FALSE);
filter_player_effect(damp, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); filter_player_effect(damp, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE);
filter_player_effect(1 - damp, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE); filter_player_effect(1 - damp, EFFECT_CHANGE_BATTLE_DAMAGE, &eset, FALSE);
eset.sort(); eset.sort();
......
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