diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 046fed92067a358e64041f9615c51a06d03afe4b..f708a128d89b8a5d6d02b09d4c17ef547bac2e71 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.1-0.7.x +9/01/2018 + + 12 + -fixes + -more pronoun implementation + 8/31/2018 11 diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 3a474036c7322c7dbec8cd625e8d6780daa6eccb..388aa7292f9e17e1de0ac173a4ccf4e38a4ee72e 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -152,10 +152,10 @@ __''General slave settings''__ <br> <<if $allowMaleSlaveNames>> Slaves ''can generate with male names.'' - [[Only use female names|Options][$allowMaleSlaveNames = false]] + [[Only use female names|Intro Summary][$allowMaleSlaveNames = false]] <<else>> Slaves will ''always generate with female names.'' - [[Allow male names|Options][$allowMaleSlaveNames = true]] + [[Allow male names|Intro Summary][$allowMaleSlaveNames = true]] <</if>> //This only affects slave generation and not your ability to name your slaves.// diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index f255075db38ac4787d0baeca343656066ca567c7..bcdd21ab2efcba28ea4debcb80ee80202802f498 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -175,7 +175,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank <</link>> <</if>> <</if>> -<<if $activeSlave.father > 0>> +<<if $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>> <<setLocalPronouns _tempDad 2>> <<if _tempDad.ID == $Concubine.ID>> <br><<link "Permit your Concubine to name _his2 daughter">> @@ -238,7 +238,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank <br><br> <span id="newName">''__@@.pink;$activeSlave.slaveName@@__''</span> now stands before your desk -<<if $activeSlave.mother > 0 && $activeSlave.father > 0>> +<<if $activeSlave.mother > 0 && $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>> alongside $his mother _tempMom.slaveName and father _tempDad.slaveName. <<elseif $activeSlave.mother > 0>> alongside $his mother _tempMom.slaveName. @@ -348,7 +348,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank <</if>> <</if>> -<<if $activeSlave.father > 0>> +<<if $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>> <<setLocalPronouns _tempDad 2>> $He glances at $his father <<if _tempDad.relationship == -3>> @@ -435,7 +435,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank <br><br> -<<if $activeSlave.mother > 0 && $activeSlave.father > 0>> +<<if $activeSlave.mother > 0 && $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>> You dismiss _tempMom.slaveName and _tempDad.slaveName so that you may conduct a more intimate inspection of their daughter. <<elseif $activeSlave.mother > 0>> <<setLocalPronouns _tempMom 2>>