Skip to content

Commit

Permalink
v1.0.0
Browse files Browse the repository at this point in the history
party
  • Loading branch information
jwklong authored Aug 31, 2022
2 parents 5a433bf + 881ebe4 commit f59ca41
Show file tree
Hide file tree
Showing 31 changed files with 267 additions and 102 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ωEngine v0.2.3
# ωEngine v1.0.0
### A engine made from Ω-Lλγers built for making mods
#### <a href='https://veprogames.github.io/omega-layers'>Ω-Lλγers</a> (the original) by VeproGames
#### Play the engine <a href='https://jwklong.github.io/omega-engine'>now</a>
Expand Down
8 changes: 8 additions & 0 deletions css/fonts/ubuntu.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@font-face{
font-family: ubuntu-font;
src: url('../../fonts/ubuntu.ttf');
}

:root{
--primary-font: ubuntu-font
}
56 changes: 48 additions & 8 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,49 @@ header nav{

header nav div{
display: flex;
justify-content: left;
padding: 0.5rem 2rem;
}

header nav div:first-child{
justify-content: space-between;
padding: 0.5rem 2rem;
}

header nav button{
padding: 0.2em;
margin-right: 2rem;
font-size: 110%;
max-width: 170px;
width: 20vw;
}

header nav button:hover{
transform: scale(1.3)
}

#automatorButton {
background-image: linear-gradient(125deg, #ff5e00 , #ffc800);
color: white;
border: 0;
}

#volatilityButton {
background-image: linear-gradient(90deg, #ff8100, #ffc800, #ff8100);
color: white;
border: 0;
}

#alephButton {
background-image: radial-gradient(#00ff5a, #00a905);
color: white;
border: 0;
}

#restackButton {
background-image: linear-gradient(90deg, #61b8ff, #ff64a0, #d5ff55);
color: white;
border: 0;
}

#debugButton {
background-color: #f0f;
color: white;
border: 0;
}

