Skip to content

Commit

Permalink
add free shop rolls and new unown-R (keldaanCommunity#2282)
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvainpolletvillard authored Oct 5, 2024
1 parent 2fe12bf commit da080fe
Show file tree
Hide file tree
Showing 24 changed files with 91 additions and 106 deletions.
44 changes: 3 additions & 41 deletions app/core/abilities/hidden-power.ts
Original file line number Diff line number Diff line change
Expand Up @@ -425,47 +425,9 @@ export class HiddenPowerRStrategy extends HiddenPowerStrategy {
crit: boolean
) {
super.process(unown, state, board, target, crit)
let coord = unown.simulation.getClosestAvailablePlaceOnBoardToPokemon(
unown,
unown.team
)
const geodude = unown.simulation.addPokemon(
PokemonFactory.createPokemonFromName(Pkm.GEODUDE, unown.player),
coord.x,
coord.y,
unown.team,
false
)
geodude.items.add(Item.ROCKY_HELMET)
geodude.simulation.applyItemsEffects(geodude)

coord = unown.simulation.getClosestAvailablePlaceOnBoardToPokemon(
unown,
unown.team
)
const graveler = unown.simulation.addPokemon(
PokemonFactory.createPokemonFromName(Pkm.GRAVELER, unown.player),
coord.x,
coord.y,
unown.team,
false
)
graveler.items.add(Item.ROCKY_HELMET)
graveler.simulation.applyItemsEffects(graveler)

coord = unown.simulation.getClosestAvailablePlaceOnBoardToPokemon(
unown,
unown.team
)
const golem = unown.simulation.addPokemon(
PokemonFactory.createPokemonFromName(Pkm.GOLEM, unown.player),
coord.x,
coord.y,
unown.team,
false
)
golem.items.add(Item.ROCKY_HELMET)
golem.simulation.applyItemsEffects(golem)
if (unown.player) {
unown.player.shopFreeRolls += 6
}
}
}

