mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-20 06:19:29 +02:00
Candy friendship changes
Update default value for friendship gain from battle and adjust Soothe Bell tier to Great
This commit is contained in:
parent
c86b6352bc
commit
38b2174b1f
@ -4,9 +4,9 @@ export const POKERUS_STARTER_COUNT = 5;
|
|||||||
|
|
||||||
// #region Friendship constants
|
// #region Friendship constants
|
||||||
export const CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER = 2;
|
export const CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER = 2;
|
||||||
export const FRIENDSHIP_GAIN_FROM_BATTLE = 2;
|
export const FRIENDSHIP_GAIN_FROM_BATTLE = 4;
|
||||||
export const FRIENDSHIP_GAIN_FROM_RARE_CANDY = 5;
|
export const FRIENDSHIP_GAIN_FROM_RARE_CANDY = 5;
|
||||||
export const FRIENDSHIP_LOSS_FROM_FAINT = 10;
|
export const FRIENDSHIP_LOSS_FROM_FAINT = 5;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function to get the cumulative friendship threshold at which a candy is earned
|
* Function to get the cumulative friendship threshold at which a candy is earned
|
||||||
@ -16,19 +16,19 @@ export const FRIENDSHIP_LOSS_FROM_FAINT = 10;
|
|||||||
export function getStarterValueFriendshipCap(starterCost: number): number {
|
export function getStarterValueFriendshipCap(starterCost: number): number {
|
||||||
switch (starterCost) {
|
switch (starterCost) {
|
||||||
case 1:
|
case 1:
|
||||||
return 20;
|
return 25;
|
||||||
case 2:
|
case 2:
|
||||||
return 40;
|
return 50;
|
||||||
case 3:
|
case 3:
|
||||||
return 60;
|
return 75;
|
||||||
case 4:
|
case 4:
|
||||||
return 100;
|
return 100;
|
||||||
case 5:
|
case 5:
|
||||||
return 140;
|
return 150;
|
||||||
case 6:
|
case 6:
|
||||||
return 200;
|
return 200;
|
||||||
case 7:
|
case 7:
|
||||||
return 280;
|
return 300;
|
||||||
case 8:
|
case 8:
|
||||||
case 9:
|
case 9:
|
||||||
return 450;
|
return 450;
|
||||||
|
@ -1702,7 +1702,8 @@ const modifierPool: ModifierPool = {
|
|||||||
new WeightedModifierType(modifierTypes.EVOLUTION_ITEM, (party: Pokemon[]) => {
|
new WeightedModifierType(modifierTypes.EVOLUTION_ITEM, (party: Pokemon[]) => {
|
||||||
return Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 15), 8);
|
return Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 15), 8);
|
||||||
}, 8),
|
}, 8),
|
||||||
new WeightedModifierType(modifierTypes.MAP, (party: Pokemon[]) => party[0].scene.gameMode.isClassic && party[0].scene.currentBattle.waveIndex < 180 ? 1 : 0, 1),
|
new WeightedModifierType(modifierTypes.MAP, (party: Pokemon[]) => party[0].scene.gameMode.isClassic && party[0].scene.currentBattle.waveIndex < 180 ? 1 : 0, 2),
|
||||||
|
new WeightedModifierType(modifierTypes.SOOTHE_BELL, 3),
|
||||||
new WeightedModifierType(modifierTypes.TM_GREAT, 3),
|
new WeightedModifierType(modifierTypes.TM_GREAT, 3),
|
||||||
new WeightedModifierType(modifierTypes.MEMORY_MUSHROOM, (party: Pokemon[]) => {
|
new WeightedModifierType(modifierTypes.MEMORY_MUSHROOM, (party: Pokemon[]) => {
|
||||||
if (!party.find(p => p.getLearnableLevelMoves().length)) {
|
if (!party.find(p => p.getLearnableLevelMoves().length)) {
|
||||||
@ -1794,7 +1795,7 @@ const modifierPool: ModifierPool = {
|
|||||||
new WeightedModifierType(modifierTypes.SOUL_DEW, 7),
|
new WeightedModifierType(modifierTypes.SOUL_DEW, 7),
|
||||||
//new WeightedModifierType(modifierTypes.OVAL_CHARM, 6),
|
//new WeightedModifierType(modifierTypes.OVAL_CHARM, 6),
|
||||||
new WeightedModifierType(modifierTypes.CATCHING_CHARM, (party: Pokemon[]) => !party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.getSpeciesCount(d => !!d.caughtAttr) > 100 ? 4 : 0, 4),
|
new WeightedModifierType(modifierTypes.CATCHING_CHARM, (party: Pokemon[]) => !party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.getSpeciesCount(d => !!d.caughtAttr) > 100 ? 4 : 0, 4),
|
||||||
new WeightedModifierType(modifierTypes.SOOTHE_BELL, 4),
|
// new WeightedModifierType(modifierTypes.SOOTHE_BELL, 4),
|
||||||
new WeightedModifierType(modifierTypes.ABILITY_CHARM, skipInClassicAfterWave(189, 6)),
|
new WeightedModifierType(modifierTypes.ABILITY_CHARM, skipInClassicAfterWave(189, 6)),
|
||||||
new WeightedModifierType(modifierTypes.FOCUS_BAND, 5),
|
new WeightedModifierType(modifierTypes.FOCUS_BAND, 5),
|
||||||
new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
|
new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
|
||||||
|
Loading…
Reference in New Issue
Block a user