-
-
-
-
-
-
@@ -56,45 +50,13 @@ export default {
},
setMSDisplay(msDisplay) {
player.msDisplay = msDisplay;
- },
- save() {
- console.warn("Not yet implemented!");
- },
- hardReset() {
- console.warn("Not yet implemented!");
- },
- exportSave() {
- console.warn("Not yet implemented!");
- },
- importSave() {
- console.warn("Not yet implemented!");
}
}
};
diff --git a/src/components/system/Save.vue b/src/components/system/Save.vue
new file mode 100644
index 0000000..c539a85
--- /dev/null
+++ b/src/components/system/Save.vue
@@ -0,0 +1,171 @@
+
+
+
drag_handle
+
+
+ content_paste
+
+
+
+
+ delete
+
+
+
+
+
+
+
+
+
v{{ save.modVersion }}
+
Last played {{ dateFormat.format(time) }}
+
+
+
+
+
+ Error: Failed to load save with id {{ save.id }}
+
+
+
+
+
+
+
+
diff --git a/src/components/system/SavesManager.vue b/src/components/system/SavesManager.vue
new file mode 100644
index 0000000..8bc5bcd
--- /dev/null
+++ b/src/components/system/SavesManager.vue
@@ -0,0 +1,218 @@
+
+
+
+
Saves Manager
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/tree/Branches.vue b/src/components/tree/Branches.vue
index 9247c72..bac73d3 100644
--- a/src/components/tree/Branches.vue
+++ b/src/components/tree/Branches.vue
@@ -29,15 +29,9 @@ export default {
};
},
mounted() {
- this.$nextTick(() => {
- if (this.$refs.resizeListener == undefined) {
- this.mounted();
- } else {
- // ResizeListener exists because ResizeObserver's don't work when told to observe an SVG element
- this.resizeObserver.observe(this.$refs.resizeListener);
- this.updateNodes();
- }
- });
+ // ResizeListener exists because ResizeObserver's don't work when told to observe an SVG element
+ this.resizeObserver.observe(this.$refs.resizeListener);
+ this.updateNodes();
},
provide() {
return {
@@ -77,7 +71,7 @@ export default {
});
},
unregisterNode(id) {
- delete this.nodes[id];
+ Vue.delete(this.nodes, id);
},
registerBranch(start, options) {
const end = typeof options === 'string' ? options : options.target;
diff --git a/src/data/layers/aca/c.js b/src/data/layers/aca/c.js
index 68fd418..1a99884 100644
--- a/src/data/layers/aca/c.js
+++ b/src/data/layers/aca/c.js
@@ -311,7 +311,7 @@ export default {
Name your points!
-
+
I have {{ format(player.points) }} {{ player.c.thingy }} points!
diff --git a/src/data/mod.js b/src/data/mod.js
index 15b0fe9..b412ecc 100644
--- a/src/data/mod.js
+++ b/src/data/mod.js
@@ -54,7 +54,7 @@ const main = {
name: "Tree"
};
-export const initialLayers = [ main, f, c, a, g, h, spook ];
+export const getInitialLayers = () => [ main, f, c, a, g, h, spook ];
export function getStartingData() {
return {
@@ -80,7 +80,7 @@ export function update(delta) {
}
/* eslint-disable-next-line no-unused-vars */
-export function fixOldSave(oldVersion) {
+export function fixOldSave(oldVersion, playerData) {
}
document.title = modInfo.title;
diff --git a/src/data/modInfo.json b/src/data/modInfo.json
index e006906..8a6d164 100644
--- a/src/data/modInfo.json
+++ b/src/data/modInfo.json
@@ -2,7 +2,7 @@
"title": "The Modding Tree X",
"id": "tmt-x",
"author": "thepaperpilot",
- "discordName": "TMT-X",
+ "discordName": "The Paper Pilot Community",
"discordLink": "https://discord.gg/WzejVAx",
"versionNumber": "0.0",
diff --git a/src/main.css b/src/main.css
index acbbf35..ca0f002 100644
--- a/src/main.css
+++ b/src/main.css
@@ -48,6 +48,14 @@ a:hover,
-3px 0 12px var(--link);
}
+.button:disabled {
+ opacity: .5;
+ cursor: not-allowed;
+}
+.button:disabled:hover {
+ text-shadow: none;
+}
+
ul {
list-style-type: none;
}
diff --git a/src/main.js b/src/main.js
index f93c405..cc05adf 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import App from './App';
import store from './store';
-import { addLayer} from './store/layers';
+import { load } from './util/save';
import { setVue } from './util/vue';
import { startGameLoop } from './store/game';
import './components/index';
@@ -10,9 +10,7 @@ import './components/index';
Vue.config.productionTip = false;
requestAnimationFrame(async () => {
- // Add layers on second frame so dependencies can resolve
- const { initialLayers } = await import('./data/mod');
- initialLayers.forEach(addLayer);
+ await load();
// Create Vue
const vue = window.vue = new Vue({
diff --git a/src/store/index.js b/src/store/index.js
index 6a71852..b0d43c0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import Vuex from 'vuex'
-import { getInitialStore } from '../util/load';
+import { getInitialStore } from '../util/save';
import { getters } from '../data/mod';
Vue.use(Vuex);
diff --git a/src/store/layers.js b/src/store/layers.js
index cd7b995..22a83ef 100644
--- a/src/store/layers.js
+++ b/src/store/layers.js
@@ -1,3 +1,5 @@
+import Vue from 'vue';
+import clone from 'lodash.clonedeep';
import { isFunction, isPlainObject } from '../util/common';
import { createProxy, createGridProxy, player } from './proxies';
import Decimal from '../util/bignum';
@@ -21,13 +23,16 @@ export function addLayer(layer) {
return;
}
}
- if (layer.type === "static" && (layer.base == undefined || Decimal.lte(layer.base, 1))) {
- layer.base = 2;
- }
+
+ // Clone object to prevent modifying the original
+ layer = clone(layer);
// Set default property values
layer = Object.assign({}, defaultLayerProperties, layer);
layer.layer = layer.id;
+ if (layer.type === "static" && (layer.base == undefined || Decimal.lte(layer.base, 1))) {
+ layer.base = 2;
+ }
const getters = {};
@@ -149,6 +154,9 @@ export function addLayer(layer) {
if (layer.challenges[id].onExit != undefined) {
layer.challenges[id].onExit.forceCached = false;
}
+ layer.challenges[id].shown = function() {
+ return this.unlocked !== false && (player.hideChallenges === false || !this.maxed);
+ }
layer.challenges[id].completed = function() {
return !layer.deactivated && player[layer.id].challenges[id]?.gt(0);
}
@@ -411,7 +419,7 @@ export function removeLayer(layer) {
// Un-set hotkeys
if (layers[layer].hotkeys) {
for (let id in layers[layer].hotkeys) {
- delete hotkeys[id];
+ Vue.delete(hotkeys, id);
}
}
diff --git a/src/store/proxies.js b/src/store/proxies.js
index 2261101..bd9466c 100644
--- a/src/store/proxies.js
+++ b/src/store/proxies.js
@@ -57,6 +57,10 @@ const playerHandler = {
}
}
return true;
+ },
+ deleteProperty(target, prop) {
+ Vue.delete(target, prop);
+ return true;
}
};
export const player = window.player = new Proxy(store.state, playerHandler);
diff --git a/src/util/load.js b/src/util/load.js
deleted file mode 100644
index 115d477..0000000
--- a/src/util/load.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import modInfo from '../data/modInfo';
-import { getStartingData, initialLayers } from '../data/mod';
-import { getStartingBuyables, getStartingClickables, getStartingChallenges } from './layers';
-import Decimal from './bignum';
-
-export function getInitialStore() {
- return {
- tabs: modInfo.initialTabs.slice(),
- time: Date.now(),
- autosave: true,
- offlineProd: true,
- timePlayed: new Decimal(0),
- keepGoing: false,
- lastTenTicks: [],
- showTPS: true,
- msDisplay: "all",
- hideChallenges: false,
- theme: "paper",
- subtabs: {},
- minimized: {},
- ...getStartingData(),
- ...initialLayers.reduce((acc, layer) => {
- acc[layer.id] = {
- upgrades: [],
- achievements: [],
- milestones: [],
- infoboxes: {},
- buyables: getStartingBuyables(layer),
- clickables: getStartingClickables(layer),
- challenges: getStartingChallenges(layer),
- ...layer.startData?.()
- };
- return acc;
- }, {}),
-
- // Values that don't get saved
- hasNaN: false,
- NaNProperty: "",
- NaNReceiver: null,
- NaNPrevious: null
- }
-}
diff --git a/src/util/save.js b/src/util/save.js
new file mode 100644
index 0000000..97f29ea
--- /dev/null
+++ b/src/util/save.js
@@ -0,0 +1,169 @@
+import modInfo from '../data/modInfo';
+import { getStartingData, getInitialLayers, fixOldSave } from '../data/mod';
+import { getStartingBuyables, getStartingClickables, getStartingChallenges } from './layers';
+import { player } from '../store/proxies';
+import Decimal from './bignum';
+
+export const NOT_IMPORTING = false;
+export const IMPORTING = true;
+export const IMPORTING_FAILED = "FAILED";
+export const IMPORTING_WRONG_ID = "WRONG_ID";
+export const IMPORTING_FORCE = "FORCE";
+
+export function getInitialStore(playerData = {}) {
+ playerData = applyPlayerData({
+ id: `${modInfo.id}-0`,
+ name: "Default Save",
+ tabs: modInfo.initialTabs.slice(),
+ time: Date.now(),
+ autosave: true,
+ offlineProd: true,
+ timePlayed: new Decimal(0),
+ keepGoing: false,
+ lastTenTicks: [],
+ showTPS: true,
+ msDisplay: "all",
+ hideChallenges: false,
+ theme: "paper",
+ subtabs: {},
+ minimized: {},
+ modID: modInfo.id,
+ modVersion: modInfo.versionNumber,
+ ...getStartingData(),
+
+ // Values that don't get loaded/saved
+ hasNaN: false,
+ NaNProperty: "",
+ NaNReceiver: null,
+ NaNPrevious: null,
+ importing: NOT_IMPORTING,
+ saveToImport: "",
+ saveToExport: ""
+ }, playerData);
+
+ Object.assign(playerData, getInitialLayers(playerData).reduce((acc, layer) => {
+ acc[layer.id] = applyPlayerData({
+ upgrades: [],
+ achievements: [],
+ milestones: [],
+ infoboxes: {},
+ buyables: getStartingBuyables(layer),
+ clickables: getStartingClickables(layer),
+ challenges: getStartingChallenges(layer),
+ ...layer.startData?.()
+ }, playerData[layer.id]);
+ return acc;
+ }, {}));
+
+ return playerData;
+}
+
+export function save() {
+ /* eslint-disable-next-line no-unused-vars */
+ let { hasNaN, NaNProperty, NaNReceiver, NaNPrevious, importing, saveToImport, saveToExport, ...playerData } = player;
+ player.saveToExport = btoa(unescape(encodeURIComponent(JSON.stringify(playerData))));
+
+ localStorage.setItem(player.id, player.saveToExport);
+}
+
+export async function load() {
+ try {
+ let modData = localStorage.getItem(modInfo.id);
+ if (modData == null) {
+ await loadSave(newSave());
+ return;
+ }
+ modData = JSON.parse(decodeURIComponent(escape(atob(modData))));
+ if (modData?.active == null) {
+ await loadSave(newSave());
+ return;
+ }
+ const save = localStorage.getItem(modData.active);
+ const playerData = JSON.parse(decodeURIComponent(escape(atob(save))));
+ if (playerData.modID !== modInfo.id) {
+ await loadSave(newSave());
+ return;
+ }
+ await loadSave(playerData);
+ } catch (e) {
+ await loadSave(newSave());
+ }
+}
+
+export async function newSave() {
+ const id = getUniqueID();
+ const playerData = getInitialStore({ id });
+ localStorage.setItem(id, btoa(unescape(encodeURIComponent(JSON.stringify(playerData)))));
+
+ if (!localStorage.getItem(modInfo.id)) {
+ const modData = { active: id, saves: [ id ] };
+ localStorage.setItem(modInfo.id, btoa(unescape(encodeURIComponent(JSON.stringify(modData)))));
+ } else {
+ const modData = JSON.parse(decodeURIComponent(escape(atob(localStorage.getItem(modInfo.id)))));
+ modData.saves.push(id);
+ localStorage.setItem(modInfo.id, btoa(unescape(encodeURIComponent(JSON.stringify(modData)))));
+ }
+
+ return playerData;
+}
+
+export function getUniqueID() {
+ let id, i = 0;
+ do {
+ id = `${modInfo.id}-${i++}`;
+ } while (localStorage.getItem(id));
+ return id;
+}
+
+export async function loadSave(playerData) {
+ const { layers, removeLayer, addLayer } = await import('../store/layers');
+
+ for (let layer in layers) {
+ removeLayer(layer);
+ }
+ getInitialLayers(playerData).forEach(addLayer);
+
+ playerData = getInitialStore(playerData);
+ if (playerData.offlineProd) {
+ if (playerData.offTime === undefined)
+ playerData.offTime = { remain: 0 };
+ playerData.offTime.remain += (Date.now() - playerData.time) / 1000;
+ }
+ playerData.time = Date.now();
+ if (playerData.modVersion !== modInfo.versionNumber) {
+ fixOldSave(playerData.modVersion, playerData);
+ }
+
+ Object.assign(player, playerData);
+ for (let prop in player) {
+ if (!(prop in playerData)) {
+ delete player[prop];
+ }
+ }
+}
+
+function applyPlayerData(target, source) {
+ for (let prop in source) {
+ if (target[prop] == null) {
+ target[prop] = source[prop];
+ } else if (target[prop] instanceof Decimal) {
+ target[prop] = new Decimal(source[prop]);
+ } else if (Array.isArray(target[prop]) || typeof target[prop] === 'object') {
+ target[prop] = applyPlayerData(target[prop], source[prop]);
+ } else {
+ target[prop] = source[prop];
+ }
+ }
+ return target;
+}
+
+setInterval(() => {
+ if (player.autosave) {
+ save();
+ }
+}, 1000);
+window.onbeforeunload = () => {
+ if (player.autosave) {
+ save();
+ }
+};
diff --git a/vue.config.js b/vue.config.js
index a074770..7d30f61 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,4 @@
module.exports = {
- publicPath: process.env.NODE_ENV === 'production'
- ? '/The-Modding-Tree-X'
- : '/',
- runtimeCompiler: true
+ publicPath: process.env.NODE_ENV === 'production' ? '/The-Modding-Tree-X' : '/',
+ runtimeCompiler: true
};