Expand Down
1 change: 1 addition & 0 deletions app/models/colyseus-models/player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export default class Player extends Schema implements IPlayer {
@type("uint16") money = process.env.MODE == "dev" ? 999 : 5
@type("int8") life = 100
@type("boolean") shopLocked: boolean = false
@type("uint8") shopFreeRolls: number = 0
@type("uint8") streak: number = 0
@type("uint8") interest: number = 0
@type("string") opponentId: string = ""
Expand Down
13 changes: 5 additions & 8 deletions app/models/shop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,11 @@ export default class Shop {

refillShop(player: Player, state: GameState) {
// No need to release pokemons since they won't be changed
const PkmList = player.shop.map((pokemon, i) => {
if (pokemon != Pkm.MAGIKARP && pokemon != Pkm.DEFAULT) {
return pokemon
player.shop.forEach((pokemon, i) => {
if (pokemon === Pkm.MAGIKARP || pokemon === Pkm.DEFAULT) {
player.shop[i] = this.pickPokemon(player, state, i)
}
return this.pickPokemon(player, state, i)
})

for (let i = 0; i < SHOP_SIZE; i++) {
player.shop[i] = PkmList[i]
}
}

assignShop(player: Player, manualRefresh: boolean, state: GameState) {
Expand All @@ -296,6 +291,8 @@ export default class Shop {
!manualRefresh &&
!player.shopLocked
) {
// Unown shop
player.shopFreeRolls += 1
const unowns = getUnownsPoolPerStage(state.stageLevel)
for (let i = 0; i < SHOP_SIZE; i++) {
player.shop[i] = pickRandomIn(unowns)
Expand Down
2 changes: 2 additions & 0 deletions app/public/dist/client/changelog/patch-5.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,14 @@
- Buff Fearow: Def/SpeDef: 1/1 → 2/2 ; buff Peck: 10/20/30 → 10/30/50 damage
- 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

# Changes to Synergies

- Nerf Fighting 8: damage blocked 15 → 13
- Buff Ice 8: frozen enemies now take 20% additional damage
- Baby 3 egg chance now increase with loss streaks only when baby synergy is active, and resets to zero once an egg is obtained. Same for shiny egg chance at Baby 7. Removed max limit for eggs on bench.
- Unown Shop of Psychic 6 can now be skipped by rerolling shop for free

# Changes to Items

Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/bg/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"HIDDEN_POWER_O": "Скрита сила (ORAN)",
"HIDDEN_POWER_P": "Скрита сила (PEST)",
"HIDDEN_POWER_Q": "Скрита сила (QUIT)",
"HIDDEN_POWER_R": "Скрита сила (ROCK)",
"HIDDEN_POWER_R": "Скрита сила (ROLL)",
"HIDDEN_POWER_S": "Скрита сила (STOP)",
"HIDDEN_POWER_T": "Скрита сила (TREE)",
"HIDDEN_POWER_U": "Скрита сила (UXIE)",
Expand Down Expand Up @@ -1007,7 +1007,7 @@
"HIDDEN_POWER_O": "Дайте Оран Бери на целия си екип. Елементът се премахва в края на битката.",
"HIDDEN_POWER_P": "Създайте 5 произволни BUG STAR покемона",
"HIDDEN_POWER_Q": "Веднага завършва битката с равенство",
"HIDDEN_POWER_R": "Породете Geodude, Graveler и Golem със скалисти шлемове",
"HIDDEN_POWER_R": "Вземете 6 безплатни превъртания в магазина",
"HIDDEN_POWER_S": "FREEZE противниковия отбор за 4 секунди",
"HIDDEN_POWER_T": "Вземете 3 произволни горски плодове",
"HIDDEN_POWER_U": "Зародете Uxie с Aqua Egg и максимум PP",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"HIDDEN_POWER_O": "Kraftreserve (ORAN)",
"HIDDEN_POWER_P": "Kraftreserve (PEST)",
"HIDDEN_POWER_Q": "Kraftreserve (QUIT)",
"HIDDEN_POWER_R": "Kraftreserve (ROCK)",
"HIDDEN_POWER_R": "Kraftreserve (ROLL)",
"HIDDEN_POWER_S": "Kraftreserve (STOP)",
"HIDDEN_POWER_T": "Kraftreserve (TREE)",
"HIDDEN_POWER_U": "Kraftreserve (UXIE)",
Expand Down Expand Up @@ -1394,7 +1394,7 @@
"HIDDEN_POWER_O": "Geben Sie Ihrem gesamten Team ORAN_BERRY. Der Gegenstand wird am Ende des Kampfes entfernt.",
"HIDDEN_POWER_P": "Bringe 5 zufällige BUG STAR Pokémon",
"HIDDEN_POWER_Q": "Beendet den Kampf sofort mit einem Unentschieden",
"HIDDEN_POWER_R": "Spawne Kleinstein, Georok und Geowaz mit Beulenhelm",
"HIDDEN_POWER_R": "Erhalte 6 kostenlose Shop-Rerolls",
"HIDDEN_POWER_S": "FREEZE das gegnerische Team für 4 Sekunden ein",
"HIDDEN_POWER_T": "Erhalte 3 zufällige Beeren",
"HIDDEN_POWER_U": "Bringe Selfe mit Manaphy-Ei und maximalem PP hervor",
Expand Down
8 changes: 4 additions & 4 deletions app/public/dist/client/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
"HIDDEN_POWER_O": "Hidden Power (ORAN)",
"HIDDEN_POWER_P": "Hidden Power (PEST)",
"HIDDEN_POWER_Q": "Hidden Power (QUIT)",
"HIDDEN_POWER_R": "Hidden Power (ROCK)",
"HIDDEN_POWER_R": "Hidden Power (ROLL)",
"HIDDEN_POWER_S": "Hidden Power (STOP)",
"HIDDEN_POWER_T": "Hidden Power (TREE)",
"HIDDEN_POWER_U": "Hidden Power (UXIE)",
Expand Down Expand Up @@ -1450,7 +1450,7 @@
"HIDDEN_POWER_O": "Give ORAN_BERRY to your whole team. The item is removed at the end of the fight.",
"HIDDEN_POWER_P": "Spawn 5 random STAR BUG Pokémons",
"HIDDEN_POWER_Q": "Immediately ends the fight with a draw",
"HIDDEN_POWER_R": "Spawn Geodude, Graveler and Golem with Rocky Helmets",
"HIDDEN_POWER_R": "Get 6 free shop rerolls",
"HIDDEN_POWER_S": "FREEZE the opponent team for 4 seconds",
"HIDDEN_POWER_T": "Get 3 random berries",
"HIDDEN_POWER_U": "Spawn Uxie with AQUA_EGG and max PP",
Expand Down Expand Up @@ -2805,7 +2805,7 @@
"rate": "Rate",
"increase_level_hint": "Increase your level to raise your chances to get higher tier Pokémon.",
"refresh_gold_hint": "Refresh shop for 1 gold",
"refresh": "Refresh",
"refresh": "Reroll",
"pve_stages": "PVE Stages",
"carousel_stages": "Carousel Stages",
"additional_picks": "Additional picks",
Expand Down Expand Up @@ -2968,7 +2968,7 @@
"action": "Action",
"key_desc_sell": "Sell hovered Pokémon",
"key_desc_buy_xp": "Buy experience",
"key_desc_refresh": "Refresh shop",
"key_desc_refresh": "Reroll shop",
"key_desc_avatar_anim": "Play avatar animation",
"key_desc_avatar_emotes": "Toggle emote menu",
"key_desc_avatar_show_emote": "Trigger emote",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
"HIDDEN_POWER_O": "Poder Oculto (ORAN)",
"HIDDEN_POWER_P": "Poder Oculto (PEST)",
"HIDDEN_POWER_Q": "Poder Oculto (QUIT)",
"HIDDEN_POWER_R": "Poder Oculto (ROCK)",
"HIDDEN_POWER_R": "Poder Oculto (ROLL)",
"HIDDEN_POWER_S": "Poder Oculto (STOP)",
"HIDDEN_POWER_T": "Poder Oculto (TREE)",
"HIDDEN_POWER_U": "Poder Oculto (UXIE)",
Expand Down Expand Up @@ -1411,7 +1411,7 @@
"HIDDEN_POWER_O": "Otorga ORAN_BERRY a todo tu equipo. El elemento se elimina al final de la pelea.",
"HIDDEN_POWER_P": "Invoca 5 Pokémon BUG STAR aleatorios",
"HIDDEN_POWER_Q": "Inmediatamente termina la pelea con un empate.",
"HIDDEN_POWER_R": "Invoca Geodude, Graveler y Golem con Rocky Helmets",
"HIDDEN_POWER_R": "Obtén 6 rerolls de tienda gratis",
"HIDDEN_POWER_S": "Deja FREEZE al equipo oponente durante 4 segundos",
"HIDDEN_POWER_T": "Consigue 3 bayas al azar",
"HIDDEN_POWER_U": "Invoca Uxie con Aqua Egg y max PP",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
"HIDDEN_POWER_O": "Puissance Cachée (ORAN)",
"HIDDEN_POWER_P": "Puissance Cachée (PEST)",
"HIDDEN_POWER_Q": "Puissance Cachée (QUIT)",
"HIDDEN_POWER_R": "Puissance Cachée (ROCK)",
"HIDDEN_POWER_R": "Puissance Cachée (ROLL)",
"HIDDEN_POWER_S": "Puissance Cachée (STOP)",
"HIDDEN_POWER_T": "Puissance Cachée (TREE)",
"HIDDEN_POWER_U": "Puissance Cachée (UXIE)",
Expand Down Expand Up @@ -1387,7 +1387,7 @@
"HIDDEN_POWER_O": "Donne une Baie Oran à toute votre équipe. Les objets sont retirés à la fin du combat.",
"HIDDEN_POWER_P": "Invoque 5 pokémons BUG STAR aléatoires",
"HIDDEN_POWER_Q": "Termine immédiatement le combat par un match nul",
"HIDDEN_POWER_R": "Invoque un Racaillou, Gravalanch et Golem des casques Brut",
"HIDDEN_POWER_R": "Gagnez 6 relances de boutique gratuites",
"HIDDEN_POWER_S": "FREEZE l'équipe adverse pendant 4 secondes",
"HIDDEN_POWER_T": "Gagnez 3 baies aléatoires",
"HIDDEN_POWER_U": "Invoque $t(pkm.UXIE) avec un AQUA_EGG et PP au max",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/it/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
"HIDDEN_POWER_O": "Introforza (ORAN)",
"HIDDEN_POWER_P": "Introforza (PEST)",
"HIDDEN_POWER_Q": "Introforza (QUIT)",
"HIDDEN_POWER_R": "Introforza (ROCK)",
"HIDDEN_POWER_R": "Introforza (ROLL)",
"HIDDEN_POWER_S": "Introforza (STOP)",
"HIDDEN_POWER_T": "Introforza (TREE)",
"HIDDEN_POWER_U": "Introforza (UXIE)",
Expand Down Expand Up @@ -1450,7 +1450,7 @@
"HIDDEN_POWER_O": "Equipaggia una ORAN_BERRY a tutta la tua squadra. L'oggetto viene rimosso alla fine del combattimento.",
"HIDDEN_POWER_P": "Evoca 5 Pokèmon STAR BUG casuali.",
"HIDDEN_POWER_Q": "Termina immediatamente il combattimento con un pareggio",
"HIDDEN_POWER_R": "Evoca Geodude, Graveler e Golem con equipaggiato Bitorzoelmo",
"HIDDEN_POWER_R": "Ottieni 6 reroll gratuiti per il negozio",
"HIDDEN_POWER_S": "Provoca FREEZE a tutta la squadra avversaria per 4 secondi.",
"HIDDEN_POWER_T": "Ricevi 3 bacche casuali",
"HIDDEN_POWER_U": "Evoca Uxie con equipaggiato un AQUA_EGG e i PP al massimo.",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"HIDDEN_POWER_O": "秘められた力 (ORAN)",
"HIDDEN_POWER_P": "隠された力 (PEST)",
"HIDDEN_POWER_Q": "秘められた力 (QUIT)",
"HIDDEN_POWER_R": "秘められた力 (ROCK)",
"HIDDEN_POWER_R": "秘められた力 (ROLL)",
"HIDDEN_POWER_S": "秘められた力 (STOP)",
"HIDDEN_POWER_T": "秘められた力 (TREE)",
"HIDDEN_POWER_U": "秘められた力 (UXIE)",
Expand Down Expand Up @@ -992,7 +992,7 @@
"HIDDEN_POWER_O": "オランベリーをチーム全員に与えましょう。アイテムは戦闘終了時に削除されます。",
"HIDDEN_POWER_P": "ランダムな BUG STAR ポケモンを 5 匹出現させる",
"HIDDEN_POWER_Q": "引き分けですぐに試合を終了する",
"HIDDEN_POWER_R": "ジオデュード、グラベルラー、ゴーレムをロッキーヘルメットでスポーン",
"HIDDEN_POWER_R": "ショップの再ロールを6回無料でゲット",
"HIDDEN_POWER_S": "相手チームを4秒間フリーズさせる",
"HIDDEN_POWER_T": "ランダムでベリーを3個入手",
"HIDDEN_POWER_U": "アクアエッグと最大MANAでユクシーを生成する",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/ko/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
"HIDDEN_POWER_O": "잠재파워(오랭열매)",
"HIDDEN_POWER_P": "잠재파워(해충)",
"HIDDEN_POWER_Q": "잠재파워(중단)",
"HIDDEN_POWER_R": "잠재파워()",
"HIDDEN_POWER_R": "잠재파워(연타)",
"HIDDEN_POWER_S": "잠재파워(얼음땡)",
"HIDDEN_POWER_T": "잠재파워(풍년)",
"HIDDEN_POWER_U": "잠재파워(유크시)",
Expand Down Expand Up @@ -1436,7 +1436,7 @@
"HIDDEN_POWER_O": "팀 구성원 전체가 ORAN_BERRY 를 획득한다. 이 아이템은 전투후 제거된다.",
"HIDDEN_POWER_P": "5마리의 무작위 STAR BUG 포켓몬을 생성한다.",
"HIDDEN_POWER_Q": "전투를 무승부로 즉시 끝낸다.",
"HIDDEN_POWER_R": "울퉁불퉁멧을 지닌 꼬마돌, 데구리, 딱구리를 생성한다.",
"HIDDEN_POWER_R": "무료 매장 리롤 6회 받기.",
"HIDDEN_POWER_S": "상대팀을 4초간 얼음상태로 만든다.",
"HIDDEN_POWER_T": "무작위 열매 3개를 얻는다.",
"HIDDEN_POWER_U": "AQUA_EGG 를 지닌 유크시가 PP 가 가득 체워진 상태로 생성된다. ",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/nl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"HIDDEN_POWER_O": "Verborgen Kracht (ORAN)",
"HIDDEN_POWER_P": "Verborgen Kracht (PEST)",
"HIDDEN_POWER_Q": "Verborgen Kracht (QUIT)",
"HIDDEN_POWER_R": "Verborgen Kracht (ROCK)",
"HIDDEN_POWER_R": "Verborgen Kracht (ROLL)",
"HIDDEN_POWER_S": "Verborgen Kracht (STOP)",
"HIDDEN_POWER_T": "Verborgen Kracht (TREE)",
"HIDDEN_POWER_U": "Verborgen Kracht (UXIE)",
Expand Down Expand Up @@ -991,7 +991,7 @@
"HIDDEN_POWER_O": "Geef Oran Berry aan je hele team. Het item wordt aan het einde van het gevecht verwijderd.",
"HIDDEN_POWER_P": "Spawn 5 willekeurige BUG STAR pokemon",
"HIDDEN_POWER_Q": "Beëindigt het gevecht onmiddellijk met een gelijkspel",
"HIDDEN_POWER_R": "Spawn Geodude, Graveler en Golem met Rocky-helmen",
"HIDDEN_POWER_R": "Ontvang 6 gratis winkelherhalingen",
"HIDDEN_POWER_S": "FREEZE het team van de tegenstander gedurende 4 seconden",
"HIDDEN_POWER_T": "Verkrijg 3 willekeurige bessen",
"HIDDEN_POWER_U": "Spawn Uxie met Aqua Egg en max PP",
Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/locales/pl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"HIDDEN_POWER_O": "Ukryta moc (ORAN)",
"HIDDEN_POWER_P": "Ukryta moc (PEST)",
"HIDDEN_POWER_Q": "Ukryta moc (QUIT)",
"HIDDEN_POWER_R": "Ukryta moc (ROCK)",
"HIDDEN_POWER_R": "Ukryta moc (ROLL)",
"HIDDEN_POWER_S": "Ukryta moc (STOP)",
"HIDDEN_POWER_T": "Ukryta moc (TREE)",
"HIDDEN_POWER_U": "Ukryta moc (UXIE)",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"HIDDEN_POWER_O": "Poder Oculto (ORAN)",
"HIDDEN_POWER_P": "Poder Oculto (PEST)",
"HIDDEN_POWER_Q": "Poder Oculto (SAIR)",
"HIDDEN_POWER_R": "Poder Oculto (ROCHA)",
"HIDDEN_POWER_R": "Poder Oculto (ROLL)",
"HIDDEN_POWER_S": "Poder Oculto (PARAR)",
"HIDDEN_POWER_T": "Poder Oculto (TREE)",
"HIDDEN_POWER_U": "Poder Oculto (UXIE)",
Expand Down Expand Up @@ -1343,7 +1343,7 @@
"HIDDEN_POWER_O": "Dê Oran Berry para toda a sua equipe. O item é removido no final da luta.",
"HIDDEN_POWER_P": "Gere 5 pokémons BUG STAR aleatórios",
"HIDDEN_POWER_Q": "Termina imediatamente a luta com um empate",
"HIDDEN_POWER_R": "Gere Geodude, Graveler e Golem com Rocky Helmets",
"HIDDEN_POWER_R": "Ganhe 6 rerolls de loja grátis",
"HIDDEN_POWER_S": "FREEZE a equipe adversária por 4 segundos",
"HIDDEN_POWER_T": "Obtenha 3 frutas aleatórias",
"HIDDEN_POWER_U": "Spawn Uxie com Aqua Egg e max PP",
Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/locales/th/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
"HIDDEN_POWER_O": "มอบ ORAN_BERRY ให้แก่โปเกมอนทุกตัวในทีมของคุณ. ไอเทมที่เพิ่มเข้ามาจะถูกลบออกเมื่อจบรอบ.",
"HIDDEN_POWER_P": "เรียกโปเกมอนประเภท BUG ระดับ STAR ออกมา 5 ตัวแบบสุ่ม",
"HIDDEN_POWER_Q": "จบการต่อสู้รอบนั้นทันทีด้วยผลเสมอ",
"HIDDEN_POWER_R": "เรียก Geodude, Graveler และ Golem โดยสวมใส่ Rocky Helmets",
"HIDDEN_POWER_R": "รับฟรีรีโรลร้านค้า 6 ครั้ง",
"HIDDEN_POWER_S": "ทำให้ศัตรูทุกตัวติดสถานะ FREEZE เป็นเวลา 4 วินาที",
"HIDDEN_POWER_T": "ได้รับเบอร์รี่ 3 อันแบบสุ่ม",
"HIDDEN_POWER_U": "เรียก Uxie โดยสวมใส่ AQUA_EGG พร้อม PP เต็ม",
Expand Down
4 changes: 2 additions & 2 deletions app/public/dist/client/locales/vi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"HIDDEN_POWER_O": "Sức Mạnh Tiềm Ẩn (ORAN)",
"HIDDEN_POWER_P": "Sức Mạnh Tiềm Ẩn (PEST)",
"HIDDEN_POWER_Q": "Sức Mạnh Tiềm Ẩn (QUIT)",
"HIDDEN_POWER_R": "Sức Mạnh Tiềm Ẩn (ROCK)",
"HIDDEN_POWER_R": "Sức Mạnh Tiềm Ẩn (ROLL)",
"HIDDEN_POWER_S": "Sức Mạnh Tiềm Ẩn (STOP)",
"HIDDEN_POWER_T": "Sức Mạnh Tiềm Ẩn (TREE)",
"HIDDEN_POWER_U": "Sức Mạnh Tiềm Ẩn (UXIE)",
Expand Down Expand Up @@ -1381,7 +1381,7 @@
"HIDDEN_POWER_O": "Tất cả đồng minh được cho ăn ORAN_BERRY. Vật phẩm này sẽ mất đi vào cuối trận đấu",
"HIDDEN_POWER_P": "Tạo ra 5 con STAR BUG Pokémon ngẫu nhiên",
"HIDDEN_POWER_Q": "Ngay lập tức kết thúc trận đấu với một trận hòa",
"HIDDEN_POWER_R": "Tạo ra Geodude, Graveler và Golem với Rocky Helmets",
"HIDDEN_POWER_R": "Nhận 6 lần đổi cửa hàng miễn phí",
"HIDDEN_POWER_S": "FREEZE tất cả đối thủ trong 4 giây",
"HIDDEN_POWER_T": "Nhận được 3 quả berry ngẫu nhiên"
},
Expand Down
2 changes: 1 addition & 1 deletion app/public/src/game/components/unown-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export const UNOWNS_PER_ABILITY = new Map([
],
[
Ability.HIDDEN_POWER_R,
[Pkm.UNOWN_R, Pkm.UNOWN_O, Pkm.UNOWN_C, Pkm.UNOWN_K]
[Pkm.UNOWN_R, Pkm.UNOWN_O, Pkm.UNOWN_L, Pkm.UNOWN_L]
],
[
Ability.HIDDEN_POWER_S,
Expand Down
8 changes: 6 additions & 2 deletions app/public/src/pages/component/game/game-refresh.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
import React from "react"
import { useTranslation } from "react-i18next"
import { useAppSelector } from "../../../hooks"
import { getGameScene } from "../../game"
import { cc } from "../../utils/jsx"
import { Money } from "../icons/money"

export default function GameRefresh() {
const { t } = useTranslation()
const shopFreeRolls = useAppSelector((state) => state.game.shopFreeRolls)
const cost = shopFreeRolls > 0 ? 0 : 1
return (
<button
className="bubbly blue refresh-button"
className={cc("bubbly blue refresh-button", { shimmer: shopFreeRolls > 0 })}
title={t("refresh_gold_hint")}
onClick={() => {
getGameScene()?.refreshShop()
}}
>
<img src={`/assets/ui/refresh.svg`} />
<Money value={t("refresh") + " 1"} />
{cost > 0 ? <Money value={`${t("refresh")} ${cost}`} /> : `${t("refresh")} (${shopFreeRolls})`}
</button>
)
}
Loading

0 comments on commit da080fe

Please sign in to comment.