From 1b586b19f8e6608163205cfb3caa91c2b45a5478 Mon Sep 17 00:00:00 2001 From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io> Date: Sun, 16 May 2021 06:08:29 +0000 Subject: [PATCH] Facility objectification prep --- src/004-base/facility.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/004-base/facility.js b/src/004-base/facility.js index 786753d5c49..dbfcf5be075 100644 --- a/src/004-base/facility.js +++ b/src/004-base/facility.js @@ -322,7 +322,7 @@ App.Entity.Facilities.Facility = class { /** Facility slave capacity * @returns {number} */ get capacity() { - return (typeof V[this.desc.baseName] === "object") ? V[this.desc.baseName].capacity : V[this.desc.baseName]; + return V[this.desc.baseName] !== null && ((typeof V[this.desc.baseName] === "object") ? V[this.desc.baseName].capacity : V[this.desc.baseName]); } get established() { @@ -382,7 +382,7 @@ App.Entity.Facilities.Facility = class { * @returns {number} */ upgrade(name) { - return this.option("Upgrade" + name); + return (typeof V[this.desc.baseName] === "object") ? V[this.desc.baseName].upgrade[name] : this.option("Upgrade" + name); } /** Can this facility be decorated? */ -- GitLab