diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw index b3d5cd1e13a597a467a40d1e544e3a7fb61b1bd4..878a029f25ecddfdc041d7b283123a3c0485cf54 100644 --- a/src/pregmod/generateChild.tw +++ b/src/pregmod/generateChild.tw @@ -76,7 +76,11 @@ <<if $PC.origRace == $mergeDad.origRace>> <<set $activeSlave.race = $mergeDad.origRace>> <<elseif random(1,4) == 4>> - <<set $activeSlave.race = either($PC.origRace, $mergeDad.origRace)>> + <<if def $mergeDad.origRace>> + <<set $activeSlave.race = either($PC.origRace, $mergeDad.origRace)>> + <<else>> + <<set $activeSlave.race = $PC.origRace>> + <</if>> <<else>> <<set $activeSlave.race = "mixed race">> <</if>> @@ -206,7 +210,11 @@ <<if $PC.origRace == $mergeDad.origRace>> <<set $activeSlave.race = $mergeDad.origRace>> <<elseif random(1,4) == 4>> - <<set $activeSlave.race = either($PC.origRace, $mergeDad.origRace)>> + <<if def $mergeDad.origRace>> + <<set $activeSlave.race = either($PC.origRace, $mergeDad.origRace)>> + <<else>> + <<set $activeSlave.race = $PC.origRace>> + <</if>> <<else>> <<set $activeSlave.race = "mixed race">> <</if>> @@ -312,7 +320,11 @@ <<if $mergeMom.origRace == $mergeDad.origRace>> <<set $activeSlave.race = $mergeDad.origRace>> <<elseif random(1,4) == 4>> - <<set $activeSlave.race = either($mergeMom.origRace, $mergeDad.origRace)>> + <<if def $mergeDad.origRace>> + <<set $activeSlave.race = either($mergeMom.origRace, $mergeDad.origRace)>> + <<else>> + <<set $activeSlave.race = $mergeMom.origRace>> + <</if>> <<else>> <<set $activeSlave.race = "mixed race">> <</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 31d1e6b0900a3ae53ee504d0827dc0c3d8a5711e..5af5e45fc461b72cafbbebe1ffbfb41e3896605c 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -2512,6 +2512,9 @@ Setting missing slave variables: <<if (_Slave.race == "surgically altered to look mixed race") || (_Slave.race == "surgically altered to look mixed")>> <<set _Slave.race = "mixed race">> <</if>> +<<if ndef _Slave.race>> + <<run nationalityToRace(_Slave)>> +<</if>> <<if ndef _Slave.origRace>> <<set _Slave.origRace = _Slave.race>> <</if>> diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw index 2a736e69c17e1da6abfd29974380c85ae4d017e4..b0807898274c776e8cca2346154c200d148a6e45 100644 --- a/src/uncategorized/addCustomDescriptors.tw +++ b/src/uncategorized/addCustomDescriptors.tw @@ -1,6 +1,6 @@ :: Add custom descriptors [nobr] -<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Slave Interact">> +<<set $nextButton = "Continue", $nextLink = "Rename">> <<set $oldName = $activeSlave.slaveName, $oldSurname = $activeSlave.slaveSurname>> You may enter custom descriptors for your slave's hair color, hair style, tattoos, or anything else here. After typing, press enter to commit your change. These custom descriptors will appear in descriptions of your slave, but will have no gameplay effect. Changing them is free. diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw index 08146fb8ce6a51e1c22d6ff431e7c38c603ca451..7e295869fa376cd6d0c8f42776c0510d42bd7e7b 100644 --- a/src/uncategorized/rename.tw +++ b/src/uncategorized/rename.tw @@ -2,6 +2,9 @@ <<set $nextButton = "Back", $nextLink = "Slave Interact">> +<<if $activeSlave.slaveName === $oldName && $activeSlave.slaveSurname === $oldSurname>> + <<goto "Slave Interact">> +<<else>> /* First time renaming reaction */ <<if $activeSlave.slaveName === "" || ndef $activeSlave.slaveName>> $oldName needs to be called something on the records, so $oldName she stays. @@ -156,4 +159,6 @@ <</if>> <</if>> <</if>> -<</if>> \ No newline at end of file +<</if>> + +<</if>> /* close new name check */