Merge remote-tracking branch 'upstream/master'

ShivaD173 · Sep 29, 2024 · 83b44a1 · 83b44a1
2 parents aff5b50 + 2618a83
commit 83b44a1
Show file tree

Hide file tree

Showing 12 changed files with 205 additions and 140 deletions.
diff --git a/src/honkalculate.template.html b/src/honkalculate.template.html
@@ -4,6 +4,7 @@
 <head>
     <meta charset="UTF-8" />
     <title>Pok&eacute;mon Damage Calculator</title>
+	 <link rel="icon" type="image/x-icon" href="./img/favicon.png">
     <link type="text/css" rel="stylesheet" href="./css/vendor/bootstrap.css" />
     <link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.4/css/jquery.dataTables.min.css" />
     <link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/colvis/1.1.1/css/dataTables.colVis.css" />

diff --git a/src/img/favicon.png b/src/img/favicon.png
diff --git a/src/index.template.html b/src/index.template.html
@@ -4,6 +4,7 @@
 <head>
     <meta charset="UTF-8" />
     <title>Pok&eacute;mon Damage Calculator</title>
+	 <link rel="icon" type="image/x-icon" href="./img/favicon.png">
     <link type="text/css" rel="stylesheet" href="./js/vendor/select2/select2.css" />
     <link type="text/css" rel="stylesheet" href="./css/main.css?" />
     <link type="text/css" rel="stylesheet" href="./css/vendor/bootstrap.css" />

diff --git a/src/js/data/sets/gen1.js b/src/js/data/sets/gen1.js
@@ -324,16 +324,16 @@ var SETDEX_RBY = {
   },
   "Rhydon": {
     "OU Standard": {"moves":["Earthquake","Rock Slide","Body Slam","Substitute"]},
-    "Ubers Standard": {"moves":["Earthquake","Rock Slide","Body Slam","Substitute"]},
+    "Ubers Physical Attacker": {"moves":["Earthquake","Body Slam","Substitute","Rock Slide"]},
     "1v1 Standard": {"moves":["Earthquake","Rock Slide","Body Slam","Bubble Beam"]},
     "Tradebacks OU Standard": {"moves":["Earthquake","Body Slam","Rock Slide","Substitute"]}
   },
   "Chansey": {
     "OU BoltBeam": {"moves":["Thunderbolt","Ice Beam","Soft-Boiled","Thunder Wave"]},
     "OU Sing": {"moves":["Sing","Ice Beam","Soft-Boiled","Thunder Wave"]},
     "OU Reflect": {"moves":["Reflect","Seismic Toss","Soft-Boiled","Thunder Wave"]},
-    "Ubers Light Screen": {"moves":["Light Screen","Seismic Toss","Soft-Boiled","Thunder Wave"]},
-    "Ubers Sing": {"moves":["Sing","Seismic Toss","Soft-Boiled","Thunder Wave"]},
+    "Ubers Sing": {"moves":["Sing","Seismic Toss","Thunder Wave","Soft-Boiled"]},
+    "Ubers Light Screen": {"moves":["Light Screen","Seismic Toss","Thunder Wave","Soft-Boiled"]},
     "1v1 The Egg": {"moves":["Ice Beam","Soft-Boiled","Thunder Wave","Reflect"]},
     "Tradebacks OU Reflect": {"moves":["Reflect","Thunder Wave","Seismic Toss","Soft-Boiled"]},
     "Tradebacks OU BoltBeam": {"moves":["Ice Beam","Thunderbolt","Soft-Boiled","Thunder Wave"]},

diff --git a/src/js/data/sets/gen3.js b/src/js/data/sets/gen3.js
diff --git a/src/js/data/sets/gen4.js b/src/js/data/sets/gen4.js