Pseudo-Corp · Pseudonian · Feb 2, 2025 · Jan 26, 2025 · Jan 26, 2025 · Jan 26, 2025
diff --git a/Pictures/PseudoShop/HAPPY_HOUR_BELL.png b/Pictures/PseudoShop/HAPPY_HOUR_BELL.png
diff --git a/Synergism.css b/Synergism.css
@@ -3789,8 +3789,78 @@ img#singularityPerksIcon {
 
 #event {
     position: relative;
-    padding: 0;
+    padding: 20px;
     text-align: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 20px;
+    width: 100%;
+}
+
+.event-container {
+    border-radius: 8px;
+    padding: 15px;
+}
+
+.event-title {
+    margin: 0 0 10px;
+    color: #ffd700;
+}
+
+.event-bonus,
+.event-timer {
+    margin: 5px 0;
+}
+
+#globalEventBonus,
+#consumableEventBonus,
+#globalEventTimer,
+#consumableEventTimer {
+    color: #8f8;
+}
+
+#eventBuffContainer,
+#consumableBuffContainer {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+}
+
+.eventBuffVal,
+.consumableBuffVal {
+    display: flex;
+    align-items: center;
+}
+
+.eventBuffVal img,
+.consumableBuffVal img {
+    margin: 0;
+    padding: 0;
+    height: 32px;
+    width: 32px;
+}
+
+.eventBuffVal p,
+.consumableBuffVall p {
+    margin: 0;
+    padding: 0;
+}
+
+.consumableButton,
+#apply-tips {
+    border: 2px solid #ffd700;
+    background-color: #ffd700;
+    color: black;
+    cursor: pointer;
+    padding: 5px;
+    margin: 5px;
+    width: 150px;
+}
+
+#apply-tips:not(:hover) {
+    border: 2px solid var(--hovershop-color);
+    background-color: var(--hovershop-color);
 }
 
 @keyframes rotation {
@@ -3803,23 +3873,7 @@ img#singularityPerksIcon {
     }
 }
 
-#unsmith {
-    margin: 15px;
-    gap: 10px 15px;
-    height: auto;
-    width: 200px;
-    max-width: 500%;
-    animation: rotation 2s infinite linear;
-}
-
-.hoveredBlueberryLoadout1 div.bbPurchasedLoadout1,
-.hoveredBlueberryLoadout2 div.bbPurchasedLoadout2,
-.hoveredBlueberryLoadout3 div.bbPurchasedLoadout3,
-.hoveredBlueberryLoadout4 div.bbPurchasedLoadout4,
-.hoveredBlueberryLoadout5 div.bbPurchasedLoadout5,
-.hoveredBlueberryLoadout6 div.bbPurchasedLoadout6,
-.hoveredBlueberryLoadout7 div.bbPurchasedLoadout7,
-.hoveredBlueberryLoadout8 div.bbPurchasedLoadout8 {
+*[class^="hoveredBlueberryLoadout"] div[class^="bbPurchasedLoadout"] {
     background-color: green;
 }
 
@@ -4146,6 +4200,40 @@ form input:hover {
     margin-top: 10px;
 }
 
+#consumablesGrid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    grid-template-rows: repeat(1, 1fr);
+    gap: 10px;
+    width: 70%;
+    margin: 0 auto;
+}
+
+#consumablesGrid > div {
+    border: 2px solid var(--amber-text-color);
+    padding: 5px;
+    box-sizing: border-box;
+}
+
+#consumablesGrid > div > button {
+    display: flex;
+    align-items: center;
+    white-space: pre;
+    padding: 0 5px;
+    box-sizing: border-box;
+    border: 2px solid var(--amber-text-color);
+    margin: 5px auto 0;
+}
+
+/* Cost text */
+#consumablesGrid > div > button > :nth-child(2) {
+    color: var(--amber-text-color);
+}
+
+#consumablesGrid > div > * {
+    margin: 0;
+}
+
 #upgradeGrid {
     display: grid;
     grid-template-columns: repeat(6, 15%);

diff --git a/index.html b/index.html
@@ -110,7 +110,7 @@
             </div>
         </div>
 
-        <button id="exitOffline" class="subtabContent" style="visibility: hidden">That's cool. Take me to the game!</button>
+        <button id="exitOffline" class="subtabContent">That's cool. Take me to the game!</button>
 
     </div>
     <header>
@@ -3045,8 +3045,6 @@
                 </div>
             </div>
             <div id="versionnumber"></div>
-            <span id="eventCurrent" class="orangeredText"></span>
-            <div id="eventBuffs" style="color: lime;">Buffs: </div>
             <a href="#" target="_blank" id="happyHolidays" style="color: greenyellow"></a>
         </div>
         <div class="subtabContent subtabDisplayFlex" id="languagesubtab">
@@ -3283,6 +3281,7 @@ <h1>Artists</h1>
                 <p id="statGSMc3" class="statPortion singularity">Forbidden Clock of Time:<span id="sGSMc3" class="statNumber">0</span></p>
                 <p id="statGSMc4" class="statPortion singularity">EXALT 6: The Great Singularity Speedrun<span id="sGSMc4" class="statNumber">0</span></p>
                 <p id="statGSMc5" class="statPortion singularity">Shop Chronometer S<span id="sGSMc5" class="statNumber">0</span></p>
