From b9f3b5958dd5235adc455025bbae0c7d7de1ec06 Mon Sep 17 00:00:00 2001
From: Jacorb90 <39597610+Jacorb90@users.noreply.github.com>
Date: Wed, 26 Aug 2020 18:42:19 -0400
Subject: [PATCH] Beta v1.1 Alpha 7
---
index.html | 135 ++++++++++++++++++++++++++++-------------------------
js/game.js | 37 ++++++++++-----
2 files changed, 96 insertions(+), 76 deletions(-)
diff --git a/index.html b/index.html
index 5c5c3a7..a45f6de 100644
--- a/index.html
+++ b/index.html
@@ -16,39 +16,62 @@
-
Pre-Alpha Build 4
+
Beta v1.1 Alpha 7
- - Implemented/balanced all row 1 & 2 prestige layers
- - Added the options/info menus
- - Balanced the row 3 prestige layers up to 1e560 points
+ - Reversed the order of the changelog
+ - Added the fourth Hindrance
+ - Balanced up to 50,000 Hindrance Spirit & Quirks
+
+
Beta v1.1 Alpha 6
+
+ - Various bugfixes
+ - Added the third Hindrance
+ - Balanced up to 2,500 Hindrance Spirit & Quirks
-
Alpha Build 4
+
Beta v1.1 Alpha 5
- - Implemented Auto-Boosters & Auto-Generators
- - Fixed a balancing issue with a certain prestige tree path (1e660 -> 1e600)
- - Added changelog
- - Balanced up to 1e700 with all prestige tree paths
+ - Add the second Hindrance
+ - Balanced up to 200 Hindrance Spirit & Quirks
-
Alpha Build 5
+
Beta v1.1 Alpha 4
- - Balanced up to 1e920 with all prestige tree paths (before unlocking third row 3 layer)
+ - Add the first Hindrance
+ - Implemented some new milestones
+ - Balanced up to 60 Hindrance Spirit & Quirks
-
Alpha Build 6
+
Beta v1.1 Alpha 3
- - Made font work for Mac users
- - Added 1 new Space & Time milestone each
- - Balanced up to 1e3,375 points
+ - Fixed corruption bug
+ - Implemented some new milestones
+ - Balanced up to 15 Hindrance Spirit & 15 Quirks
-
Alpha Build 7
+
Beta v1.1 Alpha 2
- - Made the new upgrades from Alpha Build 6 shown at proper times
- - Balanced up to 1e4,175 points
- - Setup a temp variable system (to prevent lag later on)
+ - Implemented some new milestones
+ - Balanced up to 5 Hindrance Spirit & 5 Quirks
-
Alpha Build 8
+
Beta v1.1 Alpha 1
- - Implemented Super-Boosters
- - Balanced up to 1e25,600 points
+ - Add the framework for the first two row 4 layers
+ - Balanced up to the second row 4 reset
+
+
Beta v1.01
+
+ - Display Generator Power in the Space tab
+ - Add a credits page in the info tab
+ - Implemented a few minor QoL/visual fixes
+
+
Beta v1.0
+
+ - Made sure any built-in saves had Auto-Save turned on
+ - Fixed a visual bug for mobile users
+ - Added a "time played" display in the info tab
+ - Implemented a NaN check system
+
+
Alpha Build 10
+
+ - Rebalanced the Super-Booster era (now up to 1e9,250 points)
+ - Implemented a game version variable
Alpha Build 9
@@ -58,57 +81,40 @@
- Fixed a bug with hotkeys
- Balanced up to 1e46,500 points
-
Alpha Build 10
+
Alpha Build 8
- - Rebalanced the Super-Booster era (now up to 1e9,250 points)
- - Implemented a game version variable
+ - Implemented Super-Boosters
+ - Balanced up to 1e25,600 points
-
Beta v1.0
+
Alpha Build 7
- - Made sure any built-in saves had Auto-Save turned on
- - Fixed a visual bug for mobile users
- - Added a "time played" display in the info tab
- - Implemented a NaN check system
+ - Made the new upgrades from Alpha Build 6 shown at proper times
+ - Balanced up to 1e4,175 points
+ - Setup a temp variable system (to prevent lag later on)
-
Beta v1.01
+
Alpha Build 6
- - Display Generator Power in the Space tab
- - Add a credits page in the info tab
- - Implemented a few minor QoL/visual fixes
+ - Made font work for Mac users
+ - Added 1 new Space & Time milestone each
+ - Balanced up to 1e3,375 points
-
Beta v1.1 Alpha 1
+
Alpha Build 5
- - Add the framework for the first two row 4 layers
- - Balanced up to the second row 4 reset
-
-
Beta v1.1 Alpha 2
+
Balanced up to 1e920 with all prestige tree paths (before unlocking third row 3 layer)
+
+
Alpha Build 4
- - Implemented some new milestones
- - Balanced up to 5 Hindrance Spirit & 5 Quirks
-
-
Beta v1.1 Alpha 3
+
Implemented Auto-Boosters & Auto-Generators
+
Fixed a balancing issue with a certain prestige tree path (1e660 -> 1e600)
+
Added changelog
+
Balanced up to 1e700 with all prestige tree paths
+
+
Pre-Alpha Build 4
- - Fixed corruption bug
- - Implemented some new milestones
- - Balanced up to 15 Hindrance Spirit & 15 Quirks
-
-
Beta v1.1 Alpha 4
-
- - Add the first Hindrance
- - Implemented some new milestones
- - Balanced up to 60 Hindrance Spirit & Quirks
-
-
Beta v1.1 Alpha 5
-
- - Add the second Hindrance
- - Balanced up to 200 Hindrance Spirit & Quirks
-
-
Beta v1.1 Alpha 6
-
- - Various bugfixes
- - Added the third Hindrance
- - Balanced up to 2,500 Hindrance Spirit & Quirks
-
+
Implemented/balanced all row 1 & 2 prestige layers
+
Added the options/info menus
+
Balanced the row 3 prestige layers up to 1e560 points
+
@@ -246,6 +252,7 @@
10 Hindrance Spirit Keep Prestige & Super-Booster Upgrades on all fourth row resets |
15 Hindrance Spirit Automatically purchase Super-Boosters |
25 Hindrance Spirit Time resets reset nothing |
+ 2,500 Hindrance Spirit Super-Boosters reset nothing |
diff --git a/js/game.js b/js/game.js
index b71559c..6a3ea65 100644
--- a/js/game.js
+++ b/js/game.js
@@ -186,10 +186,10 @@ const LAYER_EFFS = {
},
g: function() { return Decimal.pow(Decimal.add(2, tmp.atgb), player.g.points).sub(1).times(getGenPowerGainMult()) },
t: function() { return {
- gain: Decimal.pow(3, player.t.points.plus(player.t.extCapsules.plus(tmp.freeExtCap))).sub(1).times(getTimeEnergyGainMult()),
- limit: Decimal.pow(2, player.t.points.plus(player.t.extCapsules.plus(tmp.freeExtCap))).sub(1).times(100).times(getTimeEnergyLimitMult()),
+ gain: Decimal.pow(3, player.t.points.plus(player.t.extCapsules.plus(tmp.freeExtCap).times(getFreeExtPow()))).sub(1).times(getTimeEnergyGainMult()),
+ limit: Decimal.pow(2, player.t.points.plus(player.t.extCapsules.plus(tmp.freeExtCap).times(getFreeExtPow()))).sub(1).times(100).times(getTimeEnergyLimitMult()),
}},
- sb: function() { return Decimal.pow(1.5, player.sb.points.times(getSuperBoosterPow())) },
+ sb: function() { return Decimal.pow(Decimal.add(1.5, addToSBBase()), player.sb.points.times(getSuperBoosterPow())) },
h: function() {
let ret = player.h.points.plus(1).times(player.points.times(player.h.points).plus(1).log10().plus(1).log10().plus(1)).log10().times(5).root(player.q.upgrades.includes(12)?1.25:2);
if (ret.gte(100)) ret = ret.log10().times(50).min(ret);
@@ -702,8 +702,8 @@ const LAYER_UPGS = {
effDisp: function(x) { return format(x.q)+"x to Quirk gain, "+format(x.h)+"x to Hindrance Spirit gain" },
},
23: {
- desc: "Unlock a built-in Better TPT (placeholder).",
- cost: new Decimal(1/0),
+ desc: "The Time Energy limit is 1e10x higher.",
+ cost: new Decimal(5000),
unl: function() { return player.q.upgrades.includes(21)||player.q.upgrades.includes(22) },
},
},
@@ -1205,7 +1205,7 @@ function doReset(layer, force=false) {
}
if ((layer=="b"&&player.t.best.gte(12))||(layer=="g"&&player.s.best.gte(12))) return;
- if ((layer=="t"&&player.h.best.gte(25))||(layer=="s"&&player.q.best.gte(25))) return;
+ if ((layer=="t"&&player.h.best.gte(25))||(layer=="s"&&player.q.best.gte(25))||(layer=="sb"&&player.h.best.gte(2500))) return;
let row = LAYER_ROW[layer]
if (row==0) rowReset(0, layer)
else for (let x=row;x>=1;x--) rowReset(x, layer)
@@ -1316,6 +1316,7 @@ function resetRow(row) {
}
function getEnhancerPow() {
+ if (tmp.hcActive ? tmp.hcActive[22] : true) return new Decimal(0);
let pow = new Decimal(1)
if (player.e.upgrades.includes(25)&&!(tmp.hcActive?tmp.hcActive[12]:true)) pow = pow.times(LAYER_UPGS.e[25].currently())
if (player.e.upgrades.includes(31)&&!(tmp.hcActive?tmp.hcActive[12]:true)) pow = pow.times(LAYER_UPGS.e[31].currently())
@@ -1363,6 +1364,12 @@ function getFreeExtCapsules() {
return amt
}
+function getFreeExtPow() {
+ if (tmp.hcActive ? tmp.hcActive[22] : true) return new Decimal(0)
+ let pow = new Decimal(1)
+ return pow
+}
+
function getTimeEnergyEff() {
if (!player.t.unl) return new Decimal(1)
let exp = 1.2
@@ -1389,6 +1396,7 @@ function getTimeEnergyLimitMult() {
if (player.t.upgrades.includes(22)&&!(tmp.hcActive?tmp.hcActive[12]:true)) mult = mult.times(LAYER_UPGS.t[22].currently())
if (player.t.upgrades.includes(23)&&!(tmp.hcActive?tmp.hcActive[12]:true)) mult = mult.times(LAYER_UPGS.t[23].currently())
if (player.t.upgrades.includes(34)&&!(tmp.hcActive?tmp.hcActive[12]:true)) mult = mult.times(LAYER_UPGS.t[34].currently())
+ if (player.q.upgrades.includes(23)) mult = mult.times(1e10)
return mult;
}
@@ -1436,6 +1444,7 @@ function getSpaceBuildingCost(x) {
function getSpaceBuildingPow() {
if (!player.s.unl) return new Decimal(0)
+ if (tmp.hcActive ? tmp.hcActive[22] : true) return new Decimal(0)
let pow = new Decimal(1)
if (player.s.upgrades.includes(21)&&!(tmp.hcActive?tmp.hcActive[12]:true)) pow = pow.times(LAYER_UPGS.s[21].currently())
if (player.s.upgrades.includes(22)&&!(tmp.hcActive?tmp.hcActive[12]:true)) pow = pow.times(LAYER_UPGS.s[22].currently())
@@ -1535,6 +1544,12 @@ function getSuperBoosterPow() {
return pow;
}
+function addToSBBase() {
+ let toAdd = new Decimal(0)
+ if (player.h.challs.includes(22)) toAdd = toAdd.plus(0.25)
+ return toAdd
+}
+
function getQuirkLayerCost() {
let cost = Decimal.pow(2, Decimal.pow(2, player.q.layers)).sub(1)
return cost.max(1);
@@ -1601,13 +1616,11 @@ const H_CHALLS = {
effDisp: function(x) { return format(x)+"x cheaper" },
},
22: {
- name: "Placeholder 420",
- desc: "Egg does nothing",
+ name: "Impaired Nodes",
+ desc: "Enhancers, Extra Time Capsules, and Space Buildings do nothing.",
unl: function() { return player.h.challs.includes(12) },
- goal: new Decimal(1/0),
- reward: "Egg Poggers boost Egg generation",
- currently: function() { return new Decimal(6.969e69) },
- effDisp: function(x) { return format(x)+"x" },
+ goal: new Decimal("1e4600"),
+ reward: "Add 0.25 to the Super-Booster base.",
},
}