diff --git a/public/models/poly-pizza/betta.glb b/public/models/poly-pizza/betta.glb new file mode 100644 index 0000000..fc8aa78 Binary files /dev/null and b/public/models/poly-pizza/betta.glb differ diff --git a/public/models/poly-pizza/blue_tang.glb b/public/models/poly-pizza/blue_tang.glb new file mode 100644 index 0000000..2a29e8d Binary files /dev/null and b/public/models/poly-pizza/blue_tang.glb differ diff --git a/public/models/poly-pizza/flower_horn.glb b/public/models/poly-pizza/flower_horn.glb new file mode 100644 index 0000000..8a6d6c0 Binary files /dev/null and b/public/models/poly-pizza/flower_horn.glb differ diff --git a/src/game/economy.ts b/src/game/economy.ts index be93be1..702135b 100644 --- a/src/game/economy.ts +++ b/src/game/economy.ts @@ -6,9 +6,9 @@ export const FISH_PRICES: Record = { angelfish: 100, goldfish: 80, guppy: 60, - fish1: 50, - fish2: 70, - fish3: 65, + betta: 110, + blue_tang: 95, + flower_horn: 105, neon_tetra: 75, oscar: 120, knifefish: 110, @@ -82,9 +82,9 @@ export const SPECIES_RARITY_DIST: Record> = angelfish: { common: 60, uncommon: 25, rare: 10, epic: 4, legendary: 1 }, goldfish: { common: 65, uncommon: 20, rare: 9, epic: 5, legendary: 1 }, guppy: { common: 70, uncommon: 18, rare: 7, epic: 4, legendary: 1 }, - fish1: { common: 75, uncommon: 15, rare: 6, epic: 3, legendary: 1 }, - fish2: { common: 65, uncommon: 20, rare: 10, epic: 4, legendary: 1 }, - fish3: { common: 68, uncommon: 18, rare: 9, epic: 4, legendary: 1 }, + betta: { common: 50, uncommon: 25, rare: 15, epic: 7, legendary: 3 }, + blue_tang: { common: 60, uncommon: 22, rare: 10, epic: 6, legendary: 2 }, + flower_horn: { common: 55, uncommon: 23, rare: 12, epic: 7, legendary: 3 }, neon_tetra: { common: 65, uncommon: 20, rare: 8, epic: 5, legendary: 2 }, oscar: { common: 55, uncommon: 25, rare: 12, epic: 6, legendary: 2 }, knifefish: { common: 50, uncommon: 25, rare: 13, epic: 8, legendary: 4 }, @@ -92,16 +92,16 @@ export const SPECIES_RARITY_DIST: Record> = }; /** Available species in shop */ -export const SHOP_SPECIES: FishSpecies[] = ["angelfish", "goldfish", "guppy", "neon_tetra", "oscar", "knifefish", "clownfish", "fish1", "fish2", "fish3"]; +export const SHOP_SPECIES: FishSpecies[] = ["angelfish", "goldfish", "guppy", "neon_tetra", "oscar", "knifefish", "clownfish", "betta", "blue_tang", "flower_horn"]; /** Species display names */ export const SPECIES_NAMES: Record = { angelfish: "Angelfish", goldfish: "Goldfish", guppy: "Guppy", - fish1: "Cute Fish I", - fish2: "Cute Fish II", - fish3: "Cute Fish III", + betta: "Betta", + blue_tang: "Blue Tang", + flower_horn: "Flower Horn", neon_tetra: "Neon Tetra", oscar: "Oscar Cichlid", knifefish: "Ghost Knifefish", diff --git a/src/game/state.ts b/src/game/state.ts index b2b1106..ecf1e46 100644 --- a/src/game/state.ts +++ b/src/game/state.ts @@ -11,14 +11,14 @@ export function createDefaultState(): GameState { makeFish("angelfish", 0.50), makeFish("goldfish", 0.45), makeFish("guppy", 0.40), - makeFish("guppy", 0.35), makeFish("neon_tetra", 0.30), makeFish("neon_tetra", 0.28), makeFish("oscar", 0.60), makeFish("knifefish", 0.50), makeFish("clownfish", 0.40), - makeFish("fish1", 0.45), - makeFish("fish2", 0.50), + makeFish("betta", 0.45), + makeFish("blue_tang", 0.50), + makeFish("flower_horn", 0.55), ]; return { version: VERSION, diff --git a/src/game/types.ts b/src/game/types.ts index 9cedf6f..bda2a03 100644 --- a/src/game/types.ts +++ b/src/game/types.ts @@ -1,7 +1,7 @@ export type Rarity = "common" | "uncommon" | "rare" | "epic" | "legendary"; export type Pattern = "solid" | "striped" | "spotted" | "gradient"; export type Gender = "male" | "female"; -export type FishSpecies = "angelfish" | "goldfish" | "guppy" | "fish1" | "fish2" | "fish3" | "neon_tetra" | "oscar" | "knifefish" | "clownfish"; +export type FishSpecies = "angelfish" | "goldfish" | "guppy" | "betta" | "blue_tang" | "flower_horn" | "neon_tetra" | "oscar" | "knifefish" | "clownfish"; export interface Genetics { hueShift: number; // -30 to +30 diff --git a/src/main.ts b/src/main.ts index 5de924b..831f58e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -43,16 +43,16 @@ const food = createFood(scene); // --- Fish helpers --- function isQuaternius(sp: FishSpecies): boolean { - return sp === "fish1" || sp === "fish2" || sp === "fish3"; + return sp === "betta" || sp === "blue_tang" || sp === "flower_horn"; } function getSpeciesUrl(sp: FishSpecies): string { const urls: Record = { angelfish: "models/blendswap/blueface_angelfish.glb", goldfish: "models/goldfish.glb", guppy: "models/guppy.glb", - fish1: "models/quaternius/glb/Fish1.glb", - fish2: "models/quaternius/glb/Fish2.glb", - fish3: "models/quaternius/glb/Fish3.glb", + betta: "models/poly-pizza/betta.glb", + blue_tang: "models/poly-pizza/blue_tang.glb", + flower_horn: "models/poly-pizza/flower_horn.glb", neon_tetra: "models/blendswap/neon_tetra.glb", oscar: "models/blendswap/oscar_cichlid.glb", knifefish: "models/blendswap/ghost_knifefish.glb",