From bc14e8d748834f40943d37e3d5ac97d8e66bd656 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 12 Aug 2018 15:43:13 -0400 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++++- src/uncategorized/costsReport.tw | 6 +++--- src/uncategorized/resMove.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 6 +++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 9108e82920c..2d5990ad38f 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,7 +2,10 @@ 0.10.7.1-0.5.x -8/11/2018 +8/12/2018 + + 32 + -fixes 31 -more outcomes for saChoosesOwnClothes diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 5183f7c5863..8c9032175dc 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -32,12 +32,12 @@ your __personal living expenses__ are <<print cashFormat(($girls*(250+($economy* <<if $breederOrphanageTotal > 0>><<set _breederTuition = 50>><<else>><<set _breederTuition = 0>><</if>> <<if $citizenOrphanageTotal+$privateOrphanageTotal+$breederOrphanageTotal > 0>> - __Orphanage__ fee: @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100+$privateOrphanageTotal*500+_breederTuition>>@@ + __Orphanage__ fee: @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100+$privateOrphanageTotal*500+_breederTuition)>>@@ <<if $citizenOrphanageTotal > 0>> - <br> Citizen: @@.yellowgreen;<<print cashFormat(100)>>@@ per child. Currently <<print commaNum($citizenOrphanageTotal)>> are being tought, bringing the total to @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100)>>@@. + <br> Citizen: @@.yellowgreen;<<print cashFormat(100)>>@@ per child. Currently <<print commaNum($citizenOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100)>>@@. <</if>> <<if $privateOrphanageTotal > 0>> - <br> Private: @@.yellowgreen;<<print cashFormat(500)>>@@ per child. Currently <<print commaNum($privateOrphanageTotal)>> are being tought, bringing the total to @@.yellowgreen;<<print cashFormat($privateOrphanageTotal*500)>>@@. + <br> Private: @@.yellowgreen;<<print cashFormat(500)>>@@ per child. Currently <<print commaNum($privateOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($privateOrphanageTotal*500)>>@@. <</if>> <<if $breederOrphanageTotal > 0>> <br> Since <<print commaNum($breederOrphanageTotal)>> of your slaves' children are being raised into productive members of society in a society funded school, you pay a flat @@.yellowgreen;<<print cashFormat(50)>>@@ usage fee. diff --git a/src/uncategorized/resMove.tw b/src/uncategorized/resMove.tw index 4602e26d162..d5c47621c21 100644 --- a/src/uncategorized/resMove.tw +++ b/src/uncategorized/resMove.tw @@ -232,7 +232,7 @@ as you suspected, <<case "incubus">> their strength; think of the sexual positions!" She exclaims, her hard-on twitching with anticipation. <<case "succubus">> - their stamina," she says, licking her lips. "You could fuck all night long witohut a single break!" + their stamina," she says, licking her lips. "You could fuck all night long without a single break!" <<case "imp">> that strength," her avatar smirks. "You could spank a girl red, easily." <<case "witch">> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 8a72987fd3f..3e4d17d511d 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4860,7 +4860,11 @@ <<if (random(1,100) > 100+$slaves[$i].trust)>> <<set _effect = random(1,4)>> Being so afraid so constantly drives $him to find solace in - <<set _givingAttention = $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>> + <<if Array.isArray($personalAttention)>> + <<set _givingAttention = $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>> + <<else>> + <<set _givingAttention = -1>> + <</if>> <<if _givingAttention != -1 && ["look after her", "soften her behavioral flaw", "soften her sexual flaw", "build her devotion", "Teach her"].includes($personalAttention[_givingAttention].trainingRegimen)>> your attention. Relying on you for @@.hotpink;emotional support@@ strengthens $his @@.mediumaquamarine;bond@@ with <<= WrittenMaster($slaves[$i])>>. <<set $slaves[$i].devotion++, $slaves[$i].trust++>> -- GitLab