From 87cc7bb54bcaf68cd1b68c0c8f34947c16617968 Mon Sep 17 00:00:00 2001
From: Vasileios Pasialiokis <whiterocket@outlook.com>
Date: Wed, 27 Jun 2018 16:12:43 +0300
Subject: [PATCH] fix missing servant quarters, bad checkbox initialisation
---
src/js/DefaultRules.tw | 3 ---
src/js/rulesAssistantOptions.tw | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 2f79ad354c2..2c9771b7c63 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -286,9 +286,6 @@ window.DefaultRules = (function() {
case "work as a servant":
r += `<br>${slave.slaveName} has been automatically assigned to work in ${V.servantsQuartersName}.`;
break;
- case "work as a servant":
- r += `<br>${slave.slaveName} has been automatically assigned to work in ${V.servantsQuartersName}.`;
- break;
case "learn in the schoolroom":
r += `<br>${slave.slaveName} has been automatically assigned to study in ${V.schoolroomName}.`;
break;
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 7f8990ee420..e9d69104001 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -773,14 +773,14 @@ window.rulesAssistantOptions = (function() {
if (V.club > 0) items.push("Club");
if (V.arcade > 0) items.push("Arcade");
if (V.dairy > 0) items.push("Dairy");
- if (V.servantQuarters > 0) items.push("Servant Quarters");
+ if (V.servantsQuarters > 0) items.push("Servant Quarters");
if (V.masterSuite > 0) items.push("Master Suite");
if (V.schoolroom > 0) items.push("Schoolroom");
if (V.spa > 0) items.push("Spa");
if (V.clinic > 0) items.push("Clinic");
if (V.cellblock > 0) items.push("Cellblock");
items.forEach(
- i => this.appendChild(new ButtonItem(i, this.getAttribute(i), current_rule.condition.assignment.includes(i))));
+ i => this.appendChild(new ButtonItem(i, this.getAttribute(i), current_rule.condition.assignment.includes(this.getAttribute(i)))));
}
onchange() {
--
GitLab