Skip to content

Commit

Permalink
v0.2.3 (#3)
Browse files Browse the repository at this point in the history
good times
  • Loading branch information
jwklong authored May 1, 2022
1 parent aed0bb5 commit 253fa44
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 14 deletions.
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
<layer-locked-button v-if="isLayerCategory === 'Layers'" @click="settings.tab = 'ReStack'" :layerid="9"><img alt="R" class="inline" src="images/layercoin.png"/> ReStack</layer-locked-button>
<button v-if="isLayerCategory === 'Guide'" @click="settings.tab = 'Changelog'"><img alt="C" class="inline" src="favicon.png"> Changelog</button>
<button v-if="isLayerCategory === 'Guide'" @click="settings.tab = 'Engine Changelog'"><img alt="EC" class="inline" src="https://jwklong.github.io/omega-engine/favicon.png"> Engine Changelog</button>
<button v-if="isLayerCategory === 'Achievements'" @click="settings.tab = 'Secret Achievements'"><img alt="Sa" class="inline" src="images/star.svg"> Secret Achievements</button>
<button v-if="isLayerCategory === 'Achievements && game.secretAchievements.filter(ach => ach.isCompleted).length > 0'" @click="settings.tab = 'Secret Achievements'"><img alt="Sa" class="inline" src="images/star.svg"> Secret Achievements</button>
<button v-if="isLayerCategory === 'Settings' && isDebug" @click="settings.tab = 'Debug'"><img alt="S" class="inline" src="images/settings.svg"/> Debug</button>
</div>
</nav>
Expand Down Expand Up @@ -119,6 +119,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>

<script src="js/components/layer-colored-text.js"></script>
<script src="js/components/layer-locked-button.js"></script>
<script src="js/components/aleph-locked-button.js"></script>
<script src="js/components/generator.js"></script>
<script src="js/components/generator-table.js"></script>
<script src="js/components/resource-name.js"></script>
Expand Down
10 changes: 10 additions & 0 deletions js/components/aleph-locked-button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Vue.component("aleph-locked-button", {
props: ["aleph"],
methods: {
totalAleph: () => game.alephLayer.aleph,
},
template: `<button @click="$emit('click')" :disabled="totalAleph().lte(aleph)">
<span v-if="totalAleph().lte(aleph)">Reach {{aleph}}<span class="aleph">ℵ</span></span>
<span v-else><slot></slot></span>
</button>`
})
7 changes: 6 additions & 1 deletion js/components/engine-tab.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Vue.component("engine-tab", {
template: `<div class="changelog-tab">
<guide-item>
<template v-slot:title>v0.2.3</template>
<template v-slot:text>New achievements & aleph locked buttons!
</template>
</guide-item>
<guide-item>
<template v-slot:title>v0.2.2</template>
<template v-slot:text>Challenges can now give a restack reward and endgame menu added!
</template>
Expand Down Expand Up @@ -41,4 +46,4 @@ Vue.component("engine-tab", {
</template>
</guide-item>
</div>`
})
})
2 changes: 1 addition & 1 deletion js/components/layer-locked-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Vue.component("layer-locked-button", {
<span v-if="maxLayerUnlocked() < layerid">Reach <resource-name :layerid="layerid"></resource-name></span>
<span v-else><slot></slot></span>
</button>`
})
})
4 changes: 2 additions & 2 deletions js/components/settings-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ Vue.component("settings-menu", {
<p>Inspiration: Antimatter Dimensions by hevipelle, Infinite Layers by dan-simon</p>
<p>Original Game (Omega Layers) created by VeproGames</p>
<p>Powered by vue.js and break_eternity.min.js</p>
<p>` + mod.primaryName + mod.secondaryName + ` v` + mod.engineVer +`</p>
<p>` + mod.primaryName + mod.secondaryName + ` v` + mod.version +`</p>
` + ((mod.primaryName + mod.secondaryName) !== "ωEngine" ? ("<p>Built with ωEngine v" + mod.engineVer + "</p>") : "") + `
</div>
</div>`
})
})
14 changes: 11 additions & 3 deletions js/data/game.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,21 @@ const game = {
},
achievements: [
new Achievement("You played!", "If you dont have this, you shouldn't exist", "&omega;", () => true),
new Achievement("Aleph-0", "Start gaining aleph", "&aleph;", () => game.alephLayer.isUnlocked()),
new Achievement("Aleph-1", "Have 1e75 aleph", "&aleph;<sub>1</sub>", () => game.alephLayer.aleph.gte("1e75")),
new Achievement("Aleph-2", "Have 1e200 aleph", "&aleph;<sub>2</sub>", () => game.alephLayer.aleph.gte("1e200")),
new Achievement("Aleph-3", "Have 1.8e308 aleph", "&aleph;<sub>3</sub>", () => game.alephLayer.aleph.gte("1.8e308")),
new Achievement("Stacking up", "Do a restack and restart your progress", "&kappa;", () => game.restackLayer.timesReset > 0),
new Achievement("Upgradalicious", "Max all the non-meta upgrades", "↑<sub>↑<sub>↑</sub></sub>", () => (Object.values(game.restackLayer.permUpgrades).filter(u => u.level.gt(0)).length + Object.values(game.restackLayer.permUpgrades).filter(u => u.level.gt(1)).length) == 12),
new Achievement("Idle^2", "Buy the meta upgrade", "↑<sub>2<sub>", () => game.restackLayer.metaUpgrade.level.gte(1)),
new Achievement("No turning back", "Go meta and be reborn", "&Omega;", () => game.metaLayer.active),
new Achievement("Endgame", "Reach layer 1.8e308 and finish "+mod.primaryName+mod.secondaryName, "Ʊ", () => game.metaLayer.layer.gte(Infinities[0])),
],
secretAchievements: [
new Achievement("Meta sucks!", "Get &Omega; without meta", "&omega;&omega;&omega;&omega;&omega;", () => game.highestLayer >= 47 && !game.metaLayer.active),
new Achievement("Volatility sucks!", "Get &epsilon; without volatility", "&omega;&omega;&omega;&omega;&omega;", () => game.highestLayer >= 47 && !game.metaLayer.active),
new Achievement("A very long wait...", "Have a game with over 3 months of time", "...", () => game.timeSpent > 50803200),
new Achievement("Aleph-π", "Have πe314 aleph", "&aleph;<sub>π</sub>", () => game.alephLayer.aleph.gte("3.141e341")),
new Achievement("Meta sucks!", "Get &Omega; without meta", "&Omega;&Omega;&Omega;&Omega;&Omega;", () => game.highestLayer >= 47 && !game.metaLayer.active),
new Achievement("Volatility sucks!", "Get &epsilon; without layer volatility upgrade", "&epsilon;&epsilon;&epsilon;&epsilon;&epsilon;", () => game.highestLayer >= 5 && game.volatility.layerVolatility.level.eq(0)),
],
alephLayer: new AlephLayer(),
restackLayer: new ReStackLayer(),
Expand Down Expand Up @@ -131,4 +139,4 @@ const game = {
saveInfo: "i have no idea"
},
};
const initialGame = functions.getSaveString();
const initialGame = functions.getSaveString();
8 changes: 4 additions & 4 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ function tickGame(seconds)
}
}

