From 1c5111090896a5edf09396eb97c8e54388c70bc4 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Tue, 26 Mar 2019 13:05:38 +0100
Subject: [PATCH] Consolidate slave skill parameters in an object
Various skills properties get moved into a .skill object inside the
SlaveState class.
---
src/endWeek/saServeThePublic.js | 6 +++---
src/init/storyInit.tw | 2 +-
src/npc/uploadSlave.tw | 2 +-
src/uncategorized/customSlave.tw | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 901ee1d6c9c..62706720bec 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -583,12 +583,12 @@ window.saServeThePublic = (function saServeThePublic() {
/** @param {App.Entity.SlaveState} slave */
function slaveSkills(slave) {
let skillIncrease;
- if (!setup.entertainmentCareers.includes(slave.career) && slave.skillE < V.masteredXP) {
- slave.skillE += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
+ if (!setup.entertainmentCareers.includes(slave.career) && slave.skill.entertainer < V.masteredXP) {
+ slave.skill.entertainer += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
}
if (setup.entertainmentCareers.includes(slave.career)) {
r += ` ${He} has experience with entertainment from ${his} life before ${he} was a slave, making ${him} more effective.`;
- } else if (slave.skillE >= V.masteredXP) {
+ } else if (slave.skill.entertainer >= V.masteredXP) {
r += ` ${He} has learned to be entertaining from working for you, making ${him} more effective.`;
}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 78fb80a9dbd..3642ff563f2 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1345,7 +1345,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $weatherToday = $niceWeather.random()>>
<<set $customSlaveOrdered = 0>>
-<<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
+<<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
<<set $huskSlaveOrdered = 0>>
<<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>>
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index 0255eba1688..d19764a7c3d 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -146,7 +146,7 @@ armsTat: "$activeSlave.armsTat",
legsTat: "$activeSlave.legsTat",
backTat: "$activeSlave.backTat",
stampTat: "$activeSlave.stampTat",
-vaginalSkill: $activeSlave.skill.vaginal,
+skill.vaginal: $activeSlave.skill.vaginal,
skill.oral: $activeSlave.skill.oral,
skill.anal: $activeSlave.skill.anal,
skill.whore: $activeSlave.skill.whore,
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index e648271d4fd..27618357c84 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -1274,7 +1274,7 @@ Nationality: $customSlave.nationality.
<br><br>
<<link "Reset custom order form">>
- <<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
+ <<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", amp: 0, eyes: 1, hears: 0}>>
<<goto "Custom Slave">>
<</link>>
--
GitLab