diff --git a/.vscode/settings.json b/.vscode/settings.json index 31acd7d..fa9f6ad 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -46,6 +46,7 @@ "Roboto", "Salac", "SAPP", + "Shinies", "Silph", "𝗦𝗽", "𝗦𝗽𝗲𝗲𝗱", diff --git a/nuxt.config.ts b/nuxt.config.ts index 85a03fb..269ac33 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -71,7 +71,7 @@ export default defineNuxtConfig({ "nuxt-viewport", ], ui: { - icons: ["tabler", "material-symbols"], + icons: ["tabler", "material-symbols", "fluent"], }, colorMode: { classSuffix: "", diff --git a/src/components/presets/badge/EncounterBadge.vue b/src/components/presets/badge/EncounterBadge.vue new file mode 100644 index 0000000..70789a7 --- /dev/null +++ b/src/components/presets/badge/EncounterBadge.vue @@ -0,0 +1,177 @@ + + + diff --git a/src/components/presets/buttons/AddInstanceButton.vue b/src/components/presets/buttons/AddInstanceButton.vue deleted file mode 100644 index d42a9f5..0000000 --- a/src/components/presets/buttons/AddInstanceButton.vue +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/src/components/presets/card/EncountersCard.vue b/src/components/presets/card/EncountersCard.vue index 223f961..bfa2b1a 100644 --- a/src/components/presets/card/EncountersCard.vue +++ b/src/components/presets/card/EncountersCard.vue @@ -170,48 +170,63 @@ watch(pokemonSelected, () => { >
-
- Total Encounters +
+ Phase / Total Encounters {{ + + pokemonSelectedData && + pokemonSelectedData.phase_encounters + ? pokemonSelectedData.phase_encounters + : "0" + }} / {{ pokemonSelectedData && pokemonSelectedData.encounters ? pokemonSelectedData.encounters : "None" - }}
- Last Encounter + Phase/Total Highest IVSums {{ - new Date( - pokemonSelectedData.last_encounter_time_unix - ).toLocaleTimeString("en-US") - }}
-
- Shiny Encounters +
+ Shiny Average {{ pokemonSelectedData && - pokemonSelectedData.shiny_encounters - ? pokemonSelectedData.shiny_encounters - : "None" + pokemonSelectedData.shiny_average + ? pokemonSelectedData.shiny_average + : "0 / " + pokemonSelectedData.encounters }}
@@ -277,4 +292,4 @@ watch(pokemonSelected, () => {
- + \ No newline at end of file diff --git a/src/components/presets/card/Sidebar.vue b/src/components/presets/card/Sidebar.vue index 6ceb505..37da0fc 100644 --- a/src/components/presets/card/Sidebar.vue +++ b/src/components/presets/card/Sidebar.vue @@ -1,9 +1,69 @@ diff --git a/src/components/presets/card/StatsCard.vue b/src/components/presets/card/StatsCard.vue index 8c4a51a..2e9fa4d 100644 --- a/src/components/presets/card/StatsCard.vue +++ b/src/components/presets/card/StatsCard.vue @@ -1,9 +1,32 @@ diff --git a/src/components/presets/card/TrainerCard.vue b/src/components/presets/card/TrainerCard.vue index ac7e5b6..ba1a018 100644 --- a/src/components/presets/card/TrainerCard.vue +++ b/src/components/presets/card/TrainerCard.vue @@ -105,6 +105,8 @@ const game: "frlg" | "rse" = ["FIRE", "LEAF"].includes( {{ trainerData.coords[1] }}) + + diff --git a/src/components/presets/modals/DetailedStatsModal.vue b/src/components/presets/modals/DetailedStatsModal.vue new file mode 100644 index 0000000..6929ab7 --- /dev/null +++ b/src/components/presets/modals/DetailedStatsModal.vue @@ -0,0 +1,310 @@ + + + + + diff --git a/src/components/presets/modals/ShinyDexModal.vue b/src/components/presets/modals/ShinyDexModal.vue new file mode 100644 index 0000000..40ee0d3 --- /dev/null +++ b/src/components/presets/modals/ShinyDexModal.vue @@ -0,0 +1,151 @@ +div + + + \ No newline at end of file diff --git a/src/components/presets/panel/InstancePanel.vue b/src/components/presets/panel/InstancePanel.vue index 4c4215e..637d4d5 100644 --- a/src/components/presets/panel/InstancePanel.vue +++ b/src/components/presets/panel/InstancePanel.vue @@ -11,12 +11,46 @@ const props = defineProps<{