From 26c73dca32a4b1cab0c7a4b56554588d648a1289 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 3 Mar 2025 17:01:15 -0500 Subject: [PATCH] move red card dancer tests to dancer.c --- test/battle/ability/dancer.c | 54 ++++++++++++++++++++++++++++++ test/battle/hold_effect/red_card.c | 53 ----------------------------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/test/battle/ability/dancer.c b/test/battle/ability/dancer.c index 657a126470..1e4c61dba0 100644 --- a/test/battle/ability/dancer.c +++ b/test/battle/ability/dancer.c @@ -246,3 +246,57 @@ DOUBLE_BATTLE_TEST("Dancer doesn't call a move that didn't execute due to Powder } } } + + +DOUBLE_BATTLE_TEST("Dancer still activates after Red Card") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) ; + PLAYER(SPECIES_ORICORIO) { Ability(ABILITY_DANCER); } + PLAYER(SPECIES_CHANSEY); + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_SHUCKLE); + } WHEN { + TURN { MOVE(playerLeft, MOVE_FIERY_DANCE, target: opponentLeft); } + } SCENE { + MESSAGE("Wobbuffet used Fiery Dance!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerLeft); + HP_BAR(opponentLeft); + // Red card trigger + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentLeft); + MESSAGE("The opposing Wobbuffet held up its Red Card against Wobbuffet!"); + MESSAGE("Chansey was dragged out!"); + // Dancer + ABILITY_POPUP(playerRight, ABILITY_DANCER); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerRight); + HP_BAR(opponentLeft); + } +} + +DOUBLE_BATTLE_TEST("Dancer still activate after Red Card even if blocked by Suction Cups") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SUCTION_CUPS); } + PLAYER(SPECIES_ORICORIO) { Ability(ABILITY_DANCER); } + PLAYER(SPECIES_CHANSEY); + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_SHUCKLE); + } WHEN { + TURN { MOVE(playerLeft, MOVE_FIERY_DANCE, target: opponentLeft); } + } SCENE { + MESSAGE("Wobbuffet used Fiery Dance!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerLeft); + HP_BAR(opponentLeft); + // red card trigger + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentLeft); + MESSAGE("The opposing Wobbuffet held up its Red Card against Wobbuffet!"); + MESSAGE("Wobbuffet anchors itself with Suction Cups!"); + NOT MESSAGE("Chansey was dragged out!"); + // Dancer + ABILITY_POPUP(playerRight, ABILITY_DANCER); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerRight); + HP_BAR(opponentLeft); + } +} diff --git a/test/battle/hold_effect/red_card.c b/test/battle/hold_effect/red_card.c index 80595b5b65..8513e795b9 100644 --- a/test/battle/hold_effect/red_card.c +++ b/test/battle/hold_effect/red_card.c @@ -521,56 +521,3 @@ SINGLE_BATTLE_TEST("Red Card activates before Eject Pack") } } -DOUBLE_BATTLE_TEST("Dancer still activates after Red Card") -{ - GIVEN { - PLAYER(SPECIES_WOBBUFFET) ; - PLAYER(SPECIES_ORICORIO) { Ability(ABILITY_DANCER); } - PLAYER(SPECIES_CHANSEY); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } - OPPONENT(SPECIES_BULBASAUR); - OPPONENT(SPECIES_SHUCKLE); - } WHEN { - TURN { MOVE(playerLeft, MOVE_FIERY_DANCE, target: opponentLeft); } - } SCENE { - MESSAGE("Wobbuffet used Fiery Dance!"); - ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerLeft); - HP_BAR(opponentLeft); - // Red card trigger - ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentLeft); - MESSAGE("The opposing Wobbuffet held up its Red Card against Wobbuffet!"); - MESSAGE("Chansey was dragged out!"); - // Dancer - ABILITY_POPUP(playerRight, ABILITY_DANCER); - ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerRight); - HP_BAR(opponentLeft); - } -} - -DOUBLE_BATTLE_TEST("Red Card: Dancer still activate after Red Card even if blocked by Suction Cups") -{ - GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SUCTION_CUPS); } - PLAYER(SPECIES_ORICORIO) { Ability(ABILITY_DANCER); } - PLAYER(SPECIES_CHANSEY); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } - OPPONENT(SPECIES_BULBASAUR); - OPPONENT(SPECIES_SHUCKLE); - } WHEN { - TURN { MOVE(playerLeft, MOVE_FIERY_DANCE, target: opponentLeft); } - } SCENE { - MESSAGE("Wobbuffet used Fiery Dance!"); - ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerLeft); - HP_BAR(opponentLeft); - // red card trigger - ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentLeft); - MESSAGE("The opposing Wobbuffet held up its Red Card against Wobbuffet!"); - MESSAGE("Wobbuffet anchors itself with Suction Cups!"); - NOT MESSAGE("Chansey was dragged out!"); - // Dancer - ABILITY_POPUP(playerRight, ABILITY_DANCER); - ANIMATION(ANIM_TYPE_MOVE, MOVE_FIERY_DANCE, playerRight); - HP_BAR(opponentLeft); - } -} -