Skip to content

Commit

Permalink
merge prod hotfixes in master (#1602)
Browse files Browse the repository at this point in the history
* fix chat not scrolled down on arrival (#1594)

* transform should not copy HP (#1595)

* fix lycanroc descriptions (#1596)

* fix silvally ability anim
  • Loading branch information
sylvainpolletvillard authored Mar 24, 2024
1 parent 7450d83 commit 51d96be
Show file tree
Hide file tree
Showing 19 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion app/core/abilities/abilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7195,7 +7195,6 @@ export class TransformStrategy extends AbilityStrategy {
pokemon.speDef = target.speDef
pokemon.attackType = target.attackType
pokemon.ap = target.ap
pokemon.hp = target.hp
pokemon.maxPP = target.maxPP
pokemon.atkSpeed = target.atkSpeed
pokemon.critChance = target.critChance
Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@
"MIMIKYU_BUSTED": "Its neck is broken. Mimikyu will never forget the person who damaged its rag for as long as it is still alive.",
"HUNGER_SWITCH": "$t(pkm.MORPEKO) alternates between its normal and hangry forms.\n Normal form attacks inflicts PARALYSIS for 2s\n Hangry form attacks inflicts WOUND for 4s",
"WATER_BUBBLE": "The pokemon is immune to BURN",
"LYCANROC": "$t(pkm.LYCANROC) turns into night form during NIGHT and day form during SUN",
"LYCANROC": "$t(pkm.LYCANROC_DUSK) turns into night form during NIGHT and day form during SUN",
"COSMOG": "$t(pkm.COSMOG) is feeding with the energy of the stars. Gain 10 permanent max HP every time you evolve a unit. Evolve after 10 times.",
"COSMOEM": "$t(pkm.COSMOEM) is feeding with the energy of the stars. Gain 10 permanent max HP every time you evolve a unit. Evolve after 10 times into $t(pkm.SOLGALEO) if in the light spot, or $t(pkm.LUNALA) instead.",
"SOUL_HEART": "Every time the caster gets a KO, gain 10 AP and 10 PP"
Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@
"MIMIKYU_BUSTED": "Son cou est cassé. Mimiqui n'oubliera jamais la personne qui a endommagé son costume.",
"HUNGER_SWITCH": "$t(pkm.MORPEKO) alterne entre sa forme rassasiée et affamée.\nLes attaques en forme rassasiée infligent PARALYSIS pendant 2 secondes.\nLes attaques en forme affamée infligent WOUND pendant 4 secondes.",
"WATER_BUBBLE": "Le pokémon est immunisé contre BURN",
"LYCANROC": "$t(pkm.LYCANROC) se transforme en forme nocturne pendant la NIGHT et en forme diurne au SUN",
"LYCANROC": "$t(pkm.LYCANROC_DUSK) se transforme en forme nocturne pendant la NIGHT et en forme diurne au SUN",
"COSMOG": "$t(pkm.COSMOG) se nourrit de l'énergie des étoiles. Gagne 10 HP max permanents chaque fois que vous faites évoluer une unité. Évolue après dix fois.",
"COSMOEM": "$t(pkm.COSMOEM) se nourrit de l'énergie des étoiles. Gagne 10 HP max permanents chaque fois que vous faites évoluer une unité. Évolue après dix fois en $t(pkm.SOLGALEO) s'il est placé dans la lumière, ou en $t(pkm.LUNALA) sinon.",
"SOUL_HEART": "À chaque KO infligé, gagne 10 AP et 10 PP"
Expand Down
5 changes: 3 additions & 2 deletions app/public/src/pages/component/chat/chat-history.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ export default function ChatHistory(props: { source: string }) {
messages.length > 0 &&
domRef &&
domRef.current &&
domRef.current.scrollTop + domRef.current.clientHeight >=
domRef.current.scrollHeight - 200 // autoscroll only if not already scrolled up by a 200px margin
(domRef.current.scrollTop === 0 ||
domRef.current.scrollTop + domRef.current.clientHeight >=
domRef.current.scrollHeight - 200) // autoscroll only if not already scrolled up by a 200px margin
) {
domRef.current.scrollTop = domRef.current.scrollHeight
}
Expand Down

0 comments on commit 51d96be

Please sign in to comment.