From ff08c2b0e8912eea6b2f4243f82475a8f5b15126 Mon Sep 17 00:00:00 2001 From: Acamaeda Date: Sat, 24 Oct 2020 20:45:50 -0400 Subject: [PATCH] aaaa --- changelog.md | 103 +++++++++++++++++++++++++++ demo.html | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 84 ++++++++++++++++++++++ js/v.js | 162 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 543 insertions(+) create mode 100644 demo.html diff --git a/changelog.md b/changelog.md index 759012c..541349c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,107 @@ +<<<<<<< Updated upstream #The Modding Tree changelog: +======= +# The Modding Tree changelog: + +- Fixed the "blank" component breaking if only specifying the height. +- Fixed some numbers not displaying with enough digits. +- Made a few more things able to be functions. + +### v2.1.3.1 - 10/21/20 +- Fixed the update function. + +### v2.1.3 - 10/21/20 +- gainMult and gainExp are now optional. +- Layer unlocking is now kept on reset. +- Game should start up faster. +- Layer updates now have a determined order and starts with earlier-rowed layers. +- Automation now has a determined order and starts with later-rowed layers. +- Fixed issues with resetting clickables and challenges. +- Commas should no longer appear in the decimal places of a number. +- Fixed potential issue in displaying the tree. + +### v2.1.2 - 10/19/20 +- Added buyUpgrade function (buyUpg still works though) +- Added author name to modInfo. +- Fix to crash caused when the name of a subtab or microtab is changed. +- Fixes to outdated information in docs. +- Improvements to Discord links. +- Thank you to thepaperpilot for contributing to this update! + +### v2.1.1 - 10/17/20 +- Added resource-display component, which displays the base currency for the prestige layer, as well as the best + and/or total of this layer's prestige currency. +- Fixed the value for the base currency not updating in resource-display. + +## v2.1: We should have thought of this sooner! - 10/17/20 +- Moved most of the code users will want to edit to mod.js, added documentation for it. + - Specifically, modInfo, VERSION, canGenPoints, getPointGen, and maxTickLength +- Added getStartPoints() +- Added the ability to store non-layer-related data +- Added the ability to display more things at the top of the tree tab below points. +- Made the endgame condition customizable +- Added "sell one" and "sell all" buttons for buyables. +- Moved the old "game" to demo.js, and replaced it with a minimal game that won't cause issues when edited. +- Fixed issues with version number +- Fixed number formatting issue making things like "10e9" appear. + + +### v2.0.5 - 10/16/20 +- Made more features (including prestige parameters) able to be dynamic. +- Layer nodes can be hidden but still take up space with "ghost" visibility +- Added clickableEffect for real. +- Fixed some visual issues with bars. +- A few other minor tweaks and improvements. + +### v2.0.4 - 10/16/20 +- Fixed HTML on buttons interfering with clicking on them. + +### v2.0.3 - 10/16/20 +- Fixed hotkeys not displaying in info. +- Fixed the game supressing all external hotkeys. +- You can use more things as currencies for upgrade costs and challenge goals using currencyLocation. +- Added maxTickLength, which can be used to prevent offline time or tab-switching from breaking time-limit based mechanics. +- Made buyable respec buttons and clickable "master" buttons their own components, and gave them a hide/show feature. +- Added a general "tooltip" feature for achievements. + +### v2.0.2 - 10/15/20 +- Branches are now dynamic (they can be functions). +- Fixed a crash related to offline time. +- Fixed links being too wide. + +### v2.0.1 - 10/15/20 +- Fixed side layers appearing multiple times. + +## v2.0: The Pinnacle of Achievement Mountain - 10/15/20 +- Added progress bars, which are highly customizable and can be horizontal or vertical! +- Added "side layers", displayed smaller and off to the side, and don't get reset by default. + They can be used for global achievements and statistics. Speaking of which... +- Added achievements! +- Added clickables, a more generalized variant of buyables. +- Almost every value in layer data can be either a function or a constant value! +- Added support for multiple completions of challenges. +- Added "none" prestige type, which removes the need for any other prestige-related features. +- The points display and other gui elements stay at the top of the screen when the tree scrolls. +- Added getter/setter functions for the amounts and effects of most Big Features +- Moved modInfo to game.js, added a spot in modInfo for a Discord link, changelog link. + Also added a separate mod version from the TMT version in VERSION. +- Tree structure is based on layer data, no index.html editing is needed. +- Tmp does not need to be manually updated. +- You don't have to have the same amount of upgrades in every row (and challs and buyables) +- "unlocked" is optional for all Big Components (defaults to true). +- All displays will update correctly. +- Changelog is no longer in index.html at all. +- Generation of Points now happens in the main game loop +- Changed the reset functions to make keeping things easier +- Renamed many things to increase readability (see the list in the link below) +- Improved documentation based on feedback + + [For a full list of changes to the format and functionality of existing things, click here.](2.0-format-changes.md) + + + +### v1.3.5: +>>>>>>> Stashed changes ##v1.3.5 diff --git a/demo.html b/demo.html new file mode 100644 index 0000000..2bc5614 --- /dev/null +++ b/demo.html @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + +
+
+

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...


+

Please check the Discord to see if there are new content updates!



