From 66494e4ce20a636a5fe637c8626fc148fdc1fa06 Mon Sep 17 00:00:00 2001 From: Acamaeda Date: Fri, 30 Oct 2020 13:27:23 -0400 Subject: [PATCH] Rearranged files --- demo.html | 49 ++++------ js/{v.js => components.js} | 136 ++------------------------- js/systemComponents.js | 0 js/{ => technical}/break_eternity.js | 0 js/{ => technical}/canvas.js | 0 js/{ => technical}/layerSupport.js | 0 js/technical/systemComponents.js | 130 +++++++++++++++++++++++++ js/{ => technical}/temp.js | 0 js/utils.js | 1 + 9 files changed, 154 insertions(+), 162 deletions(-) rename js/{v.js => components.js} (78%) delete mode 100644 js/systemComponents.js rename js/{ => technical}/break_eternity.js (100%) rename js/{ => technical}/canvas.js (100%) rename js/{ => technical}/layerSupport.js (100%) create mode 100644 js/technical/systemComponents.js rename js/{ => technical}/temp.js (100%) diff --git a/demo.html b/demo.html index e7cb3c4..df95e84 100644 --- a/demo.html +++ b/demo.html @@ -4,16 +4,17 @@ - - + + - + - - + + + @@ -23,8 +24,8 @@

Loading... (If this takes too long it means there was a serious error!)

-
-
+
+

{{modInfo.name}} {{VERSION.withoutName}}



Congratulations! You have reached the end and beaten this game, but for now...


@@ -110,42 +111,26 @@
  • Main Prestige Tree server
    • - +
    -
    +




    - + +
    -
    - - -
    - +
    +
    +
    + +
    diff --git a/js/v.js b/js/components.js similarity index 78% rename from js/v.js rename to js/components.js index 3eab530..ad8b1d7 100644 --- a/js/v.js +++ b/js/components.js @@ -396,137 +396,13 @@ function loadVue() { ` }) - // NOT FOR USE IN STANDARD TAB FORMATTING - Vue.component('tab-buttons', { - props: ['layer', 'data', 'name'], - template: ` -
    -
    - -
    -
    - ` - }) + // SYSTEM COMPONENTS - Vue.component('button-node', { - props: ['layer', 'abb', 'size'], - template: ` - - ` - }) - - Vue.component('layer-node', { - props: ['layer', 'abb', 'size'], - template: ` - - ` - }) - - Vue.component('layer-tab', { - props: ['layer', 'back', 'spacing'], - template: `
    -
    -
    -
    - - -
    - -
    - - -
    - -
    - - - - -

    -
    -
    -
    - -
    -
    -
    - -
    - - -
    -
    - ` - }) - - Vue.component('overlay-head', { - template: ` -
    - -
    Dev Speed: {{format(player.devSpeed)}}x
    -     - -
    Offline Time: {{formatTime(player.offTime.remain)}}
    -     - -
    Reach {{formatWhole(ENDGAME)}} to beat the game!
    -     -
    - You have -

    {{format(player.points)}}

    - {{modInfo.pointsName}} -
    - ({{format(getPointGen())}}/sec) -
    -
    - ` - }) - - + Vue.component('tab-buttons', systemComponents['tab-buttons']) + Vue.component('button-node', systemComponents['button-node']) + Vue.component('layer-node', systemComponents['layer-node']) + Vue.component('layer-tab', systemComponents['layer-tab']) + Vue.component('overlay-head', systemComponents['overlay-head']) app = new Vue({ diff --git a/js/systemComponents.js b/js/systemComponents.js deleted file mode 100644 index e69de29..0000000 diff --git a/js/break_eternity.js b/js/technical/break_eternity.js similarity index 100% rename from js/break_eternity.js rename to js/technical/break_eternity.js diff --git a/js/canvas.js b/js/technical/canvas.js similarity index 100% rename from js/canvas.js rename to js/technical/canvas.js diff --git a/js/layerSupport.js b/js/technical/layerSupport.js similarity index 100% rename from js/layerSupport.js rename to js/technical/layerSupport.js diff --git a/js/technical/systemComponents.js b/js/technical/systemComponents.js new file mode 100644 index 0000000..1b8072a --- /dev/null +++ b/js/technical/systemComponents.js @@ -0,0 +1,130 @@ +var systemComponents = { + 'tab-buttons': { + props: ['layer', 'data', 'name'], + template: ` +
    +
    + +
    +
    + ` + }, + + 'button-node': { + props: ['layer', 'abb', 'size'], + template: ` + + ` + }, + + 'layer-node': { + props: ['layer', 'abb', 'size'], + template: ` + + ` + }, + + 'layer-tab': { + props: ['layer', 'back', 'spacing'], + template: `
    +
    +
    +
    + + +
    + +
    + + +
    + +
    + + + + +

    +
    +
    +
    + +
    +
    +
    + +
    + + +
    +
    + ` + }, + + 'overlay-head': { + template: ` +
    + +
    Dev Speed: {{format(player.devSpeed)}}x
    +     + +
    Offline Time: {{formatTime(player.offTime.remain)}}
    +     + +
    Reach {{formatWhole(ENDGAME)}} to beat the game!
    +     +
    + You have +

    {{format(player.points)}}

    + {{modInfo.pointsName}} +
    + ({{format(getPointGen())}}/sec) +
    +
    + ` + }, +} \ No newline at end of file diff --git a/js/temp.js b/js/technical/temp.js similarity index 100% rename from js/temp.js rename to js/technical/temp.js diff --git a/js/utils.js b/js/utils.js index 58bc3e8..acd826e 100644 --- a/js/utils.js +++ b/js/utils.js @@ -100,6 +100,7 @@ function startPlayerBase() { showStory: true, points: modInfo.initialStartPoints, subtabs: {}, + gameEnded:false } }