incremental-social/The-Modding-Tree
incremental-social/The-Modding-Tree
Template
1
0
Fork 0
mirror of https://github.com/Acamaeda/The-Modding-Tree.git synced 2024-11-22 00:21:32 +00:00
Code Issues Releases Activity Actions

More treeless work

Browse source
This commit is contained in:
Acamaeda 2020-10-29 14:57:42 -04:00
parent eebc05db1f
commit 7c895952bf
7 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.md
View file

@ -3,6 +3,7 @@
- You can now embed a layer inside of a subtab or microtab! - You can now embed a layer inside of a subtab or microtab!
- Added support for hiding the tree tab (although some aspects are still lazy and WIP) - Added support for hiding the tree tab (although some aspects are still lazy and WIP)
- Added shouldNotify to subtab/microtab buttons. (You can make them highlighted) - Added shouldNotify to subtab/microtab buttons. (You can make them highlighted)
- Added commas to large exponents.
- NaN is now handled more intelligently. - NaN is now handled more intelligently.
- Thank you to thepaperpilot for fixing errors in docs and the infobox appearance! - Thank you to thepaperpilot for fixing errors in docs and the infobox appearance!

4
demo.html
View file

@ -98,7 +98,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div id="treeOverlay" class="treeOverlay" v-if="player.tab!='gameEnded'" onscroll="resizeCanvas()" v-bind:class="{ fullWidth: (player.tab == 'none' || player.navTab == 'none'), col: (player.tab !== 'none' && player.navTab !== 'none'), left: (player.tab !== 'none' && player.navTab !== 'none')}"> <div id="treeOverlay" class="treeOverlay" onscroll="resizeCanvas()" v-bind:class="{ fullWidth: (player.tab == 'none' || player.navTab == 'none'), col: (player.tab !== 'none' && player.navTab !== 'none'), left: (player.tab !== 'none' && player.navTab !== 'none')}">
<div id="version" class="overlayThing" style="margin-right: 13px">{{VERSION.withoutName}}</div> <div id="version" class="overlayThing" style="margin-right: 13px">{{VERSION.withoutName}}</div>
<img id="optionWheel" class="overlayThing" v-if="player.tab!='options'" src="options_wheel.png" onclick="showTab('options')"></img> <img id="optionWheel" class="overlayThing" v-if="player.tab!='options'" src="options_wheel.png" onclick="showTab('options')"></img>
<div id="info" v-if="player.tab!='info'" class="overlayThing" onclick="showTab('info')"><br>i</div> <div id="info" v-if="player.tab!='info'" class="overlayThing" onclick="showTab('info')"><br>i</div>
@ -110,7 +110,7 @@
<li><a class="link" href="http://discord.gg/wwQfgPa" target="_blank" v-bind:style="{'font-size': '16px'}">Main Prestige Tree server</a></li> <li><a class="link" href="http://discord.gg/wwQfgPa" target="_blank" v-bind:style="{'font-size': '16px'}">Main Prestige Tree server</a></li>
</ul> </ul>
</div> </div>
<div class="overlayThing" style="padding-bottom:7px; width: 90%"> <div class="overlayThing" v-if="player.tab!='gameEnded' && !(player.navTab == 'none' && (player.tab=='options' || player.tab=='info'))" style="padding-bottom:7px; width: 90%">
<span v-if="player.devSpeed && player.devSpeed != 1" class="overlayThing"> <span v-if="player.devSpeed && player.devSpeed != 1" class="overlayThing">
<br>Dev Speed: {{format(player.devSpeed)}}x<br> <br>Dev Speed: {{format(player.devSpeed)}}x<br>
</span> </span>

4
docs/subtabs-and-microtabs.md
View file

