1
0
Fork 0
mirror of https://github.com/Acamaeda/The-Modding-Tree.git synced 2025-05-12 04:51:06 +00:00

Fixed everything with branches

This commit is contained in:
Harley White 2021-06-02 18:51:33 -04:00
parent 95046d9299
commit 10e3c429a8
9 changed files with 30 additions and 11 deletions

View file

@ -7,7 +7,6 @@ function retrieveCanvasData() {
let treeCanv = document.getElementById("treeCanvas")
let treeTab = document.getElementById("treeTab")
if (treeCanv===undefined||treeCanv===null) return false;
if (treeTab===undefined||treeTab===null) return false;
canvas = treeCanv;
ctx = canvas.getContext("2d");
return true;
@ -52,7 +51,6 @@ function drawTree() {
function drawTreeBranch(num1, data) { // taken from Antimatter Dimensions & adjusted slightly
let num2 = data
let color_id = 1
if (Array.isArray(data)){
num2 = data[0]
color_id = data[1]

View file

@ -51,7 +51,6 @@ function achievementStyle(layer, id){
function updateWidth() {
let screenWidth = window.innerWidth
let last = tmp.other.splitScreen
let splitScreen = screenWidth >= 1024
if (player.forceOneTab) splitScreen = false
if (player.navTab == "none") splitScreen = true
@ -60,7 +59,6 @@ function updateWidth() {
tmp.other.splitScreen = splitScreen
tmp.other.lastPoints = player.points
if (last !== tmp.other.splitScreen) needCanvasUpdate = true
}
function updateOomps(diff)

View file

@ -66,7 +66,7 @@ var systemComponents = {
'layer-tab': {
props: ['layer', 'back', 'spacing', 'embedded'],
template: `<div v-bind:style="[tmp[layer].style ? tmp[layer].style : {}, (tmp[layer].tabFormat && !Array.isArray(tmp[layer].tabFormat)) ? tmp[layer].tabFormat[player.subtabs[layer].mainTabs].style : {}]">
template: `<div v-bind:style="[tmp[layer].style ? tmp[layer].style : {}, (tmp[layer].tabFormat && !Array.isArray(tmp[layer].tabFormat)) ? tmp[layer].tabFormat[player.subtabs[layer].mainTabs].style : {}, {'background-color': 'transparent !important', '--background': 'transparent !important'}]">
<div v-if="back"><button v-bind:class="back == 'big' ? 'other-back' : 'back'" v-on:click="goBack(layer)"></button></div>
<div v-if="!tmp[layer].tabFormat">
<div v-if="spacing" v-bind:style="{'height': spacing}" :key="this.$vnode.key + '-spacing'"></div>
@ -136,8 +136,6 @@ var systemComponents = {
The Modding Tree <a v-bind:href="'https://github.com/Acamaeda/The-Modding-Tree/blob/master/changelog.md'" target="_blank" class="link" v-bind:style = "{'font-size': '14px', 'display': 'inline'}" >{{TMT_VERSION.tmtNum}}</a> by Acamaeda
<br>
The Prestige Tree made by Jacorb and Aarex
<br>
Original idea by papyrus (on discord)
<br><br>
<div class="link" onclick="showTab('changelog-tab')">Changelog</div><br>
<span v-if="modInfo.discordLink"><a class="link" v-bind:href="modInfo.discordLink" target="_blank">{{modInfo.discordName}}</a><br></span>
@ -211,5 +209,11 @@ var systemComponents = {
`
},
'bg': {
props: ['layer'],
template: `<div class ="bg" v-bind:style="[tmp[layer].style ? tmp[layer].style : {}, (tmp[layer].tabFormat && !Array.isArray(tmp[layer].tabFormat)) ? tmp[layer].tabFormat[player.subtabs[layer].mainTabs].style : {}]"></div>
`
}
}