diff --git a/js/data/achievements.js b/js/data/achievements.js index 47b0f01..d124619 100644 --- a/js/data/achievements.js +++ b/js/data/achievements.js @@ -129,8 +129,8 @@ addLayer("ach", { }, 53: { name: "A new prestige layer!", - done() { return player.p.points.gte(5000) }, - tooltip: "Reach 5000 PP." + done() { return player.sp.points.gte(5000) }, + tooltip: "Reach 5000 SPP." }, 54: { name: "Ok so that speeds things up", diff --git a/js/data/files.js b/js/data/files.js index 931567c..1dcea25 100644 --- a/js/data/files.js +++ b/js/data/files.js @@ -1,7 +1,7 @@ addLayer("f", { name: "files", // This is optional, only used in a few places, If absent it just uses the layer id. symbol: "🗎", // This appears on the layer's node. Default is the id with the first letter capitalized - position: 1, // Horizontal position within a row. By default it uses the layer id and sorts in alphabetical order + position: 2, // Horizontal position within a row. By default it uses the layer id and sorts in alphabetical order startData() { return { unlocked: false, points: new Decimal(0), @@ -15,8 +15,8 @@ addLayer("f", { return req }, // Can be a function that takes requirement increases into account resource: "files", // Name of prestige currency - baseResource: "progress points", // Name of resource prestige is based on - baseAmount() {return player.p.points}, // Get the current amount of baseResource + baseResource: "super progress points", // Name of resource prestige is based on + baseAmount() {return player.sp.points}, // Get the current amount of baseResource type: "static", // normal: cost to gain currency depends on amount gained. static: cost depends on how much you already have exponent: 1.3, // Prestige currency exponent base() { @@ -33,7 +33,8 @@ addLayer("f", { canBuyMax() { return hasMilestone(this.layer, 6) }, - row: 1, // Row the layer is in on the tree (0 is the first row) + row: 2, // Row the layer is in on the tree (0 is the first row) + displayRow: 0, hotkeys: [ {key: "f", description: "F: Reset for files", onPress(){if (canReset(this.layer)) doReset(this.layer)}}, ], @@ -192,7 +193,7 @@ addLayer("f", { filestones: { content: [ "main-display", - ["row", ["prestige-button", ["clickable", 11]]], + "prestige-button", "resource-display", "blank", "blank", diff --git a/js/data/integrals.js b/js/data/integrals.js index 8746e16..95bbe43 100644 --- a/js/data/integrals.js +++ b/js/data/integrals.js @@ -19,10 +19,19 @@ addLayer("i", { gainExp() { // Calculate the exponent on main currency from bonuses return new Decimal(1) }, - row: 2, // Row the layer is in on the tree (0 is the first row) + row: 3, // Row the layer is in on the tree (0 is the first row) + displayRow: 1, hotkeys: [ {key: "i", description: "I: reset for integrals", onPress(){if (canReset(this.layer)) doReset(this.layer)}}, ], + tabFormat: [ + "main-display", + "prestige-button", + "resource-display", + "blank", + "blank", + ["raw-html", "Coming Soon!"] + ], layerShown(){ return player.points.gte("1e25") || player[this.layer].unlocked }, - branches: ['sp', 'f'] + branches: ['p', 'sp', 'f'] }) diff --git a/js/data/super progress.js b/js/data/super progress.js index 7a54736..6a4cbed 100644 --- a/js/data/super progress.js +++ b/js/data/super progress.js @@ -1,7 +1,7 @@ addLayer("sp", { name: "super progress", // This is optional, only used in a few places, If absent it just uses the layer id. symbol: "‰", // This appears on the layer's node. Default is the id with the first letter capitalized - position: 0, // Horizontal position within a row. By default it uses the layer id and sorts in alphabetical order + position: 1, // Horizontal position within a row. By default it uses the layer id and sorts in alphabetical order startData() { return { unlocked: false, points: new Decimal(0) @@ -20,6 +20,7 @@ addLayer("sp", { return new Decimal(1) }, row: 1, // Row the layer is in on the tree (0 is the first row) + displayRow: 0, hotkeys: [ {key: "s", description: "S: Reset for super progress points", onPress(){if (canReset(this.layer)) doReset(this.layer)}}, ],