From cc4c9da47d51d06fc3ed33a77001e492ba58fcce Mon Sep 17 00:00:00 2001 From: fcanon <fcanon@nowhere.na> Date: Thu, 11 May 2017 12:30:35 -0400 Subject: [PATCH] remove unnecessary assignment checks before Rules Facility Remove in assignFacility processing block of DefaultRules widget --- src/utility/raWidgets.tw | 52 ++++++++++------------------------------ 1 file changed, 13 insertions(+), 39 deletions(-) diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 0cda196ce3c..aff77258230 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -3243,9 +3243,7 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "serve in the master suite")>> - <<include "Rules Facility Remove">> - <</if>> + <<include "Rules Facility Remove">> <</if>> <<case "clinic">> @@ -3255,9 +3253,7 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "get treatment in the clinic")>> - <<include "Rules Facility Remove">> - <</if>> + <<include "Rules Facility Remove">> <</if>> <<case "spa">> @@ -3267,9 +3263,7 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "rest in the spa")>> - <<include "Rules Facility Remove">> - <</if>> + <<include "Rules Facility Remove">> <</if>> <<case "brothel">> @@ -3279,9 +3273,7 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "work in the brothel")>> - <<include "Rules Facility Remove">> - <</if>> + <<include "Rules Facility Remove">> <</if>> <<case "club">> @@ -3291,9 +3283,7 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "serve in the club")>> - <<include "Rules Facility Remove">> - <</if>> + <<include "Rules Facility Remove">> <</if>> <<case "dairy">> @@ -3310,24 +3300,16 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "work in the dairy")>> - <<include "Rules Facility Remove">> - <</if>> - <</if>> - <<else>> - <<if ($args[0].assignment == "work in the dairy")>> <<include "Rules Facility Remove">> <</if>> - <</if>> - <<else>> - <<if ($args[0].assignment == "work in the dairy")>> + <<else>> <<include "Rules Facility Remove">> <</if>> - <</if>> - <<else>> - <<if ($args[0].assignment == "work in the dairy")>> + <<else>> <<include "Rules Facility Remove">> <</if>> + <<else>> + <<include "Rules Facility Remove">> <</if>> <</if>> <</if>> @@ -3339,9 +3321,7 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "work as a servant")>> - <<include "Rules Facility Remove">> - <</if>> + <<include "Rules Facility Remove">> <</if>> <<case "schoolroom">> @@ -3352,14 +3332,10 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "learn in the schoolroom")>> - <<include "Rules Facility Remove">> - <</if>> - <</if>> - <<else>> - <<if ($args[0].assignment == "learn in the schoolroom")>> <<include "Rules Facility Remove">> <</if>> + <<else>> + <<include "Rules Facility Remove">> <</if>> <<case "cellblock">> @@ -3369,9 +3345,7 @@ Your brand design is ''$brandDesign.'' <<assignJob $args[0] _combinedRule.assignFacility>> <</if>> <<else>> - <<if ($args[0].assignment == "be confined in the cellblock")>> - <<include "Rules Facility Remove">> - <</if>> + <<include "Rules Facility Remove">> <</if>> <</switch>> -- GitLab