Skip to content

Commit

Permalink
v0.7.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
MrRedShark77 committed Jul 15, 2023
1 parent c6f9bbe commit 1ce7180
Show file tree
Hide file tree
Showing 17 changed files with 396 additions and 99 deletions.
Binary file added images/galactic_texture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
102 changes: 57 additions & 45 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -210,55 +210,66 @@ <h1><b>Your mass is enough to go Infinity!</b></h1><br><br>
</button>
</div>
</div>
<br><br>
<div id="mass_upgs_table"></div><br><br>
<div style="width: 100%; margin-bottom: 5px;" class="table_center upgrade" id="tickspeed_div">
<div style="width: 300px">
<div class="resources">
<img src="images/tickspeed.png">
<span style="margin-left: 5px; text-align: left;"><span id="tickspeed_scale"></span>Tickspeeds [<span id="tickspeed_lvl">X</span>]</span>
</div>
</div><button id="tickspeed_btn" class="btn" style="width: 300px;" onclick="FORMS.tickspeed.buy()">Cost: <span id="tickspeed_cost">X</span> Rage Power</button>
<button class="btn" style="width: 120px;" onclick="FORMS.tickspeed.buyMax()">Buy Max</button>
<button id="tickspeed_auto" class="btn" style="width: 80px;" onclick="FORMS.tickspeed.autoSwitch()">OFF</button>
<div style="margin-left: 5px; text-align: left; width: 400px">
Tickspeed Power: <span id="tickspeed_step">X</span><br>
Tickspeed Effect: <span id="tickspeed_eff">X</span> to mass gain
</div>
</div><div style="width: 100%; margin-bottom: 5px;" class="table_center upgrade" id="accel_div">
<div style="width: 300px">
<div class="resources">
<img src="images/accelerator.png">
<span style="margin-left: 5px; text-align: left;"><span id="accel_scale"></span>Accelerators [<span id="accel_lvl">X</span>]</span>
</div>
</div><button id="accel_btn" class="btn" style="width: 300px;" onclick="FORMS.accel.buy()">Cost: <span id="accel_cost">X</span> Rage Power</button>
<button class="btn" style="width: 120px;" onclick="FORMS.accel.buyMax()">Buy Max</button>
<button id="accel_auto" class="btn" style="width: 80px;" onclick="FORMS.accel.autoSwitch()">OFF</button>
<div style="margin-left: 5px; text-align: left; width: 400px">
Accelerator Power: <span id="accel_step">X</span><br>
Accelerator Effect: <span id="accel_eff">X</span>
</div>
</div><br><div>
<span id="massSoft1" class="red">After <b id="massSoftStart1">X</b> of mass gain, mass gain will be softcapped!<br></span>
<span id="massSoft3" style="color: rgb(121, 0, 0)">After <b id="massSoftStart3">X</b> of mass gain will softcap^2 mass gain!<br></span>
<span id="massSoft4" style="color: rgb(122, 0, 86)">After <b id="massSoftStart4">X</b> of mass gain will softcap^3 mass gain!<br></span>
<span id="massSoft5" style="color: rgb(255, 94, 0)">After <b id="massSoftStart5">X</b> of mass gain will softcap^4 mass gain!<br></span>
<span id="massSoft6" style="color: rgb(255, 238, 0)">After <b id="massSoftStart6">X</b> of mass gain will softcap^5 mass gain!<br></span>
<span id="massSoft7" style="color: rgb(166, 255, 0)">After <b id="massSoftStart7">X</b> of mass gain will softcap^6 mass gain!<br></span>
<span id="massSoft8" style="color: rgb(0, 255, 149)">After <b id="massSoftStart8">X</b> of mass gain will softcap^7 mass gain!<br></span>
<span id="massSoft9" style="color: rgb(0, 225, 255)">After <b id="massSoftStart9">X</b> of mass gain will softcap^8 mass gain!</span>
<div id="massOverflow"></div>
<div id="massOverflow2" style="color: rgb(255, 197, 215)"></div>
<div id="strongerOverflow"></div>
<div id="strongerOverflow2" style="color: rgb(255, 197, 215)"></div>
<div id="rankCollapse"></div>
</div>
</div><div id="rank_tab1">
Your Prestige base is <span id="pres_base"></span> (based on product of Rank tiers+1)<br><br>
<div id="pres_table" class="table_center" style="min-height: 180px;"></div>
</div><div id="rank_tab2">
Your Ascension base is <span id="asc_base"></span> (based on product of ln[Prestige tiers+1]+1)<br><br>
<div id="asc_table" class="table_center" style="min-height: 180px;"></div>
</div>
<br><br>
<div id="mass_upgs_table"></div><br><br>
<div style="width: 100%; margin-bottom: 5px;" class="table_center upgrade" id="tickspeed_div">
<div style="width: 300px">
<div class="resources">
<img src="images/tickspeed.png">
<span style="margin-left: 5px; text-align: left;"><span id="tickspeed_scale"></span>Tickspeeds [<span id="tickspeed_lvl">X</span>]</span>
<br><br>
<div id="galactic_prestige_div">
<div>
Galactic Prestige <h4 id="gal_prestige">0</h4><br>
<button id="gp_btn" class="btn galactic" onclick="GAL_PRESTIGE.reset()">Reset Supernova for that what do you mean?</button>
</div>
</div><button id="tickspeed_btn" class="btn" style="width: 300px;" onclick="FORMS.tickspeed.buy()">Cost: <span id="tickspeed_cost">X</span> Rage Power</button>
<button class="btn" style="width: 120px;" onclick="FORMS.tickspeed.buyMax()">Buy Max</button>
<button id="tickspeed_auto" class="btn" style="width: 80px;" onclick="FORMS.tickspeed.autoSwitch()">OFF</button>
<div style="margin-left: 5px; text-align: left; width: 400px">
Tickspeed Power: <span id="tickspeed_step">X</span><br>
Tickspeed Effect: <span id="tickspeed_eff">X</span> to mass gain
</div>
</div><div style="width: 100%; margin-bottom: 5px;" class="table_center upgrade" id="accel_div">
<div style="width: 300px">
<div class="resources">
<img src="images/accelerator.png">
<span style="margin-left: 5px; text-align: left;"><span id="accel_scale"></span>Accelerators [<span id="accel_lvl">X</span>]</span>
<br>
<div id="gp_rewards">

