From fd8c61658a9c6c2eb4606e7a3ebb89c0756411c4 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Fri, 2 Oct 2020 21:50:47 -0400 Subject: [PATCH] Code refactoring --- src/facilities/pit/killSlave.js | 36 ++++++++++++++------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/facilities/pit/killSlave.js b/src/facilities/pit/killSlave.js index 8dde476dd84..2ff8f34be25 100644 --- a/src/facilities/pit/killSlave.js +++ b/src/facilities/pit/killSlave.js @@ -11,30 +11,24 @@ App.Facilities.Pit.killSlave = function(slave) { const frag = new DocumentFragment; const {He, His, he, him, his, daughter, himself} = getPronouns(slave); + const FS = { + FSRomanRevivalist: 'gladius', + FSNeoImperialist: 'estoc', + FSAztecRevivalist: 'Tecpatl', + FSEgyptianRevivalist: 'kopesh', + FSEdoRevivalist: 'katana', + FSArabianRevivalist: 'scimitar', + FSChineseRevivalist: 'jian', + }; + let weapon = "handgun"; let qualifiedFS = false; - if (V.arcologies[0].FSRomanRevivalist !== "unset") { - qualifiedFS = true; - weapon = "gladius"; - } else if (V.arcologies[0].FSNeoImperialist !== "unset") { - qualifiedFS = true; - weapon = "estoc"; - } else if (V.arcologies[0].FSAztecRevivalist !== "unset") { - qualifiedFS = true; - weapon = "Tecpatl"; - } else if (V.arcologies[0].FSEgyptianRevivalist !== "unset") { - qualifiedFS = true; - weapon = "kopesh"; - } else if (V.arcologies[0].FSEdoRevivalist !== "unset") { - qualifiedFS = true; - weapon = "katana"; - } else if (V.arcologies[0].FSArabianRevivalist !== "unset") { - qualifiedFS = true; - weapon = "scimitar"; - } else if (V.arcologies[0].FSChineseRevivalist !== "unset") { - qualifiedFS = true; - weapon = "jian"; + for (const fs in FS) { + if (V.arcologies[0][fs] !== "unset") { + qualifiedFS = true; + weapon = FS[fs]; + } } frag.appendChild(intro()); -- GitLab