From 04859f43bf23c127eaabedda3726e58e8bafd58c Mon Sep 17 00:00:00 2001
From: Sean Davis <wormania@gmail.com>
Date: Sat, 2 Dec 2023 21:59:40 +0000
Subject: [PATCH] =?UTF-8?q?Move=20Friend=20Safari=20information=20back=20t?=
 =?UTF-8?q?o=20Towns=20page,=20add=20Safari=20information=20to=20Town=20Pa?=
 =?UTF-8?q?ges,=20link=20from=20Pok=C3=A9mon=20page=20to=20Safari=20Zones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundle.js                                     |  2 +-
 data/Safari/overview_description.md           |  2 +-
 .../Friend Safari_description.md}             |  5 +-
 "pages/Pok\303\251mon/main.html"              | 42 ++++++++--------
 pages/Towns/main.html                         | 48 +++++++++++++++++++
 scripts/typeahead.js                          |  2 +-
 6 files changed, 75 insertions(+), 26 deletions(-)
 rename data/{Friend Safari/overview_description.md => Towns/Friend Safari_description.md} (88%)

diff --git a/bundle.js b/bundle.js
index a082c5a96..2712152db 100644
--- a/bundle.js
+++ b/bundle.js
@@ -79722,7 +79722,7 @@ const searchOptions = [
     type: 'Towns',
     page: '',
   },
