From 97c2bd5aa269c50012ed4a0fe0fafa42c3abf7cd Mon Sep 17 00:00:00 2001 From: mweggen <361046+mweggen@users.noreply.github.com> Date: Tue, 18 Sep 2018 19:27:45 +0200 Subject: [PATCH] Moved teeth check to saLongTermEffects, and added some descriptions. --- src/uncategorized/nextWeek.tw | 17 ----------------- src/uncategorized/saLongTermEffects.tw | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index e5b1002a672..784677b72a4 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -40,23 +40,6 @@ <<if $seeAge == 1>> <<set $slaves[_i].physicalAge += 1, $slaves[_i].actualAge += 1>> - <<if $slaves[_i].physicalAge >= 6 && $slaves[_i].teeth == "baby">> - <<set $slaves[_i].teeth = "mixed">> - <<elseif $slaves[_i].physicalAge >= 12 && $slaves[_i].teeth == "mixed">> - <<set _crookedTeethGen = 4+$slaves[_i].intelligence+$slaves[_i].intelligenceImplant>> - <<if "American" == $slaves[_i].nationality>> - <<set _crookedTeethGen += 2>> - <<elseif ["Andorran", "Antiguan", "Argentinian", "Aruban", "Australian", "Austrian", "Bahamian", "Bahraini", "Barbadian", "Belarusian", "Belgian", "Bermudian", "Brazilian", "British", "Bruneian", "Bulgarian", "Canadian", "Catalan", "Chilean", "a Cook Islander", "Croatian", "Czech", "Cypriot", "Danish", "Dutch", "Emirati", "Estonian", "Finnish", "French", "German", "Greek", "Greenlandic", "Guamanian", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Japanese", "Kazakh", "Korean", "Kuwaiti", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Malaysian", "Maltese", "Mauritian", "Monégasque", "Montenegrin", "New Caledonian", "a New Zealander", "Niuean", "Norwegian", "Omani", "Palauan", "Panamanian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Sammarinese", "Saudi", "Seychellois", "Singaporean", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Taiwanese", "Trinidadian", "Uruguayan", "Vatican"].includes($slaves[_i].nationality)>> - <<else>> - <<set _crookedTeethGen -= 2>> - <</if>> - <<if random(1,_crookedTeethGen) == 1>> - <<set $slaves[_i].teeth = "crooked">> - <<else>> - <<set $slaves[_i].teeth = "normal">> - <</if>> - <</if>> - /* Note Induced NCS completely takes over visual aging, so the increment from pre-existing code simply is trapped behind a !NCS test. Additionally, because of the neotony aspects of NCS, ovaries don't age quite as fast. */ <<if $slaves[_i].inducedNCS == 0>> <<set $slaves[_i].visualAge += 1>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a954d69ee07..84352dacba8 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6023,6 +6023,31 @@ <</if>> <</if>> +<<if $slaves[$i].birthWeek >= 52>> + <<if $seeAge == 1>> + <<if $slaves[$i].physicalAge >= 6 && $slaves[_i].teeth == "baby">> + <<set $slaves[$i].teeth = "mixed">> + $He lost $his first baby tooth this week. + <<elseif $slaves[$i].physicalAge >= 12 && $slaves[$i].teeth == "mixed">> + <<set _crookedTeethGen = 4+$slaves[$i].intelligence+$slaves[$i].intelligenceImplant>> + <<if "American" == $slaves[$i].nationality>> + <<set _crookedTeethGen += 2>> + <<elseif ["Andorran", "Antiguan", "Argentinian", "Aruban", "Australian", "Austrian", "Bahamian", "Bahraini", "Barbadian", "Belarusian", "Belgian", "Bermudian", "Brazilian", "British", "Bruneian", "Bulgarian", "Canadian", "Catalan", "Chilean", "a Cook Islander", "Croatian", "Czech", "Cypriot", "Danish", "Dutch", "Emirati", "Estonian", "Finnish", "French", "German", "Greek", "Greenlandic", "Guamanian", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Japanese", "Kazakh", "Korean", "Kuwaiti", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Malaysian", "Maltese", "Mauritian", "Monégasque", "Montenegrin", "New Caledonian", "a New Zealander", "Niuean", "Norwegian", "Omani", "Palauan", "Panamanian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Sammarinese", "Saudi", "Seychellois", "Singaporean", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Taiwanese", "Trinidadian", "Uruguayan", "Vatican"].includes($slaves[$i].nationality)>> + <<else>> + <<set _crookedTeethGen -= 2>> + <</if>> + $He lost the last of $his baby teeth this week. + <<if random(1,_crookedTeethGen) == 1>> + <<set $slaves[$i].teeth = "crooked">> + $His teeth ended up @@.yellow;crooked@@, detracting from $his beauty whenever $he opens $his mouth. + <<else>> + <<set $slaves[$i].teeth = "normal">> + <</if>> + teeth. + <</if>> + <</if>> +<</if>> + <<if $weightAffectsAssets != 0>> <<if $slaves[$i].weight <= 10>> <<if $slaves[$i].diet != "fattening">> -- GitLab