From 0618da147b4d24151a48377d6276b2a251d58180 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Sat, 11 May 2019 16:23:07 +0200 Subject: [PATCH] fixes --- src/js/rulesAssistant.js | 3 +-- src/js/slaveCostJS.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js index 5cae9ede34f..399d95b4a9f 100644 --- a/src/js/rulesAssistant.js +++ b/src/js/rulesAssistant.js @@ -93,7 +93,6 @@ window.ruleApplied = function(slave, rule) { * remove slave from the facility described by the rule * @param {App.Entity.SlaveState} slave * @param {Object} rule - * @returns {string} */ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) { const V = State.variables; @@ -195,7 +194,7 @@ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) { /** * return whether the rule applies to the slave - * @param {Object} cond + * @param {{function:boolean|string, data, specialSlaves, selectedSlaves, excludedSlaves, assignment}} cond * @param {App.Entity.SlaveState} slave * @returns {boolean} flag */ window.ruleAppliesP = function ruleAppliesP(cond, slave) { diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js index 21add638d26..a4a571ffe93 100644 --- a/src/js/slaveCostJS.js +++ b/src/js/slaveCostJS.js @@ -19,7 +19,7 @@ window.Beauty = (function() { beauty += 30; calcFaceBeauty(slave); calcTeethBeauty(slave); - calcModBeauty(slave); + calcModBeauty(); calcCosmeticsBeauty(slave); calcFSNotFuckdollBeauty(slave); calcMiscNotFuckdollBeauty(slave); @@ -1833,7 +1833,7 @@ window.slaveCost = (function() { calcMiscCost(slave); calcIndentureCost(slave); /* multipliers */ - calcCost(slave); + calcCost(); if (isStartingSlave) { calcStartingSlaveCost(slave); } -- GitLab