diff --git a/app/models/colyseus-models/pokemon.ts b/app/models/colyseus-models/pokemon.ts
index c16b8e90d5..92861ffe1a 100644
--- a/app/models/colyseus-models/pokemon.ts
+++ b/app/models/colyseus-models/pokemon.ts
@@ -10845,7 +10845,7 @@ export class Nihilego extends Pokemon {
   rarity = Rarity.LEGENDARY
   stars = 3
   hp = 200
-  atk = 30
+  atk = 25
   def = 1
   speDef = 5
   maxPP = 80
diff --git a/app/models/precomputed/pokemons-data.csv b/app/models/precomputed/pokemons-data.csv
index 272f3288a6..e07014b8d2 100644
--- a/app/models/precomputed/pokemons-data.csv
+++ b/app/models/precomputed/pokemons-data.csv
@@ -112,7 +112,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0117,SEADRA,UNCOMMON,2,false,DRAGON,WATER,,,140,12,1,1,2,100,WHIRLPOOL,HORSEA,DRAGON,WATER,,,false
 0120,STARYU,RARE,1,true,WATER,PSYCHIC,,,80,7,2,3,2,100,PSYBEAM,STARYU,WATER,PSYCHIC,,,false
 0121,STARMIE,RARE,2,true,WATER,PSYCHIC,,,180,20,2,6,2,100,PSYBEAM,STARYU,WATER,PSYCHIC,,,false
-0122,MR_MIME,RARE,2,true,FAIRY,PSYCHIC,HUMAN,,200,15,2,4,2,85,MIMIC,MIME_JR,FAIRY,PSYCHIC,BABY,HUMAN,false
+0122,MR_MIME,RARE,2,true,FAIRY,PSYCHIC,HUMAN,,200,15,2,4,2,80,MIMIC,MIME_JR,FAIRY,PSYCHIC,BABY,HUMAN,false
 0123,SCYTHER,ULTRA,1,false,BUG,FLYING,,,130,18,5,5,1,80,X_SCISSOR,SCYTHER,BUG,FLYING,STEEL,,false
 0124,JYNX,UNCOMMON,2,true,ICE,PSYCHIC,HUMAN,,130,12,3,3,2,80,LOVELY_KISS,SMOOCHUM,ICE,PSYCHIC,BABY,HUMAN,false
 0125,ELECTABUZZ,EPIC,2,false,ELECTRIC,ARTIFICIAL,LIGHT,,180,16,5,5,1,90,DISCHARGE,ELEKID,ELECTRIC,ARTIFICIAL,BABY,LIGHT,false
@@ -120,10 +120,10 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0127,PINSIR,UNIQUE,3,false,BUG,HUMAN,,,190,25,3,3,1,85,GUILLOTINE,PINSIR,BUG,HUMAN,,,false
 0128,TAUROS,UNIQUE,3,false,NORMAL,FIELD,,,200,20,7,2,1,100,HEAD_SMASH,TAUROS,NORMAL,FIELD,,,false
 0131,LAPRAS,UNIQUE,3,false,WATER,ICE,,,250,12,5,6,1,100,DIVE,LAPRAS,WATER,ICE,,,false
-0133,EEVEE,UNCOMMON,1,false,NORMAL,FIELD,,,90,5,2,2,1,100,HAPPY_HOUR,EEVEE,NORMAL,FIELD,,,false
-0134,VAPOREON,UNCOMMON,2,false,WATER,FIELD,AQUATIC,,180,12,1,1,1,100,HAPPY_HOUR,VAPOREON,WATER,FIELD,AQUATIC,,false
-0135,JOLTEON,UNCOMMON,2,false,ELECTRIC,FIELD,,,180,12,1,1,1,100,HAPPY_HOUR,JOLTEON,ELECTRIC,FIELD,,,false
-0136,FLAREON,UNCOMMON,2,false,FIRE,FIELD,LIGHT,,180,12,3,2,1,80,HAPPY_HOUR,FLAREON,FIRE,FIELD,LIGHT,,false
+0133,EEVEE,UNCOMMON,1,false,NORMAL,FIELD,,,90,5,3,2,1,100,HAPPY_HOUR,EEVEE,NORMAL,FIELD,,,false
+0134,VAPOREON,UNCOMMON,2,false,WATER,FIELD,AQUATIC,,180,12,3,2,1,100,HAPPY_HOUR,VAPOREON,WATER,FIELD,AQUATIC,,false
+0135,JOLTEON,UNCOMMON,2,false,ELECTRIC,FIELD,,,180,12,3,2,1,100,HAPPY_HOUR,JOLTEON,ELECTRIC,FIELD,,,false
+0136,FLAREON,UNCOMMON,2,false,FIRE,FIELD,LIGHT,,180,12,3,2,1,100,HAPPY_HOUR,FLAREON,FIRE,FIELD,LIGHT,,false
 0137,PORYGON,EPIC,1,true,NORMAL,PSYCHIC,ARTIFICIAL,,120,6,1,1,2,90,TRI_ATTACK,PORYGON,NORMAL,PSYCHIC,ARTIFICIAL,,false
 0138,OMANYTE,UNCOMMON,1,true,FOSSIL,WATER,,,70,6,2,3,2,90,ROCK_TOMB,OMANYTE,FOSSIL,WATER,,,false
 0139,OMASTAR,UNCOMMON,2,true,FOSSIL,WATER,,,150,14,3,4,2,90,ROCK_TOMB,OMANYTE,FOSSIL,WATER,,,false
@@ -176,7 +176,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0191,SUNKERN,EPIC,1,true,GRASS,FIRE,FLORA,,80,8,3,3,2,100,SOLAR_BEAM,SUNKERN,GRASS,FIRE,FLORA,,false
 0192,SUNFLORA,EPIC,2,true,GRASS,FIRE,FLORA,,160,18,5,5,2,80,SOLAR_BEAM,SUNKERN,GRASS,FIRE,FLORA,,false
 0193,YANMA,RARE,1,true,BUG,FOSSIL,FLYING,,70,9,1,1,2,100,AERIAL_ACE,YANMA,BUG,FOSSIL,FLYING,,false
-0196,ESPEON,UNCOMMON,2,false,PSYCHIC,FIELD,,,180,12,1,1,1,80,HAPPY_HOUR,ESPEON,PSYCHIC,FIELD,,,false
+0196,ESPEON,UNCOMMON,2,false,PSYCHIC,FIELD,,,180,12,3,2,1,80,HAPPY_HOUR,ESPEON,PSYCHIC,FIELD,,,false
 0197,UMBREON,UNCOMMON,2,false,DARK,FIELD,,,180,12,3,2,1,80,HAPPY_HOUR,UMBREON,DARK,FIELD,,,false
 0199,SLOWKING,UNCOMMON,3,true,AQUATIC,PSYCHIC,,,260,24,6,4,1,100,SOAK,SLOWPOKE,AQUATIC,PSYCHIC,,,false
 0200,MISDREAVUS,EPIC,1,true,GHOST,FAIRY,,,90,9,2,3,3,95,NIGHT_SHADE,MISDREAVUS,GHOST,FAIRY,,,false
@@ -399,7 +399,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0436,BRONZOR,RARE,1,true,STEEL,PSYCHIC,,,100,5,6,3,1,85,DEFENSE_CURL,BRONZOR,STEEL,PSYCHIC,SOUND,,false
 0437,BRONZONG,RARE,2,true,STEEL,PSYCHIC,SOUND,,200,11,9,7,1,85,DEFENSE_CURL,BRONZOR,STEEL,PSYCHIC,SOUND,,false
 0438,BONSLEY,EPIC,1,true,ROCK,FLORA,BABY,,125,8,5,2,1,100,MIMIC,BONSLEY,ROCK,FLORA,BABY,MONSTER,false
-0439,MIME_JR,RARE,1,true,FAIRY,PSYCHIC,BABY,,70,6,2,2,2,85,MIMIC,MIME_JR,FAIRY,PSYCHIC,BABY,HUMAN,false
+0439,MIME_JR,RARE,1,true,FAIRY,PSYCHIC,BABY,,70,6,2,2,2,80,MIMIC,MIME_JR,FAIRY,PSYCHIC,BABY,HUMAN,false
 0440,HAPPINY,ULTRA,1,false,NORMAL,HUMAN,BABY,,150,8,5,5,1,120,SOFT_BOILED,HAPPINY,NORMAL,HUMAN,BABY,,false
 0441,CHATOT,UNIQUE,3,false,FLYING,SOUND,,,200,20,2,2,3,100,CHATTER,CHATOT,FLYING,SOUND,,,false
 0442,SPIRITOMB,UNIQUE,3,false,DARK,GHOST,,,200,20,2,2,2,80,SHADOW_BALL,SPIRITOMB,DARK,GHOST,,,false
@@ -427,7 +427,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0468,TOGEKISS,RARE,3,false,FAIRY,NORMAL,FLYING,,260,25,1,1,2,70,WISH,TOGEPI,FAIRY,NORMAL,BABY,FLYING,false
 0469,YANMEGA,RARE,2,true,BUG,FOSSIL,FLYING,,160,16,2,2,2,100,AERIAL_ACE,YANMA,BUG,FOSSIL,FLYING,,false
 0470,LEAFEON,UNCOMMON,2,false,GRASS,FLORA,FIELD,,180,12,3,2,1,80,HAPPY_HOUR,LEAFEON,GRASS,FLORA,FIELD,,false
-0471,GLACEON,UNCOMMON,2,false,ICE,FIELD,,,180,12,1,1,1,80,HAPPY_HOUR,GLACEON,ICE,FIELD,,,false
+0471,GLACEON,UNCOMMON,2,false,ICE,FIELD,,,180,12,3,2,1,80,HAPPY_HOUR,GLACEON,ICE,FIELD,,,false
 0472,GLISCOR,UNIQUE,4,true,GROUND,POISON,FLYING,,170,18,4,4,1,90,POISON_JAB,GLIGAR,GROUND,POISON,FLYING,,false
 0473,MAMOSWINE,COMMON,3,false,GROUND,ICE,,,200,14,8,6,1,100,ICICLE_CRASH,SWINUB,GROUND,ICE,,,false
 0474,PORYGON_Z,EPIC,3,true,NORMAL,PSYCHIC,ARTIFICIAL,,200,33,1,5,2,90,TRI_ATTACK,PORYGON,NORMAL,PSYCHIC,ARTIFICIAL,,false
@@ -524,7 +524,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0695,HELIOLISK,EPIC,2,true,NORMAL,ELECTRIC,LIGHT,,170,22,3,3,3,80,PARABOLIC_CHARGE,HELIOPTILE,NORMAL,ELECTRIC,LIGHT,,false
 0698,AMAURA,EPIC,1,true,FOSSIL,ICE,,,130,7,3,3,1,100,ICICLE_CRASH,AMAURA,FOSSIL,ICE,,,false
 0699,AURORUS,EPIC,2,true,FOSSIL,ICE,,,280,18,5,5,1,100,ICICLE_CRASH,AMAURA,FOSSIL,ICE,,,false
-0700,SYLVEON,UNCOMMON,2,false,FAIRY,FIELD,SOUND,,180,12,1,1,1,80,HAPPY_HOUR,SYLVEON,FAIRY,FIELD,SOUND,,false
+0700,SYLVEON,UNCOMMON,2,false,FAIRY,FIELD,SOUND,,180,12,3,2,1,80,HAPPY_HOUR,SYLVEON,FAIRY,FIELD,SOUND,,false
 0703,CARBINK,EPIC,1,true,FOSSIL,ROCK,FAIRY,,125,7,4,2,1,100,DIAMOND_STORM,CARBINK,FOSSIL,ROCK,FAIRY,,false
 0704,GOOMY,EPIC,1,false,DRAGON,AQUATIC,MONSTER,,90,6,4,6,1,80,LIQUIDATION,GOOMY,DRAGON,AQUATIC,MONSTER,,false
 0705,SLIGOO,EPIC,2,false,DRAGON,AQUATIC,MONSTER,,160,12,5,7,1,80,LIQUIDATION,GOOMY,DRAGON,AQUATIC,MONSTER,,false
@@ -569,7 +569,7 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0786,TAPU_LELE,UNIQUE,3,false,PSYCHIC,FAIRY,,,200,17,3,3,3,100,PSYCHIC_SURGE,TAPU_LELE,PSYCHIC,FAIRY,,,false
 0787,TAPU_BULU,UNIQUE,3,false,GRASS,FAIRY,,,200,17,5,5,1,100,GRASSY_SURGE,TAPU_BULU,GRASS,FAIRY,,,false
 0788,TAPU_FINI,UNIQUE,3,false,WATER,FAIRY,,,200,17,3,3,3,100,MISTY_SURGE,TAPU_FINI,WATER,FAIRY,,,false
-0793,NIHILEGO,LEGENDARY,3,false,POISON,ROCK,,,200,30,1,5,3,80,EMPTY_LIGHT,NIHILEGO,POISON,ROCK,,,false
+0793,NIHILEGO,LEGENDARY,3,false,POISON,ROCK,,,200,25,1,5,3,80,EMPTY_LIGHT,NIHILEGO,POISON,ROCK,,,false
 0795,PHEROMOSA,LEGENDARY,3,false,BUG,FIGHTING,,,200,35,5,5,1,80,LUNGE,PHEROMOSA,BUG,FIGHTING,,,false
 0796,XURKITREE,LEGENDARY,3,false,ELECTRIC,ARTIFICIAL,HUMAN,,200,16,3,3,3,80,CHARGE_BEAM,XURKITREE,ELECTRIC,ARTIFICIAL,HUMAN,,false
 0798,KARTANA,LEGENDARY,3,false,STEEL,GRASS,,,230,40,10,2,1,65,LEAF_BLADE,KARTANA,STEEL,GRASS,,,false
@@ -608,9 +608,9 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
 0924,TANDEMAUS,UNIQUE,2,false,NORMAL,FAIRY,,,160,16,5,5,1,100,POPULATION_BOMB,TANDEMAUS,NORMAL,FAIRY,,,false
 0925,MAUSHOLD_THREE,UNIQUE,3,false,NORMAL,FAIRY,,,200,20,5,5,1,100,POPULATION_BOMB,TANDEMAUS,NORMAL,FAIRY,,,false
 0925-0001,MAUSHOLD_FOUR,UNIQUE,4,false,NORMAL,FAIRY,,,240,24,5,5,1,100,POPULATION_BOMB,TANDEMAUS,NORMAL,FAIRY,,,false
-0957,TINKATINK,EPIC,1,false,STEEL,FAIRY,,,100,11,3,3,1,150,GIGATON_HAMMER,TINKATINK,STEEL,FAIRY,,,false
-0958,TINKATUFF,EPIC,2,false,STEEL,FAIRY,,,200,22,4,4,1,150,GIGATON_HAMMER,TINKATINK,STEEL,FAIRY,,,false
-0959,TINKATON,EPIC,3,false,STEEL,FAIRY,,,300,44,8,8,1,150,GIGATON_HAMMER,TINKATINK,STEEL,FAIRY,,,false
+0957,TINKATINK,EPIC,1,false,STEEL,FAIRY,,,100,11,3,3,1,120,GIGATON_HAMMER,TINKATINK,STEEL,FAIRY,,,false
+0958,TINKATUFF,EPIC,2,false,STEEL,FAIRY,,,200,22,4,4,1,120,GIGATON_HAMMER,TINKATINK,STEEL,FAIRY,,,false
+0959,TINKATON,EPIC,3,false,STEEL,FAIRY,,,300,44,8,8,1,120,GIGATON_HAMMER,TINKATINK,STEEL,FAIRY,,,false
 0967,CYCLIZAR,UNIQUE,3,false,DRAGON,NORMAL,,,220,20,4,4,1,100,SHED_TAIL,CYCLIZAR,DRAGON,NORMAL,,,false
 0983,KINGAMBIT,ULTRA,3,false,DARK,STEEL,,,400,42,12,6,1,60,KOWTOW_CLEAVE,PAWNIARD,DARK,STEEL,,,false
 0991,IRON_BUNDLE,UNIQUE,3,false,ICE,WATER,ARTIFICIAL,,200,16,5,2,1,100,AURORA_BEAM,IRON_BUNDLE,ICE,WATER,ARTIFICIAL,,false
diff --git a/app/public/dist/client/changelog/patch-4.7.md b/app/public/dist/client/changelog/patch-4.7.md
index 51dd462b9e..88d4c7575a 100644
--- a/app/public/dist/client/changelog/patch-4.7.md
+++ b/app/public/dist/client/changelog/patch-4.7.md
@@ -20,6 +20,7 @@
 - Buff Happiny line PP ~~130~~ 120 Spe def ~~5/6/8~~ 5/10/15
 - Confusion (Meditite) now also cause Silence in addition to Confusion
 - Nerf Charge (Zapdos): increase attack & attack speed by ~~30~~ 25%
+- Nerf Nihilego preventively after rock/poison buff: Attack ~~30~~ 25
 - Leaf Stone (Kartana) now deals true damage
 - Buff Rotom: gain Light synergy
 - Nerf Helioptile and Heliodisk: HP ~~90/220~~ 75/170 Def/Spedef ~~3/4~~ 2/3