Resolve comments P1

This commit is contained in:
Waiting Idly 2021-06-15 19:39:44 -07:00
parent 3b54c8d6c2
commit a0fc8ebfe4
24 changed files with 116 additions and 117 deletions

View File

@ -284,8 +284,8 @@ const Depression = {
<div class="stuff-container">
<template v-for="stuff in stuffs">
<br v-if="stuff.id > 1">
<stuff-button :stuff="stuff"/>
<prestige-button :stuff="stuff"/>
<stuff-button :stuff="stuff" />
<prestige-button :stuff="stuff" />
</template>
</div>
</div>

View File

@ -3,7 +3,7 @@
<head>
<title>Antimatter Dimensions</title>
<link rel="icon" type="image/png" href="icon.png">
<meta name="Antimatter Dimensions" content="A game about huge numbers and watching them go up." charset="utf-8"/>
<meta name="Antimatter Dimensions" content="A game about huge numbers and watching them go up." charset="utf-8" />
<script type="text/javascript" src='https://cdn1.kongregate.com/javascripts/kongregate_api.js'></script>
<script type="text/javascript" src="javascripts/lib/jquery-3.2.1.min.js"></script>
<link href="https://fonts.googleapis.com/css?family=PT+Mono" rel="stylesheet">

View File

@ -103,7 +103,7 @@ Vue.component("effarig-tab", {
},
template: `
<div class="l-teresa-celestial-tab">
<celestial-quote-history celestial="effarig"/>
<celestial-quote-history celestial="effarig" />
<div class="l-effarig-shop-and-run">
<div class="l-effarig-shop">
<div class="c-effarig-relics">

View File

@ -84,50 +84,50 @@ Vue.component("matter-dimension-row", {
}
},
template: `
<div class="c-matter-dimension-container">
<div class="o-matter-dimension-amount">
{{ name }} {{ ascensionText }}: {{ format(amount, 2, 0) }}
</div>
<div class="c-matter-dimension-buttons">
<button
@click="handleIntervalClick()"
class="o-matter-dimension-button"
:class="intervalClassObject"
>
{{ intervalText }}
<span v-if="isIntervalCapped">
<br>
Ascend!
<span :ach-tooltip="ascensionTooltip">
<i class="fas fa-question-circle"></i>
<div class="c-matter-dimension-container">
<div class="o-matter-dimension-amount">
{{ name }} {{ ascensionText }}: {{ format(amount, 2, 0) }}
</div>
<div class="c-matter-dimension-buttons">
<button
@click="handleIntervalClick()"
class="o-matter-dimension-button"
:class="intervalClassObject"
>
{{ intervalText }}
<span v-if="isIntervalCapped">
<br>
Ascend!
<span :ach-tooltip="ascensionTooltip">
<i class="fas fa-question-circle"></i>
</span>
</span>
</span>
<span v-else>
<br>Cost: {{ format(intervalCost, 2, 0) }}
</span>
</button>
<button
@click="dimension.buyPowerDM()"
class="o-matter-dimension-button"
:class="{ 'o-matter-dimension-button--available': canBuyPowerDM }"
>
DM {{ formatX(powerDM, 2, 2) }}<br>Cost: {{ format(powerDMCost, 2, 0) }}
</button>
<button
@click="dimension.buyPowerDE()"
class="o-matter-dimension-button"
:class="{ 'o-matter-dimension-button--available': canBuyPowerDE }"
>
DE +{{ format(powerDE, 2, 4) }}
<br>
Cost: {{ format(powerDECost, 2, 0) }}
</button>
</div>
<div v-if="interval > 200">
Tick: {{ formatInt(timer) }} ms ({{ formatPercents(timerPercent, 1) }})
</div>
<div>
DE: {{ format(powerDE * 1000 / interval, 2, 4) }}/s
</div>
</div>`
<span v-else>
<br>Cost: {{ format(intervalCost, 2, 0) }}
</span>
</button>
<button
@click="dimension.buyPowerDM()"
class="o-matter-dimension-button"
:class="{ 'o-matter-dimension-button--available': canBuyPowerDM }"
>
DM {{ formatX(powerDM, 2, 2) }}<br>Cost: {{ format(powerDMCost, 2, 0) }}
</button>
<button
@click="dimension.buyPowerDE()"
class="o-matter-dimension-button"
:class="{ 'o-matter-dimension-button--available': canBuyPowerDE }"
>
DE +{{ format(powerDE, 2, 4) }}
<br>
Cost: {{ format(powerDECost, 2, 0) }}
</button>
</div>
<div v-if="interval > 200">
Tick: {{ formatInt(timer) }} ms ({{ formatPercents(timerPercent, 1) }})
</div>
<div>
DE: {{ format(powerDE * 1000 / interval, 2, 4) }}/s
</div>
</div>`
});