-  ...Object.values(TownList).filter(t => !(t instanceof DungeonTown) && !['Safari Zone', 'Friend Safari'].includes(t.name) && t.region <= GameConstants.MAX_AVAILABLE_REGION).map(t => ({
+  ...Object.values(TownList).filter(t => !(t instanceof DungeonTown) && t.region <= GameConstants.MAX_AVAILABLE_REGION).map(t => ({
     display: t.name,
     type: 'Towns',
     page: t.name,
diff --git a/data/Safari/overview_description.md b/data/Safari/overview_description.md
index a3d310d48..edde67d69 100644
--- a/data/Safari/overview_description.md
+++ b/data/Safari/overview_description.md
@@ -1,4 +1,4 @@
-Safari is an area available in Kanto ([[Towns/Safari Zone]]) and Kalos ([[Friend Safari]]) where the player may spend Quest Points to try and catch unique Pokémon. To unlock this area the player must first have the Safari Ticket.
+Safari is an area available in Kanto ([[Towns/Safari Zone]]) and Kalos ([[Towns/Friend Safari]]) where the player may spend Quest Points to try and catch unique Pokémon. To unlock this area the player must first have the Safari Ticket.
 
 The Pokémon can randomly spawn both on water and grass tiles, and also as sprites that can show up in both these environments. In Kanto, some Pokémon, like in the original games, only appear here.
 
diff --git a/data/Friend Safari/overview_description.md b/data/Towns/Friend Safari_description.md
similarity index 88%
rename from data/Friend Safari/overview_description.md
rename to data/Towns/Friend Safari_description.md
index 894b947f4..a5502c357 100644
--- a/data/Friend Safari/overview_description.md	
+++ b/data/Towns/Friend Safari_description.md	
@@ -1,5 +1,2 @@
-## Location
-[Kalos](#!Towns/Friend_Safari)
-
 ## Encounter List
-Each day, 5 Pokémon will get randomly chosen, based on the player's trainer ID, which can be checked with the Safari Ranger NPC. Only those Pokémon that **cannot gain EVs in any other place** may show up and only if the player has captured them previously. If the player hasn't, then the Pokémon will show up as a silhouette and cannot be encountered. Even if all daily Pokémon are currently unavailable to the player, Friend Safari has a list of Pokémon that always show up, no matter what. These Pokémon have a lower encounter rate (5 times less likely to appear) in comparison to the 5 daily ones:
\ No newline at end of file
+Each day, 5 Pokémon will get randomly chosen, based on the player's trainer ID, which can be checked with the Safari Ranger NPC. Only those Pokémon that **cannot gain EVs in any other place** may show up and only if the player has captured them previously. If the player hasn't, then the Pokémon will show up as a silhouette and cannot be encountered. Even if all daily Pokémon are currently unavailable to the player, Friend Safari has a list of Pokémon that always show up, no matter what. These Pokémon have a lower encounter rate (5 times less likely to appear) in comparison to the 5 daily ones:
diff --git "a/pages/Pok\303\251mon/main.html" "b/pages/Pok\303\251mon/main.html"
index b5b822050..d121e19d0 100644
--- "a/pages/Pok\303\251mon/main.html"
+++ "b/pages/Pok\303\251mon/main.html"
@@ -334,14 +334,17 @@ <h4 class="accordion-header">
                         <div class="accordion-body" data-bind="foreach: Object.entries($data[PokemonLocationType.Safari])">
                             <h5 data-bind="text: GameConstants.camelCaseToString(GameConstants.Region[$data[0]])"></h5>
                             <p data-bind="foreach: Object.entries($data[1])">
-                                <span class="badge text-bg-secondary" data-bind="with: { chance: $data[1], requireCaught: SafariPokemonList.list[$parent[0]]().find(p => p.name == Wiki.pageName())?.requireCaught }">
-                                    <knockout data-bind="text: `Chance ${$data.chance}%${$data.requireCaught ? ' 🔒' : ''}`, tooltip: {
-                                        title: $data.requireCaught ? `${Wiki.pageName()} will become available in the Safari Zone after being obtained elsewhere.` : '',
-                                        html: true,
-                                        placement: 'bottom',
-                                        trigger: 'hover'
-                                    }"></knockout>
-                                </span>
+                                <knockout data-bind="with: { chance: $data[1], requireCaught: SafariPokemonList.list[$parent[0]]().find(p => p.name == Wiki.pageName())?.requireCaught }">
+                                    <a class="badge text-bg-secondary" data-bind="text: `Chance ${$data.chance}%${$data.requireCaught ? ' 🔒' : ''}`,
+                                        attr: { href: `#!Towns/${Object.values(TownList).find(t => t.region == $parents[1][0] && t.content.filter(c => c instanceof SafariTownContent).length).name}` },
+                                        tooltip: {
+                                            title: $data.requireCaught ? `${Wiki.pageName()} will become available in the Safari Zone after being obtained elsewhere.` : '',
+                                            html: true,
+                                            placement: 'bottom',
+                                            trigger: 'hover'
+                                        }">
+                                    </a>
+                                </knockout>
                             </p>
                         </div>
                     </div>
@@ -362,17 +365,18 @@ <h4 class="accordion-header">
                     </h4>
                     <div id="obtain-method-friend-safari" class="accordion-collapse collapse">
                         <div class="accordion-body">
-                            <h5>Kalos</h5>
-                            <p>
-                                <span class="badge text-bg-secondary" data-bind="using: !(SafariPokemonList.list[GameConstants.Region.kalos]().find(p => p.name == Wiki.pageName())?.requireCaught == false), as: 'requireCaught'">
-                                    <knockout data-bind="text: `In ${SafariPokemonList.getEnvironmentByPokemonType(Wiki.pageName()).map(env => SafariEnvironments[env]).join(', ')}${requireCaught ? ' 🔒' : ''}`, tooltip: {
-                                        title: requireCaught ? `${Wiki.pageName()} will become available in the Friend Safari after being obtained elsewhere.` : '',
-                                        html: true,
-                                        placement: 'bottom',
-                                        trigger: 'hover'
-                                    }"></knockout>
-                                </span>
-                            </p>
+                            <h5 data-bind="">Kalos</h5>
+                                <knockout data-bind="using: !(SafariPokemonList.list[GameConstants.Region.kalos]().find(p => p.name == Wiki.pageName())?.requireCaught == false), as: 'requireCaught'">
+                                    <a class="badge text-bg-secondary"  data-bind="text: `In ${SafariPokemonList.getEnvironmentByPokemonType(Wiki.pageName()).map(env => SafariEnvironments[env]).join(', ')}${requireCaught ? ' 🔒' : ''}`,
+                                        attr: { href: `#!Towns/Friend Safari` },
+                                        tooltip: {
+                                            title: requireCaught ? `${Wiki.pageName()} will become available in the Friend Safari after being obtained elsewhere.` : '',
+                                            html: true,
+                                            placement: 'bottom',
+                                            trigger: 'hover'
+                                        }">
+                                    </a>
+                                </knockout>
                         </div>
                     </div>
                 </div>
diff --git a/pages/Towns/main.html b/pages/Towns/main.html
index d6bf18afa..34adf0c2d 100644
--- a/pages/Towns/main.html
+++ b/pages/Towns/main.html
@@ -184,5 +184,53 @@ <h3 data-bind="text: $data.name"></h3>
         </div>
     </div>
     <!-- /ko -->
+    <!-- ko if: $data.content.filter(c => c instanceof SafariTownContent )-->
+    <div class="mt-3">
+        <h2>Safari Encounters</h2>
+        <table class="table table-bordered table-striped table-hover text-center">
+            <thead>
+                <tr>
+                    <th class="text-center">Pokémon</th>
+                    <th class="text-center">Weight</th>
+                    <th class="text-center">Environment</th>
+                </tr>
+            </thead>
+            <tbody data-bind="foreach: SafariPokemonList.list[$data.region]().filter(p => !p.requireCaught || !p.showUncaught)">
+                <tr>
+                    <td class="align-middle">
+                        <img width="48px" class="me-1" data-bind="attr: {src: './pokeclicker/docs/assets/images/pokemon/' + pokemonMap[$data.name].id + '.png'}"/>
+                        <a href="#!" class="text-decoration-none" data-bind="text: $data.name, attr: {href: `#!Pokemon/${$data.name}` }"></a>
+                    </td>
+                    <td class="align-middle" data-bind="text: $data.weight">
+                    </td>
+                    <td class="align-middle">
+                        <knockout data-bind="text: $data.environments.map(env => SafariEnvironments[env]).join(', ')"></knockout>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+        <h2>Safari Items</h2>
+        <table class="table table-hover table-striped table-bordered no-data-tables">
+            <thead class="thead-dark">
+                <tr>
+                    <th>Item</th>
+                    <th>Chance</th>
+                    <th>Requirement</th>
+                </tr>
+            </thead>
+            <tbody data-bind="foreach: SafariItemController.list[$data.region]">
+                <tr>
+                    <td class="align-middle">
+                        <img width="32px" class="me-1" data-bind="attr: { src: `pokeclicker/docs/${BagHandler.image($data.item)}` }"/>
+                        <knockout data-bind="text: BagHandler.displayName($data.item)"></knockout>
+                    </td>
+                    <td class="align-middle" data-bind="text: `${Math.round($data.weight*100/SafariItemController.list[$parent.region].reduce((acc, cur) => { return acc + cur.weight }, 0) * 100)/100}%`"></td>
+                    <td class="align-middle" data-bind="html: $data.requirement ? Wiki.gameHelper.requirementHints($data.requirement.requirements).join('<br />') : 'N/A'"></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <!-- /ko -->
     <!-- /ko -->
 </div>
diff --git a/scripts/typeahead.js b/scripts/typeahead.js
index 94e490de7..99e2e1b3c 100644
--- a/scripts/typeahead.js
+++ b/scripts/typeahead.js
@@ -155,7 +155,7 @@ const searchOptions = [
     type: 'Towns',
     page: '',
   },
-  ...Object.values(TownList).filter(t => !(t instanceof DungeonTown) && !['Safari Zone', 'Friend Safari'].includes(t.name) && t.region <= GameConstants.MAX_AVAILABLE_REGION).map(t => ({
+  ...Object.values(TownList).filter(t => !(t instanceof DungeonTown) && t.region <= GameConstants.MAX_AVAILABLE_REGION).map(t => ({
     display: t.name,
     type: 'Towns',
     page: t.name,