From af60379c9ebc9f292cf611101b9867c75d2faf7b Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 10 Oct 2020 15:40:06 -0400
Subject: [PATCH] race and misc fixes
---
js/003-data/policiesData.js | 8 ++++----
.../specificMarkets/customSlaveMarket.js | 19 ++++++++++++++-----
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index 13fdd6416ca..318ae6e3cd7 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -815,7 +815,7 @@ App.Data.Policies.Selection = {
App.UI.DOM.makeTextBox(
V.policies.retirement.sex,
v => {
- V.policies.retirement.sex = Math.clamp(v, 1, 1e7);;
+ V.policies.retirement.sex = Math.clamp(v, 1, 1e7);
policy("RetirementPolicies");
},
true
@@ -875,7 +875,7 @@ App.Data.Policies.Selection = {
App.UI.DOM.makeTextBox(
V.policies.retirement.cum,
v => {
- V.policies.retirement.cum = Math.clamp(v, 1, 1e9);;
+ V.policies.retirement.cum = Math.clamp(v, 1, 1e9);
policy("RetirementPolicies");
},
true
@@ -935,7 +935,7 @@ App.Data.Policies.Selection = {
App.UI.DOM.makeTextBox(
V.policies.retirement.kills,
v => {
- V.policies.retirement.kills = Math.clamp(v, 1, 1e6);;
+ V.policies.retirement.kills = Math.clamp(v, 1, 1e6);
policy("RetirementPolicies");
},
true
@@ -1817,7 +1817,7 @@ App.Data.Policies.Selection = {
note: `Will improve your arcology's combat power during crises`
}
],
- "arcologies[0].FSNeoImperialistLaw2": [
+ "arcologies[0].FSNeoImperialistLaw2": [
{
title: "Neo-Imperial Baronies",
titleClass: "lime",
diff --git a/src/markets/specificMarkets/customSlaveMarket.js b/src/markets/specificMarkets/customSlaveMarket.js
index 684b4ce6f5b..f47c4afde96 100644
--- a/src/markets/specificMarkets/customSlaveMarket.js
+++ b/src/markets/specificMarkets/customSlaveMarket.js
@@ -301,6 +301,16 @@ App.Markets["Custom Slave"] = function() {
createDescription(el, description, slaveProperty);
// Choices
+ el.append(
+ App.UI.DOM.makeTextBox(
+ slave.race,
+ (v) => {
+ slave.race = v;
+ jQuery("#race-text").empty().append(description());
+ }
+ )
+ );
+
const select = document.createElement("select");
for (const [value, text] of choices) {
const option = document.createElement("option");
@@ -315,12 +325,11 @@ App.Markets["Custom Slave"] = function() {
el.append(select);
function description() {
- for (const [value, text] of choices) {
- if (slave.nationality === value) {
- return `${text}. `;
- }
+ if (slave.race) {
+ return `${capFirstChar(slave.race)}. `;
+ } else {
+ return "Ethnicity is unimportant. ";
}
- return "Ethnicity is unimportant. "
}
return el;
--
GitLab