View File

@ -156,7 +156,7 @@ Vue.component("ra-tab", {
<p>
Cost: {{ format(laitelaRealityMachineCost) }} Reality Machines
</p>
<div class="o-laitela-run-button__icon" @click="unlockLaitela"/>
<div class="o-laitela-run-button__icon" @click="unlockLaitela" />
</div>
</div>
</div>`

View File

@ -47,7 +47,7 @@ Vue.component("infinity-challenges-tab", {
</template>
<div slot="bottom" class="l-challenge-box__bottom--infinity">
<span>Goal: {{ format(config.goal, 0, 0) }} antimatter</span>
<description-display :config="config.reward" title="Reward:"/>
<description-display :config="config.reward" title="Reward:" />
<effect-display v-if="isCompleted" :config="config.reward" />
</div>
</challenge-box>`

View File

@ -120,9 +120,9 @@ Vue.component("expanding-control-box", {
{{label}}
</div>
<div v-else ref="expandButton" @click="openRequest=!openRequest">
<slot name="header"/>
<slot name="header" />
</div>
<div ref="dropdown"><slot name="dropdown"/></div>
<div ref="dropdown"><slot name="dropdown" /></div>
</div>
</div>
`,
@ -136,4 +136,4 @@ Vue.component("expanding-control-box", {
this.state = this.states.CLOSED;
this.$on("openrequest", () => this.openRequest = true);
}
});
});

View File

@ -13,7 +13,7 @@ Vue.component("dilation-time-study", {
created() {
if (this.id === 1) {
this.requirement = `Requirement: ${formatInt(5)} EC11 and EC12 completions
and ${formatInt(13000)} total Time Theorems`;
and ${formatInt(13000)} total Time Theorems`;
}
if (this.id === 6) {
if (PlayerProgress.realityUnlocked()) {

View File

@ -26,7 +26,7 @@ Vue.component("game-ui", {
<component :is="uiLayout">
<component :is="page" />
</component>
<modal-popup v-if="view.modal.current" :modal="view.modal.current"/>
<modal-popup v-if="view.modal.current" :modal="view.modal.current" />
<modal-progress-bar v-if="view.modal.progressBar" />
<link v-if="view.theme !== 'Normal'" type="text/css" rel="stylesheet" :href="themeCss">
<help-me />

View File

@ -96,7 +96,7 @@ Vue.component("big-crunch-autobuyer-box", {
class="o-autobuyer-toggle-checkbox c-autobuyer-box__small-text"
@click="increaseWithMult = !increaseWithMult"
>
<input type="checkbox" :checked="increaseWithMult"/>
<input type="checkbox" :checked="increaseWithMult" />
</div>
</template>
</template>

View File

@ -29,7 +29,7 @@ Vue.component("tickspeed-autobuyer-box", {
},
template: `
<autobuyer-box :autobuyer="autobuyer" name="Tickspeed Autobuyer" showInterval>
<autobuyer-interval-button :autobuyer="autobuyer" slot="intervalSlot"/>
<autobuyer-interval-button :autobuyer="autobuyer" slot="intervalSlot" />
<template slot="toggleSlot">
<button class="o-autobuyer-btn" @click="toggleMode" v-if="isUnlocked">{{ modeDisplay }}</button>
<button class="o-autobuyer-btn" v-else>Complete the challenge to change mode</button>

View File

@ -41,34 +41,34 @@ Vue.component("modal-import", {
},
},
template: `
<div class="c-modal-import l-modal-content--centered">
<modal-close-button @click="emitClose" />
<h3>Input your save</h3>
<input
v-model="input"
ref="input"
type="text"
class="c-modal-input c-modal-import__input"
@keyup.enter="importSave"
@keyup.esc="emitClose"
/>
<div class="c-modal-import__save-info">
<div v-if="inputIsSecret">???</div>
<template v-else-if="inputIsValidSave">
<div>Antimatter: {{ formatPostBreak(antimatter, 2, 1) }}</div>
<div v-if="progress.isInfinityUnlocked">Infinities: {{ formatPostBreak(player.infinities, 2, 0) }}</div>
<div v-if="progress.isEternityUnlocked">Eternities: {{ formatPostBreak(player.eternities, 2, 0) }}</div>
<div v-if="progress.isRealityUnlocked">Realities: {{ formatPostBreak(player.realities, 2, 0) }}</div>
<div class="c-modal-import__warning">(your current save file will be overwritten!)</div>
</template>
<div v-else-if="hasInput">Not a valid save</div>
</div>
<primary-button
v-if="inputIsValid"
class="o-primary-btn--width-medium c-modal-import__import-btn c-modal__confirm-btn"
@click="importSave"
>
Import
</primary-button>
</div>`
<div class="c-modal-import l-modal-content--centered">
<modal-close-button @click="emitClose" />
<h3>Input your save</h3>
<input
v-model="input"
ref="input"
type="text"
class="c-modal-input c-modal-import__input"
@keyup.enter="importSave"
@keyup.esc="emitClose"
/>
<div class="c-modal-import__save-info">
<div v-if="inputIsSecret">???</div>
<template v-else-if="inputIsValidSave">
<div>Antimatter: {{ formatPostBreak(antimatter, 2, 1) }}</div>
<div v-if="progress.isInfinityUnlocked">Infinities: {{ formatPostBreak(player.infinities, 2, 0) }}</div>
<div v-if="progress.isEternityUnlocked">Eternities: {{ formatPostBreak(player.eternities, 2, 0) }}</div>
<div v-if="progress.isRealityUnlocked">Realities: {{ formatPostBreak(player.realities, 2, 0) }}</div>
<div class="c-modal-import__warning">(your current save file will be overwritten!)</div>
</template>
<div v-else-if="hasInput">Not a valid save</div>
</div>
<primary-button
v-if="inputIsValid"
class="o-primary-btn--width-medium c-modal-import__import-btn c-modal__confirm-btn"
@click="importSave"
>
Import
</primary-button>
</div>`
});

View File

@ -65,7 +65,7 @@ Vue.component("new-tickspeed-row", {
template: `
<div :class="classObject">
<div class="tickspeed-labels">
<span>{{ tickspeedDisplay }} <game-header-gamespeed-display v-if="!isGameSpeedNormal"/></span>
<span>{{ tickspeedDisplay }} <game-header-gamespeed-display v-if="!isGameSpeedNormal" /></span>
<span>{{ multiplierDisplay }}</span>
</div>
<div class="tickspeed-buttons">

View File

@ -38,7 +38,7 @@ Vue.component("tab-button", {
{{ tab.name }} <i v-if="hasNotification" class="fas fa-exclamation"></i>
</div>
<div v-else class="l-tab-btn-inner">???</div>
<div class="subtabs" v-if="isAvailable && subtabVisibilities.filter(x => x).length > 1">
<div class="subtabs" v-if="isAvailable && subtabVisibilities.length > 1">
<div
v-for="(subtab, index) in tab.subtabs"
v-if="subtabVisibilities[index]"

View File

@ -49,7 +49,7 @@ Vue.component("game-header-amounts-line", {
You have
<span class="c-game-header__ip-amount">{{ formatPoints(infinityPoints) }}</span>
Infinity {{ "Point" | pluralize(infinityPoints) }}.
<span v-if="isTesseractUnlocked"v-html="tesseractText"></span>
<span v-if="isTesseractUnlocked" v-html="tesseractText"></span>
</div>
<div v-if="showEternityPoints" class="c-game-header__eternity-points l-game-header__eternity-points">
You have

View File

@ -20,9 +20,9 @@ Vue.component("old-ui-subtab-button", {
<button
v-if="isAvailable"
@click="subtab.show(true)"
class="o-tab-btn o-tab-btn--secondary">
{{subtab.name}} <i v-if="hasNotification" class="fas fa-exclamation"
class="o-tab-btn o-tab-btn--secondary"
>
</i>
{{ subtab.name }}
<i v-if="hasNotification" class="fas fa-exclamation"></i>
</button>`
});

View File

@ -118,7 +118,7 @@ Vue.component("automator-block-editor", {
:block="block"
:updateBlock="updateBlock"
:deleteBlock="deleteBlock"
></automator-single-block>
/>
</draggable>
</div>`
});

View File

@ -115,7 +115,6 @@ Vue.component("automator-single-block", {
class="o-automator-block-input"
v-tooltip="errorTooltip"
/>
<div @click="deleteBlock(b.id)" class="o-automator-block-delete">X</div>
</div>
<draggable v-if="block.nested" class="l-automator-nested-block" v-model="block.nest" group="code-blocks">
@ -126,7 +125,7 @@ Vue.component("automator-single-block", {
:block="block"
:updateBlock="updateBlockFromNest"
:deleteBlock="deleteBlockFromNest"
></automator-single-block>
/>
</draggable>
</div>`
});

View File

@ -12,7 +12,7 @@ Vue.component("automator-man-page", {
<div class="c-automator-docs-page__indented" v-html="command.syntax" />
<template v-if="command.description">
<b>DESCRIPTION</b>
<div class="c-automator-docs-page__indented"v-html="command.description" />
<div class="c-automator-docs-page__indented" v-html="command.description" />
</template>
<template v-for="section in command.sections">
<b>{{ section.name }}</b>
@ -27,6 +27,5 @@ Vue.component("automator-man-page", {
<b>EXAMPLES</b>
<div v-for="example in command.examples" class="c-automator-docs-page__indented" v-html="example" />
</template>
</div>
`
</div>`
});

View File

@ -105,13 +105,13 @@ Vue.component("reality-button", {
>
<div class="l-reality-button__contents">
<template v-if="canReality">
<div class="c-reality-button__header">Make a new Reality</div>
<div class="c-reality-button__header">Make a new Reality</div>
<div>{{ formatMachinesGained }}</div>
<div>{{ formatMachineStats }}</div>
<div>{{ formatGlyphLevel }}</div>
</template>
<template v-else-if="hasRealityStudy">
<div>Get {{ format("1e4000", 0, 0) }} Eternity Points to unlock a new Reality</div>
<div>Get {{ format("1e4000") }} Eternity Points to unlock a new Reality</div>
</template>
<template v-else>
<div>Purchase the study in the Eternity tab to unlock a new Reality</div>

View File

@ -146,9 +146,9 @@ Vue.component("tt-shop", {
</div>
</div>
<div class="ttbuttons-row" v-if="!minimized">
<tt-buy-button :budget="budget.am" :cost="costs.am" :formatCost="formatAM" :action="buyWithAM"/>
<tt-buy-button :budget="budget.ip" :cost="costs.ip" :formatCost="formatIP" :action="buyWithIP"/>
<tt-buy-button :budget="budget.ep" :cost="costs.ep" :formatCost="formatEP" :action="buyWithEP"/>
<tt-buy-button :budget="budget.am" :cost="costs.am" :formatCost="formatAM" :action="buyWithAM" />
<tt-buy-button :budget="budget.ip" :cost="costs.ip" :formatCost="formatIP" :action="buyWithIP" />
<tt-buy-button :budget="budget.ep" :cost="costs.ep" :formatCost="formatEP" :action="buyWithEP" />
<div class="l-tt-buy-max-vbox">
<button
v-if="!minimized"

View File

@ -164,9 +164,7 @@ class EternityChallengeState extends GameMechanicState {
this.start();
return;
}
if (this.isUnlocked) {
Modal.startEternityChallenge.show(this.id);
}
if (this.isUnlocked) Modal.startEternityChallenge.show(this.id);
}
start(auto) {

View File

@ -193,9 +193,12 @@ let player = {
totalTimePlayed: 0,
realTimePlayed: 0,
totalAntimatter: new Decimal(0),
lastTenInfinities: Array.range(0, 10).map(() => [Number.MAX_VALUE, new Decimal(1), new Decimal(1), Number.MAX_VALUE]),
lastTenEternities: Array.range(0, 10).map(() => [Number.MAX_VALUE, new Decimal(1), new Decimal(1), Number.MAX_VALUE]),
lastTenRealities: Array.range(0, 10).map(() => [Number.MAX_VALUE, new Decimal(1), 1, Number.MAX_VALUE, 0]),
lastTenInfinities: Array.range(0, 10).map(() =>
[Number.MAX_VALUE, new Decimal(1), new Decimal(1), Number.MAX_VALUE]),
lastTenEternities: Array.range(0, 10).map(() =>
[Number.MAX_VALUE, new Decimal(1), new Decimal(1), Number.MAX_VALUE]),
lastTenRealities: Array.range(0, 10).map(() =>
[Number.MAX_VALUE, new Decimal(1), 1, Number.MAX_VALUE, 0]),
thisInfinity: {
time: 0,
realTime: 0,
@ -352,11 +355,11 @@ let player = {
},
upgradeBits: 0,
upgReqs: [null, true, true, true, true, true,
false, false, false, false, false,
false, false, false, false, false,
false, false, false, false, false,
false, false, false, false, false,
false, false, false, false, false],
false, false, false, false, false,
false, false, false, false, false,
false, false, false, false, false,
false, false, false, false, false,
false, false, false, false, false],
perks: new Set(),
respec: false,
showGlyphSacrifice: false,

View File

@ -3,7 +3,7 @@
<head>
<title>Antimatter Dimensions</title>
<link rel="icon" type="image/png" href="icon.png">
<meta name="Antimatter Dimensions" content="A game about huge numbers and watching them go up." charset="utf-8"/>
<meta name="Antimatter Dimensions" content="A game about huge numbers and watching them go up." charset="utf-8" />
<script type="text/javascript" src='https://cdn1.kongregate.com/javascripts/kongregate_api.js'></script>
<script type="text/javascript" src="javascripts/lib/jquery-3.2.1.min.js"></script>
<link href="https://fonts.googleapis.com/css?family=PT+Mono" rel="stylesheet">