diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index 901ee1d6c9c00105f51bdf6ba24f7255e7c4b93b..62706720becfef45f7876862a02ae952a430c937 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 78fb80a9dbd2c918483ce2b1b9456bec63c85827..3642ff563f2cb46e9515dad2a688076bdfae3f0e 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 0255eba168863a441173ee4e0758e1dd60764387..d19764a7c3d9d20ee5d2646d1c0758125c6740af 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 e648271d4fd50334e4cf1b429a9577de2c6f48d7..27618357c8450dc6400df64204e7e1558d6f47ab 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>>