Add Vue, Add options tab and options button components, Move theme change handler to options.js for further refactor

This commit is contained in:
Andrei Andreev 2018-09-16 00:11:41 +02:00
parent 6d29e8f581
commit ad0e0ed454
7 changed files with 11073 additions and 84 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
.vscode
.vscode
.idea

View File

@ -964,6 +964,11 @@
</table>
</div>
</div>
<div id="optionsVue" class="tab" align="center" style="display: none">
<br>
<options :rows="rows"></options>
</br>
</div>
<div id="options" class="tab" align="center">
<br>
<table>
@ -3063,8 +3068,9 @@
</video>
</div>
<script type="text/javascript"src="PlayFab/PlayFabClientApi.js"></script>
<script type="text/javascript" src="javascripts/lib/vue.js"></script>
<script type="text/javascript" src="javascripts/components/options.js"></script>
<script type="text/javascript" src="PlayFab/PlayFabClientApi.js"></script>
<script type="text/javascript" src="javascripts/autobuyer.js"></script>
<!-- script type="text/javascript" src="javascripts/decimal.js"></script> -->
<script type="text/javascript" src="javascripts/breakinfinity.js"></script>
@ -3076,6 +3082,7 @@
<script type="text/javascript" src="javascripts/core/polyfill.js"></script>
<script type="text/javascript" src="javascripts/core/format.js"></script>
<script type="text/javascript" src="javascripts/core/app/options.js"></script>
<script type="text/javascript" src="javascripts/core/achievements.js"></script>
<script type="text/javascript" src="javascripts/core/chart.js"></script>
<script type="text/javascript" src="javascripts/core/tickspeed.js"></script>

View File

@ -0,0 +1,17 @@
Vue.component('options', {
props: ['rows'],
template:
'<table>\
<tr v-for="row in rows">\
<td v-for="button in row" is="options-button" :button="button" />\
</tr>\
</table>'
});
Vue.component('options-button', {
props: ['button'],
template:
'<button class="storebtn" style="color:black; width: 200px; height: 55px; font-size: 20px" @click="button.action">\
{{ button.name }}\
</button>'
});

View File

