diff --git a/devTools/types/FC/financial.d.ts b/devTools/types/FC/financial.d.ts index ab8535a32cdf82d91c841bf41cf21add10b29827..d108e80567dc5b2b488a379d1ad820adf1acd0b5 100644 --- a/devTools/types/FC/financial.d.ts +++ b/devTools/types/FC/financial.d.ts @@ -15,4 +15,21 @@ declare namespace FC { /** The full amount that will be paid. */ full: number; } + + interface SlaveStatisticData { + /** ID of relevant slave */ + ID: number, + slaveName: string, + customLabel: string, + income: number, + adsIncome: number, + rep: number, + food: number, + cost: number, + customers: number, + + milk?:number, + cum?:number, + fluid?:number, + } } diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js index e6105425232ee1f0fdbad4a68ac5a32322a7ea72..2e0dac00c92f25c80a1071bbc4f57536a5e08111 100644 --- a/src/endWeek/saGetMilked.js +++ b/src/endWeek/saGetMilked.js @@ -92,7 +92,7 @@ } /** - * @param {object} incomeStats getSlaveStatisticData return value - FIXME should be a named type + * @param {FC.SlaveStatisticData} incomeStats */ function recordFacilityStatistics(incomeStats) { incomeStats.milk = r.milk; diff --git a/src/js/economyJS.js b/src/js/economyJS.js index 99fbadc1e13b4a7a444603dfdd9b132cea44aaaf..5cbe49ea29c91399fb6bb976f50faebab65d12b5 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -2171,7 +2171,7 @@ globalThis.endWeekSlaveMarket = function() { /** * @param {App.Entity.SlaveState} s * @param {object|undefined} facility - * @returns {Object} + * @returns {FC.SlaveStatisticData} */ globalThis.getSlaveStatisticData = function(s, facility) { if (!facility) { // Base data, even without facility