diff --git a/game/cards/dm03/gel_fish.go b/game/cards/dm03/gel_fish.go index a60a2722..7fd39440 100644 --- a/game/cards/dm03/gel_fish.go +++ b/game/cards/dm03/gel_fish.go @@ -27,7 +27,7 @@ func ChaosFish(c *match.Card) { ctx.ScheduleAfter(func() { nrCardsToDraw := (getWaterCardsInYourBattleZone(card) - 1) //-1 to exclude self - fx.DrawBetween(card, ctx, 0, nrCardsToDraw) + fx.DrawUpto(card, ctx, nrCardsToDraw) }) })) diff --git a/game/cards/dm06/survivor.go b/game/cards/dm06/survivor.go index 1ad77550..797aae39 100644 --- a/game/cards/dm06/survivor.go +++ b/game/cards/dm06/survivor.go @@ -27,7 +27,7 @@ func QTronicHypermind(c *match.Card) { return } - fx.DrawBetween(card, ctx, 0, toDraw) + fx.DrawUpto(card, ctx, toDraw) })) } diff --git a/game/fx/draw.go b/game/fx/draw.go index 11df71cd..ef1e5c25 100644 --- a/game/fx/draw.go +++ b/game/fx/draw.go @@ -44,16 +44,16 @@ func MayDraw1(card *match.Card, ctx *match.Context) { } func DrawUpTo2(card *match.Card, ctx *match.Context) { - DrawBetween(card, ctx, 0, 2) + DrawUpto(card, ctx, 2) } func DrawUpTo3(card *match.Card, ctx *match.Context) { - DrawBetween(card, ctx, 0, 3) + DrawUpto(card, ctx, 3) } -// This gives the player the choice to select a number of cards to draw between 2 provided limits -func DrawBetween(card *match.Card, ctx *match.Context, min int, max int) { - for i := min; i < max; i++ { +// This gives the player the choice to select a number of cards to draw upto the provided limit +func DrawUpto(card *match.Card, ctx *match.Context, max int) { + for i := 0; i < max; i++ { if BinaryQuestion(card.Player, ctx.Match, fmt.Sprintf("Do you want to draw? (%s effect)", card.Name)) { card.Player.DrawCards(1) ctx.Match.BroadcastState()