diff --git a/src/themes/MLG.ts b/src/themes/MLG.ts index 0f4dfc9..44e1ea9 100644 --- a/src/themes/MLG.ts +++ b/src/themes/MLG.ts @@ -1,11 +1,14 @@ -import type { Theme } from "./Theme"; +import { even, type Theme } from "./Theme"; export const MLGTheme: Theme = { size: 32, mine: () => import("../assets/themes/MLG/mine.png"), tile: () => import("../assets/themes/MLG/tile.png"), revealed: () => import("../assets/themes/MLG/revealed.png"), - flag: () => import("../assets/themes/MLG/flag-2.png"), + flag: even( + () => import("../assets/themes/MLG/flag-1.png"), + () => import("../assets/themes/MLG/flag-2.png") + ), questionMark: () => import("../assets/themes/MLG/question-mark.png"), lastPos: () => import("../assets/themes/MLG/last-pos.png"), 1: () => import("../assets/themes/MLG/1.png"), diff --git a/src/themes/Theme.ts b/src/themes/Theme.ts index a35adba..3454d68 100644 --- a/src/themes/Theme.ts +++ b/src/themes/Theme.ts @@ -51,7 +51,7 @@ export const mainWithSpecials = ( const [main, ...specials] = sprites; return [ { weight: 1, sprite: main }, - ...specials.map((sprite) => ({ weight: 0.05, sprite })), + ...specials.map((sprite) => ({ weight: 0.3, sprite })), ]; }; diff --git a/src/themes/cats.ts b/src/themes/cats.ts index 0ebcb24..8fcd325 100644 --- a/src/themes/cats.ts +++ b/src/themes/cats.ts @@ -1,8 +1,11 @@ -import type { Theme } from "./Theme"; +import { even, type Theme } from "./Theme"; export const catsTheme: Theme = { size: 32, - mine: () => import("../assets/themes/cats/mine-2.png"), + mine: even( + () => import("../assets/themes/cats/mine-1.png"), + () => import("../assets/themes/cats/mine-2.png") + ), tile: () => import("../assets/themes/cats/tile.png"), revealed: () => import("../assets/themes/cats/revealed.png"), flag: () => import("../assets/themes/cats/flag.png"), diff --git a/src/themes/dinos.ts b/src/themes/dinos.ts index 8cac39e..cab6947 100644 --- a/src/themes/dinos.ts +++ b/src/themes/dinos.ts @@ -1,8 +1,11 @@ -import type { Theme } from "./Theme"; +import { even, type Theme } from "./Theme"; export const dinoTheme: Theme = { size: 32, - mine: () => import("../assets/themes/dinos/mine-1.png"), + mine: even( + () => import("../assets/themes/dinos/mine-1.png"), + () => import("../assets/themes/dinos/mine-2.png") + ), tile: () => import("../assets/themes/dinos/tile.png"), revealed: () => import("../assets/themes/dinos/revealed-1.png"), flag: () => import("../assets/themes/dinos/flag.png"), diff --git a/src/themes/insects.ts b/src/themes/insects.ts index 25d0f63..4d93bf0 100644 --- a/src/themes/insects.ts +++ b/src/themes/insects.ts @@ -1,8 +1,11 @@ -import type { Theme } from "./Theme"; +import { even, type Theme } from "./Theme"; export const insectsTheme: Theme = { size: 32, - mine: () => import("../assets/themes/insects/mine-1.png"), + mine: even( + () => import("../assets/themes/insects/mine-1.png"), + () => import("../assets/themes/insects/mine-2.png") + ), tile: () => import("../assets/themes/insects/tile.png"), revealed: () => import("../assets/themes/insects/revealed.png"), flag: () => import("../assets/themes/insects/flag.png"), diff --git a/src/themes/isaac.ts b/src/themes/isaac.ts index b19045e..c180f5e 100644 --- a/src/themes/isaac.ts +++ b/src/themes/isaac.ts @@ -1,8 +1,12 @@ -import type { Theme } from "./Theme"; +import { even, type Theme } from "./Theme"; export const isaacTheme: Theme = { size: 32, - mine: () => import("../assets/themes/isaac/mine-3.png"), + mine: even( + () => import("../assets/themes/isaac/mine-1.png"), + () => import("../assets/themes/isaac/mine-2.png"), + () => import("../assets/themes/isaac/mine-3.png") + ), tile: () => import("../assets/themes/isaac/tile.png"), revealed: () => import("../assets/themes/isaac/revealed.png"), flag: () => import("../assets/themes/isaac/flag.png"), diff --git a/src/themes/league-teemo.ts b/src/themes/league-teemo.ts index 5e18d66..cc75abb 100644 --- a/src/themes/league-teemo.ts +++ b/src/themes/league-teemo.ts @@ -1,9 +1,12 @@ -import type { Theme } from "./Theme"; +import { mainWithSpecials, type Theme } from "./Theme"; export const leagueTeemoTheme: Theme = { size: 32, mine: () => import("../assets/themes/league/teemo/mine.png"), - tile: () => import("../assets/themes/league/tile-1.png"), + tile: mainWithSpecials( + () => import("../assets/themes/league/tile-1.png"), + () => import("../assets/themes/league/tile-2.png") + ), revealed: () => import("../assets/themes/league/revealed.png"), flag: () => import("../assets/themes/league/teemo/flag.png"), questionMark: () => import("../assets/themes/league/question-mark.png"), diff --git a/src/themes/league-ziggs.ts b/src/themes/league-ziggs.ts index 05f7915..803d299 100644 --- a/src/themes/league-ziggs.ts +++ b/src/themes/league-ziggs.ts @@ -1,9 +1,12 @@ -import type { Theme } from "./Theme"; +import { mainWithSpecials, type Theme } from "./Theme"; export const leagueZiggsTheme: Theme = { size: 32, mine: () => import("../assets/themes/league/ziggs/mine.png"), - tile: () => import("../assets/themes/league/tile-1.png"), + tile: mainWithSpecials( + () => import("../assets/themes/league/tile-1.png"), + () => import("../assets/themes/league/tile-2.png") + ), revealed: () => import("../assets/themes/league/revealed.png"), flag: () => import("../assets/themes/league/ziggs/flag.png"), questionMark: () => import("../assets/themes/league/question-mark.png"), diff --git a/src/themes/mine-dogs.ts b/src/themes/mine-dogs.ts index f9ca0d7..d6a13b0 100644 --- a/src/themes/mine-dogs.ts +++ b/src/themes/mine-dogs.ts @@ -1,11 +1,14 @@ -import type { Theme } from "./Theme"; +import { even, type Theme } from "./Theme"; export const mineDogsTheme: Theme = { size: 32, mine: () => import("../assets/themes/mine-dogs/mine.png"), tile: () => import("../assets/themes/mine-dogs/tile.png"), revealed: () => import("../assets/themes/mine-dogs/revealed.png"), - flag: () => import("../assets/themes/mine-dogs/flag-2.png"), + flag: even( + () => import("../assets/themes/mine-dogs/flag-1.png"), + () => import("../assets/themes/mine-dogs/flag-2.png") + ), questionMark: () => import("../assets/themes/mine-dogs/question-mark.png"), lastPos: () => import("../assets/themes/mine-dogs/last-pos.png"), 1: () => import("../assets/themes/mine-dogs/1.png"), diff --git a/src/themes/techies-dire.ts b/src/themes/techies-dire.ts index 8f399d9..8d692ed 100644 --- a/src/themes/techies-dire.ts +++ b/src/themes/techies-dire.ts @@ -1,4 +1,4 @@ -import { even, type Theme } from "./Theme"; +import { even, mainWithSpecials, type Theme } from "./Theme"; export const techiesDireTheme: Theme = { size: 32, @@ -6,7 +6,11 @@ export const techiesDireTheme: Theme = { () => import("../assets/themes/techies/dire/mine-1.png"), () => import("../assets/themes/techies/dire/mine-2.png"), ), - tile: () => import("../assets/themes/techies/dire/tile-1.png"), + tile: mainWithSpecials( + () => import("../assets/themes/techies/dire/tile-1.png"), + () => import("../assets/themes/techies/dire/tile-2.png"), + () => import("../assets/themes/techies/dire/tile-3.png") + ), revealed: () => import("../assets/themes/techies/dire/revealed.png"), flag: () => import("../assets/themes/techies/flag.png"), questionMark: () => import("../assets/themes/techies/dire/question-mark.png"), diff --git a/src/themes/techies-radiant.ts b/src/themes/techies-radiant.ts index 348062d..ad124c9 100644 --- a/src/themes/techies-radiant.ts +++ b/src/themes/techies-radiant.ts @@ -1,9 +1,16 @@ -import type { Theme } from "./Theme"; +import { even, mainWithSpecials, type Theme } from "./Theme"; export const techiesRadiantTheme: Theme = { size: 32, - mine: () => import("../assets/themes/techies/radiant/mine-1.png"), - tile: () => import("../assets/themes/techies/radiant/tile-1.png"), + mine: even( + () => import("../assets/themes/techies/radiant/mine-1.png"), + () => import("../assets/themes/techies/radiant/mine-2.png") + ), + tile: mainWithSpecials( + () => import("../assets/themes/techies/radiant/tile-1.png"), + () => import("../assets/themes/techies/radiant/tile-2.png"), + () => import("../assets/themes/techies/radiant/tile-3.png") + ), revealed: () => import("../assets/themes/techies/radiant/revealed-1.png"), flag: () => import("../assets/themes/techies/flag.png"), questionMark: () =>