.omega{
Expand Down Expand Up @@ -126,6 +157,7 @@ img.inline{
color: var(--color-contrast);
transform: translateY(10%);
fill: var(--color-contrast);
filter: invert();
}

.flipped-v{
Expand Down Expand Up @@ -215,6 +247,7 @@ div.layer-navigation button{

div.layer-navigation button:hover{
background-color: var(--color-hover-strong);
transform: scale(1)
}

div.layer-navigation button .ordinal{
Expand All @@ -241,11 +274,12 @@ button{
padding: 2px 4px;
border: 1px solid var(--color-primary);

transition: background-color 500ms, filter 250ms;
transition: background-color 500ms, filter 250ms, transform 500ms;
}

button:hover:not(:disabled){
background-color: var(--color-hover);
transform: scale(1.02)
}

button:active:not(:disabled){
Expand Down Expand Up @@ -713,6 +747,12 @@ p.resource-display > span:first-child{
user-select: all;
}

input#layerID {
background-color: var(--background-body);
border: 1px solid var(--color-primary);
color: var(--color-contrast);
}

.settings .credits{
padding: 1rem;
text-align: center;
Expand Down Expand Up @@ -844,4 +884,4 @@ footer p{

.expandable-leave-active{
animation: expand 250ms reverse !important;
}
}
14 changes: 14 additions & 0 deletions css/themes/darkalt.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
:root{
--background-body: #202020;
--background-header: #202020;
--color-base: #282828;
--color-primary: #800080;
--color-hover: #303030;
--color-hover-strong: #404040;
--color-contrast: #bebebe;
--color-success: #004203;
--button-dark: #0a0a0a;
--notification--error: #C5431F;
--notification--success: #08a019;
--notification--special: #69861b;
}
14 changes: 14 additions & 0 deletions css/themes/light.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
:root {
--background-body: #644d00;
--background-header: #c99a00;
--color-base: #ffc400;
--color-primary: #fff;
--color-hover: #ffd23e;
--color-hover-strong: #ffdf77;
--color-contrast: #fff;
--color-success: #00c109;
--button-dark: #483900;
--notification--error: #ff5e00;
--notification--success: #60ff30;
--notification--special: #ffd900;
}
Binary file added fonts/ubuntu.ttf
Binary file not shown.
Binary file removed images/information-circle.png
Binary file not shown.
Binary file removed images/layercoin.png
Binary file not shown.
Binary file removed images/layers.png
Binary file not shown.
1 change: 1 addition & 0 deletions images/layers.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 13 additions & 12 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ <h2><span class="omega">&omega;</span> E n g i n e</h2>
<nav>
<div>
<h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
<button @click="settings.tab = 'Layers'"><img alt="L" class="inline" src="images/layers.png"/> Layers</button>
<button @click="settings.tab = 'Layers'"><img alt="L" class="inline" src="images/layers.svg"/> Layers</button>
<button @click="settings.tab = 'Achievements'"><img alt="A" class="inline" src="images/star.svg"/> Achievements</button>
<button @click="settings.tab = 'Guide'"><img alt="G" class="inline" src="images/information-circle.svg"/> Guide</button>
<button @click="settings.tab = 'Settings'"><img alt="S" class="inline" src="images/settings.svg"/> Settings</button>
</div>
<div>
<layer-locked-button v-if="!isMeta && isLayerCategory === 'Layers'" @click="settings.tab = 'Automators'" :layerid="1"><img alt="Au" class="inline" src="images/hardware-chip.svg"/> Automators</layer-locked-button>
<layer-locked-button v-if="!isMeta && isLayerCategory === 'Layers'" @click="settings.tab = 'Volatility'" :layerid="2"><img alt="V" class="inline" src="images/save.svg"/> Volatility</layer-locked-button>
<layer-locked-button v-if="!isMeta && isLayerCategory === 'Layers'" @click="settings.tab = 'Aleph'" :layerid="3"><span class="aleph"></span> Aleph</layer-locked-button>
<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 && 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>
<layer-locked-button id="automatorButton" v-if="!isMeta && isLayerCategory === 'Layers'" @click="settings.tab = 'Automators'" :layerid="1"><img alt="Au" class="inline" src="images/hardware-chip.svg"/> Automators</layer-locked-button>
<layer-locked-button id="volatilityButton" v-if="!isMeta && isLayerCategory === 'Layers'" @click="settings.tab = 'Volatility'" :layerid="2"><img alt="V" class="inline" src="images/save.svg"/> Volatility</layer-locked-button>
<layer-locked-button id="alephButton" v-if="!isMeta && isLayerCategory === 'Layers'" @click="settings.tab = 'Aleph'" :layerid="3"><span class="aleph"></span> Aleph</layer-locked-button>
<layer-locked-button id="restackButton" v-if="isLayerCategory === 'Layers'" @click="settings.tab = 'ReStack'" :layerid="9"><img alt="R" class="inline" src="images/layercoin.svg"/> ReStack</layer-locked-button>
<button v-if="isLayerCategory === 'Guide'" @click="settings.tab = 'Changelog'"><img style="filter: none" alt="C" class="inline" src="favicon.png"> Changelog</button>
<button v-if="isLayerCategory === 'Guide'" @click="settings.tab = 'Engine Changelog'"><img style="filter: none" alt="EC" class="inline" src="https://jwklong.github.io/omega-engine/favicon.png"> Engine Changelog</button>
<button v-if="isLayerCategory === 'Achievements' && secretAchUnlock" @click="settings.tab = 'Secret Achievements'"><img alt="Sa" class="inline" src="images/star.svg"> Secret Achievements</button>
<button id="debugButton" v-if="isLayerCategory === 'Settings' && isDebug" @click="settings.tab = 'Debug'"><img alt="S" class="inline" src="images/settings.svg"/> Debug</button>
</div>
</nav>
<news-ticker v-if="settings.newsTicker"></news-ticker>
Expand Down Expand Up @@ -87,7 +87,6 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
<!-- <script src="https://cdn.jsdelivr.net/npm/vue@2"></script> -->

<script>
const Infinities = [new Decimal("1.8e308"), new Decimal("1.8e30008"), new Decimal("1.8e300000008"), new Decimal("ee38")]
var LETTERS = "αβγδεζηθικλμνξοπρστυφχψωΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ";
var ORDERS = "ψϝϛͱϻϙͳϸ";
var GIANTS = ["Ʊ", "Ʊ<sup>2</sup>","Ʊ<sup>3</sup>","Ʊ<sup>2<sup>2</sup></sup>"]
Expand All @@ -103,7 +102,8 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
<script src="js/mod.js"></script>

<script src="js/debug/test.js"></script>
<script src="js/debug/TabTesting.js"></script>
<script src="js/debug/tabTesting.js"></script>
<script src="js/debug/debugSaves.js"></script>

<script src="js/classes/generator.js"></script>
<script src="js/classes/powergenerator.js"></script>
Expand All @@ -120,6 +120,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/restack-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 Expand Up @@ -165,7 +166,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>

<script src="js/main.js"></script>
<script>
var endgameReq = game.metaLayer.layer.gte(Infinities[0])
var endgameReq = game.metaLayer.layer.gte(mod.Infinities[0])
setInterval(function() {
if (endgameReq && !temp.endgameOverride) {
game.settings.tab = "Endgame"
Expand Down
36 changes: 18 additions & 18 deletions js/classes/prestigelayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,45 +55,45 @@ class PrestigeLayer
{
return "-" + PrestigeLayer.getNameForLayer(new Decimal("-1").minus(nLayer))
}
if(layer instanceof Decimal && layer.gte(Infinities[0]) && !layer.gte(Infinities[1]))
if(layer instanceof Decimal && layer.gte(mod.Infinities[0]) && !layer.gte(mod.Infinities[1]))
{
const infinityOrder = Decimal.log(layer, Infinities[0]).floor();
const infinityOrder = Decimal.log(layer, mod.Infinities[0]).floor();
if(infinityOrder.gte(6))
{
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(Infinities[0], infinityOrder)).floor().sub(1));
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(mod.Infinities[0], infinityOrder)).floor().sub(1));
return "(" + GIANTS[0] + "↑↑" + functions.formatNumber(infinityOrder, 3, 0, 1e9) + ")<sup>" + exp + "</sup>";
}
return GIANTS[0] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(Infinities[0]).floor().sub(1)) + "</sup>";
return GIANTS[0] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(mod.Infinities[0]).floor().sub(1)) + "</sup>";
}
if(layer instanceof Decimal && layer.gte(Infinities[1]) && !layer.gte(Infinities[2]))
if(layer instanceof Decimal && layer.gte(mod.Infinities[1]) && !layer.gte(mod.Infinities[2]))
{
const infinityOrder = Decimal.log(layer, Infinities[1]).floor();
const infinityOrder = Decimal.log(layer, mod.Infinities[1]).floor();
if(infinityOrder.gte(6))
{
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(Infinities[1], infinityOrder)).floor().sub(1));
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(mod.Infinities[1], infinityOrder)).floor().sub(1));
return "(" + GIANTS[1] + "↑↑" + functions.formatNumber(infinityOrder, 3, 0, 1e9) + ")<sup>" + exp + "</sup>";
}
return GIANTS[1] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(Infinities[1]).floor().sub(1)) + "</sup>";
return GIANTS[1] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(mod.Infinities[1]).floor().sub(1)) + "</sup>";
}
if(layer instanceof Decimal && layer.gte(Infinities[2]) && !layer.gte(Infinities[3]))
if(layer instanceof Decimal && layer.gte(mod.Infinities[2]) && !layer.gte(mod.Infinities[3]))
{
const infinityOrder = Decimal.log(layer, Infinities[2]).floor();
const infinityOrder = Decimal.log(layer, mod.Infinities[2]).floor();
if(infinityOrder.gte(6))
{
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(Infinities[2], infinityOrder)).floor().sub(1));
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(mod.Infinities[2], infinityOrder)).floor().sub(1));
return "(" + GIANTS[2] + "↑↑" + functions.formatNumber(infinityOrder, 3, 0, 1e9) + ")<sup>" + exp + "</sup>";
}
return GIANTS[2] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(Infinities[2]).floor().sub(1)) + "</sup>";
return GIANTS[2] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(mod.Infinities[2]).floor().sub(1)) + "</sup>";
}
if(layer instanceof Decimal && layer.gte(Infinities[3]))
if(layer instanceof Decimal && layer.gte(mod.Infinities[3]))
{
const infinityOrder = Decimal.log(layer, Infinities[3]).floor();
const infinityOrder = Decimal.log(layer, mod.Infinities[3]).floor();
if(infinityOrder.gte(6))
{
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(Infinities[3], infinityOrder)).floor().sub(1));
const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(mod.Infinities[3], infinityOrder)).floor().sub(1));
return "(" + GIANTS[3] + "↑↑" + functions.formatNumber(infinityOrder, 3, 0, 1e9) + ")<sup>" + exp + "</sup>";
}
return GIANTS[3] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(Infinities[3]).floor().sub(1)) + "</sup>";
return GIANTS[3] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(mod.Infinities[3]).floor().sub(1)) + "</sup>";
}
const letters = LETTERS;
const orders = ORDERS;
Expand Down Expand Up @@ -293,7 +293,7 @@ class PrestigeLayer
{
return new Decimal(1);
}
const boostRes = Decimal.min(this.resource, Infinities[0]).mul(Decimal.pow(Decimal.max(1, this.resource.div(Infinities[0])), 0.2));
const boostRes = Decimal.min(this.resource, Infinities[0]).mul(Decimal.pow(Decimal.max(1, this.resource.div(mod.Infinities[0])), 0.2));
const challengePow = game.currentChallenge && game.currentChallenge.type === CHALLENGE_EFFECT_UPGRADESTRENGTH_SIMPLEBOOST ? game.currentChallenge.applyEffect() : 1;
const boost = boostRes.add(1).pow(2 * Math.pow(this.getExponentialBoostFactor(), this.layer - 1)).pow(challengePow);
return this.hasSimpleBoost() ? boost : new Decimal(1);
Expand Down Expand Up @@ -791,4 +791,4 @@ class PrestigeLayer
}
}
}
}
}
4 changes: 2 additions & 2 deletions js/classes/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Utils
return gen;
}

