mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-21 14:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict resolve

Browse Source
This commit is contained in:
muscode13 2024-10-07 17:02:34 -06:00
parent ac7751973d
commit fc89850e07
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales

@ -1 +1 @@
Subproject commit b44ee2173788018ffd5dc6b7b7fa159be5b9d514 Subproject commit 3ccef8472dd7cc7c362538489954cb8fdad27e5f

4
src/data/move.ts
View File

@ -2237,7 +2237,7 @@ export class RemoveHeldItemAttr extends MoveEffectAttr {
// Decrease item amount and update icon // Decrease item amount and update icon
!--removedItem.stackCount; !--removedItem.stackCount;
target.scene.updateModifiers(target.isPlayer()); target.scene.updateModifiers(target.isPlayer());
target.turnData.itemsLost+=1; target.turnData.itemsLost += 1;
if (this.berriesOnly) { if (this.berriesOnly) {
user.scene.queueMessage(i18next.t("moveTriggers:incineratedItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: removedItem.type.name })); user.scene.queueMessage(i18next.t("moveTriggers:incineratedItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: removedItem.type.name }));
@ -2352,7 +2352,7 @@ export class StealEatBerryAttr extends EatBerryAttr {
} }
// if the target has berries, pick a random berry and steal it // if the target has berries, pick a random berry and steal it
this.chosenBerry = heldBerries[user.randSeedInt(heldBerries.length)]; this.chosenBerry = heldBerries[user.randSeedInt(heldBerries.length)];
target.turnData.itemsLost+=1; target.turnData.itemsLost += 1;
const message = i18next.t("battle:stealEatBerry", { pokemonName: user.name, targetName: target.name, berryName: this.chosenBerry.type.name }); const message = i18next.t("battle:stealEatBerry", { pokemonName: user.name, targetName: target.name, berryName: this.chosenBerry.type.name });
user.scene.queueMessage(message); user.scene.queueMessage(message);
this.reduceBerryModifier(target); this.reduceBerryModifier(target);

2
src/field/pokemon.ts
View File

@ -939,7 +939,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
ret >>= 1; ret >>= 1;
} }
if (this.getTag(BattlerTagType.UNBURDEN)) { if (this.getTag(BattlerTagType.UNBURDEN)) {
ret *=2; ret *= 2;
} }
break; break;
} }