@ -0,0 +1,77 @@
function optionsSetNextTheme() {
if (player.options.theme === undefined) {
player.options.theme = "Metro";
} else if (player.options.theme === "Metro") {
player.options.theme = "Dark";
Chart.defaults.global.defaultFontColor = '#888';
normalDimChart.data.datasets[0].borderColor = '#888'
} else if (player.options.theme === "Dark") {
player.options.theme = "Dark Metro";
} else if (player.options.theme === "Dark Metro") {
player.options.theme = "Inverted";
Chart.defaults.global.defaultFontColor = 'black';
normalDimChart.data.datasets[0].borderColor = '#000'
} else if (player.options.theme === "Inverted") {
player.options.theme = "Inverted Metro";
} else {
player.options.theme = getNextSecretTheme();
}
setTheme(player.options.theme);
}
function getNextSecretTheme() {
if (player.options.theme === "Inverted Metro") var currentThemeNum = 0
else var currentThemeNum = parseInt(player.options.theme[1])
var lowestThemeNum = 100;
for (i in player.secretUnlocks.themes) {
if (currentThemeNum < 1 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "ef853879b60fa6755d9599fd756c94d112f987c0cd596abf48b08f33af5ff537") {
if (lowestThemeNum > 1) {
lowestThemeNum = 1;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 2 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "078570d37e6ffbf06e079e07c3c7987814e03436d00a17230ef5f24b1cb93290") {
if (lowestThemeNum > 2) {
lowestThemeNum = 2;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 3 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "a3d64c3d1e1749b60b2b3dba10ed5ae9425300e9600ca05bcbafe4df6c69941f") {
if (lowestThemeNum > 3) {
lowestThemeNum = 3;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 4 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "d910565e1664748188b313768c370649230ca348cb6330fe9df73bcfa68d974d") {
if (lowestThemeNum > 4) {
lowestThemeNum = 4;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 5 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "cb72e4a679254df5f99110dc7a93924628b916d2e069e3ad206db92068cb0883") {
if (lowestThemeNum > 5) {
lowestThemeNum = 5;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 6 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "c8fac64da08d674123c32c936b14115ab384fe556fd24e431eb184a8dde21137") {
if (lowestThemeNum > 6) {
lowestThemeNum = 6;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 7 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "da3b3c152083f0c70245f104f06331497b97b52ac80edec05e26a33ee704cae7") {
if (lowestThemeNum > 7) {
lowestThemeNum = 7;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 8 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "1bbc0800145e72dfea5bfb218eba824c52510488b3a05ee88feaaa6683322d19") {
if (lowestThemeNum > 8) {
lowestThemeNum = 8;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
}
}
if (lowestThemeNum === 100) {
Chart.defaults.global.defaultFontColor = 'black';
normalDimChart.data.datasets[0].borderColor = '#000'
return undefined
} else {
return "S"+lowestThemeNum
}
}

View File

@ -410,85 +410,7 @@ function setTheme(name) {
head.appendChild(link);
}
document.getElementById("theme").onclick = function () {
if (player.options.theme === undefined) {
player.options.theme = "Metro";
} else if (player.options.theme === "Metro") {
player.options.theme = "Dark";
Chart.defaults.global.defaultFontColor = '#888';
normalDimChart.data.datasets[0].borderColor = '#888'
} else if (player.options.theme === "Dark") {
player.options.theme = "Dark Metro";
} else if (player.options.theme === "Dark Metro") {
player.options.theme = "Inverted";
Chart.defaults.global.defaultFontColor = 'black';
normalDimChart.data.datasets[0].borderColor = '#000'
} else if (player.options.theme === "Inverted") {
player.options.theme = "Inverted Metro";
} else {
player.options.theme = getNextSecretTheme();
}
setTheme(player.options.theme);
}
function getNextSecretTheme() {
if (player.options.theme === "Inverted Metro") var currentThemeNum = 0
else var currentThemeNum = parseInt(player.options.theme[1])
var lowestThemeNum = 100;
for (i in player.secretUnlocks.themes) {
if (currentThemeNum < 1 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "ef853879b60fa6755d9599fd756c94d112f987c0cd596abf48b08f33af5ff537") {
if (lowestThemeNum > 1) {
lowestThemeNum = 1;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 2 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "078570d37e6ffbf06e079e07c3c7987814e03436d00a17230ef5f24b1cb93290") {
if (lowestThemeNum > 2) {
lowestThemeNum = 2;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 3 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "a3d64c3d1e1749b60b2b3dba10ed5ae9425300e9600ca05bcbafe4df6c69941f") {
if (lowestThemeNum > 3) {
lowestThemeNum = 3;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 4 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "d910565e1664748188b313768c370649230ca348cb6330fe9df73bcfa68d974d") {
if (lowestThemeNum > 4) {
lowestThemeNum = 4;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 5 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "cb72e4a679254df5f99110dc7a93924628b916d2e069e3ad206db92068cb0883") {
if (lowestThemeNum > 5) {
lowestThemeNum = 5;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 6 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "c8fac64da08d674123c32c936b14115ab384fe556fd24e431eb184a8dde21137") {
if (lowestThemeNum > 6) {
lowestThemeNum = 6;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 7 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "da3b3c152083f0c70245f104f06331497b97b52ac80edec05e26a33ee704cae7") {
if (lowestThemeNum > 7) {
lowestThemeNum = 7;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
} else if (currentThemeNum < 8 && sha512_256(player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1].toUpperCase()) === "1bbc0800145e72dfea5bfb218eba824c52510488b3a05ee88feaaa6683322d19") {
if (lowestThemeNum > 8) {
lowestThemeNum = 8;
player.options.secretThemeKey = player.secretUnlocks.themes[i].split(player.secretUnlocks.themes[i][1])[1]
}
}
}
if (lowestThemeNum === 100) {
Chart.defaults.global.defaultFontColor = 'black';
normalDimChart.data.datasets[0].borderColor = '#000'
return undefined
} else {
return "S"+lowestThemeNum
}
}
document.getElementById("theme").onclick = optionsSetNextTheme;
let kongIPMult = 1
let kongDimMult = 1
@ -1738,8 +1660,7 @@ document.getElementById("importbtn").onclick = function () {
document.getElementById("reset").onclick = function () {
var hardReset = function () {
if (forceHardReset) {
if (window.location.href.split("//")[1].length > 20) set_save('dimensionTestSave', currentSave, defaultStart);
else set_save('dimensionSave', currentSave, defaultStart);
@ -1793,6 +1714,19 @@ document.getElementById("reset").onclick = function () {
}
};
document.getElementById("reset").onclick = hardReset;
var opt = {};
opt.rows = [
[
{ name: "RESET THE GAME", action: hardReset }
]
];
var app = new Vue({
el: '#optionsVue',
data: opt
})
function breakInfinity() {
if (player.autobuyers[11]%1 === 0 || player.autobuyers[11].interval>100) return false

10947
javascripts/lib/vue.js Normal file

File diff suppressed because it is too large Load Diff

6
javascripts/lib/vue.min.js vendored Normal file

File diff suppressed because one or more lines are too long