diff --git a/src/js/economyJS.js b/src/js/economyJS.js index e85043fad1fb92820b4a3cf372d8932b09d94cbf..44b14fd895287308881b1c5dfeb81866c365ff61 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -858,7 +858,7 @@ window.getSlaveCost = function(s) { if (s.preg === -1 && isFertile(s)) { cost += Math.trunc((drugsCost * 0.5)); } - + if ((Job.CONCUBINE === s.assignment || s.relationship === -3) && State.variables.arcologies[0].FSPetiteAdmirationLaw === 1) { cost -= 200; } @@ -1148,7 +1148,7 @@ window.slaveJobValues = function() { // Complicated, I know - but it should automatically account for what acts are possible to scale the injury risk smoothly between 90% when totally unskilled // and 0% when perfectly skilled in the relevant method or methods. - if (jsRandom(1,100) > skilltarget) { + if (jsRandom(1, 100) > skilltarget) { s.health -= 10 - 7*canA*canV; // Any limitations means an injury inflicts the harsher 10 instead of 3 s.minorInjury = 1; } @@ -1551,4 +1551,4 @@ window.forceNeg = function(x) { Number.prototype.toFixedHTML = function() { return num(Number.prototype.toFixed.apply(this, arguments)).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>'); -}; \ No newline at end of file +}; diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js index 0e812eddd848039f61fac8a5ad2245e3fb8f4201..a822306a2a86f0b28d65a6f3fdc420a85a280046 100644 --- a/src/js/slaveCostJS.js +++ b/src/js/slaveCostJS.js @@ -316,7 +316,7 @@ window.Beauty = (function() { beauty -= (slave.intelligenceImplant * 1.5); } } else if (arcology.FSSlaveProfessionalism !== "unset") { - if (slave.intelligenceImplant == 30) { + if (slave.intelligenceImplant >= 30) { beauty += 5 + (arcology.FSSlaveProfessionalism / 10); /* 15 */ } else if (slave.intelligenceImplant >= 15) { beauty += (arcology.FSSlaveProfessionalism / 20); /* 5 */ @@ -1528,9 +1528,9 @@ window.FResult = (function() { V = State.variables; incestBonus = V.arcologies[0].FSEgyptianRevivalist > 20 || V.arcologies[0].FSEgyptianRevivalistIncestPolicy === 1; - calcUseWeights(slave,forSale); + calcUseWeights(slave, forSale); if (!slave.fuckdoll) { - calcNotFuckdoll(slave,forSale); + calcNotFuckdoll(slave, forSale); } else { result += slave.fuckdoll / 10; } @@ -1585,7 +1585,7 @@ window.FResult = (function() { /** * @param {App.Entity.SlaveState} slave */ - function calcUseWeights(slave,forSale=0) { + function calcUseWeights(slave, forSale=0) { result = (slave.muscles / 30); if (slave.muscles < -95) { result -= 5; @@ -1877,7 +1877,7 @@ window.FResult = (function() { /** * @param {App.Entity.SlaveState} slave */ - function calcNotFuckdoll(slave,forSale=0) { + function calcNotFuckdoll(slave, forSale=0) { if (!forSale) { if (V.familyTesting === 1 && totalRelatives(slave) > 0) { calcWorksWithRelatives(slave); @@ -1901,7 +1901,7 @@ window.FResult = (function() { calcHearing(slave); } else { result += slave.hears; - result += Math.clamp(slave.eyes*2 + 1,-3,0); + result += Math.clamp(slave.eyes * 2 + 1, -3, 0); } if (V.arcologies[0].FSEgyptianRevivalist !== "unset") { calcEgyptianBonus(slave); @@ -1984,7 +1984,7 @@ window.slaveCost = (function() { V = State.variables; arcology = V.arcologies[0]; multiplier = V.slaveCostFactor; - cost = Beauty(slave) * FResult(slave,1); + cost = Beauty(slave) * FResult(slave, 1); calcGenitalsCost(slave); calcDevotionTrustCost(slave); @@ -2018,7 +2018,7 @@ window.slaveCost = (function() { if (slave.anus === 0 && slave.counter.anal === 0) { multiplier += 0.2; } - //Boosted these to 20% to account for the fact that it limits the skill that can be attained + // Boosted these to 20% to account for the fact that it limits the skill that can be attained if (slave.vagina > -1 && arcology.FSRestartSMR === 1) { if (slave.dick > 0) { if (slave.ovaries === 0 && slave.balls === 0) { diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js index e4f24ef93eea7a1b06483786238bca1a45973c29..06f253d191daa9d06af349157ad6fac6d00eca77 100644 --- a/src/js/slaveStatsChecker.js +++ b/src/js/slaveStatsChecker.js @@ -1264,5 +1264,5 @@ window.armsAndLegs = function(slave, arms = "arms", arm = "arm", legs = "legs", }; window.isProstheticAvailable = function(slave, prosthetic) { - return slave.readyProsthetics.findIndex(function(p) {return p.id === prosthetic}) !== -1 -} + return slave.readyProsthetics.findIndex(function(p) { return p.id === prosthetic; }) !== -1; +};