+
It took you {{formatTime(player.timePlayed)}} to beat the game.
+
Make sure that you record the time in your stream or else your speedrun won't count!
+
+      +


+ {{modInfo.discordName}}
 + The Modding Tree Discord
+ Main Prestige Tree server
+

+ If you would like to speedrun this, press Play Again and record your attempt, then submit on the Discord Server in the channel #speedrun-submissions. +


+

Oh, you are still reading this?

+
+
+
+


+
+ +
+
+

{{modInfo.name}}

+
+

{{VERSION.withName}}

+ +
+ Made by {{modInfo.author}} + +
+ The Modding Tree {{TMT_VERSION.tmtNum}} by Acamaeda +
+ The Prestige Tree made by Jacorb and Aarex +
+ Original idea by papyrus (on discord) +

+ Changelog
+ {{modInfo.discordName}}
 + The Modding Tree Discord
+ Main Prestige Tree server
+
+ Note by Jacorb: If anyone wishes to make a mod of this game, that is perfectly fine with me, just make sure to name it something different (ex: Prestige Tree NG+) and to let me know on my discord. +

+ Time Played: {{ formatTime(player.timePlayed) }}

+

Hotkeys


+
{{key.description}} +
+
+
+ + + + + + + + + + + + + + + + + + + + +
+
+
+
{{VERSION.withoutName}}
+ +

i
+ +
+ +
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) +
+
+
+
+
+
+ + +
+



+ + + + +


+ + +
+
+
+


+
+ +
+ +
+ + +
+ +
+ + + + +

+
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+ diff --git a/index.html b/index.html index 0d98709..c02bdde 100644 --- a/index.html +++ b/index.html @@ -137,6 +137,7 @@ +<<<<<<< Updated upstream
{{VERSION.withoutName}}
@@ -147,6 +148,68 @@
Offline Time: {{formatTime(player.offTime.remain)}}
+======= +
+
{{VERSION.withoutName}}
+ +

i
+ +
+ +
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) +
+
+
+
+
+
+ + +
+



+ + + + +


+>>>>>>> Stashed changes
Reach {{formatWhole(ENDGAME)}} to beat the game!
@@ -171,6 +234,7 @@
+<<<<<<< Updated upstream



@@ -184,15 +248,35 @@
+======= +
+
+


+
+ +
+ +
+ + +
+ +>>>>>>> Stashed changes


+<<<<<<< Updated upstream
+======= +
+
+ +>>>>>>> Stashed changes
diff --git a/js/v.js b/js/v.js index d65adf7..375c3e5 100644 --- a/js/v.js +++ b/js/v.js @@ -118,10 +118,17 @@ function loadVue() { props: ['layer'], template: `
+<<<<<<< Updated upstream
+======= +
+
+ +
+>>>>>>> Stashed changes

@@ -132,12 +139,21 @@ function loadVue() { Vue.component('upgrade', { props: ['layer', 'data'], template: ` +<<<<<<< Updated upstream ` }) @@ -147,9 +163,15 @@ function loadVue() { template: `
+<<<<<<< Updated upstream +======= +
+
+>>>>>>> Stashed changes

@@ -160,10 +182,17 @@ function loadVue() { Vue.component('milestone', { props: ['layer', 'data'], template: ` +<<<<<<< Updated upstream



  +======= + +


+
+   +>>>>>>> Stashed changes ` }) @@ -203,11 +232,19 @@ function loadVue() { props: ['layer', 'data'], template: `
+<<<<<<< Updated upstream
+======= + +
+
+ +
+>>>>>>> Stashed changes
@@ -218,6 +255,7 @@ function loadVue() { Vue.component('buyable', { props: ['layer', 'data', 'size'], template: ` +<<<<<<< Updated upstream +
+ + +
+ ` + }) + + Vue.component('respec-button', { + props: ['layer', 'data'], + template: ` + + ` + }) + + // data = button size, in px + Vue.component('clickables', { + props: ['layer', 'data'], + template: ` +
+ +
+
+ +
+
+
+
+ ` + }) + + // data = id of clickable + Vue.component('clickable', { + props: ['layer', 'data', 'size'], + template: ` + ` }) +<<<<<<< Updated upstream +======= + Vue.component('master-button', { + props: ['layer', 'data'], + template: ` + + ` + }) + +>>>>>>> Stashed changes // data = button size, in px Vue.component('microtabs', { props: ['layer', 'data'], @@ -246,6 +344,70 @@ function loadVue() { }) +<<<<<<< Updated upstream +======= + // data = id of the bar + Vue.component('bar', { + props: ['layer', 'data'], + template: ` +
+
+ +
+
+
+
+
+ ` + }) + + + Vue.component('achievements', { + props: ['layer'], + template: ` +
+
+
+ +
+
+
+
+ ` + }) + + // data = id + Vue.component('achievement', { + props: ['layer', 'data'], + template: ` +
+


+
+ ` + }) + + + // These are for buyables, data is the id of the corresponding buyable + Vue.component('sell-one', { + props: ['layer', 'data'], + template: ` + + ` + }) + Vue.component('sell-all', { + props: ['layer', 'data'], + template: ` + + ` + }) + +>>>>>>> Stashed changes // NOT FOR USE IN STANDARD TAB FORMATTING Vue.component('tab-buttons', { props: ['layer', 'data', 'name'],