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

Revert "Added setting"

Browse Source 
This reverts commit 2d3bff06af.
This commit is contained in:
RedstonewolfX 2024-07-24 12:10:13 -04:00
parent 2d3bff06af
commit 334bf371cf
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/battle-scene.ts
View File

@ -130,7 +130,6 @@ export default class BattleScene extends SceneBase {
public disableDailyShinies: boolean = true; // Disables shiny luck in Daily Runs to prevent affecting RNG
public quickloadDisplayMode: string = "Dailies";
public chaosmode: boolean = false;
public simpleShop: boolean = false;
/**
* Determines the condition for a notification should be shown for Candy Upgrades
* - 0 = 'Off'

24
src/modifier/modifier-type.ts
View File

@ -2055,37 +2055,37 @@ export function getPlayerShopModifierTypeOptionsForWave(scene: BattleScene, wave
// Assemble the shop by removing items that would just be a waste of money
// HP Restore
if (!scene.simpleShop || maxdmg > 0) // If any Pokemon has taken any damage, add Potion
if (maxdmg > 0) // If any Pokemon has taken any damage, add Potion
options[0].push(new ModifierTypeOption(modifierTypes.POTION(), 0, baseCost * 0.2))
if (!scene.simpleShop || maxdmg >= 20 || maxdmg_percent >= 0.1) // If Potion isn't enough, add Super Potion
if (maxdmg >= 20 || maxdmg_percent >= 0.1) // If Potion isn't enough, add Super Potion
options[1].push(new ModifierTypeOption(modifierTypes.SUPER_POTION(), 0, baseCost * 0.45))
if (!scene.simpleShop || maxdmg >= 50 || maxdmg_percent >= 0.2) // If Super Potion isn't enough, add Hyper Potion
if (maxdmg >= 50 || maxdmg_percent >= 0.2) // If Super Potion isn't enough, add Hyper Potion
options[3].push(new ModifierTypeOption(modifierTypes.HYPER_POTION(), 0, baseCost * 0.8))
if (!scene.simpleShop || maxdmg >= 200 || maxdmg_percent >= 0.5) // If Hyper Potion isn't enough, add Max Potion
if (maxdmg >= 200 || maxdmg_percent >= 0.5) // If Hyper Potion isn't enough, add Max Potion
options[4].push(new ModifierTypeOption(modifierTypes.MAX_POTION(), 0, baseCost * 1.5))
// Status Restore
if (!scene.simpleShop || (maxdmg >= 200 || maxdmg_percent >= 0.5) && hasStatus) // If Hyper Potion isn't enough, and you have a status condition, add Full Restore
if ((maxdmg >= 200 || maxdmg_percent >= 0.5) && hasStatus) // If Hyper Potion isn't enough, and you have a status condition, add Full Restore
options[5].push(new ModifierTypeOption(modifierTypes.FULL_RESTORE(), 0, baseCost * 2.25))
if (!scene.simpleShop || hasStatus) // If you have a status condition, add Full Heal
if (hasStatus) // If you have a status condition, add Full Heal
options[1].push(new ModifierTypeOption(modifierTypes.FULL_HEAL(), 0, baseCost))
// PP Restore
if (!scene.simpleShop || hasPPUsed) // If you have used any PP (you probably have), add Ether
if (hasPPUsed) // If you have used any PP (you probably have), add Ether
options[0].push(new ModifierTypeOption(modifierTypes.ETHER(), 0, baseCost * 0.4))
if (!scene.simpleShop || hasPPUsedOver10) // If you used at least 10 PP, add Max Ether
if (hasPPUsedOver10) // If you used at least 10 PP, add Max Ether
options[2].push(new ModifierTypeOption(modifierTypes.MAX_ETHER(), 0, baseCost))
if (!scene.simpleShop || hasPPUsedMulti) // If you have used PP from multiple moves, add Elexir
if (hasPPUsedMulti) // If you have used PP from multiple moves, add Elexir
options[2].push(new ModifierTypeOption(modifierTypes.ELIXIR(), 0, baseCost))
if (!scene.simpleShop || hasPPUsedOver10 && hasPPUsedMulti) // If you have used multiple moves' PP, and have used more than 10 in at least one, add Max Elexir
if (hasPPUsedOver10 && hasPPUsedMulti) // If you have used multiple moves' PP, and have used more than 10 in at least one, add Max Elexir
options[4].push(new ModifierTypeOption(modifierTypes.MAX_ELIXIR(), 0, baseCost * 2.5))
// Revives
if (!scene.simpleShop || hasFainted) { // If a Pokemon has fainted, add Revive and Max Revive
if (hasFainted) { // If a Pokemon has fainted, add Revive and Max Revive
options[0].push(new ModifierTypeOption(modifierTypes.REVIVE(), 0, baseCost * 2))
options[3].push(new ModifierTypeOption(modifierTypes.MAX_REVIVE(), 0, baseCost * 2.75))
}
if (!scene.simpleShop || multiFainted) // If multiple Pokemon are fainted, add Sacred Ash
if (multiFainted) // If multiple Pokemon are fainted, add Sacred Ash
options[6].push(new ModifierTypeOption(modifierTypes.SACRED_ASH(), 0, baseCost * 10))
return options.slice(0, Math.ceil(Math.max(waveIndex + 10, 0) / 30)).flat();
}

13
src/system/settings/settings.ts
View File

@ -106,8 +106,7 @@ export const SettingKeys = {
ShowAutosaves: "SHOW_AUTOSAVES",
TitleScreenContinueMode: "TITLE_SCREEN_QUICKLOAD",
BiomePanels: "BIOME_PANELS",
DailyShinyLuck: "DAILY_LUCK",
SimpleShop: "SIMPLE_SHOP"
DailyShinyLuck: "DAILY_LUCK"
};
/**
@ -218,13 +217,6 @@ export const Setting: Array<Setting> = [
default: 1,
type: SettingType.GENERAL,
},
{
key: SettingKeys.SimpleShop,
label: "Simple Shop",
options: OFF_ON,
default: 0,
type: SettingType.GENERAL
},
{
key: SettingKeys.DailyShinyLuck,
label: "Daily Shiny Luck",
@ -752,9 +744,6 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
scene.disableDailyShinies = Setting[index].options[value].value == "Off"
case SettingKeys.TitleScreenContinueMode:
scene.quickloadDisplayMode = Setting[index].options[value].value;
case SettingKeys.SimpleShop:
scene.simpleShop = Setting[index].options[value].value == "On";
break;
case SettingKeys.Skip_Seen_Dialogues:
scene.skipSeenDialogues = Setting[index].options[value].value === "On";
break;