@ -7,9 +7,11 @@ Subtabs are defined by using the tab format like this, where each element of tab
```js ```js
tabFormat: { tabFormat: {
"Main tab": { "Main tab": {
content: [tab format things],
*subtab features* *subtab features*
}, },
"Other tab": { "Other tab": {
content: [tab format things],
*subtab features* *subtab features*
}, },
etc etc
@ -22,9 +24,11 @@ Microtabs are defined similarly, and use the same features, but are defined in t
microtabs: { microtabs: {
stuff: { stuff: {
first: { first: {
content: [tab format things],
*subtab features* *subtab features*
}, },
second: { second: {
content: [tab format things],
*subtab features* *subtab features*
} }
}, },

17
index.html
View file

@ -6,6 +6,7 @@
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script> <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
<script type="text/javascript" src="js/break_eternity.js"></script> <script type="text/javascript" src="js/break_eternity.js"></script>
<script type="text/javascript" src="js/layerSupport.js"></script> <script type="text/javascript" src="js/layerSupport.js"></script>
<script type="text/javascript" src="js/tree.js"></script>
<script type="text/javascript" src="js/layers.js"></script> <script type="text/javascript" src="js/layers.js"></script>
<script type="text/javascript" src="js/mod.js"></script> <script type="text/javascript" src="js/mod.js"></script>
<script type="text/javascript" src="js/temp.js"></script> <script type="text/javascript" src="js/temp.js"></script>
@ -17,6 +18,8 @@
</head> </head>
<body onload="load()"> <body onload="load()">
<div id="app"> <div id="app">
<canvas id="treeCanvas" class="canvas"></canvas>
<div v-if="false" id="loadingSection" class="fullWidth"> <div v-if="false" id="loadingSection" class="fullWidth">
<h1>Loading... (If this takes too long it means there was a serious error!)</h1> <h1>Loading... (If this takes too long it means there was a serious error!)</h1>
</div> </div>
@ -95,7 +98,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div id="treeOverlay" class="treeOverlay" v-if="player.tab!='gameEnded'" onscroll="resizeCanvas()" v-bind:class="{ fullWidth: (player.tab == 'none' || player.navTab == 'none'), col: (player.tab !== 'none' && player.navTab !== 'none'), left: (player.tab !== 'none' && player.navTab !== 'none')}"> <div id="treeOverlay" class="treeOverlay" onscroll="resizeCanvas()" v-bind:class="{ fullWidth: (player.tab == 'none' || player.navTab == 'none'), col: (player.tab !== 'none' && player.navTab !== 'none'), left: (player.tab !== 'none' && player.navTab !== 'none')}">
<div id="version" class="overlayThing" style="margin-right: 13px">{{VERSION.withoutName}}</div> <div id="version" class="overlayThing" style="margin-right: 13px">{{VERSION.withoutName}}</div>
<img id="optionWheel" class="overlayThing" v-if="player.tab!='options'" src="options_wheel.png" onclick="showTab('options')"></img> <img id="optionWheel" class="overlayThing" v-if="player.tab!='options'" src="options_wheel.png" onclick="showTab('options')"></img>
<div id="info" v-if="player.tab!='info'" class="overlayThing" onclick="showTab('info')"><br>i</div> <div id="info" v-if="player.tab!='info'" class="overlayThing" onclick="showTab('info')"><br>i</div>
@ -107,7 +110,7 @@
<li><a class="link" href="http://discord.gg/wwQfgPa" target="_blank" v-bind:style="{'font-size': '16px'}">Main Prestige Tree server</a></li> <li><a class="link" href="http://discord.gg/wwQfgPa" target="_blank" v-bind:style="{'font-size': '16px'}">Main Prestige Tree server</a></li>
</ul> </ul>
</div> </div>
<div class="overlayThing" style="padding-bottom:7px; width: 90%"> <div class="overlayThing" v-if="player.tab!='gameEnded' && !(player.navTab == 'none' && (player.tab=='options' || player.tab=='info'))" style="padding-bottom:7px; width: 90%">
<span v-if="player.devSpeed && player.devSpeed != 1" class="overlayThing"> <span v-if="player.devSpeed && player.devSpeed != 1" class="overlayThing">
<br>Dev Speed: {{format(player.devSpeed)}}x<br> <br>Dev Speed: {{format(player.devSpeed)}}x<br>
</span> </span>
@ -126,7 +129,7 @@
<div v-for="thing in tmp.displayThings" class="overlayThing"><span v-if="thing" v-html="thing"></span></div> <div v-for="thing in tmp.displayThings" class="overlayThing"><span v-if="thing" v-html="thing"></span></div>
</div> </div>
<div class="sideLayers" > <div class="sideLayers" >
<div v-for="node in OTHER_LAYERS['side']"><layer-node :layer='node.layer' :abb='tmp[node.layer].symbol' :size="'small'"></layer-node></div> <div v-for="node in OTHER_LAYERS['side']"><layer-node :layer='node' :abb='tmp[node].symbol' :size="'small'"></layer-node></div>
</div> </div>
</div> </div>
@ -151,13 +154,7 @@
<span v-if="canGenPoints()" class="overlayThing">({{format(getPointGen())}}/sec)</span> <span v-if="canGenPoints()" class="overlayThing">({{format(getPointGen())}}/sec)</span>
<div v-for="thing in tmp.displayThings" class="overlayThing"><span v-if="thing" v-html="thing"></span></div> <div v-for="thing in tmp.displayThings" class="overlayThing"><span v-if="thing" v-html="thing"></span></div>
</div> </div>
<span v-for="(n, row) in (maxRow + 1)"><table> <tree :data="(layoutInfo.treeLayout ? layoutInfo.treeLayout : TREE_LAYERS)"></tree>
<td v-for="node in TREE_LAYERS[row]">
<layer-node :layer='node.layer' :abb='tmp[node.layer].symbol'></layer-node>
</td>
<table><button class="treeNode hidden"></button></table>
</span>
<canvas id="treeCanvas" class="canvas"></canvas>
</div> </div>
<div v-for="layer in LAYERS" > <div v-for="layer in LAYERS" >
<div v-if="player.navTab == 'none'" id="fakeHead" style="visibility: hidden;"> <div v-if="player.navTab == 'none'" id="fakeHead" style="visibility: hidden;">

2
js/mod.js
View file

@ -9,8 +9,6 @@ let modInfo = {
initialStartPoints: new Decimal (10), // Used for hard resets and new players initialStartPoints: new Decimal (10), // Used for hard resets and new players
offlineLimit: 1, // In hours offlineLimit: 1, // In hours
startTab: "none",
startNavTab: "tree",
} }
// Set your version in num and name // Set your version in num and name

15
js/tree.js Normal file
View file

@ -0,0 +1,15 @@
var layoutInfo = {
startTab: "none",
showTree: true,
treeLayout: ""
}
// A "ghost" layer which offsets other layers in the tree
addNode("spook", {
layerShown: "ghost",
},
)

11
js/utils.js
View file

@ -7,7 +7,8 @@ function exponentialFormat(num, precision) {
m = new Decimal(1) m = new Decimal(1)
e = e.add(1) e = e.add(1)
} }
return m.toStringWithDecimalPlaces(precision)+"e"+e.toStringWithDecimalPlaces(0) e = (e.gte(10000) ? commaFormat(e, 0) : e.toStringWithDecimalPlaces(0))
return m.toStringWithDecimalPlaces(precision)+"e"+e
} }
function commaFormat(num, precision) { function commaFormat(num, precision) {
@ -61,7 +62,9 @@ function formatWhole(decimal) {
function formatTime(s) { function formatTime(s) {
if (s<60) return format(s)+"s" if (s<60) return format(s)+"s"
else if (s<3600) return formatWhole(Math.floor(s/60))+"m "+format(s%60)+"s" else if (s<3600) return formatWhole(Math.floor(s/60))+"m "+format(s%60)+"s"
else return formatWhole(Math.floor(s/3600))+"h "+formatWhole(Math.floor(s/60)%60)+"m "+format(s%60)+"s" else if (s<86400) return formatWhole(Math.floor(s/3600))+"h "+formatWhole(Math.floor(s/60)%60)+"m "+format(s%60)+"s"
else if (s<31536000) return formatWhole(Math.floor(s/84600)%365)+"d " + formatWhole(Math.floor(s/3600)%24)+"h "+formatWhole(Math.floor(s/60)%60)+"m "+format(s%60)+"s"
else return formatWhole(Math.floor(s/31536000))+"y "+formatWhole(Math.floor(s/84600)%365)+"d " + formatWhole(Math.floor(s/3600)%24)+"h "+formatWhole(Math.floor(s/60)%60)+"m "+format(s%60)+"s"
} }
function toPlaces(x, precision, maxAccepted) { function toPlaces(x, precision, maxAccepted) {
@ -80,8 +83,8 @@ function save() {
function startPlayerBase() { function startPlayerBase() {
return { return {
tab: modInfo.startTab, tab: layoutInfo.startTab,
navTab: modInfo.startNavTab, navTab: (layoutInfo.showTree ? "tree" : "none"),
time: Date.now(), time: Date.now(),
autosave: true, autosave: true,
notify: {}, notify: {},