game.highestLayer = Math.max(game.highestLayer, game.layers.length - 1);
game.highestLayer = Math.max(game.highestLayer, game.metaLayer.layer);
game.highestUpdatedLayer = Math.max(game.highestUpdatedLayer, game.layers.length - 1);
game.highestUpdatedLayer = Math.max(game.highestUpdatedLayer, game.metaLayer.layer);
game.highestLayer = Decimal.max(new Decimal(game.highestLayer), game.layers.length - 1);
game.highestLayer = Decimal.max(new Decimal(game.highestLayer), game.metaLayer.layer);
game.highestUpdatedLayer = Decimal.max(new Decimal(game.highestUpdatedLayer), game.layers.length - 1);
game.highestUpdatedLayer = Decimal.max(new Decimal(game.highestUpdatedLayer), game.metaLayer.layer);

const minActiveLayer = game.settings.showMinLayers;
const maxActiveLayer = game.layers.length - game.settings.showMaxLayers;
Expand Down
4 changes: 2 additions & 2 deletions js/mod.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var mod = {
primaryName: "ω",
secondaryName: "Engine",
version: "1.0.0",
engineVer: "0.2.2 P2", //DO NOT MODIFY
engineVer: "0.2.3", //DO NOT MODIFY
debugMode: true,
themes: [
["Dark", "css/themes/dark.css"],
Expand Down Expand Up @@ -65,4 +65,4 @@ var mod = {

mod.layerNames.push(["Refresh Names", "refresh"])

document.getElementById("superImportantTitle").innerHTML = "<span class='omega'>"+mod.primaryName+"</span>"+mod.secondaryName
document.getElementById("superImportantTitle").innerHTML = "<span class='omega'>"+mod.primaryName+"</span>"+mod.secondaryName

0 comments on commit 253fa44

Please sign in to comment.