From 8d369ad2bbbd3ed021db7ab95295e4f9274263fd Mon Sep 17 00:00:00 2001 From: circle-gon <97845741+circle-gon@users.noreply.github.com> Date: Sun, 12 May 2024 21:17:58 -0400 Subject: [PATCH] stuff --- saves/element-32.txt | 1 + saves/latest.txt | 2 +- src/atom/Particles.vue | 6 ++++-- src/atom/elements.js | 8 +++++++- src/atom/md.js | 6 +++--- src/main.js | 5 +++++ 6 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 saves/element-32.txt diff --git a/saves/element-32.txt b/saves/element-32.txt new file mode 100644 index 0000000..6b5191a --- /dev/null +++ b/saves/element-32.txt @@ -0,0 +1 @@ +N4IgLglgtgpiBcAOAjAZgJwFZEDp0HZN1F1V90A2AGhADcYAnAZwgHsA7BABhy+RoA2AQyZgAqgAcAJkLBx4yfMkyYKqLgCZ8+PjSgimCEMhyozXLF03oN6PsgAsMZBWxkQNBkIDm80BNYAd0YjfBxEBw0KKNIyNGVEGFJEfEQPEABXdgFWAGMAaxgpBDAGDJgAXxopKARQGQZ8gFlZOQYjChxkDRcXbGRurm1kGA0HC1R0rJyCopKymD0DIxNEdQ0N7WJNDRQnSh6QKpBZVlr4UGm8wuL4UvKaAEcMoUaV3kxUFORKZQt8CgDUbjdKnc4gVA4TCpLgoTQUfCoByYZApUawtI0ALBdrwEDoUxcVxYVTqSxDGAOCgUdJMCQCCBgbieWRsBAAbX4XIAuljXpBcgIYIZ4OyIaY1jCHIhEFZfkjgVx0pCvmRZdLZRZAQqxkqaCrJeqZXLtU5dSBeSBsYwRWLOvhbKitJ8lHYKOgYNF0Ol7Y7EM64m6PV6fTgHegnYRA0Tg7YLTQYELYOwwLauFR+BoqKgqA4qJgqNR8FREFR0Bn0wMM1m0Bm88oM9RFBnSz8qBp0z121mNDmxu2C1F28Xdu3y+puccoLdQEJcpB6AgAGZCARMRZW/kQQXyEBhLioWxkVSyij+gHORTpfRMEXGHCRAiA5QUSJaBxoGCoFRTCTeLxSMKHIgLs3o0B2eogWg6TIMq6ToA4MFIZOTwZKwci2pm2ZUFwlqsBIkAcCKoDsOhrIcEYTC5NeBgACIQCK/AgOwQi0AAEhAgEciua6LDx66Wl47D5AASjAgSvFIADKiYwPOczwOmmR/gBMBsaw9AMApYoeLhfIZOutz3BuuQcEuEAMOcoBeL4y6ruu1SvM0rQhHcCzVOc/EbmCdm8ccABGGQQAIUgQOw3gAIIZGArB1CAN5MLBbkPPFBgaPMKUJZMyUbgK+R0jACnGTQ/kABbUTlNCmUwUDbhllQ0BkKlCIBUUxXFDASPVHndScMWefZDUgEJ+RtbForFZNCyWkuHBMniABqjAyCx6SsEuS4MuwMAAAoMKw/7CiKxnHCNtrGDo2DpBs6U0MgSqWoFwWheFxGpbeSV7jYAL4DRt7pXiGBqP6f1MNlIH+mB4DbvlEiFbcICfIgNIleVRgQVD1W1RViOEEcjXNYBb2dRyWZ5gWlbYUWJZlhWGZcjWOaOJaNQcnmlNZjmBbU6W5b3fT1YZkzDiWj5ooc9h5OFlQxa8xWKEgLkpWrkK4V+IrZwSOdaBWDB6iQTrBv68qGiYNdDiTPqus0PgiGi/OECLvAAC0TFK6w66cPAxaZNk1xFQsxxKyrMBq+dD2OY0LRgG0cVCFArBZPNICQVcsy3F5p0+LtQSuSn6TBwIcVpzc9UVBUQA \ No newline at end of file diff --git a/saves/latest.txt b/saves/latest.txt index ab782d6..6b5191a 100644 --- a/saves/latest.txt +++ b/saves/latest.txt @@ -1 +1 @@ -N4IgLglgtgpiBcAOAjAZgEwBZUDoAMeA7AJzEECsq5ANCAG4wBOAzhAPYB2Ce+ytANgENmYAKoAHACaCwceMkLJKxcuUXY+IKMOYIQ6HGWTHihAGxnCeU8kSYYaM+lSYQtRoIDmc0OLYB3Jj1MHEQCdAJiTHNEFxUYQkJMFDcQAFcOfjYAYwBrGEkEMEY0mABfWkkoBFBpRlyAWRlZRj0DMxUsZGxiJQ7URDMHUnRCVIysvIKikphabWZdeBBkHFQndHRevGRidGNFYhhEcl6QCpAZNmr4UAmc/ML4YtLaAEc0wXq9VaUiVDwmBUpw6qhg+zMqSuNxAIUwmAIgPIZnI4SBiAcg2QqT8gVaywMp2Q6DM1jUeFJuzwGOw5FSzHE/AgYG47hk7AQAG0+DyALq0cRfSDZfgwJaclY4KwnKKjcgIszdVDgpSpVbS06YOUKpUqum0dXUzXaim6/Z0/kgXFMcUgXAA5K2FERJIAqgwZHoVL2wEoQbkF3YPDuz3eta+p0BohBkNOECWmCi2AcMDivDUPjoaioaiYag0MzUQjURDUYgZ9PGDNZtAZvNKDOFhQZ0u7agRduZrPOdt59A0Ent4voUtbXkXKBPUCCbKQBgIABmgn4zDmVqFEBFchA5BwmBMg2Ig0w5BOQ2QeH1Wh0PxwER6PSUp52xGVGFQ43Eng8kjFXP0ihqogiCpBE2IGt6qSIGMEG0Hg8YXB8bCyOKmbZtQeCWmw4iQJwSygBwyHspwejMNkqQLMwAAiEBLOmIAcIIdAABIQL+XJLiucycauloeBwuQAEowP4XySAAyomMCztM8i0GkX4/jAzFsAwjCyRKbiYQKghpKuTwvGu2ScAuECMDcoAeN4i7LqulRfI0zRBM8syVDcPFrtCNlcRcABGaQQPwkgQBwngAIJpGAbA1NeizYi5ryxcwXoJWulEfqltDCrkDIwLJhm0L5AAW5GZSAxnMFAm4zKUFwKd+gi/hFUUxYw4g1WuVQdbQXnwB5Fz8bkzXRfAnIFeNsyWgunAsssABqTDSIxqRsAuC5MhwMAAAqMGw35ikshkDYIAm2ko2CQrQ+zgSs8GWv5gXBaF+FJfFIAosShBXpRKV2v2ZjrBROgZfooZZZuOXiHlTywogpCpMVpUrIg/apBVVVI/K2J1YpjV/rcIBtVyWZ5jQlboYWxaluWF4ZjyNY5t0lpdaNebk1mOYFkWJZlhWdPVhmjOYJavWcuz6Gk9QlM8zTmEXNkRXLqKoU+OV1ziGdALwQaWtqrrOsEN6qNXRg3qG7QHTxj1s4QPO8AALSaArbCrlw8DFukmQPPlszy4r/DK94tp3fZ9RNGALQxYIUBsBks0gNrnuTI83mrsd3hbQEzkJ2j/sxfcUwGb7ZRAA== \ No newline at end of file +N4IgLglgtgpiBcAOAjAZgJwFZEDp0HZN1F1V90A2AGhADcYAnAZwgHsA7BABhy+RoA2AQyZgAqgAcAJkLBx4yfMkyYKqLgCZ8+PjSgimCEMhyozXLF03oN6PsgAsMZBWxkQNBkIDm80BNYAd0YjfBxEBw0KKNIyNGVEGFJEfEQPEABXdgFWAGMAaxgpBDAGDJgAXxopKARQGQZ8gFlZOQYjChxkDRcXbGRurm1kGA0HC1R0rJyCopKymD0DIxNEdQ0N7WJNDRQnSh6QKpBZVlr4UGm8wuL4UvKaAEcMoUaV3kxUFORKZQt8CgDUbjdKnc4gVA4TCpLgoTQUfCoByYZApUawtI0ALBdrwEDoUxcVxYVTqSxDGAOCgUdJMCQCCBgbieWRsBAAbX4XIAuljXpBcgIYIZ4OyIaY1jCHIhEFZfkjgVx0pCvmRZdLZRZAQqxkqaCrJeqZXLtU5dSBeSBsYwRWLOvhbKitJ8lHYKOgYNF0Ol7Y7EM64m6PV6fTgHegnYRA0Tg7YLTQYELYOwwLauFR+BoqKgqA4qJgqNR8FREFR0Bn0wMM1m0Bm88oM9RFBnSz8qBp0z121mNDmxu2C1F28Xdu3y+puccoLdQEJcpB6AgAGZCARMRZW/kQQXyEBhLioWxkVSyij+gHORTpfRMEXGHCRAiA5QUSJaBxoGCoFRTCTeLxSMKHIgLs3o0B2eogWg6TIMq6ToA4MFIZOTwZKwci2pm2ZUFwlqsBIkAcCKoDsOhrIcEYTC5NeBgACIQCK/AgOwQi0AAEhAgEciua6LDx66Wl47D5AASjAgSvFIADKiYwPOczwOmmR/gBMBsaw9AMApYoeLhfIZOutz3BuuQcEuEAMOcoBeL4y6ruu1SvM0rQhHcCzVOc/EbmCdm8ccABGGQQAIUgQOw3gAIIZGArB1CAN5MLBbkPPFBgaPMKUJZMyUbgK+R0jACnGTQ/kABbUTlNCmUwUDbhllQ0BkKlCIBUUxXFDASPVHndScMWefZDUgEJ+RtbForFZNCyWkuHBMniABqjAyCx6SsEuS4MuwMAAAoMKw/7CiKxnHCNtrGDo2DpBs6U0MgSqWoFwWheFxGpbeSV7jYAL4DRt7pXiGBqP6f1MNlIH+mB4DbvlEiFbcICfIgNIleVRgQVD1W1RViOEEcjXNYBb2dRyWZ5gWlbYUWJZlhWGZcjWOaOJaNQcnmlNZjmBbU6W5b3fT1YZkzDiWj5ooc9h5OFlQxa8xWKEgLkpWrkK4V+IrZwSOdaBWDB6iQTrBv68qGiYNdDiTPqus0PgiGi/OECLvAAC0TFK6w66cPAxaZNk1xFQsxxKyrMBq+dD2OY0LRgG0cVCFArBZPNICQVcsy3F5p0+LtQSuSn6TBwIcVpzc9UVBUQA \ No newline at end of file diff --git a/src/atom/Particles.vue b/src/atom/Particles.vue index f153cc8..2bb0f3b 100644 --- a/src/atom/Particles.vue +++ b/src/atom/Particles.vue @@ -28,10 +28,11 @@ {{ formatInteger(player.atom.particles[i]) }} {{ particle.name }} + {{ hasElement(29) ? formatGain(player.atom.particles[i], player.atom.quark.div(10)) : ""}},
- Which generates + which generates {{ format(powerGain(i)) }} - {{ particle.name }} Powers
+ {{ particle.name }} Powers.
You have {{ format(player.atom.powers[i]) }} @@ -49,6 +50,7 @@ import { player } from "../core/save"; import { formatInteger, formatGain, format } from "../core/format"; import { PARTICLES, assignParticle, assignParticles, powerGain } from "./atom"; +import { hasElement } from "./elements"; import { computed } from "vue"; const RATIO_DESC = ["+1", "25%", "100%"]; diff --git a/src/atom/elements.js b/src/atom/elements.js index 3e48be4..dc0c2e0 100644 --- a/src/atom/elements.js +++ b/src/atom/elements.js @@ -327,8 +327,14 @@ export const ELEMENT_UPGRADES = [ cost: 1e203 }, { - desc: computed(() => `Raise Neutron Power's first effect by ${formatInteger(2)}`), + desc: computed(() => `Raise Neutron Power's first effect by ${formatInteger(2)}, and gain ${formatPercent(0.1, 0)} of each Particle gained from assigning per second`), cost: 1e210 + }, + { + desc: "Relativistic Particle gain is boosted by Dilated Mass", + cost: 1e233, + eff: computed(() => dilate(player.md.mass.add(1), 1 / 3).sqrt()), + effDesc: x => formatMult(x) } ]; diff --git a/src/atom/md.js b/src/atom/md.js index cc5fd1f..f020e1c 100644 --- a/src/atom/md.js +++ b/src/atom/md.js @@ -1,6 +1,5 @@ import { computed } from "vue"; import { elementEffect, hasElement } from "./elements"; -import Decimal from "break_eternity.js"; import { player } from "../core/save"; import { atomReset } from "./atom"; import { costScaling } from "../core/cost"; @@ -70,7 +69,7 @@ const UPGRADES = createUpgrades([ }, eff: computed(() => { const amt = player.md.upgrades[1] - return amt.mul(player.md.upgrades[7].gte(1) ? 0.03 : 0.02).add(1) + return amt.mul(player.md.upgrades[7].gte(1) ? 0.025 : 0.02).add(1) }), effDesc: x => `^${format(x)}` }, @@ -126,7 +125,7 @@ const UPGRADES = createUpgrades([ }, { ...single(uni(1e267)), - desc: computed(() => `Dilated Mass upgrade ${formatInteger(2)} is stronger`), + desc: computed(() => `Mass Dilation upgrade ${formatInteger(2)} is stronger`), } ]); @@ -150,6 +149,7 @@ const rpExp = computed(() => effect(5).add(1)); const rpMult = computed(() => { let mult = effect(2) if (hasElement(23)) mult = mult.mul(elementEffect(23)) + if (hasElement(30)) mult = mult.mul(elementEffect(30)) return mult }); const rpGain = computed(() => { diff --git a/src/main.js b/src/main.js index d10f611..1d1e204 100644 --- a/src/main.js +++ b/src/main.js @@ -52,6 +52,11 @@ function loop() { player.atom.atom = atomGain.value .mul(diff) .add(player.atom.atom) + if (hasElement(29)) + for (let i = 0; i < PARTICLES.length; i++) + player.atom.particles[i] = player.atom.quark + .mul(0.1 * diff) + .add(player.atom.particles[i]); } upgradeAuto();