diff --git a/app/core/abilities/abilities.ts b/app/core/abilities/abilities.ts index f8fc6d6aad..69fc837f62 100644 --- a/app/core/abilities/abilities.ts +++ b/app/core/abilities/abilities.ts @@ -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 diff --git a/app/public/dist/client/locales/en/translation.json b/app/public/dist/client/locales/en/translation.json index 2c36bc0c70..7abb0e48a6 100644 --- a/app/public/dist/client/locales/en/translation.json +++ b/app/public/dist/client/locales/en/translation.json @@ -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" diff --git a/app/public/dist/client/locales/fr/translation.json b/app/public/dist/client/locales/fr/translation.json index 89a8c0afbd..8bbdb2e27e 100644 --- a/app/public/dist/client/locales/fr/translation.json +++ b/app/public/dist/client/locales/fr/translation.json @@ -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" diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/000.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/000.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/000.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/000.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/001.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/001.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/001.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/001.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/002.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/002.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/002.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/002.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/003.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/003.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/003.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/003.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/004.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/004.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/004.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/004.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/005.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/005.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/005.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/005.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/006.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/006.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/006.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/006.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/007.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/007.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/007.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/007.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/008.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/008.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/008.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/008.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/009.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/009.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/009.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/009.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/010.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/010.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/010.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/010.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/011.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/011.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/011.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/011.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/012.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/012.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/012.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/012.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/013.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/013.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/013.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/013.png diff --git a/app/public/src/assets/abilities{tps}/RKS_SYSTEM/014.png b/app/public/src/assets/abilities{tps}/MULTI_ATTACK/014.png similarity index 100% rename from app/public/src/assets/abilities{tps}/RKS_SYSTEM/014.png rename to app/public/src/assets/abilities{tps}/MULTI_ATTACK/014.png diff --git a/app/public/src/pages/component/chat/chat-history.tsx b/app/public/src/pages/component/chat/chat-history.tsx index fd92170349..0147f0be4a 100644 --- a/app/public/src/pages/component/chat/chat-history.tsx +++ b/app/public/src/pages/component/chat/chat-history.tsx @@ -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 }