diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 7f157b1fc556f399d88003548c42c2dc927c2868..b3e1373ed6c0d3a99f98d515212bf8f39838da8d 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4944,4 +4944,9 @@ Pregmod 0.10.3.0
12/18/2017
214
- -saRules now applies to the spa
\ No newline at end of file
+ -saRules now applies to the spa
+
+ 215
+ -fixed brothel devotion oddities
+ -adjusted arcology sector demand
+ -optional comma'd numbers
\ No newline at end of file
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 5e10b2799d12a6d71112c42a8c8986c14901065b..15e834a71c400e764adda9a0aff88403dbc0ccfe 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2411,7 +2411,7 @@ window.initFacilityStatistics = function(facility) {
}
Number.prototype.toFixedHTML = function() {
- return Number.prototype.toFixed.apply(this, arguments).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>');
+ return commaNum(Number.prototype.toFixed.apply(this, arguments)).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>');
}
/*:: rulesAssistant [script]*/
@@ -3609,6 +3609,18 @@ window.Categorizer.prototype.cat = function(val, def) {
return result;
};
+window.commaNum = function(s) {
+ if(!s) { return 0; }
+ console.log(window);
+ if(State.variables.formatNumbers != 1) { return s; }
+ return s.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+}
+
+window.cashFormat = function(s) {
+ if(!s) { s = 0; }
+ return "¤"+commaNum(s);
+}
+
window.isFloat = function(n){
return n === +n && n !== (n|0);
}
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 3e5b4851e10e04a25f8441d17351b6aa81b5d445..a01cbaef084e6277d6f3cea6c93e119ffb7fd24b 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -280,7 +280,29 @@
<<default>>
<<set $slaves[$i].livingRules = "normal">>
<</switch>>
-
+ <<if ($slaves[$i].health < -80)>>
+ <<set $slaves[$i].health += 20>>
+ <<elseif $slaves[$i].health < -40>>
+ <<set $slaves[$i].health += 15>>
+ <<elseif $slaves[$i].health < 0>>
+ <<set $slaves[$i].health += 10>>
+ <<elseif $slaves[$i].health < 90>>
+ <<set $slaves[$i].health += 7>>
+ <</if>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
+ <<elseif ($slaves[$i].devotion < 45)>>
+ <<set $slaves[$i].devotion += 4>>
+ <<elseif ($slaves[$i].devotion >= 50)>>
+ <<set $slaves[$i].devotion -= 4>>
+ <</if>>
+ <<if ($slaves[$i].trust < 30)>>
+ <<set $slaves[$i].trust += 5>>
+ <</if>>
+ <<if $slaves[$i].energy > 40 && $slaves[$i].energy < 95>>
+ <<set $slaves[$i].energy++>>
+ <</if>>
+
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -397,28 +419,6 @@
<<set $cash += _adsIncome, getSlaveStatisticData($slaves[$i], $facility.brothel).adsIncome += _adsIncome>>
<</if>>
<</if>>
- <<if ($slaves[$i].health < -80)>>
- <<set $slaves[$i].health += 20>>
- <<elseif $slaves[$i].health < -40>>
- <<set $slaves[$i].health += 15>>
- <<elseif $slaves[$i].health < 0>>
- <<set $slaves[$i].health += 10>>
- <<elseif $slaves[$i].health < 90>>
- <<set $slaves[$i].health += 7>>
- <</if>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
- <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
- <<elseif ($slaves[$i].devotion < 45)>>
- <<set $slaves[$i].devotion += 4>>
- <<elseif ($slaves[$i].devotion >= 50)>>
- <<set $slaves[$i].devotion -= 4>>
- <</if>>
- <<if ($slaves[$i].trust < 30)>>
- <<set $slaves[$i].trust += 5>>
- <</if>>
- <<if $slaves[$i].energy > 40 && $slaves[$i].energy < 95>>
- <<set $slaves[$i].energy++>>
- <</if>>
<</for>>
<<set _profits += $cash-_oldCash, _oldCash = $cash, _possibleBonuses = 0, _brothelBonuses = 0>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index de183e1ad36eebc0a71b76926966d950f8550ce8..976a4859db41f6e875e75b83205d85adc329a7c3 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -196,7 +196,7 @@ if(!Macro.has('sectorblock')) {
<<set $price = 1000*Math.trunc($arcologies[0].prosperity*(1+($arcologies[0].demandFactor/100)))>>
Selling this sector would relinquish a 4% interest in $arcologies[0].name. Such an interest is worth <<print cashFormat($price)>>.
<<if $arcologies[0].ownership >= 4>>
- [[Sell|Main][$cash += $price, $arcologies[0].ownership -= 4, $arcologies[0].demandFactor -= 20, $sectors[$AS].ownership = 0]]
+ [[Sell|Main][$cash += $price, $arcologies[0].ownership -= 4, $arcologies[0].demandFactor += 40, $sectors[$AS].ownership = 0]]
<</if>>
<</widget>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index c4f4234383d613b36c08234df7b0d4fb2a4b8415..887be27001390ea0fcb2267f3431f868ccb1553d 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -49,7 +49,7 @@ You make a habit of dropping in on your mercenaries whenever you get the chance.
When you enter the lounge of their <<if $barracks>>barracks<<else>>main living area<</if>>, you see $activeSlave.slaveName kneeling next to a mercenary with most of his armor stripped off. She's the $activeSlave.nationality nurse they captured and enslaved, and she seems to be doing pretty well in her new life. She seems to be checking the sutures on a minor wound to the man's flank.
-"Don't squirm!" she says with an annoyed tone. "I'll get you off when I've checked this." He chuckles and holds still; she redresses the wound, stands up, and strips off her tank top, allowing her huge tits to swing free. She's quite young, but her $activeSlave.skin body is quite curvy. As she swings one leg across the seated mercenary, she continues, "Please sit still and let me do the work. You need to take it easy for a day or two or you'll pop those sutures." Using her hands, she wraps her breasts around onto his stiff prick, eliciting a grunt. She's a strong girl, and pleasures him without letting any of her weight rest on his body at all. When he climaxes, she leans in to clean him with her mouth and then heads off to wash.
+"Don't squirm!" she says with an annoyed tone. "I'll get you off when I've checked this." He chuckles and holds still; she redresses the wound, stands up, and strips off her tank top, allowing her huge tits to swing free. She's quite young, but her $activeSlave.skin body is quite curvy. As she swings one leg across the seated mercenary, she continues, "Please sit still and let me do the work. You need to take it easy for a day or two or you'll pop those sutures." Using her hands, she gently carresses his stiff prick with her pillowy breasts, eliciting a grunt. She's a strong girl, and pleasures him without letting any of her weight rest on his body at all. When he climaxes, she leans in to clean him with her mouth and then heads off to wash.
<<else>>
diff --git a/src/uncategorized/reBusyDairy.tw b/src/uncategorized/reBusyDairy.tw
index 1a6bb647b10a9210ab49da2382e0b12b8370e786..1ebc14f9a73ba83d407bc4b665201a057428b774 100644
--- a/src/uncategorized/reBusyDairy.tw
+++ b/src/uncategorized/reBusyDairy.tw
@@ -18,10 +18,10 @@ Even with high doses of modern drugs, human cows simply do not produce a very hi
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].assignment == "work in the dairy">>
<<set $slaves[$i].devotion += 4>>
- <<if ($slaves[$i].vagina > -1) && ($slaves[$i].vaginalAccessory != "chastity belt")>>
+ <<if canDoVaginal($slaves[$i])>>
<<set $slaves[$i].vaginalCount += 1>>
<<set $vaginalTotal += 1>>
- <<else>>
+ <<elseif canDoAnal($slaves[$i])>>
<<set $slaves[$i].analCount += 1>>
<<set $analTotal += 1>>
<</if>>