mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-26 17:29:30 +02:00
More changes
Removed two settings that aren't necessary (settings are bugged, and I don't know how to fix it ;-;) Re-added logging the wave seed
This commit is contained in:
parent
7b6664cc13
commit
23ed38f8c5
@ -433,7 +433,9 @@ export interface DRPD {
|
|||||||
*/
|
*/
|
||||||
waves: Wave[],
|
waves: Wave[],
|
||||||
/** The Pokemon that the player started with. Daily runs will have 3. @see PokeData */
|
/** The Pokemon that the player started with. Daily runs will have 3. @see PokeData */
|
||||||
starters?: PokeData[]
|
starters?: PokeData[],
|
||||||
|
/** The RNG seed of the run. */
|
||||||
|
seed?: string
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Imports a string as a DRPD.
|
* Imports a string as a DRPD.
|
||||||
@ -479,6 +481,7 @@ export function printDRPD(inData: string, indent: string, drpd: DRPD): string {
|
|||||||
inData += indent + "{"
|
inData += indent + "{"
|
||||||
inData += "\n" + indent + " \"version\": \"" + drpd.version + "\""
|
inData += "\n" + indent + " \"version\": \"" + drpd.version + "\""
|
||||||
inData += ",\n" + indent + " \"title\": \"" + drpd.title + "\""
|
inData += ",\n" + indent + " \"title\": \"" + drpd.title + "\""
|
||||||
|
inData += ",\n" + indent + " \"seed\": \"" + drpd.seed + "\""
|
||||||
inData += ",\n" + indent + " \"authors\": [\"" + drpd.authors.join("\", \"") + "\"]"
|
inData += ",\n" + indent + " \"authors\": [\"" + drpd.authors.join("\", \"") + "\"]"
|
||||||
inData += ",\n" + indent + " \"date\": \"" + drpd.date + "\""
|
inData += ",\n" + indent + " \"date\": \"" + drpd.date + "\""
|
||||||
inData += ",\n" + indent + " \"label\": \"" + drpd.label + "\""
|
inData += ",\n" + indent + " \"label\": \"" + drpd.label + "\""
|
||||||
@ -1668,6 +1671,7 @@ export function logPokemon(scene: BattleScene, floor: integer = undefined, slot:
|
|||||||
//wv.actions = []
|
//wv.actions = []
|
||||||
wv.clearActionsFlag = false;
|
wv.clearActionsFlag = false;
|
||||||
wv.shop = ""
|
wv.shop = ""
|
||||||
|
drpd.seed = scene.seed
|
||||||
console.log("--> ", drpd)
|
console.log("--> ", drpd)
|
||||||
localStorage.setItem(getLogID(scene), JSON.stringify(drpd))
|
localStorage.setItem(getLogID(scene), JSON.stringify(drpd))
|
||||||
}
|
}
|
||||||
|
@ -593,6 +593,7 @@ export class TitlePhase extends Phase {
|
|||||||
var lastsave = this.getLastSave(); // Gets the last save you played
|
var lastsave = this.getLastSave(); // Gets the last save you played
|
||||||
var ls1 = this.getLastSave(false, true)
|
var ls1 = this.getLastSave(false, true)
|
||||||
var ls2 = this.getLastSavesOfEach()
|
var ls2 = this.getLastSavesOfEach()
|
||||||
|
this.scene.quickloadDisplayMode = "Both"
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case (this.scene.quickloadDisplayMode == "Daily" && this.getLastSave(false, true) != undefined):
|
case (this.scene.quickloadDisplayMode == "Daily" && this.getLastSave(false, true) != undefined):
|
||||||
options.push({
|
options.push({
|
||||||
|
@ -177,19 +177,6 @@ export const Setting: Array<Setting> = [
|
|||||||
default: 0,
|
default: 0,
|
||||||
type: SettingType.GENERAL,
|
type: SettingType.GENERAL,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: SettingKeys.LazyReloads,
|
|
||||||
label: "Lazy Reloads",
|
|
||||||
options: [{
|
|
||||||
label: "Off",
|
|
||||||
value: "Off"
|
|
||||||
}, {
|
|
||||||
label: "On",
|
|
||||||
value: "On"
|
|
||||||
}],
|
|
||||||
default: 0,
|
|
||||||
type: SettingType.GENERAL,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
key: SettingKeys.FancyBiome,
|
key: SettingKeys.FancyBiome,
|
||||||
label: "Fancy Title Screen",
|
label: "Fancy Title Screen",
|
||||||
@ -203,28 +190,6 @@ export const Setting: Array<Setting> = [
|
|||||||
default: 0,
|
default: 0,
|
||||||
type: SettingType.GENERAL,
|
type: SettingType.GENERAL,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: SettingKeys.TitleScreenContinueMode,
|
|
||||||
label: "Quick Load",
|
|
||||||
options: [{
|
|
||||||
label: "Off",
|
|
||||||
value: "Off" // Shows "Continue" button on the home screen
|
|
||||||
}, {
|
|
||||||
label: "Daily",
|
|
||||||
value: "Daily" // Shows the last played Daily Run, or the last run if there are no Daily Runs
|
|
||||||
}, {
|
|
||||||
label: "Dailies",
|
|
||||||
value: "Dailies" // Shows all Daily Runs, or the last run if there are no Daily Runs
|
|
||||||
}, {
|
|
||||||
label: "Latest",
|
|
||||||
value: "Latest" // Shows the last run
|
|
||||||
}, {
|
|
||||||
label: "Both",
|
|
||||||
value: "Both" // Shows the last run and the last Daily Run, or only the last played game if it is a Daily Run
|
|
||||||
}],
|
|
||||||
default: 1,
|
|
||||||
type: SettingType.GENERAL,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
key: SettingKeys.DailyShinyLuck,
|
key: SettingKeys.DailyShinyLuck,
|
||||||
label: "Daily Shiny Luck",
|
label: "Daily Shiny Luck",
|
||||||
@ -388,7 +353,7 @@ export const Setting: Array<Setting> = [
|
|||||||
{
|
{
|
||||||
key: SettingKeys.Window_Type,
|
key: SettingKeys.Window_Type,
|
||||||
label: i18next.t("settings:windowType"),
|
label: i18next.t("settings:windowType"),
|
||||||
options: new Array(5).fill(null).map((_, i) => {
|
options: new Array(6).fill(null).map((_, i) => {
|
||||||
const windowType = (i + 1).toString();
|
const windowType = (i + 1).toString();
|
||||||
return {
|
return {
|
||||||
value: windowType,
|
value: windowType,
|
||||||
|
@ -1009,7 +1009,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
|||||||
ease: "Sine.easeInOut",
|
ease: "Sine.easeInOut",
|
||||||
alpha: visible && this.iconsActive ? 0 : (this.lastStatus == 0 ? 0 : 1)
|
alpha: visible && this.iconsActive ? 0 : (this.lastStatus == 0 ? 0 : 1)
|
||||||
});
|
});
|
||||||
console.log(this.iconsActive, this.lastStatus, this.statusIndicator.visible, this.statusIndicator.alpha)
|
//console.log(this.iconsActive, this.lastStatus, this.statusIndicator.visible, this.statusIndicator.alpha)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user