diff --git a/devNotes/Extended Family Mode Explained.txt b/devNotes/Extended Family Mode Explained.txt index 660e16940766a8bc766540e67005a012d9223987..133682e127105715ac020cbb94852e651a796514 100644 --- a/devNotes/Extended Family Mode Explained.txt +++ b/devNotes/Extended Family Mode Explained.txt @@ -9,7 +9,7 @@ Everything about a slave's family can be gathered by looking into her mother and The following values are used with .mother and .father: Valid slave IDs (in other words, a value > 0) - Serves as both a target for checks and as a check itself to see if effort should be expended to search for the parent. 0 - Slave has no known parent. A slave with a parent value of 0 is capable of having a parent added via reRelativeRecruiter -MissingParentIDs (in other words, a value < -2) - Serves as a placeholder to preserve sibling relations in the case of a parent being sold or lost. Outside of extreme cases, this value will never be restored to its' previous value. $missingParentID starts at -10000 and decrements after application. On NG+, positive values are incremented the same as a normal slave and checked for validity. Should it be invalid, it will be replaced with $missingParentID. Negative values, on the other hand, are decremented by 1200000. Values of -1 and -2 are ignored by the JS, so don't use them. Also -9999 through -9996 are used by hero slaves to preserve their sibling status no matter when they are purchased or obtained during the same game. +MissingParentIDs (in other words, a value < -2) - Serves as a placeholder to preserve sibling relations in the case of a parent being sold or lost. Outside of extreme cases, this value will never be restored to its' previous value. $missingParentID starts at -10000 and decrements after application. On NG+, positive values are incremented the same as a normal slave and checked for validity. Should it be invalid, it will be replaced with $missingParentID. Negative values, on the other hand, are decremented by 1200000. Values of -1 and -2 are ignored by the JS, so don't use them. Also -9999 through -9994 are used by hero slaves to preserve their sibling status no matter when they are purchased or obtained during the same game. The limiters: .sisters and .daughters diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw index b28699e70a5aaf2e391300859e299a743b93db1c..e2b194bd6bea6520a3b6dbc5918a26845b4f8e7e 100644 --- a/src/uncategorized/pRivalryHostage.tw +++ b/src/uncategorized/pRivalryHostage.tw @@ -199,7 +199,7 @@ time as a gang leader. She was one of your best, yet you never got close enough, but you do remember her, and your rival knows it. This is obviously the best they could come up with to provoke an emotional reaction. <br><br> -"Hello, $PC.name<<if $PC.surname>> $PC.surname<</if>>," your rival sneers. "Sorry to pull you away from +"Hello, <<PlayerName>>," your rival sneers. "Sorry to pull you away from <<switch $rivalryFS>> <<case "Racial Subjugationism">> whipping some poor $arcologies[0].FSSubjugationistRace girl's back bloody, diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw index fcb331fd66e1db0c2c526c3e08551df07d66ae5e..c4deedd658837a5d41400a3cbb949ddad9c5558a 100644 --- a/src/uncategorized/pRivalryVictory.tw +++ b/src/uncategorized/pRivalryVictory.tw @@ -349,7 +349,7 @@ For the first time, you receive a direct call from your rival. You pictured the <<elseif $seed == "breeder">> immediately apparent: there's nothing wrong with having a pregnancy fetish, but applying it to oneself is ill-fitting for an arcology owner. <<if $pedo_mode == 1>> - <<set $activeSlaveOneTimeMinAge = ($minimumSlaveAge + 6)>> + <<set $activeSlaveOneTimeMinAge = ($fertilityAge + 6)>> <<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have been pregnant many times. %/ <<else>> <<set $activeSlaveOneTimeMinAge = 18>> diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index 44ab45d62324b3da65cf4c66d6fd9e181eb955ad..33d3b227bfdd0b5968f122fe8e20f9e0297a9339 100644 --- a/src/uncategorized/randomIndividualEvent.tw +++ b/src/uncategorized/randomIndividualEvent.tw @@ -140,17 +140,17 @@ <</if>> <<if $familyTesting == 0>> -<<if $eventSlave.devotion > 20>> -<<if $eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80>> -<<if $eventSlave.relation == "mother">> -<<if $eventSlave.lactation>> -<<if $eventSlave.releaseRules != "restrictive">> - <<set $RETSevent.push("incestuous nursing")>> -<</if>> -<</if>> -<</if>> -<</if>> -<</if>> + <<if $eventSlave.devotion > 20>> + <<if $eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80>> + <<if $eventSlave.relation == "mother">> + <<if $eventSlave.lactation>> + <<if $eventSlave.releaseRules != "restrictive">> + <<set $RETSevent.push("incestuous nursing")>> + <</if>> + <</if>> + <</if>> + <</if>> + <</if>> <<else>> <<if $eventSlave.devotion > 20 && ($eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80) && $eventSlave.lactation > 0 && $eventSlave.releaseRules != "restrictive" && $eventSlave.daughters > 0>> <<set $RETSevent.push("incestuous nursing")>> diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw index b82a510262ba66938db16bfcad94b9c068b59f57..8b018ff067cdb6380a41cd3317c4a76edc1e9276 100644 --- a/src/uncategorized/reMalefactor.tw +++ b/src/uncategorized/reMalefactor.tw @@ -1,6 +1,6 @@ :: RE malefactor [nobr] -<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $showEncyclopedia = 1, $encyclopedia = "Free Cities Justice">> +<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $showEncyclopedia = 1, $encyclopedia = "Free Cities Justice", $applyLaw = 0>> <<if $malefactor == "addict">> diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw index 4b899883f044421aa6b838b0f9d131645ccbb1d6..51ac354dd5795686a7e55af9c834c3440a57095d 100644 --- a/src/uncategorized/reMilfTourist.tw +++ b/src/uncategorized/reMilfTourist.tw @@ -10,7 +10,7 @@ <<set $activeSlaveOneTimeMaxAge = 42>> <<set $one_time_age_overrides_pedo_mode = 1>> /* middle-aged */ <<include "Generate XX Slave">> -<<set $activeSlave.origin = "She came to your arcology as a tourist, and found herself enslaved.">> +<<set $activeSlave.origin = "She came to your arcology as a tourist and found herself enslaved.">> <<set $activeSlave.devotion = random(-70,-55)>> <<set $activeSlave.trust = random(-45,-25)>> <<set $activeSlave.health = random(10,20)>> @@ -94,7 +94,7 @@ <<set $slaves[_milfed].trust += 4, $slaves[_milfed].oralCount += 3, $slaves[_milfed].analCount += 3>> <<set $oralTotal += 3, $analTotal += 3>> <<set $rep += 100>> - <<set $desc = "a thank-you note from a MILF tourist who you made feel welcome in the arcology">> + <<set $desc = "a thank-you note from a MILF tourist whom you made feel welcome in the arcology">> <<set $trinkets.push($desc)>> <</replace>> <</link>> @@ -112,7 +112,7 @@ <<set $slaves[_milfed].trust += 4, $slaves[_milfed].oralCount++>> <<set $oralTotal++>> <<set $rep += 100>> - <<set $desc = "a thank-you note from a MILF tourist who you made feel welcome in the arcology">> + <<set $desc = "a thank-you note from a MILF tourist whom you made feel welcome in the arcology">> <<set $trinkets.push($desc)>> <</replace>> <</link>> diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw index ad96782f8bd952dfe53509436d348f9bc08a6144..f71ee22274bab513a1fa62dce10ba8fde4bf812c 100644 --- a/src/uncategorized/rename.tw +++ b/src/uncategorized/rename.tw @@ -37,8 +37,8 @@ <<if $oldName != $activeSlave.slaveName>> <<set _toSearch = $activeSlave.slaveName>> <<set _toSearch = _toSearch.toLowerCase();>> - <<for $i = 0; $i < $badWords.length; $i++>> - <<if _toSearch.indexOf($badWords[$i]) != -1>> + <<for $i = 0; $i < setup.badWords.length; $i++>> + <<if _toSearch.indexOf(setup.badWords[$i]) != -1>> <<set _insultingName = 1>> <</if>> <</for>> @@ -47,8 +47,8 @@ <<if $oldSurname != $activeSlave.slaveSurname>> <<set _toSearch = $activeSlave.slaveSurname>> <<set _toSearch = _toSearch.toLowerCase();>> - <<for $i = 0; $i < $badWords.length; $i++>> - <<if _toSearch.indexOf($badWords[$i]) != -1>> + <<for $i = 0; $i < setup.badWords.length; $i++>> + <<if _toSearch.indexOf(setup.badWords[$i]) != -1>> <<set _insultingName = 1>> <</if>> <</for>> diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw index 2a01e21e20b9554ede517a161227118d9b361b6d..cdee1d8f66ab3ab35356525b4ef3d0fbf64b60bc 100644 --- a/src/uncategorized/slaveShelter.tw +++ b/src/uncategorized/slaveShelter.tw @@ -21,7 +21,6 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is <<else>> <<set _possibleOrigins.push("cannibal victim female")>> <</if>> - <</if>> <</if>> <<if _num < $seeDicks>> <<set _possibleOrigins.push("geldling", "dickpain")>>