Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Balance] Remove Species Locks from Aura Wheel and Poison Puppeteer #4330

Merged
merged 24 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/data/ability.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5872,6 +5872,6 @@ export function initAbilities() {
new Ability(Abilities.POISON_PUPPETEER, 9)
.attr(UncopiableAbilityAbAttr)
.attr(UnswappableAbilityAbAttr)
.conditionalAttr(pokemon => pokemon.species.speciesId===Species.PECHARUNT, ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
.attr(ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
);
}
3 changes: 1 addition & 2 deletions src/data/move.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9073,8 +9073,7 @@ export function initMoves() {
new AttackMove(Moves.AURA_WHEEL, Type.ELECTRIC, MoveCategory.PHYSICAL, 110, 100, 10, 100, 0, 8)
.attr(StatStageChangeAttr, [ Stat.SPD ], 1, true)
.makesContact(false)
.attr(AuraWheelTypeAttr)
.condition((user, target, move) => [user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.MORPEKO)), // Missing custom fail message
.attr(AuraWheelTypeAttr),
new AttackMove(Moves.BREAKING_SWIPE, Type.DRAGON, MoveCategory.PHYSICAL, 60, 100, 15, 100, 0, 8)
.target(MoveTarget.ALL_NEAR_ENEMIES)
.attr(StatStageChangeAttr, [ Stat.ATK ], -1),
Expand Down
2 changes: 1 addition & 1 deletion src/locales/de/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Giftpuppenspiel",
"description": "Wenn Infamomo ein Ziel mit einer Attacke vergiftet, so wird dieses auch verwirrt."
"description": "Wenn das Pokémon ein Ziel mit einer Attacke vergiftet, so wird dieses auch verwirrt."
}
}
2 changes: 1 addition & 1 deletion src/locales/de/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Aura-Rad",
"effect": "Mithilfe der in den Backentaschen gespeicherten Energie greift der Anwender an und erhöht seine Initiative. Der Typ der Attacke hängt von Morpekos Form ab."
"effect": "Mithilfe der in den Backentaschen gespeicherten Energie greift der Anwender an und erhöht seine Initiative. Wenn dies von Morpeko verwendet wird hängt der Typ der Attacke von dessen Form ab."
},
"breakingSwipe": {
"name": "Breitseite",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Poison Puppeteer",
"description": "Pokémon poisoned by Pecharunt's moves will also become confused."
"description": "Pokémon poisoned by this Pokémon's moves will also become confused."
}
}
2 changes: 1 addition & 1 deletion src/locales/en/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Aura Wheel",
"effect": "Morpeko attacks and raises its Speed with the energy stored in its cheeks. This move's type changes depending on the user's form."
"effect": "The user attacks and raises its Speed with the energy stored in its cheeks. If used by Morpeko, this move's type changes depending on the user's form."
},
"breakingSwipe": {
"name": "Breaking Swipe",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/es/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Títere Tóxico",
"description": "Los rivales que Pecharunt envenene con sus movimientos también sufrirán confusión."
"description": "Los rivales que Pecharunt envenene con sus movimientos también sufrirán confusión. //TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 1 addition & 1 deletion src/locales/es/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Rueda Aural",
"effect": "La energía que acumula en las mejillas le sirve para atacar y aumentar su Velocidad. Este movimiento cambia de tipo según la forma que adopte Morpeko."
"effect": "La energía que acumula en las mejillas le sirve para atacar y aumentar su Velocidad. Este movimiento cambia de tipo según la forma que adopte Morpeko. //TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
},
"breakingSwipe": {
"name": "Vasto Impacto",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/fr/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Emprise Toxique",
"description": "Lorsque Pêchaminus empoisonne un Pokémon grâce à l’une de ses capacités, ce dernier devient également confus."
"description": "Lorsque le Pokémon en empoisonne un autre grâce à l’une de ses capacités, ce dernier devient également confus."
}
}
2 changes: 1 addition & 1 deletion src/locales/fr/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Roue Libre",
"effect": "Inflige et change en type Ténèbres"
"effect": "Le Pokémon libère l’énergie stockée dans ses joues pour attaquer et augmenter sa Vitesse. Le type de cette capacité change en fonction de la forme du lanceur."
},
"breakingSwipe": {
"name": "Abattage",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/it/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "\tMalia Tossica",
"description": "I Pokémon avvelenati dalle mosse di Pecharunt entreranno anche in stato di confusione."
"description": "I Pokémon avvelenati dalle mosse di questo Pokémon entreranno anche in stato di confusione."
}
}
2 changes: 1 addition & 1 deletion src/locales/it/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Ruota d'Aura",
"effect": "Il Pokémon emette l'energia accumulata nelle guance per attaccare e aumentare la Velocità. Il tipo della mossa cambia in base alla forma assunta da Morpeko."
"effect": "Il Pokémon emette l'energia accumulata nelle guance per attaccare e aumentare la Velocità. Se usata da Morpeko, il tipo della mossa cambia in base alla forma assunta."
},
"breakingSwipe": {
"name": "Vastoimpatto",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ja/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "どくくぐつ",
"description": "モモワロウの 技によって どく状態に なった 相手は こんらん状態にも なってしまう。"
"description": "モモワロウの 技によって どく状態に なった 相手は こんらん状態にも なってしまう。 //TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 1 addition & 1 deletion src/locales/ja/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "オーラぐるま",
"effect": "ほほぶくろに 溜めた エネルギーで 攻撃し 自分の 素早さを あげる。 モルペコの 姿で タイプが 変わる。"
"effect": "ほほぶくろに 溜めた エネルギーで 攻撃し 自分の 素早さを あげる。 モルペコの 姿で タイプが 変わる。//TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
},
"breakingSwipe": {
"name": "ワイドブレイカー",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ko/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "독조종",
"description": "복숭악동의 기술에 의해 독 상태가 된 상대는 혼란 상태도 되어 버린다."
"description": " 기술에 의해 독 상태가 된 상대는 혼란 상태도 되어 버린다."
}
}
2 changes: 1 addition & 1 deletion src/locales/ko/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "오라휠",
"effect": "볼주머니에 저장해둔 에너지로 공격하고 자신의 스피드를 올린다. 모르페코의 모습에 따라 타입이 바뀐다."
"effect": "볼주머니에 저장해둔 에너지로 공격하고 자신의 스피드를 올린다. 모르페코가 사용할 경우 모습에 따라 타입이 바뀐다."
},
"breakingSwipe": {
"name": "와이드브레이커",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/pt_BR/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Poison Puppeteer",
"description": "Pokémon envenenados pelos movimentos de Pecharunt também ficarão confusos."
"description": "Pokémon envenenados pelos movimentos deste Pokémon também ficarão confusos."
}
}
2 changes: 1 addition & 1 deletion src/locales/pt_BR/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Aura Wheel",
"effect": "Morpeko ataca e aumenta sua Velocidade com a energia armazenada em suas bochechas. O tipo deste movimento muda dependendo da forma do usuário."
"effect": "O usuário ataca e aumenta sua Velocidade com a energia armazenada em suas bochechas. Se usado por Morpeko, o tipo deste movimento muda dependendo da forma do usuário."
},
"breakingSwipe": {
"name": "Breaking Swipe",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh_CN/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "毒傀儡",
"description": "因桃歹郎的招式而陷入中毒状态的\n对手同时也会陷入混乱状态。"
"description": "因桃歹郎的招式而陷入中毒状态的\n对手同时也会陷入混乱状态。//TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 1 addition & 1 deletion src/locales/zh_CN/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "气场轮",
"effect": "用储存在颊囊里的能量进行攻击,\n并提高自己的速度。其属性会随着\n莫鲁贝可的样子而改变"
"effect": "用储存在颊囊里的能量进行攻击,\n并提高自己的速度。其属性会随着\n莫鲁贝可的样子而改变 //TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
},
"breakingSwipe": {
"name": "广域破坏",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh_TW/ability.json
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "毒傀儡",
"description": "因為桃歹郎的招式而陷入中\n毒狀態的對手同時也會陷入\n混亂狀態。"
"description": "因為桃歹郎的招式而陷入中\n毒狀態的對手同時也會陷入\n混亂狀態。//TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 1 addition & 1 deletion src/locales/zh_TW/move.json
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "氣場輪",
"effect": "用儲存在頰囊裏的能量進行\n攻擊,並提高自己的速度。\n其屬性會隨着莫魯貝可的樣\n子而改變"
"effect": "用儲存在頰囊裏的能量進行\n攻擊,並提高自己的速度。\n其屬性會隨着莫魯貝可的樣\n子而改變 //TODO"
Adri1 marked this conversation as resolved.
Show resolved Hide resolved
},
"breakingSwipe": {
"name": "廣域破壞",
Expand Down
Loading