+                <p id="statGSMc6" class="statPortion singularity">Event<span id="sGSMc6" class="statNumber">0</span></p>
 
                 <p id ="statGSMT" class="statPortion statTotal" style="color: white">TOTAL GLOBAL SPEED MULTIPLIER:<span id="sGSMT" class="statNumber statTotal">0</span></p>
             </div>
@@ -4682,9 +4681,135 @@ <h1>Artists</h1>
     </div>
 
     <div id="event">
-        <a target="_blank" href="https://www.youtube.com/watch?v=E9de-cmycx8"><img id="unsmith" src="Pictures/Default/Unsmith.png"></a>
-        <p i18n="event.aprilFools.introText"></p>
-        <p id="eventClicked" style="color: lime; display: none" i18n="event.aprilFools.clickedText"></p>
+        <div id="globalFreeEvents" class="event-container">
+            <h4 class="event-title">Global Event <span id="globalEventName"></span></h4>
+            <div id="eventBuffContainer">
+                <div class="eventBuffVal" id="eventBuffQuark">
+                    <img src="Pictures/Default/Quark.png" alt="Quarks">
+                    <p id="eventBuffQuarkValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffGoldenQuark">
+                    <img src="Pictures/Default/GoldenQuark.png" alt="Golden Quarks">
+                    <p id="eventBuffGoldenQuarkValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffCubes">
+                    <img src="Pictures/Default/WowCube.png" alt="Cube Bonus">
+                    <p id="eventBuffCubesValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffOcteract">
+                    <img src="Pictures/Default/Octeract.png" alt="Octeract Bonus">
+                    <p id="eventBuffOcteractValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffAscensionSpeed">
+                    <img src="Pictures/Default/TinySpeedAscension.png" alt="Ascension Speed">
+                    <p id="eventBuffAscensionSpeedValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffGlobalSpeed">
+                    <img src="Pictures/Default/TinySpeed.png" alt="Global Speed">
+                    <p id="eventBuffGlobalSpeedValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffObtainium">
+                    <img src="Pictures/Default/Obtainium.png" alt="Obtainium">
+                    <p id="eventBuffObtainiumValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffOffering">
+                    <img src="Pictures/Default/Offering.png" alt="Offering">
+                    <p id="eventBuffOfferingValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffAscensionScore">
+                    <img src="Pictures/Default/TinyA.png" alt="Ascension Score">
+                    <p id="eventBuffAscensionScoreValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffBlueberryTime">
+                    <img src="Pictures/Default/Ambrosia.png" alt="Blueberry Generation Speed">
+                    <p id="eventBuffBlueberryTimeValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffAmbrosiaLuck">
+                    <img src="Pictures/Default/BlueberryLuck.png" alt="Ambrosia Luck">
+                    <p id="eventBuffAmbrosiaLuckValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffPowderConversion">
+                    <img src="Pictures/Default/HepteractOverfluxPowder.png" alt="Powder Conversion">
+                    <p id="eventBuffPowderConversionValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffAntSacrifice">
+                    <img src="Pictures/Default/AntSacrifice.png" alt="Ant Sacrifice">
+                    <p id="eventBuffAntSacrificeValue">+10%</p>
+                </div>
+                <div class="eventBuffVal" id="eventBuffOneMind">
+                    <img src="Pictures/Default/SingularityOneMind.png" alt="One Mind Bonus">
+                    <p id="eventBuffOneMindValue">+10%</p>
+                </div>
+            </div>            
+            <div class="event-timer">Time Remaining: <span id="globalEventTimer">--:--:--</span></div>
+        </div>
+
+        <div id="consumableEvents" class="event-container">
+            <h4 class="event-title" i18n="pseudoCoins.consumables.eventTitle"></h4>
+            <div class="event-bonus">Current Amount: <span id="consumableEventBonus">No active consumable</span></div>
+            <div class="event-timer">Ends At: <span id="consumableEventTimer">--:--:--</span></div>
+            <div id="consumableBuffContainer">
+                <div class="consumableBuffVal" id="consumableBuffQuark">
+                    <img src="Pictures/Default/Quark.png">
+                    <p id="consumableBuffQuarkValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffGoldenQuark">
+                    <img src="Pictures/Default/GoldenQuark.png">
+                    <p id="consumableBuffGoldenQuarkValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffCubes">
+                    <img src="Pictures/Default/WowCube.png">
+                    <p id="consumableBuffCubesValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffOcteract">
+                    <img src="Pictures/Default/Octeract.png">
+                    <p id="consumableBuffOcteractValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffAscensionSpeed">
+                    <img src="Pictures/Default/TinySpeedAscension.png">
+                    <p id="consumableBuffAscensionSpeedValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffGlobalSpeed">
+                    <img src="Pictures/Default/TinySpeed.png">
+                    <p id="consumableBuffGlobalSpeedValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffObtainium">
+                    <img src="Pictures/Default/Obtainium.png">
+                    <p id="consumableBuffObtainiumValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffOffering">
+                    <img src="Pictures/Default/Offering.png">
+                    <p id="consumableBuffOfferingValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffAscensionScore">
+                    <img src="Pictures/Default/TinyA.png">
+                    <p id="consumableBuffAscensionScoreValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffBlueberryTime">
+                    <img src="Pictures/Default/Ambrosia.png">
+                    <p id="consumableBuffBlueberryTimeValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffAmbrosiaLuck">
+                    <img src="Pictures/Default/BlueberryLuck.png">
+                    <p id="consumableBuffAmbrosiaLuckValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffPowderConversion">
+                    <img src="Pictures/Default/HepteractOverfluxPowder.png">
+                    <p id="consumableBuffPowderConversionValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffAntSacrifice">
+                    <img src="Pictures/Default/AntSacrifice.png">
+                    <p id="consumableBuffAntSacrificeValue">+10%</p>
+                </div>
+                <div class="consumableBuffVal" id="consumableBuffOneMind">
+                    <img src="Pictures/Default/SingularityOneMind.png">
+                    <p id="consumableBuffOneMindValue">+10%</p>
+                </div>
+            </div>
+            <div class="consumableSpoiler" i18n="pseudoCoins.consumables.consumableSpoiler"></div>
+            <button class="consumableButton" i18n="pseudoCoins.consumables.consumableButton"></button>
+            <button id="apply-tips" i18n="pseudoCoins.consumables.applyTips"></button>
+        </div>
     </div>
 
     <div id="pseudoCoins">
