From c8ffd1b5a3a22745c8f93b85af2db0f2d3fa2c37 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 30 Jul 2018 19:03:34 -0400 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++ src/pregmod/huskSlaveSwapWorkaround.tw | 2 +- src/uncategorized/saDrugs.tw | 2 +- src/uncategorized/slaveInteract.tw | 6 +++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index eba7259a978..bbaf1e08487 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,9 @@ 7/30/2018 + 12 + -fixed bugs and typos + 11 -more widget to JS conversions -gingering now works as intended diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw index 09449d87ad2..26fb5eebc94 100644 --- a/src/pregmod/huskSlaveSwapWorkaround.tw +++ b/src/pregmod/huskSlaveSwapWorkaround.tw @@ -11,7 +11,7 @@ __Select an eligible slave:__ <<for _i = 0; _i < $slaves.length; _i++>> <<if isSlaveAvailable($slaves[_i])>> <<if $slaves[_i].fuckdoll == 0>> - <<if ($slaves[_i].PLimb == 0) || ($slaves[_i].PLimb == 1 && $slaves[_i].amp == 1)>> + <<if $slaves[_i].amp >= 0)>> <<if ($slaves[_i].indenture == -1)>> <<if ($slaves[_i].breedingMark == 0 || $propOutcome == 0)>> <<if ($slaves[_i].reservedChildren == 0)>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index aa5abaaf9d3..935846632bb 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -762,7 +762,7 @@ <<case "anti-aging cream">> <<if ($slaves[$i].visualAge <= 18)>> - $His outward age has regressed to the point that the creams will have little effect. Since they can't be improved with further drug treatment, @@.yellow;$his drug regimen has been ended.@@ + $His outward age has regressed to the point that the creams will have little effect. Since there is no gain for further treatment, @@.yellow;$his drug regimen has been ended.@@ <<set $slaves[$i].drugs = "no drugs">> <<else>> The skin creams @@.lime;soothe $his aging skin@@ leaving $him looking younger, though the effects are only skin deep. diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 2febacd2153..2c3c47351a0 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1353,12 +1353,16 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRule [[Publicize|Slave Interact][$activeSlave.pornFameSpending += 1000]] //Will cost <<print cashFormat(1000)>> weekly.// <<else>> - <<print cashFormat($activeSlave.pornFameSpending)>> weekly is spent to publicize them. + <<textbox "_newPornSpending" $activeSlave.pornFameSpending>> weekly is spent to publicize them. [[Save changes|Slave Interact][$activeSlave.pornFameSpending = Number(_newPornSpending) || 0]] | [[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFameSpending = 0, $activeSlave.pornFocus = "none"]] | <<if $activeSlave.pornFameSpending < 5000>> [[Increase|Slave Interact][$activeSlave.pornFameSpending += 1000]] | <</if>> [[Decrease|Slave Interact][$activeSlave.pornFameSpending -= 1000]] + <<if $activeSlave.pornFameSpending > 5000>><<set _warn = 1>><</if>> + <<set $activeSlave.pornFameSpending = Number($activeSlave.pornFameSpending) || 0>> + <<set $activeSlave.pornFameSpending = Math.clamp(Math.ceil($activeSlave.pornFameSpending/1000)*1000, 0, 5000)>> + <<if _warn>><br>//Spending more than <<print cashFormat(5000)>> weekly will have no effect.//<</if>> <</if>> <<if $studioFeed == 1>> -- GitLab