static createValueDilation(value, strength, start = Infinities[0])
static createValueDilation(value, strength, start = mod.Infinities[0])
{
return value.pow(Decimal.max(0, value.div(start).log10().mul(strength)).add(1));
}
Expand Down Expand Up @@ -81,4 +81,4 @@ class Utils
{
return Math.max(Math.min(v, max), min);
}
}
}
14 changes: 7 additions & 7 deletions js/components/achievement.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Vue.component("achievement", {
}
},
template: `<div class="achievement-wrapper">
<div class="tooltip" v-if="showTooltip">
<h4>{{achievement.title}}</h4>
<p v-html="achievement.description"></p>
</div>
<div @mouseenter="showTooltip = true" @mouseleave="showTooltip = false" :class="{completed: achievement.isCompleted}" class="achievement" v-html="achievement.html"></div>
</div>`
});
<div class="tooltip" v-if="showTooltip">
<h4>{{achievement.title}}</h4>
<p v-html="achievement.description"></p>
</div>
<div @mouseenter="showTooltip = true" @mouseleave="showTooltip = false" :class="{completed: achievement.isCompleted}" class="achievement" v-html="achievement.html"></div>
</div>`
});
5 changes: 3 additions & 2 deletions js/components/aleph-locked-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ Vue.component("aleph-locked-button", {
props: ["aleph"],
methods: {
totalAleph: () => game.alephLayer.aleph,
Decimal: (x) => new Decimal(x)
},
template: `<button @click="$emit('click')" :disabled="totalAleph().lte(aleph)">
<span v-if="totalAleph().lte(aleph)">Reach {{aleph}}<span class="aleph">ℵ</span></span>
template: `<button @click="$emit('click')" :disabled="Decimal(totalAleph()).lt(aleph)">
<span v-if="Decimal(totalAleph()).lt(aleph)">Reach {{aleph}}<span class="aleph">ℵ</span></span>
<span v-else><slot></slot></span>
</button>`
})
7 changes: 4 additions & 3 deletions js/components/debug-tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ Vue.component("debug-tab", {
template: `<div class="guide-tab">
<guide-item>
<template v-slot:title>All buttons</template>
<template v-slot:text>All buttons from debug menu items<br>` + mod.debugClasses[0].getButtons() + mod.debugClasses[1].getButtons() + `
<template v-slot:text>All buttons from debug menu items<br>` + mod.debugClasses[0].getButtons() + mod.debugClasses[1].getButtons() + mod.debugClasses[2].getButtons() + `
</template>
</guide-item>
` + mod.debugClasses[0].getInfo() +
mod.debugClasses[1].getInfo() + `
mod.debugClasses[1].getInfo() +
mod.debugClasses[2].getInfo() + `
</div>`
})
})
5 changes: 5 additions & 0 deletions 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><h1>v1.0.0</h1></template>
<template v-slot:text>The biggest update yet! Adds many new debug mode features, two new themes (one replacing the old light theme), new button stylings, latin layer names, updated layer name finder, ubuntu font, and alot of bug fixing!
</template>
</guide-item>
<guide-item>
<template v-slot:title>v0.2.3</template>
<template v-slot:text>New achievements & aleph locked buttons!
</template>
Expand Down
Loading

0 comments on commit f59ca41

Please sign in to comment.