@@ -4704,9 +4829,14 @@ <h1>Artists</h1>
           style="border: 2px solid cyan"
           i18n="tabs.pseudocoins.upgrades"
         ></button>
+        <button
+          id="cartSubTab4"
+          style="border: 2px solid #8f8"
+          i18n="tabs.pseudocoins.consumables"
+        ></button>
         <span style="position:relative">
           <button
-            id="cartSubTab4"
+            id="cartSubTab5"
             style="display: flex; align-items: center; justify-content: center; border: 2px solid cornflowerblue; width: 100%"
           >
             <p style="margin: 0">Checkout</p>
@@ -4718,7 +4848,7 @@ <h1>Artists</h1>
           ></span>
         </span>
         <button
-          id="cartSubTab5"
+          id="cartSubTab6"
           style="border: 2px solid white"
           i18n="tabs.pseudocoins.merch"
         ></button>
@@ -4758,6 +4888,8 @@ <h1 id="pCoinUpgradeName">Welcome to the PseudoShop!</h1>
           </div>
         </div>
       </div>
+      <div id="consumablesGrid">
+      </div>
       <div id="cartContainer">
         <div
           class="cartList scrollbar"

diff --git a/package.json b/package.json
@@ -7,7 +7,6 @@
     "@ungap/custom-elements": "^1.3.0",
     "break_infinity.js": "^2.0.0",
     "clipboard": "^2.0.11",
-    "eventemitter3": "^4.0.7",
     "fast-mersenne-twister": "^1.0.3",
     "i18next": "^22.4.9",
     "lodash.clonedeepwith": "^4.5.0",

diff --git a/src/Achievements.ts b/src/Achievements.ts
@@ -2,7 +2,6 @@ import Decimal from 'break_infinity.js'
 import i18next from 'i18next'
 import { DOMCacheGetOrSet } from './Cache/DOM'
 import { CalcCorruptionStuff, calculateTimeAcceleration } from './Calculate'
-import { Synergism } from './Events'
 import { format, player } from './Synergism'
 import { Alert, Notification, revealStuff } from './UpdateHTML'
 import { sumContents } from './Utility'
@@ -479,5 +478,4 @@ export const achievementaward = (num: number) => {
   }
 
   DOMCacheGetOrSet(`ach${num}`).style.backgroundColor = 'Green'
-  Synergism.emit('achievement', num)
 }
diff --git a/src/Ants.ts b/src/Ants.ts
@@ -14,8 +14,7 @@ import Decimal from 'break_infinity.js'
 import i18next from 'i18next'
 import { achievementaward } from './Achievements'
 import { DOMCacheGetOrSet } from './Cache/DOM'
-import { Synergism } from './Events'
-import type { ResetHistoryEntryAntSacrifice } from './History'
+import { resetHistoryAdd, type ResetHistoryEntryAntSacrifice } from './History'
 import { buyResearch } from './Research'
 import { resetAnts } from './Reset'
 import { Tabs } from './Tabs'
@@ -409,7 +408,7 @@ export const sacrificeAnts = async (auto = false) => {
       }
       calculateAntSacrificeELO()
 
-      Synergism.emit('historyAdd', 'ants', historyEntry)
+      resetHistoryAdd('ants', historyEntry)
     }
   }