merge some old stuff and add floating dim mults

This commit is contained in:
IvarK 2018-06-04 00:33:05 +03:00
commit 66944607c1
7 changed files with 46 additions and 18 deletions

BIN
images/s21.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
images/s22.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -592,7 +592,7 @@
<table class="table" >
<tbody id="parent">
<tr style="font-size: 15px" id="firstRow">
<td id="firstD" width="32%">
<td id="firstD" width="32%" class="rel">
First Dimension x1
</td>
<td>
@ -606,7 +606,7 @@
</td>
</tr>
<tr id="secondRow" style="display: none; font-size: 15px">
<td id="secondD">
<td id="secondD" class="rel">
Second Dimension
</td>
<td>
@ -619,7 +619,7 @@
</td>
</tr>
<tr id="thirdRow" style="display: none; font-size: 15px">
<td id="thirdD">
<td id="thirdD" class="rel">
Third Dimension
</td>
<td>
@ -633,7 +633,7 @@
</td>
</tr>
<tr id="fourthRow" style="display: none; font-size: 15px">
<td id="fourthD">
<td id="fourthD" class="rel">
Fourth Dimension
</td>
<td>
@ -647,7 +647,7 @@
</td>
</tr>
<tr id="fifthRow" style="display: none; font-size: 15px">
<td id="fifthD">
<td id="fifthD" class="rel">
Fifth Dimension
</td>
<td>
@ -661,7 +661,7 @@
</td>
</tr>
<tr id="sixthRow" style="display: none; font-size: 15px">
<td id="sixthD">
<td id="sixthD" class="rel">
Sixth Dimension
</td>
<td>
@ -675,7 +675,7 @@
</td>
</tr>
<tr id="seventhRow" style="display: none; font-size: 15px">
<td id="seventhD">
<td id="seventhD" class="rel">
Seventh Dimension
</td>
<td>
@ -689,7 +689,7 @@
</td>
</tr>
<tr id="eightRow" style="display: none; font-size: 15px">
<td id="eightD">
<td id="eightD" class="rel">
Eight Dimension
</td>
<td>
@ -1560,10 +1560,10 @@
<div id="You do know how these work, right?" class="achievement achievementlocked" style="background-image: url(images/s20.png)" ach-tooltip="You do know how these work, right?"><br></div>
</td>
<td>
<div id="Should we tell him about the buy max..." class="achievement achievementlocked" style="background-image: url(images/s21.png)" ach-tooltip="s35"><br></div>
<div id="Should we tell them about buy max..." class="achievement achievementlocked" style="background-image: url(images/s21.png)" ach-tooltip="Should we tell them about buy max..."><br></div>
</td>
<td>
<div id="Dip the antimatter" class="achievement achievementlocked" style="background-image: url(images/s22.png)" ach-tooltip="s36"><br></div>
<div id="Dip the antimatter" class="achievement achievementlocked" style="background-image: url(images/s22.png)" ach-tooltip="Dip the antimatter."><br></div>
</td>
<td>
<div id="You followed the instructions" class="achievement achievementlocked" style="background-image: url(images/s23.png)" ach-tooltip="s37"><br></div>

View File

@ -123,7 +123,7 @@ const allAchievements = {
s32 : "Less than or equal to 0.001",
s33 : "A sound financial decision",
s34 : "You do know how these work, right?",
s35 : "Should we tell him about the buy max...",
s35 : "Should we tell them about buy max...",
s36 : "Dip the antimatter",
s37 : "You followed the instructions",
s38 : "s38",

View File

@ -275,7 +275,7 @@ function hasInfinityMult(tier) {
else if (player.currentChallenge == "postc5") multiplyPC5Costs(player[name + 'Cost'], tier)
else multiplySameCosts(cost);
if (player[name + 'Cost'].gte(Number.MAX_VALUE)) player.costMultipliers[tier-1] = player.costMultipliers[tier-1].times(player.dimensionMultDecrease)
floatText(name+"D", "x" + getDimensionPowerMultiplier(tier))
}
if (player.currentChallenge == "challenge2" || player.currentChallenge == "postc1") player.chall2Pow = 0;
@ -333,7 +333,7 @@ function hasInfinityMult(tier) {
if (player[name + 'Cost'].gte(Number.MAX_VALUE)) player.costMultipliers[tier-1] = player.costMultipliers[tier-1].times(player.dimensionMultDecrease)
if (player.currentChallenge == "challenge2" || player.currentChallenge == "postc1") player.chall2Pow = 0;
if (player.currentChallenge == "challenge8" || player.currentChallenge == "postc1") clearDimensions(tier-1);
floatText(name+"D", "x" + getDimensionPowerMultiplier(tier))
onBuyDimension(tier);
return true;

View File

@ -515,7 +515,7 @@ function updateDimensions() {
if (!canBuyDimension(tier) && document.getElementById(name + "Row").style.display !== "table-row") {
break;
}
document.getElementById(name + "D").textContent = DISPLAY_NAMES[tier] + " Dimension x" + formatValue(player.options.notation, getDimensionFinalMultiplier(tier), 1, 1);
document.getElementById(name + "D").childNodes[0].nodeValue = DISPLAY_NAMES[tier] + " Dimension x" + formatValue(player.options.notation, getDimensionFinalMultiplier(tier), 1, 1);
document.getElementById(name + "Amount").textContent = getDimensionDescription(tier);
}
@ -705,6 +705,14 @@ function updateCosts() {
}
}
function floatText(id, text) {
var el = $("#"+id)
el.append("<div class='floatingText'>"+text+"</div>")
setTimeout(function() {
el.children()[0].remove()
}, 1000)
}
@ -751,11 +759,9 @@ function updateChallenges() {
}
}
function updateEternityChallenges() {
for (var property in player.eternityChalls) {
@ -4601,7 +4607,7 @@ setInterval(function() {
if (player.replicanti.amount.gt(new Decimal("1e20000"))) giveAchievement("When will it be enough?")
if (player.tickspeed.e < -8296272) giveAchievement("Faster than a potato^345678")
if (player.timestudy.studies.length == 0 && player.dilation.active && player.infinityPoints.e >= 20000) giveAchievement("This is what I have to do to get rid of you.")
if (player.why >= 1e6) giveAchievement("Should we tell him about the buy max...")
if (player.why >= 1e6) giveAchievement("Should we tell them about buy max...")
if ( Math.max(document.documentElement.clientHeight, window.innerHeight || 0) <= 150 ) giveAchievement("Dip the antimatter")
}, 1000)

View File

@ -1613,6 +1613,22 @@ br {
}
.floatingText {
position: absolute;
bottom: 20px;
left: 150px;
animation: float 1s 1;
color: green;
font-size: 1.5em;
opacity: 0;
}
.rel {
position: relative;
}
@media print,
@ -1774,3 +1790,9 @@ screen and (max-width: 480px) {
100% {transform: rotate3d(5.2, -2.8, 1.4, 360deg);}
}
@keyframes float {
0% { bottom: 0px; opacity: 0;}
50% {opacity: 1; }
100% { bottom: 75px; opacity: 0;}
}