diff --git a/src/cljs/nr/cardbrowser.cljs b/src/cljs/nr/cardbrowser.cljs index 9ff7b7880a..a306a6eeb3 100644 --- a/src/cljs/nr/cardbrowser.cljs +++ b/src/cljs/nr/cardbrowser.cljs @@ -196,7 +196,9 @@ art (if (sequential? alt-art) (first alt-art) alt-art) art-index (if (sequential? alt-art) (second alt-art) 0) images (image-or-face card)] - (nth (get-image-path images (keyword lang) (keyword res) (keyword art)) art-index)))) + (let [art-urls (get-image-path images (keyword lang) (keyword res) (keyword art)) + safe-index (min art-index (dec (count art-urls)))] + (nth art-urls safe-index))))) (defn- base-image-url "The default card image. Displays an alternate image if the card is specified as one." diff --git a/src/cljs/nr/gameboard/board.cljs b/src/cljs/nr/gameboard/board.cljs index 522bddfb6f..0a1f483eed 100644 --- a/src/cljs/nr/gameboard/board.cljs +++ b/src/cljs/nr/gameboard/board.cljs @@ -69,7 +69,8 @@ images (image-or-face card)] (if (sequential? art) (let [art-urls (get-image-path images (keyword lang) (keyword res) (keyword (first art))) - chosen-art (nth art-urls (second art))] + safe-index (min (second art) (dec (count art-urls))) + chosen-art (nth art-urls safe-index)] [chosen-art]) (first (get-image-path images (keyword lang) (keyword res) (keyword art)))))))