Merge branch 'keldaanCommunity:master' into master

app/core/terrain.ts

@@ -35,8 +35,9 @@ export default class Terrain {
   }
 
   newRandom(seed: number) {
+    let s: string
     try {
-      var s = seed.toString()
+      s = seed.toString()
     } catch (_) {
       s = (new Date().getTime() + Math.random()).toString()
     }

app/models/colyseus-models/pokemon.ts

@@ -4874,7 +4874,7 @@ export class Zapdos extends Pokemon {
 }
 
 export class Zeraora extends Pokemon {
-  types = new SetSchema<Synergy>([Synergy.ELECTRIC, Synergy.FIGHTING])
+  types = new SetSchema<Synergy>([Synergy.ELECTRIC, Synergy.WILD])
   rarity = Rarity.UNIQUE
   stars = 3
   hp = 200
@@ -5804,7 +5804,7 @@ export class Phione extends Pokemon {
   atk = 15
   def = 2
   speDef = 2
-  maxPP = 90
+  maxPP = 80
   range = 3
   skill = Ability.TAKE_HEART
   passive = Passive.PHIONE
@@ -5823,7 +5823,7 @@ export class Manaphy extends Pokemon {
   atk = 17
   def = 4
   speDef = 4
-  maxPP = 90
+  maxPP = 80
   range = 3
   skill = Ability.TAKE_HEART
   attackSprite = AttackSprite.PSYCHIC_RANGE
@@ -7268,7 +7268,7 @@ export class Regieleki extends Pokemon {
   speDef = 3
   maxPP = 100
   range = 2
-  skill = Ability.VOLT_SWITCH
+  skill = Ability.THUNDER_CAGE
   attackSprite = AttackSprite.ELECTRIC_RANGE
 }
 export class Regidrago extends Pokemon {
@@ -10903,7 +10903,7 @@ export class Hitmonlee extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.FIGHTING, Synergy.HUMAN])
   rarity = Rarity.UNIQUE
   stars = 3
-  hp = 180
+  hp = 200
   atk = 30
   def = 3
   speDef = 3
@@ -10917,7 +10917,7 @@ export class Hitmonchan extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.FIGHTING, Synergy.HUMAN])
   rarity = Rarity.UNIQUE
   stars = 3
-  hp = 180
+  hp = 200
   atk = 20
   def = 7
   speDef = 7
@@ -11376,10 +11376,10 @@ export class Sableye extends Pokemon {
   evolution = Pkm.MEGA_SABLEYE
   rarity = Rarity.UNIQUE
   stars = 3
-  hp = 220
+  hp = 200
   atk = 12
-  def = 5
-  speDef = 5
+  def = 4
+  speDef = 4
   maxPP = 100
   range = 1
   skill = Ability.KNOCK_OFF
@@ -13134,7 +13134,7 @@ export class Kangaskhan extends Pokemon {
   speDef = 4
   maxPP = 100
   range = 1
-  skill = Ability.UPPERCUT
+  skill = Ability.HEADBUTT
   attackSprite = AttackSprite.NORMAL_MELEE
 }
 
@@ -14596,8 +14596,8 @@ export class Pawmot extends Pokemon {
   types = new SetSchema<Synergy>([Synergy.ELECTRIC, Synergy.FIGHTING])
   rarity = Rarity.RARE
   stars = 3
-  hp = 230
-  atk = 27
+  hp = 240
+  atk = 35
   def = 5
   speDef = 5
   maxPP = 100

app/public/dist/client/changelog/patch-5.6.md

@@ -33,7 +33,7 @@
 - Buff Seaking: HP 200 → 250 ; buff Waterfall: shield 30/60/120 → 50/100/150
 - Buff Carvanha line: PP 100 → 80
 - Nerf Quiver dance (Burmy): Attack speed buff 20% → 10%
-- Buff Phione line: PP 100 → 90
+- Buff Phione line: PP 100 → 80
 - Revert 5.4 Tapu Fini buff: PP 80 → 100
 - Buff Psychic surge (Tapu Lele)): AP buff 5 → 10%
 - New ability for Cobalion: Metal Burst: Deal 30 true damage to the target. Increase damage by 10% for each attack blocked by user fighting
@@ -55,6 +55,20 @@
 - Buff Unown-A: PP 100 → 90, Unown-D: PP 150 → 100, Unown-J: PP 100 → 90, Unown-K: PP 100 → 90, Unown-L: PP 100 → 60, Unown-O: PP 100 → 50, Unown-R: PP 100 → 90, Unown-V: PP 100 → 90, Unown-X: PP 100 → 60, Unown-Z: PP 100 → 90, Unown-!: PP 100 → 60
 - Change Unown-N: team gains 50 shield and cast Explosion
 - Change Unown-R: ROLL: gives 6 free shop rerolls
+- Nerf Scyzor: XScissor damage 10/20/40/80 → 10/20/40/60
+- Change Charge (Zapdos): buff Attack and Attack speed of ~~Electric~~ all allies by ~~25~~ 20%
+- Buff Morpeko: reduce ability cooldown to 100 ms
+- Buff Close Combat (Heracross): reduce user Def/SpeDef by ~~2~~ 1
+- Buff Pawmot: Attack 27 → 35, HP: 230 → 240
+- Zeraora is now Electric/Wild instead of Electric/Fighting
+- New ability for Regieleki: Thunder Cage: Traps target and adjacent enemies in an electric prison that deals 60 special damage and inflicts Locked and Paralysis for 3 seconds.
+- New ability for Kangaskhan: Headbutt: Deals 20/40/80 special damage to the target and inflicts Flinch for 5 seconds. Double damage if target has a shield.
+- Buff Hitmonchan: HP: 180 → 200
+- Buff Hitmonlee: HP: 180 → 200
+- Change Rolling Kick (Hitmonlee): now also push target away
+- Buff Flying Press (Hawlucha): deal ~~30%~~ 50% of user's max HP as SPECIAL
+- Nerf Sableye: HP 220 → 200, Def/SpeDef 5/5 → 4/4
+- Change Crabhammer (Poliwrath, Corphish): can now crit by default with a 30% increased crit chance
 
 # Changes to Synergies
 
@@ -85,17 +99,21 @@
 - Show total money earned, total damage dealt and total reroll count in the player detail tooltip ingame
 - Units in your team planner are highlighted with a dedicated icon in the shop
 - Changed the font to Jost
+- Add a key shortcut to switch between bench and board
+- Add a key shortcut to lock/unlock the shop
 
 # Bugfix
 
 - Fix regional variants of additional pokemons not being immediately available after the additional pokemon being picked
 - Fix total money earned not being correctly updated sometimes
 - Fix Spike Armor ability: it was not dealing damage to ranged pokemons at melee contact, was not being able to crit and was not applying Pokenomicon burn
 - Fix some pokemons passives not working properly when played in ghost matchups (ghost = copy of a player to ensure every player has an opponent)
+- Fix evolutions in shop not showing the evolution synergies
 
 # Misc
 
 - Room name is no longer customizable (too many stupid people)
 - Private lobbies passwords are now automatically generated and no longer customizable
 - Custom lobbies are now private by default
-- Enabling/disabling ELO in a custom lobby now resets all players ready status
+- Shop is now automatically locked if you use the sell key shortcut to empty one slot
+- Enabling/disabling ELO in a custom lobby now resets all players ready status

app/public/dist/client/locales/bg/translation.json

@@ -874,7 +874,7 @@
     "SEED_FLARE": "Тялото на Shaymin излъчва ударна вълна, нанасяйки [30,SP] SPECIAL на всички вражески покемони и намалявайки техния SPE_DEF с 2",
     "IRON_TAIL": "Раздайте [20,40,80,SP] SPECIAL на целта и подобрете DEF на потребителя с [1,3,5]",
     "BLAST_BURN": "Сделка [30,60,120,SP] SPECIAL в зона около потребителя",
-    "CHARGE": "Увеличете ATK ATK_SPEED на всички съюзни ELECTRIC рически покемони с [25,SP]%",
+    "CHARGE": "Увеличете ATK ATK_SPEED на всички съюзни рически покемони с [20,SP]%",
     "DISCHARGE": "Раздайте [25,50,75,SP] SPECIAL на близките вражески покемони и ги накарайте да PARALYSIS за 5 секунди",
     "BITE": "Раздайте [40,80,120,SP] SPECIAL на целта и излекувайте потребителя за 30% от нанесените щети. FLINCH целта за 5 секунди",
     "DRAGON_TAIL": "Раздайте [30,60,100,SP] SPECIAL на целта и подобрете DEF и SPE_DEF на потребителя с [1,2,3,SP]",
@@ -951,7 +951,7 @@
     "TRIPLE_KICK": "Раздава [60,SP] SPECIAL на до 3 съседни врага",
     "MAWASHI_GERI": "Оферти [60,SP] SPECIAL. Двойни щети, ако нападателят има по-добра ATK от целта",
     "FORECAST": "Дава [10,SP] ЩИТ на вашия отбор плюс допълнителен бонус в зависимост от времето:\n Sun: също дава [3,SP] ATK\n Дъжд: също дава [5,SP] PP\n Сняг: също дава [2,SP] DEF / SPE_DEF",
-    "X_SCISSOR": "Раздава [10,20,40,80,SP] TRUE два пъти",
+    "X_SCISSOR": "Раздава [10,20,40,60,SP] TRUE два пъти",
     "PLASMA_FIST": "Сделки [120,SP] SPECIAL с 25% кражба на живот",
     "SPECTRAL_THIEF": "Изчезва и се появява отново, раздавайки [50,SP] SPECIAL, открадвайки цялото статистическо усилване на целта",
     "GEOMANCY": "Увеличете [15,SP] ATK, [5,SP] SPE_DEF и 20% ATK_SPEED",

app/public/dist/client/locales/de/translation.json

@@ -1249,7 +1249,7 @@
     "SEED_FLARE": "Shaymins Körper sendet eine Schockwelle aus, die allen Feinden [30,SP] SPECIAL zufügt und ihre SPE_DEF um 2 verringert",
     "IRON_TAIL": "Mono-Zielschadensangriff, der [20,40,80,SP] SPECIAL verursacht. Stärkung der DEF um [1,3,5] Punkte",
     "BLAST_BURN": "Flächenangriff, der [30,60,120,SP] SPECIAL verursacht",
-    "CHARGE": "Verbessere den ATK aller ELECTRIC Verbündeten-Pokémons um [25,SP] %",
+    "CHARGE": "Verbessere den ATK aller Verbündeten-Pokémons um [20,SP] %",
     "DISCHARGE": "Schocken Sie Gegner in der Nähe mit [25,50,75,SP] SPECIAL und paralysieren Sie sie für 5 Sekunden",
     "BITE": "Fügt dem Ziel [40,80,120,SP] SPECIAL Schaden zu und heilt ihn um 30 % des Schadens. FLINCH das Ziel 5 Sekunden lang",
     "AQUA_TAIL": "Füge dem Gegner [30.60,100,SP] SPECIAL zu und erhalte [30,60,100,SP] SHIELD",
@@ -1319,7 +1319,7 @@
     "GRASSY_SURGE": "Erhöhe die ATK aller GRASS Pokémon um [5,SP]",
     "MISTY_SURGE": "Alle FAIRY Verbündeten erholen sich von [30,SP] HP und [30,SP] PP.",
     "SKY_ATTACK": "Erhebt sich in die Luft und fällt nach einer Sekunde auf das am weitesten entfernte Ziel und verursacht [120,SP] SPECIAL",
-    "FLYING_PRESS": "Stürzt sich vom Himmel auf das am weitesten entfernte Ziel und verursacht [30,SP]% der maximalen HP des Anwenders als SPECIAL",
+    "FLYING_PRESS": "Stürzt sich vom Himmel auf das am weitesten entfernte Ziel und verursacht [50,SP]% der maximalen HP des Anwenders als SPECIAL",
     "ILLUSION": "Der Benutzer gewinnt [30,50,70,SP=0,5] HP-Punkte zurück und kopiert die Form sowie die ATK, DEF, SPE_DEF und RANGE des Ziel-Pokémon",
     "SLUDGE": "Wirft Müll auf die 3 Felder vor sich, was [2,3,4] Stapel von POISONNED für [3,SP] Sekunden verursacht",
     "SLUDGE_WAVE": "Wirf einen Sprühstrahl aus Abfall auf den Gegner mit den meisten HP, der allen Gegnern im Weg [10,20,30,SP] SPECIAL und POISON für [2,4,6] Sekunden zufügt",
@@ -1335,7 +1335,7 @@
     "TRIPLE_KICK": "Fügt bis zu 3 benachbarten Feinden [60,SP] SPECIAL zu",
     "MAWASHI_GERI": "Angebote [60,SP] SPECIAL. Doppelter Schaden, wenn der Angreifer einen besseren ATK als das Ziel hat",
     "FORECAST": "Gibt Ihrem Team [10,SP] SHIELD sowie einen zusätzlichen Bonus je nach Wetterlage:\n Sonne: gibt auch [3,SP] ATK\n Regen: Gibt auch [5,SP] PP\n Schnee: gibt auch [2,SP] DEF / SPE_DEF",
-    "X_SCISSOR": "Fügt dem Ziel zweimal [10,20,40,80,SP] TRUE zu.",
+    "X_SCISSOR": "Fügt dem Ziel zweimal [10,20,40,60,SP] TRUE zu.",
     "MANTIS_BLADES": "Entfesselt drei Klingen die dem Ziel jeweils [30,60,120,SP] PHYSICAL, SPECIAL und TRUE zufügen.",
     "PLASMA_FIST": "Bietet [120,SP] SPECIAL mit 25 % Lebensraub",
     "SPECTRAL_THIEF": "Verschwindet und erscheint wieder, verursacht [50,SP] SPECIAL und stiehlt dem Ziel den gesamten Statistik-Boost",
@@ -1424,7 +1424,7 @@
     "PARABOLIC_CHARGE": "Heilt [25,50] HP und fügt dem Ziel [25,50,100,SP] SPECIAL Schaden zu. Überschüssige HP werden in SPECIAL umgewandelt.",
     "SUPER_FANG": "Verursacht [30,60,90,SP] SPECIAL. Doppelter Schaden bei GRASS Pokémon",
     "TEETER_DANCE": "Erhalte [20,SP]% ATK_SPEED. Alle anderen Pokémon sind 3 Sekunden lang CONFUSION, Verbündete und Feinde gleichermaßen.",
-    "CLOSE_COMBAT": "Verursacht [130,SP] SPECIAL und reduziert DEF und SPE_DEF des Zauberers um 2",
+    "CLOSE_COMBAT": "Verursacht [130,SP] SPECIAL und reduziert DEF und SPE_DEF des Zauberers um 1",
     "AQUA_RING": "Taucht in die Mitte des verbündeten Teams und erzeugt einen Wasserring, der negativen Status beseitigt und [20,30,50,SP] HP heilt",
     "POISON_GAS": "Eine Wolke stinkenden Gases wird allen Gegnern in der Nähe ins Gesicht geschleudert und fügt [15,30,60,SP] SPECIAL und 3 Sekunden lang POISONNED zu.",
     "ASSIST": "Kopiert und benutzt die Fähigkeit von einem Zufälligen verbündeten Pokémon",