final gay changes for draft

ShivaD173 · Dec 31, 2023 · f085e73 · f085e73
1 parent ba8353b
commit f085e73
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 41 deletions.
diff --git a/calc/src/data/items.ts b/calc/src/data/items.ts
@@ -27,6 +27,7 @@ const GSC = [
   'King\'s Rock',
   'Leaf Stone',
   'Leftovers',
+  'Light Ball',
   'Lucky Punch',
   'Magnet',
   'Mail',

diff --git a/calc/src/data/moves.ts b/calc/src/data/moves.ts
@@ -232,6 +232,7 @@ const GSC_PATCH: {[name: string]: DeepPartial<MoveData>} = {
   'Sonic Boom': {bp: 0},
   'Super Fang': {bp: 0},
   'Wing Attack': {bp: 60},
+  'Electro Shot': {bp: 120},
   Aeroblast: {bp: 100, type: 'Flying'},
   Attract: {bp: 0, category: 'Status', type: 'Normal'},
   'Beat Up': {bp: 10, type: 'Dark'},
@@ -5002,12 +5003,12 @@ const GAY_PATCH = {
   'Luster Purge': {bp: 75},
   'Mist Ball': {bp: 75},
   'Accelerock': {bp: 60},
-  'G-Max Replenish': {bp: 70},
+  'G-Max Replenish': {bp: 65},
   'G-Max Malodor': {bp: 80},
   'G-Max Steelsurge': {bp: 90},
-  'G-Max Gravitas': {bp: 90},
-  'G-Max Finale': {bp: 90},
-  'G-Max Depletion': {bp: 90},
+  'G-Max Gravitas': {bp: 90, category: 'Special'},
+  'G-Max Finale': {bp: 80, category: 'Special'},
+  'G-Max Depletion': {bp: 90, category: 'Special'},
   'Hyper Beam': {bp: 140},
   'Giga Impact': {bp: 140},
   'Frenzy Plant': {bp: 140},

diff --git a/calc/src/data/species.ts b/calc/src/data/species.ts
@@ -10906,8 +10906,8 @@ const GAY_PATCH = {
       "Fairy"
     ],
     "bs": {
-      "hp": 40,
-      "at": 55,
+      "hp": 45,
+      "at": 50,
       "df": 65,
       "sa": 110,
       "sd": 120,
@@ -13048,11 +13048,11 @@ const GAY_PATCH = {
       ""
     ],
     "bs": {
-      "hp": 60,
+      "hp": 50,
       "at": 90,
-      "df": 65,
+      "df": 70,
       "sa": 70,
-      "sd": 115,
+      "sd": 120,
       "sp": 40
     },
     "abilities": {
@@ -15246,7 +15246,7 @@ const GAY_PATCH = {
       "df": 75,
       "sa": 65,
       "sd": 75,
-      "sp": 115
+      "sp": 110
     },
     "abilities": {
       "0": "Chlorophyll"
@@ -15779,7 +15779,7 @@ const GAY_PATCH = {
       "0": "Prankster"
     }
   },
-  "Tornadus Therian": {
+  "Tornadus-Therian": {
     "types": [
       "Flying",
       ""
@@ -15813,7 +15813,7 @@ const GAY_PATCH = {
       "0": "Prankster"
     }
   },
-  "Thundurus Therian": {
+  "Thundurus-Therian": {
     "types": [
       "Electric",
       "Flying"
@@ -15847,7 +15847,7 @@ const GAY_PATCH = {
       "0": "Sand Force"
     }
   },
-  "Landorus Therian": {
+  "Landorus-Therian": {
     "types": [
       "Ground",
       "Flying"
@@ -16227,7 +16227,7 @@ const GAY_PATCH = {
       "Normal"
     ],
     "bs": {
-      "hp": 67,
+      "hp": 72,
       "at": 60,
       "df": 57,
       "sa": 114,
@@ -16381,9 +16381,9 @@ const GAY_PATCH = {
     ],
     "bs": {
       "hp": 62,
-      "at": 80,
+      "at": 85,
       "df": 91,
-      "sa": 80,
+      "sa": 85,
       "sd": 87,
       "sp": 75
     },
@@ -16668,7 +16668,7 @@ const GAY_PATCH = {
       "0": "Dancer"
     }
   },
-  "Oricorio Pom-Pom": {
+  "Oricorio-Pom-Pom": {
     "types": [
       "Electric",
       "Flying"
@@ -16685,7 +16685,7 @@ const GAY_PATCH = {
       "0": "Dancer"
     }
   },
-  "Oricorio Pa'u": {
+  "Oricorio-Pa'u": {
     "types": [
       "Fairy",
       "Flying"
@@ -16702,7 +16702,7 @@ const GAY_PATCH = {
       "0": "Dancer"
     }
   },
-  "Oricorio Sensu": {
+  "Oricorio-Sensu": {
     "types": [
       "Ghost",
       "Flying"
@@ -16753,7 +16753,7 @@ const GAY_PATCH = {
       "0": "Keen Eye"
     }
   },
-  "Lycanroc Midnight": {
+  "Lycanroc-Midnight": {
     "types": [
       "Rock",
       ""
@@ -16770,7 +16770,7 @@ const GAY_PATCH = {
       "0": "Keen Eye"
     }
   },
-  "Lycanroc Dusk": {
+  "Lycanroc-Dusk": {
     "types": [
       "Rock",
       ""
@@ -16804,7 +16804,7 @@ const GAY_PATCH = {
       "0": "Schooling"
     }
   },
-  "Wishiwashi School": {
+  "Wishiwashi-School": {
     "types": [
       "Water",
       ""
@@ -17076,7 +17076,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyBug": {
+  "Silvally-Bug": {
     "types": [
       "Bug",
       ""
@@ -17093,7 +17093,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyDark": {
+  "Silvally-Dark": {
     "types": [
       "Dark",
       ""
@@ -17110,7 +17110,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyDragon": {
+  "Silvally-Dragon": {
     "types": [
       "Dragon",
       ""
@@ -17127,7 +17127,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyElectric": {
+  "Silvally-Electric": {
     "types": [
       "Electric",
       ""
@@ -17144,7 +17144,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyFairy": {
+  "Silvally-Fairy": {
     "types": [
       "Fairy",
       ""
@@ -17161,7 +17161,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyFighting": {
+  "Silvally-Fighting": {
     "types": [
       "Fighting",
       ""
@@ -17178,7 +17178,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyFire": {
+  "Silvally-Fire": {
     "types": [
       "Fire",
       ""
@@ -17195,7 +17195,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyFlying": {
+  "Silvally-Flying": {
     "types": [
       "Flying",
       ""
@@ -17212,7 +17212,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyGhost": {
+  "Silvally-Ghost": {
     "types": [
       "Ghost",
       ""
@@ -17229,7 +17229,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyGrass": {
+  "Silvally-Grass": {
     "types": [
       "Grass",
       ""
@@ -17246,7 +17246,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyGround": {
+  "Silvally-Ground": {
     "types": [
       "Ground",
       ""
@@ -17263,7 +17263,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyIce": {
+  "Silvally-Ice": {
     "types": [
       "Ice",
       ""
@@ -17280,7 +17280,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyPoison": {
+  "Silvally-Poison": {
     "types": [
       "Poison",
       ""
@@ -17297,7 +17297,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyPsychic": {
+  "Silvally-Psychic": {
     "types": [
       "Psychic",
       ""
@@ -17314,7 +17314,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyRock": {
+  "Silvally-Rock": {
     "types": [
       "Rock",
       ""
@@ -17331,7 +17331,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallySteel": {
+  "Silvally-Steel": {
     "types": [
       "Steel",
       ""
@@ -17348,7 +17348,7 @@ const GAY_PATCH = {
       "0": "RKS System"
     }
   },
-  "SilvallyWater": {
+  "Silvally-Water": {
     "types": [
       "Water",
       ""
@@ -18289,7 +18289,7 @@ const GAY_PATCH = {
       ""
     ],
     "bs": {
-      "hp": 80,
+      "hp": 75,
       "at": 60,
       "df": 80,
       "sa": 110,

diff --git a/src/js/data/sets/gen9.js b/src/js/data/sets/gen9.js