Added subtabs, fixed some issues

js/game.js

@@ -5,39 +5,8 @@ var NaNalert = false;
 var gameEnded = false;
 
 let VERSION = {
-	num: "1.2.4",
-	name: "This changes everything!"
-}
-
-function startPlayerBase() {
-	return {
-		tab: "tree",
-		time: Date.now(),
-		autosave: true,
-		notify: {},
-		msDisplay: "always",
-		offlineProd: true,
-		versionType: "Modding",
-		version: VERSION.num,
-		beta: VERSION.beta,
-		timePlayed: 0,
-		keepGoing: false,
-		hasNaN: false,
-		points: new Decimal(10),
-	}
-}
-
-function getStartPlayer() {
-	playerdata = startPlayerBase()
-	for (layer in layers){
-		playerdata[layer] = layers[layer].startData()
-		playerdata[layer].buyables = getStartBuyables(layer)
-		playerdata[layer].spentOnBuyables = new Decimal(0)
-		playerdata[layer].upgrades = []
-		playerdata[layer].milestones = []
-		playerdata[layer].challs = []
-	}
-	return playerdata
+	num: "1.3",
+	name: "Finally some real progress!"
 }
 
 function getPointGen() {

js/layers.js

@@ -172,23 +172,28 @@ addLayer("c", {
         incr_order: [], // Array of layer names to have their order increased when this one is first unlocked
 
         // Optional, lets you format the tab yourself by listing components. You can create your own components in v.js.
-        tabFormat: ["main-display",
-                    ["prestige-button", function() {return "Melt your points into "}],
-                    ["blank", "5px"], // Height
-                    ["raw-html", function() {return "<button onclick='console.log(`yeet`)'>'HI'</button>"}],
-                    ["display-text",
-                        function() {return 'I have ' + format(player.points) + ' pointy points!'},
-                        {"color": "red", "font-size": "32px", "font-family": "Comic Sans MS"}],
-                    ["buyables", "150px"],
-                    ["row", [
-                        ["toggle", ["c", "beep"]], ["blank", ["30px", "10px"]], // Width, height
-                        ["display-text", function() {return "Beep"}], "blank",
-                        ["column", [
-                            ["prestige-button", function() {return "Be redundant for "}, {'width': '150px', 'height': '30px'}],
-                            ["prestige-button", function() {return "Be redundant for "}, {'width': '150px', 'height': '30px'}],
-                        ]],
-                    ]],
-                    "milestones", "blank", "upgrades", "challs"],
+        tabFormat: {
+            main: 
+                ["main-display",
+                ["prestige-button", function() {return "Melt your points into "}],
+                ["blank", "5px"], // Height
+                ["raw-html", function() {return "<button onclick='console.log(`yeet`)'>'HI'</button>"}],
+                ["display-text",
+                    function() {return 'I have ' + format(player.points) + ' pointy points!'},
+                    {"color": "red", "font-size": "32px", "font-family": "Comic Sans MS"}],
+                "milestones", "blank", "upgrades", "challs"],
+            thingies: [
+                ["buyables", "150px"], "blank",
+                ["row", [
+                    ["toggle", ["c", "beep"]], ["blank", ["30px", "10px"]], // Width, height
+                    ["display-text", function() {return "Beep"}], "blank",
+                    ["column", [
+                        ["prestige-button", function() {return "Be redundant for "}, {'width': '150px', 'height': '30px'}],
+                        ["prestige-button", function() {return "Be redundant for "}, {'width': '150px', 'height': '30px'}],
+                ]],
+            ]],
+],
+        },
         style() {return {
             'background-color': '#3325CC'
         }},

js/utils.js

@@ -56,6 +56,40 @@ function save() {
 	localStorage.setItem(modInfo.id, btoa(JSON.stringify(player)))
 }
 
+function startPlayerBase() {
+	return {
+		tab: "tree",
+		time: Date.now(),
+		autosave: true,
+		notify: {},
+		msDisplay: "always",
+		offlineProd: true,
+		versionType: "Modding",
+		version: VERSION.num,
+		beta: VERSION.beta,
+		timePlayed: 0,
+		keepGoing: false,
+		hasNaN: false,
+		points: new Decimal(10),
+	}
+}
+
+function getStartPlayer() {
+	playerdata = startPlayerBase()
+	for (layer in layers){
+		playerdata[layer] = layers[layer].startData()
+		playerdata[layer].buyables = getStartBuyables(layer)
+		playerdata[layer].spentOnBuyables = new Decimal(0)
+		playerdata[layer].upgrades = []
+		playerdata[layer].milestones = []
+		playerdata[layer].challs = []
+		if (layers[layer].tabFormat && !Array.isArray(layers[layer].tabFormat))
+			playerdata[layer].subtab = Object.keys(layers[layer].tabFormat)[0]
+
+	}
+	return playerdata
+}
+
 function fixSave() {
 	defaultData = startPlayerBase()
 	for (datum in defaultData){
@@ -89,6 +123,9 @@ function fixSave() {
 					player[layer].buyables[id] = new Decimal(0)
 			}
 		}
+		
+		if (player[layer].subtab == undefined && layers[layer].tabFormat && !Array.isArray(layers[layer].tabFormat))
+			player[layer].subtab = Object.keys(layers[layer].tabFormat)[0]
 	}
 }
 
@@ -145,12 +182,12 @@ function versionCheck() {
 	let setVersion = true
 	
 	if (player.versionType===undefined||player.version===undefined) {
-		player.versionType = "Modding"
+		player.versionType = modInfo.id
 		player.version = 0
 	}
 	
 	if (setVersion) {
-		if (player.versionType == "Modding" && VERSION.num > player.version) player.keepGoing = false
+		if (player.versionType == modInfo.id && VERSION.num > player.version) player.keepGoing = false
 		player.versionType = getStartPlayer().versionType
 		player.version = VERSION.num
 		player.beta = VERSION.beta