Make buildings owned be tied to BuildingHandler

Author: FifthTundraG

src/ts/clickercookie.ts

@@ -668,7 +668,7 @@ export default class ClickerCookie extends Mod {
         document.getElementById("cookiesStat").innerText = `${Handlers.CURRENTLY_CLICKED.getCurrentlyClicked().namePlural}: ${makeSlightlyImperfectFloatNice(this.cookies)}`;
         document.getElementById("allTimeCookies").innerText = `All Time ${Handlers.CURRENTLY_CLICKED.getCurrentlyClicked().namePlural}: ${makeSlightlyImperfectFloatNice(this.totalCookies)}`;
         document.getElementById("cookiesPerSecondStat").innerText = `${Handlers.CURRENTLY_CLICKED.getCurrentlyClicked().namePlural} Per Second: ${makeSlightlyImperfectFloatNice(this.cookiesPerSecond)}`;
-        document.getElementById("buildingsOwnedStat").innerText = `Buildings Owned: ${commaify(Game.getInstance().buildingsOwned)}`; // todo: should this be in Game? How should statistics actually work at all?
+        document.getElementById("buildingsOwnedStat").innerText = `Buildings Owned: ${commaify(Handlers.BUILDING.buildingsOwned)}`; // todo: should this be in Game? How should statistics actually work at all?
         document.getElementById("cookieBeenClickedTimesStat").innerText = `Total ${Handlers.CURRENTLY_CLICKED.getCurrentlyClicked().name} Clicks: ${this.cookieBeenClickedTimes}`;
         document.getElementById("cookiesPerClickStat").innerText = `${Handlers.CURRENTLY_CLICKED.getCurrentlyClicked().namePlural} Per Click: ${this.cookiesPerClick}`;
     }

src/ts/handlers.ts

@@ -118,7 +118,15 @@ export class CurrentlyClickedHandler extends Handler<CurrentlyClickedObject> {
 }
 
 /* Buildings*/
-export class BuildingHandler extends Handler<Building> {}
+export class BuildingHandler extends Handler<Building> {
+    public get buildingsOwned(): number {
+        let bought = 0;
+        for (const value of this) {
+            bought += value.bought;
+        }
+        return bought;
+    }
+}
 
 /* Upgrades */
 export class UpgradeHandler extends Handler<Upgrade> {

src/ts/helper.ts

@@ -131,7 +131,6 @@ export class Interval {
     }
 
     reset(newTimeout: number = this.timeout) {
-        console.log(this.timeout);
         this.timeout = newTimeout;
         return this.stop().start();
     }

src/ts/main.ts

@@ -105,14 +105,6 @@ export class Game extends SaveProvider {
     /** Said to be the physical manifestation of the cookie gods themselves... */
     public clickercookie: ClickerCookie;
 
-    // buildings owned
-    private _buildingsOwned: number = 0;
-    public get buildingsOwned() { return this._buildingsOwned }
-    public set buildingsOwned(num: number) {
-        this._buildingsOwned = num;
-        this.clickercookie.updateStatistics();
-    }
-
     // self-explainatory-ish things
     private _hasCheated: boolean;
     public get hasCheated() { return this._hasCheated }
@@ -333,13 +325,6 @@ export class Game extends SaveProvider {
         if (!this.theGameCanLoopBecauseTheInitializationIsCompleted) return;
 
         Handlers.UPGRADE.checkUpgradeAvailability();
-        
-        // stats that need to be updated beforehand
-        let buildingsOwned = 0;
-        for (const building of Handlers.BUILDING) {
-            buildingsOwned += building.bought;
-        }
-        this.buildingsOwned = buildingsOwned;
 
         let cps = 0;
         for (const building of Handlers.BUILDING) {