From f772369b00084846af6e8055bce40337e8611878 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 1 May 2017 15:58:21 -0400 Subject: [PATCH] Fixes. --- src/uncategorized/randomNonindividualEvent.tw | 2 +- src/utility/assignWidgets.tw | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 2afc1ba0878..334b5abc098 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -77,7 +77,7 @@ <<if ($slaves[$i].daughters > 0)>> <<if ($slaves[$i].devotion > 50)>> <<set $mother = $slaves[$i]>> - <<set $daughter = RandomDaughter($slaves[$i])>> + <<set $daughter = randomDaughter($slaves[$i])>> <<if ($daughter.devotion > 50)>> <<if canWalk($daughter)>> <<if canWalk($mother)>> diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw index 1d9fd0c4ea6..edee8d60f9e 100644 --- a/src/utility/assignWidgets.tw +++ b/src/utility/assignWidgets.tw @@ -92,6 +92,7 @@ /% use .toLowerCase() to get rid of a few dupe conditions. %/ <<switch $args[1].toLowerCase()>> <<case "clinic" "get treatment in the clinic">> + <<if _wID == $Nurse.ID>><<set $Nurse = 0>><</if>> <<set _Tcount = $CliniciIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $CliniciIDs[_wi].ID>> @@ -100,6 +101,7 @@ <</if>> <</for>> <<case "schoolroom" "learn in the schoolroom">> + <<if _wID == $Schoolteacher.ID>><<set $Schoolteacher = 0>><</if>> <<set _Tcount = $SchlRiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $SchlRiIDs[_wi].ID>> @@ -108,6 +110,7 @@ <</if>> <</for>> <<case "spa" "rest in the spa">> + <<if _wID == $Attendant.ID>><<set $Attendant = 0>><</if>> <<set _Tcount = $SpaiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $SpaiIDs[_wi].ID>> @@ -116,6 +119,7 @@ <</if>> <</for>> <<case "cellblock" "be confined in the cellblock">> + <<if _wID == $Wardeness.ID>><<set $Wardeness = 0>><</if>> <<set _Tcount = $CellBiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $CellBiIDs[_wi].ID>> @@ -132,6 +136,7 @@ <</if>> <</for>> <<case "brothel" "work in the brothel">> + <<if _wID == $Madam.ID>><<set $Madam = 0>><</if>> <<set _Tcount = $BrothiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $BrothiIDs[_wi].ID>> @@ -140,6 +145,7 @@ <</if>> <</for>> <<case "club" "serve in the club">> + <<if _wID == $DJ.ID>><<set $DJ = 0>><</if>> <<set _Tcount = $ClubiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $ClubiIDs[_wi].ID>> @@ -148,6 +154,7 @@ <</if>> <</for>> <<case "dairy" "work in the dairy">> + <<if _wID == $Milkmaid.ID>><<set $Milkmaid = 0>><</if>> <<set _Tcount = $DairyiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $DairyiIDs[_wi].ID>> @@ -164,6 +171,7 @@ <</if>> <</for>> <<case "servantsquarters" "servants' quarters" "work as a servant">> + <<if _wID == $Stewardess.ID>><<set $Stewardess = 0>><</if>> <<set _Tcount = $ServQiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $ServQiIDs[_wi].ID>> @@ -172,6 +180,7 @@ <</if>> <</for>> <<case "mastersuite" "master suite" "serve in the master suite">> + <<if _wID == $Concubine.ID>><<set $Concubine = 0>><</if>> <<set _Tcount = $MastSiIDs.length>> <<for _wi = 0; _wi < _Tcount; _wi++>> <<if _wID == $MastSiIDs[_wi].ID>> -- GitLab