Readded the new code for Resounding Roar and Resounding Thunder.

Their code was just fine and 100% accurate in concerns with the official rules.

The tests 'cycling2' and 'resounding_roar' occured because of a missing 'choice 0'. Now, the test suite passes.

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -20916,28 +20916,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Noetic Scales
-auto=@each my upkeep restriction{type(*|myhand)~equalto~7}:moveTo(ownerhand) all(creature[power>=8]|mybattlefield)
-auto=@each my upkeep restriction{type(*|myhand)~equalto~6}:moveTo(ownerhand) all(creature[power>=7]|mybattlefield)
-auto=@each my upkeep restriction{type(*|myhand)~equalto~5}:moveTo(ownerhand) all(creature[power>=6]|mybattlefield)
-auto=@each my upkeep restriction{type(*|myhand)~equalto~4}:moveTo(ownerhand) all(creature[power>=5]|mybattlefield)
-auto=@each my upkeep restriction{type(*|myhand)~equalto~3}:moveTo(ownerhand) all(creature[power>=4]|mybattlefield)
-auto=@each my upkeep restriction{type(*|myhand)~equalto~2}:moveTo(ownerhand) all(creature[power>=3]|mybattlefield)
-auto=@each my upkeep restriction{type(*|myhand)~equalto~1}:moveTo(ownerhand) all(creature[power>=2]|mybattlefield)
-auto=@each my upkeep restriction{type(*|myhand)~lessthan~1}:moveTo(ownerhand) all(creature[power>=1]|mybattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~7}:moveTo(ownerhand) all(creature[power>=8]|opponentbattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~6}:moveTo(ownerhand) all(creature[power>=7]|opponentbattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~5}:moveTo(ownerhand) all(creature[power>=6]|opponentbattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~4}:moveTo(ownerhand) all(creature[power>=5]|opponentbattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~3}:moveTo(ownerhand) all(creature[power>=4]|opponentbattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~2}:moveTo(ownerhand) all(creature[power>=3]|opponentbattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~1}:moveTo(ownerhand) all(creature[power>=2]|opponentbattlefield)
-auto=@each opponent upkeep restriction{type(*|opponenthand)~lessthan~1}:moveTo(ownerhand) all(creature[power>=1]|opponentbattlefield)
-text=At the beginning of each player's upkeep, return to its owner's hand each creature that player controls with power greater than the number of cards in his or her hand.
-mana={4}
-type=Artifact
-[/card]
-[card]
 name=Elvish Branchbender
 auto={T}:target(forest) transforms((Forest Land TreeFolk Creature,setpower=type:elf:mybattlefield,settoughness=type:elf:mybattlefield)) ueot
 text={T}: Until end of turn, target Forest becomes an X/X Treefolk creature in addition to its other types, where X is the number of Elves you control.
@@ -48382,6 +48360,28 @@ mana={2}{B}{B}
 type=Instant
 [/card]
 [card]
+name=Noetic Scales
+auto=@each my upkeep restriction{type(*|myhand)~equalto~7}:moveTo(ownerhand) all(creature[power>=8]|mybattlefield)
+auto=@each my upkeep restriction{type(*|myhand)~equalto~6}:moveTo(ownerhand) all(creature[power>=7]|mybattlefield)
+auto=@each my upkeep restriction{type(*|myhand)~equalto~5}:moveTo(ownerhand) all(creature[power>=6]|mybattlefield)
+auto=@each my upkeep restriction{type(*|myhand)~equalto~4}:moveTo(ownerhand) all(creature[power>=5]|mybattlefield)
+auto=@each my upkeep restriction{type(*|myhand)~equalto~3}:moveTo(ownerhand) all(creature[power>=4]|mybattlefield)
+auto=@each my upkeep restriction{type(*|myhand)~equalto~2}:moveTo(ownerhand) all(creature[power>=3]|mybattlefield)
+auto=@each my upkeep restriction{type(*|myhand)~equalto~1}:moveTo(ownerhand) all(creature[power>=2]|mybattlefield)
+auto=@each my upkeep restriction{type(*|myhand)~lessthan~1}:moveTo(ownerhand) all(creature[power>=1]|mybattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~7}:moveTo(ownerhand) all(creature[power>=8]|opponentbattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~6}:moveTo(ownerhand) all(creature[power>=7]|opponentbattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~5}:moveTo(ownerhand) all(creature[power>=6]|opponentbattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~4}:moveTo(ownerhand) all(creature[power>=5]|opponentbattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~3}:moveTo(ownerhand) all(creature[power>=4]|opponentbattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~2}:moveTo(ownerhand) all(creature[power>=3]|opponentbattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~equalto~1}:moveTo(ownerhand) all(creature[power>=2]|opponentbattlefield)
+auto=@each opponent upkeep restriction{type(*|opponenthand)~lessthan~1}:moveTo(ownerhand) all(creature[power>=1]|opponentbattlefield)
+text=At the beginning of each player's upkeep, return to its owner's hand each creature that player controls with power greater than the number of cards in his or her hand.
+mana={4}
+type=Artifact
+[/card]
+[card]
 name=Noggle Bandit
 auto=cantbeblockedby(creature[-defender])
 text=Noggle Bandit can't be blocked except by creatures with defender.
@@ -57005,7 +57005,7 @@ toughness=1
 name=Resounding Roar
 target=creature
 auto=3/3
-autohand={5}{R}{G}{W}{cycle}:name(cycling) draw:1 controller && 6/6 target(creature)
+autohand={5}{R}{G}{W}{cycle}:name(cycling and six damage to creature) draw:1 && transforms((,newability[target(creature) 6/6])) forever
 text=Target creature gets +3/+3 until end of turn. -- Cycling {5}{R}{G}{W} ({5}{R}{G}{W}, Discard this card: Draw a card.) -- When you cycle Resounding Roar, target creature gets +6/+6 until end of turn.
 mana={1}{G}
 type=Instant
@@ -57023,7 +57023,8 @@ type=Sorcery
 name=Resounding Thunder
 target=creature,player
 auto=damage:3
-autohand={5}{B}{R}{G}{cycle}:name(cycling) draw:1 controller && damage:6 target(creature,player)
+autohand={5}{B}{R}{G}{cycle}:name(cycling and six damage to target creature) draw:1 controller && transforms((,newability[target(creature) damage:6])) forever
+autohand={5}{B}{R}{G}{cycle}:name(cycling and six damage to target player) draw:1 controller && transforms((,newability[target(player) damage:6])) forever
 text=Resounding Thunder deals 3 damage to target creature or player. -- Cycling {5}{B}{R}{G} ({5}{B}{R}{G}, Discard this card: Draw a card.) -- When you cycle Resounding Thunder, it deals 6 damage to target creature or player.
 mana={2}{R}
 type=Instant

projects/mtg/bin/Res/test/generic/cycling2.txt

@@ -14,6 +14,7 @@ inplay:Nim Grotesque
 [DO]
 Resounding Thunder
 choice 1
+choice 0
 Nim Grotesque
 [ASSERT]
 FIRSTMAIN

projects/mtg/bin/Res/test/resounding_roar.txt

@@ -10,6 +10,7 @@ manapool:{5}{R}{G}{W}
 [DO]
 Resounding Roar
 choice 1
+choice 0
 Runeclaw Bear
 next
 next