From cbcf452f4b76a5f42b29df0162ed2600c6c821b0 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 28 Nov 2020 15:08:53 -0500
Subject: [PATCH] use assign
---
src/events/intro/introSummary.js | 31 +++++++++++++-----------
src/gui/options/summaryOptions.js | 39 +++++++++++++++++--------------
2 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/events/intro/introSummary.js b/src/events/intro/introSummary.js
index 6cabe488c84..494b7edb30f 100644
--- a/src/events/intro/introSummary.js
+++ b/src/events/intro/introSummary.js
@@ -269,20 +269,23 @@ App.Intro.summary = function() {
V.sortSlavesOrder = "descending";
V.sortSlavesMain = 0;
V.rulesAssistantMain = 1;
- V.UI.slaveSummary.abbreviation = {
- devotion: 1,
- rules: 1,
- clothes: 2,
- health: 1,
- diet: 1,
- drugs: 1,
- race: 1,
- nationality: 1,
- genitalia: 1,
- physicals: 1,
- skills: 1,
- mental: 2
- };
+ Object.assign(
+ V.UI.slaveSummary.abbreviation,
+ {
+ devotion: 1,
+ rules: 1,
+ clothes: 2,
+ health: 1,
+ diet: 1,
+ drugs: 1,
+ race: 1,
+ nationality: 1,
+ genitalia: 1,
+ physicals: 1,
+ skills: 1,
+ mental: 2
+ }
+ );
V.PC.skill.trading = 100;
V.PC.skill.warfare = 100;
V.PC.skill.slaving = 100;
diff --git a/src/gui/options/summaryOptions.js b/src/gui/options/summaryOptions.js
index 48402b23401..ff8c74b10bd 100644
--- a/src/gui/options/summaryOptions.js
+++ b/src/gui/options/summaryOptions.js
@@ -74,24 +74,27 @@ App.UI.summaryOptions = function() {
V.sortSlavesOrder = "descending";
V.sortSlavesMain = 0;
V.rulesAssistantMain = 1;
- V.UI.slaveSummary.abbreviation = {
- devotion: 1,
- mental: 1,
- rules: 1,
- clothes: 2,
- health: 1,
- diet: 1,
- drugs: 1,
- hormoneBalance: 1,
- race: 1,
- genitalia: 1,
- physicals: 1,
- skills: 1,
- nationality: 1,
- rulesets: 1,
- clothes: 0,
- origins: 0
- };
+ Object.assign(
+ V.UI.slaveSummary.abbreviation,
+ {
+ devotion: 1,
+ mental: 1,
+ rules: 1,
+ clothes: 2,
+ health: 1,
+ diet: 1,
+ drugs: 1,
+ hormoneBalance: 1,
+ race: 1,
+ genitalia: 1,
+ physicals: 1,
+ skills: 1,
+ nationality: 1,
+ rulesets: 1,
+ clothes: 0,
+ origins: 0
+ }
+ );
V.abbreviateSidebar = 1;
},
"Summary Options"
--
GitLab