diff --git a/js/003-data/constants.js b/js/003-data/constants.js
index c1e4470406bb2a03ff96e014f2be96b47faacfd0..14e2e482b5bc5ee165b3a202a9f80f0a8d9c4340 100644
--- a/js/003-data/constants.js
+++ b/js/003-data/constants.js
@@ -92,6 +92,10 @@ globalThis.PersonalAttention = Object.freeze({
RELAX: 'rest and relaxation',
PROCLAMATION: 'proclamation',
TRAINING: 'slave training',
+ STUDY: 'education',
+ GED: 'degree',
+ EDUCATION: 'advanced education',
+ TEST: 'advanced degree',
});
/**
diff --git a/src/endWeek/reports/personalAttention.js b/src/endWeek/reports/personalAttention.js
index e720f56e42b9871e9d754d9f488a1e01801c1ba5..76b3932937b5107969275c8bf0185b425488fc45 100644
--- a/src/endWeek/reports/personalAttention.js
+++ b/src/endWeek/reports/personalAttention.js
@@ -20,13 +20,31 @@ App.PersonalAttention.slaveReport = function(slave) {
const {womenP} = getPronouns(V.PC).appendSuffix("P");
let r = [];
- if (onBedRest(V.PC, true) && V.PC.dick < -4000) { // Impossible condition to prevent scope creep. Need to finish this later, not right now.
- // too badly injured to train this week
- r.push(`You planned to ${pa.objective === "health" ? "care for" : "train"}`);
+ if (onBedRest(V.PC, true)) {
+ r.push(`You`);
+ if (pa.objective === "health") {
+ r.push(`wanted to care for`);
+ } else if (pa.objective === "ravish") {
+ r.push(`really wanted to fuck`);
+ } else if (pa.objective === "torture") {
+ r.push(`wanted to torment`);
+ } else {
+ r.push(`wanted to train`);
+ }
r.push(App.UI.DOM.makeElement("span", slave.slaveName, ["slave-name"]));
r.push(`this week, but you're not feeling up to it.`);
App.Events.addNode(el, r, "div", "indent");
return el;
+ } else if (["combat training", "spar"].includes(pa.objective) && !canWalk(V.PC)) {
+ r.push(`As much as you'd like to train`);
+ r.push(App.UI.DOM.makeElement("span", slave.slaveName, ["slave-name"]));
+ r.push(`this week, you won't be able to until you're back on your feet.`);
+ if (!hasBothLegs(V.PC) || V.PC.physicalImpairment > 1) {
+ r.push(`Since that will never happen, you'll focus on building ${his} devotion for now.`);
+ pa.objective = "build devotion";
+ }
+ App.Events.addNode(el, r, "div", "indent");
+ return el;
}
// actually training this slave
@@ -36,8 +54,12 @@ App.PersonalAttention.slaveReport = function(slave) {
let vaginalTrainingEfficiency;
let analTrainingEfficiency;
let seed;
+ let hindranceMod = isHinderedDegree(V.PC);
+ const nymphoMod = isPlayerHorny(V.PC) ? .75 : 1;
if (pa.objective === "health") {
r.push(App.UI.DOM.makeElement("span", `You care for`, ["bold"]));
+ } else if (pa.objective === "spar") {
+ r.push(App.UI.DOM.makeElement("span", `You train with`, ["bold"]));
} else {
r.push(App.UI.DOM.makeElement("span", `You train`, ["bold"]));
}
@@ -761,6 +783,116 @@ App.PersonalAttention.slaveReport = function(slave) {
currentSlaveValue = 0.1;
slave.training = 0;
break;
+ case "combat training":
+ trainingEfficiency = Math.max(1, Math.round((7 + (slave.devotion / 30) + (slave.intelligence / 32) - (isHindered(slave) ? 2 : 0) - Math.floor(slave.health.tired/ 10)) * hindranceMod * nymphoMod));
+ r.push(`You focus on passing on your combat skills to ${him}.`);
+ if (hindranceMod <= .3) {
+ r.push(`It's physically impossible for you to properly train someone in your shape, so you're forced to rely on theory over example. Even the most rudimentary of techniques takes longer for ${her} to pick up due to the lack of proper demonstration.`);
+ } else if (hindranceMod <= .5) {
+ r.push(`You have to rely on theory more than example due to your body, cutting into the effectiveness of your training.`);
+ } else if (hindranceMod <= .7) {
+ r.push(`It's difficult to convey proper technique with your body constantly getting in the way.`);
+ } else if (hindranceMod < 1) {
+ r.push(`Your body gets in the way at times, forcing you to reconsider how exactly to demonstrate techniques with proper form.`);
+ }
+ if (slave.intelligence + slave.intelligenceImplant > 15) {
+ r.push(`${His} intelligence allows ${him} to absorb ${his} lessons quickly.`);
+ } else if (slave.intelligence + slave.intelligenceImplant < -15) {
+ r.push(`${His} stupidity makes ${him} absorb ${his} lessons slowly.`);
+ } else {
+ r.push(`${He} takes to your lessons well enough.`);
+ }
+ if (isHindered(slave)) {
+ r.push(`${He} isn't physically cut for combat, which hinders ${his} growth`);
+ }
+ if (slave.health.tired > 30) {
+ r.push(`${His} fatigue cuts into the amount of time ${he} can spend training.`);
+ }
+ if (nymphoMod < 1) {
+ r.push(`Activities like this definitely has to be done in the buff, and the sight of ${his}`);
+ if (slave.weight > 160) {
+ r.push(`rippling flesh`);
+ } else if (slave.weight > 95) {
+ r.push(`soft body`);
+ } else if (slave.muscles > 95) {
+ r.push(`ripped body`);
+ } else if (slave.muscles > 30) {
+ r.push(`muscular body`);
+ } else if (slave.muscles > 5) {
+ r.push(`toned body`);
+ } else if (slave.weight > 30) {
+ r.push(`soft body`);
+ } else {
+ r.push(`lithe body`);
+ }
+ if (eventSlave.weight > 160) {
+ r.push(`bouncing around`);
+ } else {
+ r.push(`in motion`);
+ }
+ r.push(`is just what your libido craves. It does detract from your teaching, but who cares when the lesson concludes with`);
+ if (canDoVaginal(slave) && slave.vagina > 0 && (canPenetrate(V.PC) || V.PC.vagina >= 0)) {
+ if (canPenetrate(V.PC)) {
+ r.push(`some sweaty sex.`);
+ seX(slave, "vaginal", V.PC, "penetrative");
+ if (canImpreg(slave, V.PC)) {
+ knockMeUp(slave, 5, 0, -1);
+ }
+ } else {
+ r.push(`some sweaty tribbing.`);
+ seX(slave, "vaginal", V.PC, "vaginal");
+ if (canFemImpreg(slave, V.PC)) {
+ knockMeUp(slave, 3, 0, -1);
+ }
+ if (canFemImpreg(V.PC, slave)) {
+ knockMeUp(V.PC, 3, 0, -1);
+ }
+ }
+ } else if (canDoAnal(slave) && slave.anus > 0 && canPenetrate(V.PC)) {
+ r.push(`some sweaty anal.`);
+ seX(slave, "anal", V.PC, "penetrative");
+ if (canImpreg(slave, V.PC)) {
+ knockMeUp(slave, 5, 1, -1);
+ }
+ } else if ((V.policies.sexualOpenness === 1 || s.toyHole === "dick") && (V.PC.dick > 0 || V.PC.vagina >= 0) && ((slave.dick > 0 && slave.chastityPenis === 0) || canDoVaginal(slave))) {
+ r.push(`a sweaty 69.`);
+ seX(slave, "oral");
+ seX(V.PC, "oral");
+ if (V.PC.dick > 0) {
+ seX(V.PC, "penetrative");
+ } else {
+ seX(V.PC, "vaginal");
+ }
+ if (slave.dick > 0 && slave.chastityPenis === 0) {
+ seX(slave, "penetrative");
+ } else {
+ seX(slave, "vaginal");
+ }
+ } else if (V.PC.dick > 0) {
+ r.push(`you getting your dick sucked.`);
+ seX(slave, "oral", V.PC, "penetrative");
+ } else if (V.PC.vagina >= 0) {
+ r.push(`you getting eaten out.`);
+ seX(slave, "oral", V.PC, "vaginal");
+ } else {
+ r.push(`a thorough molestation of ${his} sweaty body.`);
+ }
+ }
+ r.push(slaveSkillIncrease('combat', slave, trainingEfficiency));
+ slave.health.tired = Math.clamp(slave.health.tired + 10, 0, 100);
+ if (slave.skill.combat >= V.PC.skill.combat - (130 - V.PC.intelligence + V.PC.intelligenceImplant)) {
+ Math.clamp(slave.skill.combat, 0, V.PC.skill.combat);
+ if (slave.skill.combat >= 100) {
+ r.push(`${He}'s learned everything you can possibly teach ${him}; if ${he} weren't so dedicated to you, it might be worrying that you didn't leave yourself an edge against ${him}.`);
+ } else {
+ r.push(`${He}'s learned everything you can teach ${him}, but you both could possibly discover further combat insights by sparring with each other.`);
+ }
+ r.push(App.UI.DOM.makeElement("span", `${His} assignment has defaulted to fostering devotion.`, "yellow"));
+ pa.objective = "build devotion";
+ }
+ currentSlaveValue = 0.1;
+ slave.training = 0;
+ break;
case "break will":
slave.devotion -= 4;
if (slave.trust > 20) {
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index 8060ea2dd2a81a92a3d8939b5837c7cf6f82603c..b589aef0e599d59fe55a59949894a680e77eac87 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -54,6 +54,18 @@ App.UI.View.mainLinks = function() {
case PersonalAttention.RELAX:
fragment.append(`You plan to take it easy this week.`);
break;
+ case PersonalAttention.STUDY:
+ text.push(`This week you will work on getting a general education.`);
+ break;
+ case PersonalAttention.GED:
+ text.push(`This week you are taking a test to prove you have a general education.`);
+ break;
+ case PersonalAttention.EDUCATION:
+ text.push(`This week you are pursuing an advanced education.`);
+ break;
+ case PersonalAttention.TEST:
+ text.push(`This week you are attempting to complete your advanced education.`);
+ break;
case PersonalAttention.TRADE:
fragment.append(`This week you will learn trading.`);
break;
diff --git a/src/js/personalAttentionFunctions.js b/src/js/personalAttentionFunctions.js
index 09fe093569f8fb6e3b0cf6a4e924bd36da4075a6..765d5a9517612034a1d3a3c9b93eeb6d8f25ee4d 100644
--- a/src/js/personalAttentionFunctions.js
+++ b/src/js/personalAttentionFunctions.js
@@ -38,6 +38,8 @@ App.PersonalAttention.update = function(input) {
return "learn skills";
case "train her":
return "combat training";
+ case "spar with her":
+ return "spar";
case "explore her sexuality":
return "explore sexuality";
case "fuck her senseless":
@@ -81,6 +83,8 @@ App.PersonalAttention.getText = function(objective, slave) {
return `teach ${him}`;
case "combat training":
return `train ${him} in combat`;
+ case "spar":
+ return `spar with ${him}`;
case "explore sexuality":
return `explore ${his} sexuality`;
case "ravish":
diff --git a/src/player/personalAttentionSelect.js b/src/player/personalAttentionSelect.js
index 75370b9267a8dc7fb398049f0ceefce956041d1e..58225d8e5bcd8e5b8db3ae6c90f3d63b2b1744c0 100644
--- a/src/player/personalAttentionSelect.js
+++ b/src/player/personalAttentionSelect.js
@@ -88,6 +88,18 @@ App.UI.Player.personalAttention = function() {
case PersonalAttention.RELAX:
text.push(`doing nothing and enjoying your time off.`);
break;
+ case PersonalAttention.STUDY:
+ text.push(`working on your general education.`);
+ break;
+ case PersonalAttention.GED:
+ text.push(`striving to complete your general education.`);
+ break;
+ case PersonalAttention.EDUCATION:
+ text.push(`working on furthering your education.`);
+ break;
+ case PersonalAttention.TEST:
+ text.push(`proving yourself in order to earn an accredited diploma.`);
+ break;
case PersonalAttention.TRADE:
text.push(`training in trade.`);
break;
@@ -143,6 +155,39 @@ App.UI.Player.personalAttention = function() {
() => isPCCareerInCategory("servant"),
],
},
+ /*
+ {
+ link: `Get an education`,
+ value: PersonalAttention.STUDY,
+ prereqs: [
+ () => V.PC.intelligenceImplant < 10,
+ ],
+ },
+ {
+ link: `Take a GED exam`,
+ value: PersonalAttention.GED,
+ prereqs: [
+ () => (V.PC.intelligenceImplant === 10 || V.PC.intelligence >= 50),
+ () => V.cash >= 5000,
+ ],
+ },
+ {
+ link: `Further your education`,
+ value: PersonalAttention.EDUCATION,
+ prereqs: [
+ () => V.PC.intelligenceImplant < 20,
+ () => V.cash >= 10000,
+ ],
+ },
+ {
+ link: `Finish your education`,
+ value: PersonalAttention.TEST,
+ prereqs: [
+ () => V.PC.intelligenceImplant === 20,
+ () => V.cash >= 50000,
+ ],
+ },
+ */
{
link: `Focus on business`,
value: PersonalAttention.BUSINESS,
@@ -586,17 +631,17 @@ App.UI.Player.personalAttention = function() {
} else {
links.push(attentionLink(i, `Teach ${him}`, "learn skills"));
}
- /*
- if (slave.assignment === Job.BODYGUARD || slave.devotion + slave.trust >= 190) {
- if (slave.skill.combat < V.PC.skill.combat - (130 - V.PC.intelligence + V.PC.intelligenceImplant)) {
- links.push(attentionLink(i, `Train ${him} to fight`, "combat training"));
- } else {
- links.push(App.UI.DOM.disabledLink(`Train ${him} to fight`, [
- `There is nothing you can teach ${him} about combat that ${he} doesn't already know`
- ]));
+ if (canWalk(V.PC)) {
+ if (slave.assignment === Job.BODYGUARD || (slave.devotion + slave.trust >= 190 && canWalk(slave))) {
+ if (slave.skill.combat < V.PC.skill.combat - (130 - V.PC.intelligence + V.PC.intelligenceImplant)) {
+ links.push(attentionLink(i, `Train ${him} to fight`, "combat training"));
+ } else {
+ /*
+ links.push(attentionLink(i, `Spar with ${him}`, "sparring"));
+ */
+ }
}
}
- */
// Health
App.Events.addNode(div, [