</div>
</div><button id="accel_btn" class="btn" style="width: 300px;" onclick="FORMS.accel.buy()">Cost: <span id="accel_cost">X</span> Rage Power</button>
<button class="btn" style="width: 120px;" onclick="FORMS.accel.buyMax()">Buy Max</button>
<button id="accel_auto" class="btn" style="width: 80px;" onclick="FORMS.accel.autoSwitch()">OFF</button>
<div style="margin-left: 5px; text-align: left; width: 400px">
Accelerator Power: <span id="accel_step">X</span><br>
Accelerator Effect: <span id="accel_eff">X</span>
</div>
</div><br><div>
<span id="massSoft1" class="red">After <b id="massSoftStart1">X</b> of mass gain, mass gain will be softcapped!<br></span>
<span id="massSoft3" style="color: rgb(121, 0, 0)">After <b id="massSoftStart3">X</b> of mass gain will softcap^2 mass gain!<br></span>
<span id="massSoft4" style="color: rgb(122, 0, 86)">After <b id="massSoftStart4">X</b> of mass gain will softcap^3 mass gain!<br></span>
<span id="massSoft5" style="color: rgb(255, 94, 0)">After <b id="massSoftStart5">X</b> of mass gain will softcap^4 mass gain!<br></span>
<span id="massSoft6" style="color: rgb(255, 238, 0)">After <b id="massSoftStart6">X</b> of mass gain will softcap^5 mass gain!<br></span>
<span id="massSoft7" style="color: rgb(166, 255, 0)">After <b id="massSoftStart7">X</b> of mass gain will softcap^6 mass gain!<br></span>
<span id="massSoft8" style="color: rgb(0, 255, 149)">After <b id="massSoftStart8">X</b> of mass gain will softcap^7 mass gain!<br></span>
<span id="massSoft9" style="color: rgb(0, 225, 255)">After <b id="massSoftStart9">X</b> of mass gain will softcap^8 mass gain!</span>
<div id="massOverflow"></div>
<div id="massOverflow2" style="color: rgb(255, 197, 215)"></div>
<div id="strongerOverflow"></div>
<div id="strongerOverflow2" style="color: rgb(255, 197, 215)"></div>
<div id="rankCollapse"></div>
</div><div id="rank_tab2">
Your Ascension base is <span id="asc_base"></span> (based on product of ln[Prestige tiers+1]+1)<br><br>
<div id="asc_table" class="table_center" style="min-height: 180px;"></div>
</div>
</div><div id="stab_frame0_1">
<div class="table_center">
Expand Down Expand Up @@ -329,7 +340,8 @@ <h1><b>Your mass is enough to go Infinity!</b></h1><br><br>
</div><div id="stab_frame0_3">
You collapsed <h4 id="stars_Amt">X</h4> stars, which multiplies mass gain based on all rank types.<br>
<span class="green">Currently: <span id="stars_Eff">X</span></span><br><br>
<button id="star_btn" class="btn" onclick="STARS.generators.unl()">X</button><br><br>
<button id="star_btn" class="btn" onclick="STARS.generators.unl()">X</button>
<br><br>
<div id="stars_table" class="table_center"></div><br><br>
<span id="starSoft1" class="red">After <b id="starSoftStart1">X</b> Collapsed stars gain, Collapsed stars gain will be softcap!</span><br>
</div><div id="stab_frame0_4">
Expand Down Expand Up @@ -651,7 +663,7 @@ <h2>Corrupted Star Effects:</h2>
<h2>Confirmation Settings</h2><br>
<div id="confirm_table" class="table_center"></div>
<br><br>
Incremental Mass Rewritten v0.7.1.1 - made by MrRedShark77<br>
Incremental Mass Rewritten v0.7.1.2 - made by MrRedShark77<br>
The game is inspired by Distance Incremental & Synergism<br>
Contributors: <span style="cursor: pointer;" onclick='addNotify(`where lemon<br><img src="https://i.imgflip.com/57cc98.jpg" style="width:100%">`)'>Bézier</span>, 16777216 & Aarex (Artists)<br><br><br>
Hint 1: Hover top image above tabs to show description...<br><br>
Expand Down
16 changes: 11 additions & 5 deletions js/ascensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ const ASCENSIONS = {
fullNames: ["Ascension",'Transcension'],
resetName: ['Ascend','Transcend'],
baseExponent() {
let x = 0
let x = E(0)

x += 1
if (hasElement(44,1)) x = x.add(muElemEff(44,0))

x = x.add(1)

return x
},
Expand Down Expand Up @@ -73,9 +75,13 @@ const ASCENSIONS = {
3: `19th Big Rip upgrade is twice as effective, and remove the overflow from unstable BH's effect.`,
4: `Kaon & Pion gains are multiplied by 5 every Ascension.`,
7: `Remove dilated mass's overflow.`,
13: `Remove atomic power's overflow.`,
15: `Remove Exotic Rank & Tier, Super & Hyper Hex.`,
},{
1: `Prestige Base Exponent is doubled. Big Rip Upgrade 19 now affects Renown.`,
2: `Super Infinity Theorem is 10% weaker.`,
3: `Super and Hyper Overpower starts +50 later.`,
4: `Meta-Prestige Level starts 2x later.`,
},
],
rewardEff: [
Expand All @@ -89,7 +95,7 @@ const ASCENSIONS = {
x=>formatMult(x),
],
},{

},
],
reset(i, bulk = false) {
Expand Down Expand Up @@ -119,7 +125,7 @@ function setupAscensionsHTML() {
for (let x = 0; x < ASCENSIONS.names.length; x++) {
table += `<div style="width: 300px" id="asc_div_${x}">
<button id="asc_auto_${x}" class="btn" style="width: 80px;" onclick="ASCENSIONS.autoSwitch(${x})">OFF</button>
<span id="asc_scale_${x}""></span>${ASCENSIONS.fullNames[x]} <span id="asc_amt_${x}">X</span><br><br>
<span id="asc_scale_${x}""></span>${ASCENSIONS.fullNames[x]} <h4 id="asc_amt_${x}">X</h4><br><br>
<button onclick="ASCENSIONS.reset(${x})" class="btn reset" id="asc_${x}">
${ASCENSIONS.resetName[x]} (force an Infinity reset), but ${ASCENSIONS.fullNames[x]} up.<span id="asc_desc_${x}"></span><br>
Req: <span id="asc_req_${x}">X</span>
Expand Down Expand Up @@ -172,7 +178,7 @@ function updateAscensionsTemp() {
tmp.ascensions.baseMul = ASCENSIONS.base()
tmp.ascensions.baseExp = ASCENSIONS.baseExponent()
tmp.ascensions.base = tmp.ascensions.baseMul.pow(tmp.ascensions.baseExp)
for (let x = 0; x < PRES_LEN; x++) {
for (let x = 0; x < ASCENSIONS.names.length; x++) {
tmp.ascensions.req[x] = ASCENSIONS.req(x)
for (let y in ASCENSIONS.rewardEff[x]) {
if (ASCENSIONS.rewardEff[x][y]) tmp.ascensions.eff[x][y] = ASCENSIONS.rewardEff[x][y][0]()
Expand Down
9 changes: 6 additions & 3 deletions js/atom.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,21 @@ const ATOM = {
if (tmp.c16active || inDarkRun()) x = expMult(x,mgEff(2))

let o = x
let os = tmp.c16active ? E('ee6') : E('ee90').pow(treeEff('ct13')?tmp.chal.eff[15]:1)
let os = tmp.c16active ? E('ee6') : E('ee90').pow(treeEff('ct13')?tmp.chal.eff[15]:1), op = E(.5)

os = os.pow(tmp.dark.abEff.ApQ_Overflow||1)

if (hasUpgrade('atom',16)) os = os.pow(10)
if (tmp.inf_unl) os = os.pow(theoremEff('atom',1))

x = overflow(x,os,0.5)
if (hasElement(45,1)) op = op.pow(0.75)

x = overflow(x,os,op)

tmp.overflowBefore.quark = o
tmp.overflow.quark = calcOverflow(o,x,os)
tmp.overflow_start.quark = os
tmp.overflow_power.quark = op

return x.floor()
},
Expand Down Expand Up @@ -99,7 +102,7 @@ const ATOM = {

if (tmp.inf_unl) os = os.pow(theoremEff('atom',1))

if (false) os = EINF
if (hasAscension(0,13)) os = EINF

x = overflow(x,os,0.25)

Expand Down
24 changes: 24 additions & 0 deletions js/darkness/exotic_atoms.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,29 @@ const MUONIC_ELEM = {
cs: true,
desc: `Remove first softcap of C9’s reward.`,
cost: E('e110'),
},{
desc: `Double corrupted star’s speed per infinity theorem.`,
cost: E('e8100'),
eff() {
let x = Decimal.pow(2,player.inf.theorem)
return x
},
effDesc: x=>formatMult(x),
},{
cs: true,
desc: `Unlock a new effect of corrupted star.`,
cost: E('e130'),
},{
desc: `The exponent of ascension base is increased by Renown at a reduced rate.`,
cost: E('e8600'),
eff() {
let x = player.prestiges[3].root(2).div(100)
return x
},
effDesc: x=>"+^"+format(x),
},{
desc: `Quark overflow is 25% weaker.`,
cost: E('e9200'),
},

/*
Expand Down Expand Up @@ -439,6 +462,7 @@ function updateExoticAtomsTemp() {
if (hasElement(25,1)) s = s.add(muElemEff(25,0))

if (tmp.inf_unl) s = s.add(theoremEff('time',4))
s = s.add(tmp.cs_effect.ea_reward||0)

tea.strength = s

Expand Down
29 changes: 28 additions & 1 deletion js/elemental.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ const ELEMENTS = {
tmp.stab[8]=3
}

if (x==262) {
tmp.tab=0
tmp.stab[0]=0
tmp.rank_tab=1
}

tmp.pass = 2
}
},
Expand Down Expand Up @@ -334,7 +340,7 @@ const ELEMENTS = {

x = overflow(x,'ee112',0.5)

return x
return x.min('ee3000')
},
effDesc(x) { return format(x)+"x" },
},
Expand Down Expand Up @@ -1473,6 +1479,27 @@ const ELEMENTS = {
c16: true,
desc: `Add 100 more C16’s max completions.`,
cost: E('ee219'),
},{
inf: true,
desc: `Unlock Galactic Prestige.`,
cost: E('e59'),
},{
desc: `Galactic Prestige’s resources are affected by pre-infinity global speed.`,
cost: E('ee7676'),
effect() {
let x = tmp.preInfGlobalSpeed.max(1).root(2)
return x
},
effDesc(x) { return formatMult(x) },
},{
c16: true,
desc: `Prestige mass’s effect now affects stronger overflow^1-2 at a reduced rate.`,
cost: E('ee294'),
effect() {
let x = GPEffect(1,E(1)).root(2)
return x
},
effDesc(x) { return formatReduction(x) + ' weaker' },
},
],
/*
Expand Down
Loading

0 comments on commit 1ce7180

Please sign in to comment.