mirror of
https://github.com/Acamaeda/The-Modding-Tree.git
synced 2024-11-21 16:13:55 +00:00
More code cleanup
This commit is contained in:
Acamaeda
parent
945e21a4bd
commit
8e36404ad8
2 changed files with 125 additions and 122 deletions
|
|
@ -41,127 +41,7 @@ function updateLayers(){
|
||||||
TREE_LAYERS = {}
|
TREE_LAYERS = {}
|
||||||
OTHER_LAYERS = {}
|
OTHER_LAYERS = {}
|
||||||
for (layer in layers){
|
for (layer in layers){
|
||||||
layers[layer].layer = layer
|
setupLayer(layer)
|
||||||
if (layers[layer].upgrades){
|
|
||||||
for (thing in layers[layer].upgrades){
|
|
||||||
if (!isNaN(thing)){
|
|
||||||
layers[layer].upgrades[thing].id = thing
|
|
||||||
layers[layer].upgrades[thing].layer = layer
|
|
||||||
if (layers[layer].upgrades[thing].unlocked === undefined)
|
|
||||||
layers[layer].upgrades[thing].unlocked = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (layers[layer].milestones){
|
|
||||||
for (thing in layers[layer].milestones){
|
|
||||||
if (!isNaN(thing)){
|
|
||||||
layers[layer].milestones[thing].id = thing
|
|
||||||
layers[layer].milestones[thing].layer = layer
|
|
||||||
if (layers[layer].milestones[thing].unlocked === undefined)
|
|
||||||
layers[layer].milestones[thing].unlocked = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (layers[layer].achievements){
|
|
||||||
for (thing in layers[layer].achievements){
|
|
||||||
if (!isNaN(thing)){
|
|
||||||
layers[layer].achievements[thing].id = thing
|
|
||||||
layers[layer].achievements[thing].layer = layer
|
|
||||||
if (layers[layer].achievements[thing].unlocked === undefined)
|
|
||||||
layers[layer].achievements[thing].unlocked = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (layers[layer].challenges){
|
|
||||||
for (thing in layers[layer].challenges){
|
|
||||||
if (!isNaN(thing)){
|
|
||||||
layers[layer].challenges[thing].id = thing
|
|
||||||
layers[layer].challenges[thing].layer = layer
|
|
||||||
if (layers[layer].challenges[thing].unlocked === undefined)
|
|
||||||
layers[layer].challenges[thing].unlocked = true
|
|
||||||
if (layers[layer].challenges[thing].completionLimit === undefined)
|
|
||||||
layers[layer].challenges[thing].completionLimit = 1
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (layers[layer].buyables){
|
|
||||||
layers[layer].buyables.layer = layer
|
|
||||||
for (thing in layers[layer].buyables){
|
|
||||||
if (!isNaN(thing)){
|
|
||||||
layers[layer].buyables[thing].id = thing
|
|
||||||
layers[layer].buyables[thing].layer = layer
|
|
||||||
if (layers[layer].buyables[thing].unlocked === undefined)
|
|
||||||
layers[layer].buyables[thing].unlocked = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (layers[layer].clickables){
|
|
||||||
layers[layer].clickables.layer = layer
|
|
||||||
for (thing in layers[layer].clickables){
|
|
||||||
if (!isNaN(thing)){
|
|
||||||
layers[layer].clickables[thing].id = thing
|
|
||||||
layers[layer].clickables[thing].layer = layer
|
|
||||||
if (layers[layer].clickables[thing].unlocked === undefined)
|
|
||||||
layers[layer].clickables[thing].unlocked = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (layers[layer].bars){
|
|
||||||
layers[layer].bars.layer = layer
|
|
||||||
for (thing in layers[layer].bars){
|
|
||||||
layers[layer].bars[thing].id = thing
|
|
||||||
layers[layer].bars[thing].layer = layer
|
|
||||||
if (layers[layer].bars[thing].unlocked === undefined)
|
|
||||||
layers[layer].bars[thing].unlocked = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (layers[layer].infoboxes){
|
|
||||||
for (thing in layers[layer].infoboxes){
|
|
||||||
layers[layer].infoboxes[thing].id = thing
|
|
||||||
layers[layer].infoboxes[thing].layer = layer
|
|
||||||
if (layers[layer].infoboxes[thing].unlocked === undefined)
|
|
||||||
layers[layer].infoboxes[thing].unlocked = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (layers[layer].startData) {
|
|
||||||
data = layers[layer].startData()
|
|
||||||
if (data.best !== undefined && data.showBest === undefined) layers[layer].showBest = true
|
|
||||||
if (data.total !== undefined && data.showTotal === undefined) layers[layer].showTotal = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!layers[layer].componentStyles) layers[layer].componentStyles = {}
|
|
||||||
if(layers[layer].symbol === undefined) layers[layer].symbol = layer.charAt(0).toUpperCase() + layer.slice(1)
|
|
||||||
if(layers[layer].unlockOrder === undefined) layers[layer].unlockOrder = []
|
|
||||||
if(layers[layer].gainMult === undefined) layers[layer].gainMult = new Decimal(1)
|
|
||||||
if(layers[layer].gainExp === undefined) layers[layer].gainExp = new Decimal(1)
|
|
||||||
if(layers[layer].type === undefined) layers[layer].type = "none"
|
|
||||||
if(layers[layer].base === undefined || layers[layer].base <= 1) layers[layer].base = 2
|
|
||||||
if(layers[layer].softcap === undefined) layers[layer].softcap = new Decimal("e1e7")
|
|
||||||
if(layers[layer].softcapPower === undefined) layers[layer].softcapPower = new Decimal("0.5")
|
|
||||||
if(layers[layer].displayRow === undefined) layers[layer].displayRow = layers[layer].row
|
|
||||||
if(layers[layer].name === undefined) layers[layer].name = layer
|
|
||||||
|
|
||||||
let row = layers[layer].row
|
|
||||||
|
|
||||||
let displayRow = layers[layer].displayRow
|
|
||||||
|
|
||||||
if(!ROW_LAYERS[row]) ROW_LAYERS[row] = {}
|
|
||||||
if(!TREE_LAYERS[displayRow] && !isNaN(displayRow)) TREE_LAYERS[displayRow] = []
|
|
||||||
if(!OTHER_LAYERS[displayRow] && isNaN(displayRow)) OTHER_LAYERS[displayRow] = []
|
|
||||||
|
|
||||||
ROW_LAYERS[row][layer]=layer;
|
|
||||||
let position = (layers[layer].position !== undefined ? layers[layer].position : layer)
|
|
||||||
|
|
||||||
if (!isNaN(displayRow)) TREE_LAYERS[displayRow].push({layer: layer, position: position})
|
|
||||||
else OTHER_LAYERS[displayRow].push({layer: layer, position: position})
|
|
||||||
|
|
||||||
if (maxRow < layers[layer].displayRow) maxRow = layers[layer].displayRow
|
|
||||||
|
|
||||||
}
|
}
|
||||||
for (row in OTHER_LAYERS) {
|
for (row in OTHER_LAYERS) {
|
||||||
OTHER_LAYERS[row].sort((a, b) => (a.position > b.position) ? 1 : -1)
|
OTHER_LAYERS[row].sort((a, b) => (a.position > b.position) ? 1 : -1)
|
||||||
|
|
@ -181,6 +61,130 @@ function updateLayers(){
|
||||||
updateHotkeys()
|
updateHotkeys()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setupLayer(layer){
|
||||||
|
layers[layer].layer = layer
|
||||||
|
if (layers[layer].upgrades){
|
||||||
|
for (thing in layers[layer].upgrades){
|
||||||
|
if (!isNaN(thing)){
|
||||||
|
layers[layer].upgrades[thing].id = thing
|
||||||
|
layers[layer].upgrades[thing].layer = layer
|
||||||
|
if (layers[layer].upgrades[thing].unlocked === undefined)
|
||||||
|
layers[layer].upgrades[thing].unlocked = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (layers[layer].milestones){
|
||||||
|
for (thing in layers[layer].milestones){
|
||||||
|
if (!isNaN(thing)){
|
||||||
|
layers[layer].milestones[thing].id = thing
|
||||||
|
layers[layer].milestones[thing].layer = layer
|
||||||
|
if (layers[layer].milestones[thing].unlocked === undefined)
|
||||||
|
layers[layer].milestones[thing].unlocked = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (layers[layer].achievements){
|
||||||
|
for (thing in layers[layer].achievements){
|
||||||
|
if (!isNaN(thing)){
|
||||||
|
layers[layer].achievements[thing].id = thing
|
||||||
|
layers[layer].achievements[thing].layer = layer
|
||||||
|
if (layers[layer].achievements[thing].unlocked === undefined)
|
||||||
|
layers[layer].achievements[thing].unlocked = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (layers[layer].challenges){
|
||||||
|
for (thing in layers[layer].challenges){
|
||||||
|
if (!isNaN(thing)){
|
||||||
|
layers[layer].challenges[thing].id = thing
|
||||||
|
layers[layer].challenges[thing].layer = layer
|
||||||
|
if (layers[layer].challenges[thing].unlocked === undefined)
|
||||||
|
layers[layer].challenges[thing].unlocked = true
|
||||||
|
if (layers[layer].challenges[thing].completionLimit === undefined)
|
||||||
|
layers[layer].challenges[thing].completionLimit = 1
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (layers[layer].buyables){
|
||||||
|
layers[layer].buyables.layer = layer
|
||||||
|
for (thing in layers[layer].buyables){
|
||||||
|
if (!isNaN(thing)){
|
||||||
|
layers[layer].buyables[thing].id = thing
|
||||||
|
layers[layer].buyables[thing].layer = layer
|
||||||
|
if (layers[layer].buyables[thing].unlocked === undefined)
|
||||||
|
layers[layer].buyables[thing].unlocked = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (layers[layer].clickables){
|
||||||
|
layers[layer].clickables.layer = layer
|
||||||
|
for (thing in layers[layer].clickables){
|
||||||
|
if (!isNaN(thing)){
|
||||||
|
layers[layer].clickables[thing].id = thing
|
||||||
|
layers[layer].clickables[thing].layer = layer
|
||||||
|
if (layers[layer].clickables[thing].unlocked === undefined)
|
||||||
|
layers[layer].clickables[thing].unlocked = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (layers[layer].bars){
|
||||||
|
layers[layer].bars.layer = layer
|
||||||
|
for (thing in layers[layer].bars){
|
||||||
|
layers[layer].bars[thing].id = thing
|
||||||
|
layers[layer].bars[thing].layer = layer
|
||||||
|
if (layers[layer].bars[thing].unlocked === undefined)
|
||||||
|
layers[layer].bars[thing].unlocked = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (layers[layer].infoboxes){
|
||||||
|
for (thing in layers[layer].infoboxes){
|
||||||
|
layers[layer].infoboxes[thing].id = thing
|
||||||
|
layers[layer].infoboxes[thing].layer = layer
|
||||||
|
if (layers[layer].infoboxes[thing].unlocked === undefined)
|
||||||
|
layers[layer].infoboxes[thing].unlocked = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (layers[layer].startData) {
|
||||||
|
data = layers[layer].startData()
|
||||||
|
if (data.best !== undefined && data.showBest === undefined) layers[layer].showBest = true
|
||||||
|
if (data.total !== undefined && data.showTotal === undefined) layers[layer].showTotal = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!layers[layer].componentStyles) layers[layer].componentStyles = {}
|
||||||
|
if(layers[layer].symbol === undefined) layers[layer].symbol = layer.charAt(0).toUpperCase() + layer.slice(1)
|
||||||
|
if(layers[layer].unlockOrder === undefined) layers[layer].unlockOrder = []
|
||||||
|
if(layers[layer].gainMult === undefined) layers[layer].gainMult = new Decimal(1)
|
||||||
|
if(layers[layer].gainExp === undefined) layers[layer].gainExp = new Decimal(1)
|
||||||
|
if(layers[layer].type === undefined) layers[layer].type = "none"
|
||||||
|
if(layers[layer].base === undefined || layers[layer].base <= 1) layers[layer].base = 2
|
||||||
|
if(layers[layer].softcap === undefined) layers[layer].softcap = new Decimal("e1e7")
|
||||||
|
if(layers[layer].softcapPower === undefined) layers[layer].softcapPower = new Decimal("0.5")
|
||||||
|
if(layers[layer].displayRow === undefined) layers[layer].displayRow = layers[layer].row
|
||||||
|
if(layers[layer].name === undefined) layers[layer].name = layer
|
||||||
|
|
||||||
|
let row = layers[layer].row
|
||||||
|
|
||||||
|
let displayRow = layers[layer].displayRow
|
||||||
|
|
||||||
|
if(!ROW_LAYERS[row]) ROW_LAYERS[row] = {}
|
||||||
|
if(!TREE_LAYERS[displayRow] && !isNaN(displayRow)) TREE_LAYERS[displayRow] = []
|
||||||
|
if(!OTHER_LAYERS[displayRow] && isNaN(displayRow)) OTHER_LAYERS[displayRow] = []
|
||||||
|
|
||||||
|
ROW_LAYERS[row][layer]=layer;
|
||||||
|
let position = (layers[layer].position !== undefined ? layers[layer].position : layer)
|
||||||
|
|
||||||
|
if (!isNaN(displayRow)) TREE_LAYERS[displayRow].push({layer: layer, position: position})
|
||||||
|
else OTHER_LAYERS[displayRow].push({layer: layer, position: position})
|
||||||
|
|
||||||
|
if (maxRow < layers[layer].displayRow) maxRow = layers[layer].displayRow
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function addLayer(layerName, layerData, tabLayers = null){ // Call this to add layers from a different file!
|
function addLayer(layerName, layerData, tabLayers = null){ // Call this to add layers from a different file!
|
||||||
layers[layerName] = layerData
|
layers[layerName] = layerData
|
||||||
|
|
|
||||||
|
|
@ -377,7 +377,6 @@ a {
|
||||||
display: block;
|
display: block;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
color: #41f5f5;
|
color: #41f5f5;
|
||||||
text-decoration-line: none;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-family: "Lucida Console", "Courier New", monospace;
|
font-family: "Lucida Console", "Courier New", monospace;
|
||||||
-webkit-text-stroke-width: 1px;
|
-webkit-text-stroke-width: 1px;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue