diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index 4dcdb9d73399443807ab41ae408fc3c91578977c..29ce3ada515010e1b15b9a37136b568695d5cb09 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -499,163 +499,241 @@ App.SlaveAssignment.takeClasses = (function() {
skillIncrease = (10 + (Math.abs(Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))));
}
if (V.cash > cost) {
- cashX(forceNeg(cost), "capEx");
+ cashX(forceNeg(cost), "slaveAssignmentClasses", slave);
switch (tutorForSlave(slave)) {
case "HeadGirl":
- if (slave.skill.headGirl <= 20) {
- r += ` ${He} is so unskilled that the tutor teaches ${him} the basics. ${He} learns how to make slaves obey ${him} and how to treat minor injuries.`;
- } else if (slave.skill.headGirl <= 60) {
- r += ` ${He} has some experience teaching others. The tutor has ${him} practice teaching slaves how to please their master, and has ${him} attend lectures on slave psychology.`;
- } else if (slave.skill.headGirl <= 120) {
- r += ` The tutor arranges for ${him} to work at different places throughout the week, from treating emergencies or diagnosing patients in the hospital to breaking resistant slaves for a slave school. ${He} is truly becoming a jack-of-all trades.`;
- } else if (slave.skill.headGirl <= 200) {
- r += ` Now that ${he} has mastered individual skills, ${he} is taught to assist you in running the arcology as a whole. ${He} learns how the security systems work, and how to make every slave perform at their best.`;
+ if (App.Data.Careers.Leader.HG.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to be a Head Girl, surprising no one.`;
+ slave.skill.headGirl = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective Head Girl.`;
+ if (slave.skill.headGirl <= 20) {
+ r += ` ${He} is so unskilled that the tutor teaches ${him} the basics. ${He} learns how to make slaves obey ${him} and how to treat minor injuries.`;
+ } else if (slave.skill.headGirl <= 60) {
+ r += ` ${He} has some experience teaching others. The tutor has ${him} practice teaching slaves how to please their master, and has ${him} attend lectures on slave psychology.`;
+ } else if (slave.skill.headGirl <= 120) {
+ r += ` The tutor arranges for ${him} to work at different places throughout the week, from treating emergencies or diagnosing patients in the hospital to breaking resistant slaves for a slave school. ${He} is truly becoming a jack-of-all trades.`;
+ } else if (slave.skill.headGirl <= 200) {
+ r += ` Now that ${he} has mastered individual skills, ${he} is taught to assist you in running the arcology as a whole. ${He} learns how the security systems work, and how to make every slave perform at their best.`;
+ }
+ r += ` ${slaveSkillIncrease('headGirl', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('headGirl', slave, skillIncrease)}`;
break;
case "Recruiter":
- if (slave.skill.recruiter <= 20) {
- r += ` The tutor starts teaching ${him} the basics. ${He} is given lessons on conversing, pronunciation, style and fashion.`;
- } else if (slave.skill.recruiter <= 60) {
- r += ` Having been taught the basics by ${his} tutor, ${he} is no longer awkward in conversation. But ${he} has a long way to go, the tutor teaches ${him} how to carry ${himself} and how to interpret others' non-verbal cues.`;
- } else if (slave.skill.recruiter <= 120) {
- r += ` The tutor has ${him} practice convincing others. ${He} watches online lectures on slave psychology, and applies it in practice by convincing others to make unfavorable deals.`;
- } else if (slave.skill.recruiter <= 200) {
- r += ` Every move ${he} makes is practiced and calculated, yet looks entirely natural. He has ${him} continue attending lectures on psychology, and sends ${him} out to convince free citizens to let themselves get voluntarily enslaved.`;
+ if (App.Data.Careers.Leader.recruiter.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to be a recruiter, surprising no one.`;
+ slave.skill.recruiter = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective recruiter.`;
+ if (slave.skill.recruiter <= 20) {
+ r += ` The tutor starts teaching ${him} the basics. ${He} is given lessons on conversing, pronunciation, style and fashion.`;
+ } else if (slave.skill.recruiter <= 60) {
+ r += ` Having been taught the basics by ${his} tutor, ${he} is no longer awkward in conversation. But ${he} has a long way to go, the tutor teaches ${him} how to carry ${himself} and how to interpret others' non-verbal cues.`;
+ } else if (slave.skill.recruiter <= 120) {
+ r += ` The tutor has ${him} practice convincing others. ${He} watches online lectures on slave psychology, and applies it in practice by convincing others to make unfavorable deals.`;
+ } else if (slave.skill.recruiter <= 200) {
+ r += ` Every move ${he} makes is practiced and calculated, yet looks entirely natural. He has ${him} continue attending lectures on psychology, and sends ${him} out to convince free citizens to let themselves get voluntarily enslaved.`;
+ }
+ r += ` ${slaveSkillIncrease('recruiter', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('recruiter', slave, skillIncrease)}`;
break;
case "Bodyguard":
- if (slave.skill.bodyguard <= 20) {
- r += ` ${He} undergoes a personalized boot camp in form of physical exercises, to make sure ${he} has the basic skills required for further security training.`;
- } else if (slave.skill.bodyguard <= 60) {
- r += ` The tutor trains ${him} in using and maintaining firearms, and forces ${him} through repetitive dry fire training in order to instill discipline.`;
- } else if (slave.skill.bodyguard <= 120) {
- r += ` During the week ${he} attends skirmish-scale wargames, and joins routine security patrols around the arcology.`;
- } else if (slave.skill.bodyguard <= 200) {
- r += `${He} receives versatile training on tactics and different weapons, culminating at the end of the week with a live fire exercise.`;
+ if (App.Data.Careers.Leader.bodyguard.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to be a bodyguard, surprising no one.`;
+ slave.skill.bodyguard = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective bodyguard.`;
+ if (slave.skill.bodyguard <= 20) {
+ r += ` ${He} undergoes a personalized boot camp in form of physical exercises, to make sure ${he} has the basic skills required for further security training.`;
+ } else if (slave.skill.bodyguard <= 60) {
+ r += ` The tutor trains ${him} in using and maintaining firearms, and forces ${him} through repetitive dry fire training in order to instill discipline.`;
+ } else if (slave.skill.bodyguard <= 120) {
+ r += ` During the week ${he} attends skirmish-scale wargames, and joins routine security patrols around the arcology.`;
+ } else if (slave.skill.bodyguard <= 200) {
+ r += `${He} receives versatile training on tactics and different weapons, culminating at the end of the week with a live fire exercise.`;
+ }
+ r += ` ${slaveSkillIncrease('bodyguard', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('bodyguard', slave, skillIncrease)}`;
break;
case "Madam":
- if (slave.skill.madam <= 20) {
- r += ` The tutor teaches ${him} the basics of whoring. To make sure the customer pays before they're serviced, how to take care of hygiene and how to take care of whores' health.`;
- } else if (slave.skill.madam <= 60) {
- r += ` Having been taught the basics, the lessons shift to learning how to best please a customer. ${He} is taught to converse and how to respond to a customer's desires.`;
- } else if (slave.skill.madam <= 120) {
- r += ` Now that ${he} is a masterful whore, the tutor teaches ${him} how to discipline ${his} subordinate whores. ${He} attends online lectures on marketing.`;
- } else if (slave.skill.madam <= 200) {
- r += ` ${He} is becoming a master at extracting maximum value from the assets ${he} commands, and is learning how to run the brothel effectively.`;
+ if (App.Data.Careers.Leader.madam.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to run a brothel, surprising no one.`;
+ slave.skill.madam = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective brothel madam.`;
+ if (slave.skill.madam <= 20) {
+ r += ` The tutor teaches ${him} the basics of whoring. To make sure the customer pays before they're serviced, how to take care of hygiene and how to take care of whores' health.`;
+ } else if (slave.skill.madam <= 60) {
+ r += ` Having been taught the basics, the lessons shift to learning how to best please a customer. ${He} is taught to converse and how to respond to a customer's desires.`;
+ } else if (slave.skill.madam <= 120) {
+ r += ` Now that ${he} is a masterful whore, the tutor teaches ${him} how to discipline ${his} subordinate whores. ${He} attends online lectures on marketing.`;
+ } else if (slave.skill.madam <= 200) {
+ r += ` ${He} is becoming a master at extracting maximum value from the assets ${he} commands, and is learning how to run the brothel effectively.`;
+ }
+ r += ` ${slaveSkillIncrease('madam', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('madam', slave, skillIncrease)}`;
break;
case "DJ":
- if (slave.skill.DJ <= 20) {
- r += ` The tutor trains ${him} to perform as a DJ. The Club is crucial for your reputation, and the DJ is in charge of the club, so classes are quite demanding. ${He} is absolutely unskilled so he is teaching ${him} the very basics. ${He} is undergoing military-like drills in dancing and composure.`;
- } else if (slave.skill.DJ <= 60) {
- r += ` The tutor trains ${him} to perform as a DJ. ${He} is still quite inexperienced, although ${he} is at least not awkward in conversation anymore. ${His} classes are heavily focused on slut etiquette, dancing and composure, but ${his} moves are still stiff and unsure.`;
- } else if (slave.skill.DJ <= 120) {
- r += ` ${He} is already a skilled entertainer, yet ${his} DJ training continues. ${His} training is now more focused on putting ${him} in charge of the whole club facility, which serves to increase public opinion of ${his} owner. ${He} is taught how to make guests feel welcome, and how to manage ${his} employees. `;
- } else if (slave.skill.DJ <= 200) {
- r += `Every movement and gesture of ${him} must engage the crowd. ${He} is so well-trained that ${his} sultry and inviting composure seems entirely natural. ${He} is also taught how to look after subordinate club sluts, to make sure they perform at their best and give the guests an unforgettable experience.`;
+ if (App.Data.Careers.Leader.DJ.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to DJ a club, surprising no one.`;
+ slave.skill.DJ = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective club manager and DJ.`;
+ if (slave.skill.DJ <= 20) {
+ r += ` The Club is crucial for your reputation, and the DJ is in charge of the club, so classes are quite demanding. ${He} is absolutely unskilled so the tutor is teaches ${him} the very basics. ${He} is undergoing military-like drills in dancing and composure.`;
+ } else if (slave.skill.DJ <= 60) {
+ r += ` ${He} is still quite inexperienced, although ${he} is at least not awkward in conversation anymore. ${His} classes are heavily focused on slut etiquette, dancing and composure, but ${his} moves are still stiff and unsure.`;
+ } else if (slave.skill.DJ <= 120) {
+ r += ` ${He} is already a skilled entertainer, yet ${his} DJ training continues. ${His} training is now more focused on putting ${him} in charge of the whole club facility, which serves to increase public opinion of ${his} owner. ${He} is taught how to make guests feel welcome, and how to manage ${his} employees. `;
+ } else if (slave.skill.DJ <= 200) {
+ r += `Every movement and gesture of ${him} must engage the crowd. ${He} is so well-trained that ${his} sultry and inviting composure seems entirely natural. ${He} is also taught how to look after subordinate club sluts, to make sure they perform at their best and give the guests an unforgettable experience.`;
+ }
+ r += ` ${slaveSkillIncrease('DJ', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('DJ', slave, skillIncrease)}`;
break;
case "Nurse":
- if (slave.skill.nurse <= 20) {
- r += ` ${He} is taught bedside manner, first aid and elementary physiology as basis for further medical tutoring.`;
- } else if (slave.skill.nurse <= 60) {
- r += ` During the week ${he} follows tutored instructions on doing common medical tests, preliminary diagnosis and the safe administering of drugs.`;
- } else if (slave.skill.nurse <= 120) {
- r += ` ${He} is busy watching lectures on physiology, pathology, biochemistry and other medical subjects under the supervision of a tutor.`;
- } else if (slave.skill.nurse <= 200) {
- r += `In addition to many, lengthy lectures on medicine, ${he} studies emergency care and basic surgery in supervised simulations.`;
+ if (App.Data.Careers.Leader.nurse.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to run a clinic, surprising no one.`;
+ slave.skill.nurse = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective clinical nurse.`;
+ if (slave.skill.nurse <= 20) {
+ r += ` ${He} is taught bedside manner, first aid and elementary physiology as basis for further medical tutoring.`;
+ } else if (slave.skill.nurse <= 60) {
+ r += ` During the week ${he} follows tutored instructions on doing common medical tests, preliminary diagnosis and the safe administering of drugs.`;
+ } else if (slave.skill.nurse <= 120) {
+ r += ` ${He} is busy watching lectures on physiology, pathology, biochemistry and other medical subjects under the supervision of a tutor.`;
+ } else if (slave.skill.nurse <= 200) {
+ r += `In addition to many, lengthy lectures on medicine, ${he} studies emergency care and basic surgery in supervised simulations.`;
+ }
+ r += ` ${slaveSkillIncrease('nurse', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('nurse', slave, skillIncrease)}`;
break;
case "Teacher":
- if (slave.skill.teacher <= 20) {
- r += ` ${He} is so inept that the tutor has to teach ${him} the very basics before ${he} can progress any further. ${He} is given grammar and arithmetic lessons.`;
- } else if (slave.skill.teacher <= 60) {
- r += ` Now that ${he} has some understanding of the basics, the tutor has ${him} attend more advanced lectures on grammar, mathematics and pronunciation.`;
- } else if (slave.skill.teacher <= 120) {
- r += ` Having mastered basic skills, ${he} is now being taught how to teach others. The tutor sends ${him} to work at a local slave school.`;
- } else if (slave.skill.teacher <= 200) {
- r += ` ${He} now knows how to teach others, and is now taught how to teach students who do not speak the language, are disabled, be it physically or mentally or simply unwilling to learn.`;
+ if (App.Data.Careers.Leader.schoolteacher.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to teach classes, surprising no one.`;
+ slave.skill.teacher = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective teacher.`;
+ if (slave.skill.teacher <= 20) {
+ r += ` ${He} is so inept that the tutor has to teach ${him} the very basics before ${he} can progress any further. ${He} is given grammar and arithmetic lessons.`;
+ } else if (slave.skill.teacher <= 60) {
+ r += ` Now that ${he} has some understanding of the basics, the tutor has ${him} attend more advanced lectures on grammar, mathematics and pronunciation.`;
+ } else if (slave.skill.teacher <= 120) {
+ r += ` Having mastered basic skills, ${he} is now being taught how to teach others. The tutor sends ${him} to work at a local slave school.`;
+ } else if (slave.skill.teacher <= 200) {
+ r += ` ${He} now knows how to teach others, and is now taught how to teach students who do not speak the language, are disabled, be it physically or mentally or simply unwilling to learn.`;
+ }
+ r += ` ${slaveSkillIncrease('teacher', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('teacher', slave, skillIncrease)}`;
break;
case "Attendant":
- if (slave.skill.attendant <= 20) {
- r += ` This week, a tutor has ${him} wait on poolside clients while offering back-rubs, an exercise instilling, more than anything, calm patience.`;
- } else if (slave.skill.attendant <= 60) {
- r += ` ${He} practices massaging techniques with a tutor until ${his} hands are sore and then suffers through hours of listening to people's problems on an online helpline.`;
- } else if (slave.skill.attendant <= 120) {
- r += ` A tutor teaches ${him} relaxing physical therapies. Additionally ${he} attends a course on applied psychology concentrated on mental well-being and stress management.`;
- } else if (slave.skill.attendant <= 200) {
- r += `${He} spends the week watching lectures of psychiatry and physiotherapy, before attending a practical exam arranged by ${his} tutor.`;
+ if (App.Data.Careers.Leader.attendant.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to manage a spa, surprising no one.`;
+ slave.skill.attendant = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective spa attendant.`;
+ if (slave.skill.attendant <= 20) {
+ r += ` This week, a tutor has ${him} wait on poolside clients while offering back-rubs, an exercise instilling, more than anything, calm patience.`;
+ } else if (slave.skill.attendant <= 60) {
+ r += ` ${He} practices massaging techniques with a tutor until ${his} hands are sore and then suffers through hours of listening to people's problems on an online helpline.`;
+ } else if (slave.skill.attendant <= 120) {
+ r += ` A tutor teaches ${him} relaxing physical therapies. Additionally ${he} attends a course on applied psychology concentrated on mental well-being and stress management.`;
+ } else if (slave.skill.attendant <= 200) {
+ r += `${He} spends the week watching lectures of psychiatry and physiotherapy, before attending a practical exam arranged by ${his} tutor.`;
+ }
+ r += ` ${slaveSkillIncrease('attendant', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('attendant', slave, skillIncrease)}`;
break;
case "Matron":
- if (slave.skill.matron <= 20) {
- r += ` The tutor teaches ${him} how to care for ${his} body during pregnancy. To eat well, rest, and avoid strenuous activity.`;
- } else if (slave.skill.matron <= 60) {
- r += ` ${He} learns how to best prepare ${his} body for a baby's birth. And how to take care of the baby after it has been born.`;
- } else if (slave.skill.matron <= 120) {
- r += ` The tutor has ${him} serve as a midwife at a local hospital. ${He} also attends lectures on child development and child psychology.`;
- } else if (slave.skill.matron <= 200) {
- r += ` ${He} continues attending lectures, but at the same time the tutor teaches ${him} how to take care of others while they are pregnant. ${He}'s quickly learning how to best rear children.`;
+ if (App.Data.Careers.Leader.matron.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to run a nursery, surprising no one.`;
+ slave.skill.matron = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective nursery matron.`;
+ if (slave.skill.matron <= 20) {
+ r += ` The tutor teaches ${him} how to care for a body during pregnancy. To eat well, rest, and avoid strenuous activity.`;
+ } else if (slave.skill.matron <= 60) {
+ r += ` ${He} learns how to best prepare a body for a baby's birth. And how to take care of the baby after it has been born.`;
+ } else if (slave.skill.matron <= 120) {
+ r += ` The tutor has ${him} serve as a midwife at a local hospital. ${He} also attends lectures on child development and child psychology.`;
+ } else if (slave.skill.matron <= 200) {
+ r += ` ${He} continues attending lectures, but at the same time the tutor teaches ${him} how to take care of others while they are pregnant. ${He}'s quickly learning how to best rear children.`;
+ }
+ r += ` ${slaveSkillIncrease('matron', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('matron', slave, skillIncrease)}`;
break;
case "Stewardess":
- if (slave.skill.stewardess <= 20) {
- r += ` ${He} has no skill as a servant, so the tutor teaches ${him} the basics. What to clean, how to clean and using which products.`;
- } else if (slave.skill.stewardess <= 60) {
- r += ` Having been taught the basics, ${his} studies continue by following cleaning crews to various parts of your arcologies to get practical experience as well as become familiar with the cleaning routines of all sectors.`;
- } else if (slave.skill.stewardess <= 120) {
- r += ` The tutor has ${him} attend lectures on slave breaking and management, to prepare ${him} for running a facility. ${He} keeps working with the cleaning crews, but now takes command during outings.`;
- } else if (slave.skill.stewardess <= 200) {
- r += ` ${He} is familiar with every nook and cranny of your arcology. ${He} no longer accompanies your cleaning crews, instead ${he} organizes their deployments. ${He}is becoming an adept manager.`;
+ if (App.Data.Careers.Leader.stewardess.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to oversee servants, surprising no one.`;
+ slave.skill.stewardess = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective stewardess.`;
+ if (slave.skill.stewardess <= 20) {
+ r += ` ${He} has no skill as a servant, so the tutor teaches ${him} the basics. What to clean, how to clean and using which products.`;
+ } else if (slave.skill.stewardess <= 60) {
+ r += ` Having been taught the basics, ${his} studies continue by following cleaning crews to various parts of your arcologies to get practical experience as well as become familiar with the cleaning routines of all sectors.`;
+ } else if (slave.skill.stewardess <= 120) {
+ r += ` The tutor has ${him} attend lectures on slave breaking and management, to prepare ${him} for running a facility. ${He} keeps working with the cleaning crews, but now takes command during outings.`;
+ } else if (slave.skill.stewardess <= 200) {
+ r += ` ${He} is familiar with every nook and cranny of your arcology. ${He} no longer accompanies your cleaning crews, instead ${he} organizes their deployments. ${He}is becoming an adept manager.`;
+ }
+ r += ` ${slaveSkillIncrease('stewardess', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('stewardess', slave, skillIncrease)}`;
break;
case "Milkmaid":
- if (slave.skill.milkmaid <= 20) {
- r += ` The tutor teaches ${him} the basics. ${He} is taught what to eat to maximize ${his} fluid production, as well as how to milk udders.`;
- } else if (slave.skill.milkmaid <= 60) {
- r += ` Having been taught the basics, the tutor has ${him} work at a farm milking cows. ${He} also attends online lectures on nutrition and health.`;
- } else if (slave.skill.milkmaid <= 120) {
- r += ` Having been taught how to milk and how to take care of ${his} body to produce as much fluids as possible, ${his} training shifts to teach ${him} leadership skills.`;
- } else if (slave.skill.milkmaid <= 200) {
- r += ` ${He} is becoming an adept leader, who knows how to squeeze every last drop of milk and cum out ${his} cows. The tutor believes ${he} will soon be able to run ${his} facility on ${his} own.`;
+ if (App.Data.Careers.Leader.milkmaid.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to run a free range dairy, surprising no one.`;
+ slave.skill.milkmaid = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective milkmaid.`;
+ if (slave.skill.milkmaid <= 20) {
+ r += ` The tutor teaches ${him} the basics. ${He} is taught what to eat to maximize fluid production, as well as how to milk udders.`;
+ } else if (slave.skill.milkmaid <= 60) {
+ r += ` Having been taught the basics, the tutor has ${him} work at a farm milking cows. ${He} also attends online lectures on nutrition and health.`;
+ } else if (slave.skill.milkmaid <= 120) {
+ r += ` Having been taught how to milk and how to take care of ones body to produce as much fluid as possible, ${his} training shifts to teach ${him} leadership skills.`;
+ } else if (slave.skill.milkmaid <= 200) {
+ r += ` ${He} is becoming an adept leader, who knows how to squeeze every last drop of milk and cum out of ${his} cows. The tutor believes ${he} will soon be able to run ${his} facility on ${his} own.`;
+ }
+ r += ` ${slaveSkillIncrease('milkmaid', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('milkmaid', slave, skillIncrease)}`;
break;
case "Farmer":
- if (slave.skill.farmer <= 20) {
- r += ` The tutor has ${him} working on a farm, nothing beats practical learning. ${He} learns how to grow cops and how to care for farm animals.`;
- } else if (slave.skill.farmer <= 60) {
- r += ` Having become familiar with farming, the tutor now has ${him} attend lectures on the science behind it. ${His} knowledge greatly increases due to this.`;
- } else if (slave.skill.farmer <= 120) {
- r += ` ${He} oversees a group of farmhands as they care for the animals and plow the fields. Having mastered farming, ${he}'s now training ${his} leadership skills.`;
- } else if (slave.skill.farmer <= 200) {
- r += ` The tutor has him lead an entire farm. ${He} manages every aspect, and does so admirably. ${He} is also introduced to a different side of slave farming, the "shows". It doesn't take long before ${he}'s overseeing those too...`;
+ if (App.Data.Careers.Leader.farmer.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to run a farm, surprising no one.`;
+ slave.skill.farmer = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective farmer.`;
+ if (slave.skill.farmer <= 20) {
+ r += ` The tutor has ${him} working on a farm, nothing beats practical learning. ${He} learns how to grow cops and how to care for farm animals.`;
+ } else if (slave.skill.farmer <= 60) {
+ r += ` Having become familiar with farming, the tutor now has ${him} attend lectures on the science behind it. ${His} knowledge greatly increases due to this.`;
+ } else if (slave.skill.farmer <= 120) {
+ r += ` ${He} oversees a group of farmhands as they care for the animals and plow the fields. Having mastered farming, ${he}'s now training ${his} leadership skills.`;
+ } else if (slave.skill.farmer <= 200) {
+ r += ` The tutor has him lead an entire farm. ${He} manages every aspect, and does so admirably. ${He} is also introduced to a different side of slave farming, the "shows". It doesn't take long before ${he}'s overseeing those too.`;
+ }
+ r += ` ${slaveSkillIncrease('farmer', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('farmer', slave, skillIncrease)}`;
break;
case "Wardeness":
- if (slave.skill.wardeness <= 20) {
- r += ` A tutor takes ${him} through basic self-defense and the safe use of prison equipment.`;
- } else if (slave.skill.wardeness <= 60) {
- r += ` ${He} practices wrestling holds with a tutor, who also shows ${him} how to tie up resisting victims.`;
- } else if (slave.skill.wardeness <= 120) {
- r += ` The correctional psychology lectures ${he} watches this week are unburdened by ethics. ${He} learns how to handle prisoners more effectively.`;
- } else if (slave.skill.wardeness <= 200) {
- r += `${He} gets to study enhanced interrogation techniques from an experienced tutor, with ample demonstrations on live subjects, including ${himself}.`;
+ if (App.Data.Careers.Leader.wardeness.includes(slave)) {
+ r += ` ${He} shows up the tutor by utilizing applicable skills from ${his} prior life as ${slave.career}. The service <span class="cash dec">will not offer a refund,</span> but does recognize ${him} as qualified to oversee a cellblock, surprising no one.`;
+ slave.skill.wardeness = 200;
+ } else {
+ r += ` ${He} spends time with a tutor training to be an effective cellblock wardeness.`;
+ if (slave.skill.wardeness <= 20) {
+ r += ` A tutor takes ${him} through basic self-defense and the safe use of prison equipment.`;
+ } else if (slave.skill.wardeness <= 60) {
+ r += ` ${He} practices wrestling holds with a tutor, who also shows ${him} how to tie up resisting victims.`;
+ } else if (slave.skill.wardeness <= 120) {
+ r += ` The correctional psychology lectures ${he} watches this week are unburdened by ethics. ${He} learns how to handle prisoners more effectively.`;
+ } else if (slave.skill.wardeness <= 200) {
+ r += `${He} gets to study enhanced interrogation techniques from an experienced tutor, with ample demonstrations on live subjects, including ${himself}.`;
+ }
+ r += ` ${slaveSkillIncrease('wardeness', slave, skillIncrease)}`;
}
- r += ` ${slaveSkillIncrease('wardeness', slave, skillIncrease)}`;
break;
default:
r += `tutorLessons ERROR unknown skill`;
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index c5d42f8abee7391fa84ed47c325d10a76593ec13..a91aff771d1b0ce9e928d2a83d4f3ee950137732 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -2560,6 +2560,8 @@ globalThis.slaveCostBeauty = (function() {
multiplier += 0.1;
} else if (App.Data.Careers.Leader.attendant.includes(slave.career)) {
multiplier += 0.1;
+ } else if (App.Data.Careers.Leader.nurse.includes(slave.career)) {
+ multiplier += 0.1;
} else if (App.Data.Careers.Leader.matron.includes(slave.career)) {
multiplier += 0.1;
} else if (App.Data.Careers.Leader.schoolteacher.includes(slave.career)) {
@@ -2609,6 +2611,9 @@ globalThis.slaveCostBeauty = (function() {
if (!App.Data.Careers.Leader.attendant.includes(slave.career) && slave.skill.attendant >= V.masteredXP) {
multiplier += 0.1;
}
+ if (!App.Data.Careers.Leader.nurse.includes(slave.career) && slave.skill.nurse >= V.masteredXP) {
+ multiplier += 0.1;
+ }
if (!App.Data.Careers.Leader.matron.includes(slave.career) && slave.skill.matron >= V.masteredXP) {
multiplier += 0.1;
}
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index b27ed6ddbe2c6389988d89206a5b7f75a1f16b0b..66c5e8c60b45c147b2936348bae2c97b5aa9d5ed 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -263,6 +263,8 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
$His background would help make $him a good Wardeness; that's valuable.
<<elseif App.Data.Careers.Leader.attendant.includes(getSlave($AS).career)>>
$His background would help make $him a good Attendant; that's valuable.
+ <<elseif App.Data.Careers.Leader.nurse.includes(getSlave($AS).career)>>
+ $His background would help make $him a good Nurse; that's valuable.
<<elseif App.Data.Careers.Leader.matron.includes(getSlave($AS).career)>>
$His background would help make $him a good Matron; that's valuable.
<<elseif App.Data.Careers.Leader.schoolteacher.includes(getSlave($AS).career)>>
@@ -309,57 +311,54 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
<<set _careers = []>>
-<<if (getSlave($AS).skill.headGirl >= $masteredXP)>>
+<<if (getSlave($AS).skill.headGirl >= $masteredXP) && !App.Data.Careers.Leader.HG.includes(getSlave($AS).career)>>
<<set _careers.push("Head Girl")>>
<</if>>
-<<if (getSlave($AS).skill.recruiter >= $masteredXP)>>
+<<if (getSlave($AS).skill.recruiter >= $masteredXP) && !App.Data.Careers.Leader.recruiter.includes(getSlave($AS).career)>>
<<set _careers.push("Recruiter")>>
<</if>>
-<<if (getSlave($AS).skill.bodyguard >= $masteredXP)>>
+<<if (getSlave($AS).skill.bodyguard >= $masteredXP) && !App.Data.Careers.Leader.bodyguard.includes(getSlave($AS).career)>>
<<set _careers.push("Bodyguard")>>
<</if>>
-<<if (getSlave($AS).skill.madam >= $masteredXP)>>
+<<if (getSlave($AS).skill.madam >= $masteredXP) && !App.Data.Careers.Leader.madam.includes(getSlave($AS).career)>>
<<set _careers.push("Madam")>>
<</if>>
-<<if (getSlave($AS).skill.DJ >= $masteredXP)>>
+<<if (getSlave($AS).skill.DJ >= $masteredXP) && !App.Data.Careers.Leader.DJ.includes(getSlave($AS).career)>>
<<set _careers.push("DJ")>>
<</if>>
-<<if (getSlave($AS).skill.nurse >= $masteredXP)>>
+<<if (getSlave($AS).skill.nurse >= $masteredXP) && !App.Data.Careers.Leader.nurse.includes(getSlave($AS).career)>>
<<set _careers.push("Nurse")>>
<</if>>
-<<if (getSlave($AS).skill.teacher >= $masteredXP)>>
+<<if (getSlave($AS).skill.teacher >= $masteredXP) && !App.Data.Careers.Leader.schoolteacher.includes(getSlave($AS).career)>>
<<set _careers.push("Schoolteacher")>>
<</if>>
-<<if (getSlave($AS).skill.attendant >= $masteredXP)>>
+<<if (getSlave($AS).skill.attendant >= $masteredXP) && !App.Data.Careers.Leader.attendant.includes(getSlave($AS).career)>>
<<set _careers.push("Attendant")>>
<</if>>
-<<if (getSlave($AS).skill.matron >= $masteredXP)>>
+<<if (getSlave($AS).skill.matron >= $masteredXP) && !App.Data.Careers.Leader.matron.includes(getSlave($AS).career)>>
<<set _careers.push("Matron")>>
<</if>>
-<<if (getSlave($AS).skill.stewardess >= $masteredXP)>>
+<<if (getSlave($AS).skill.stewardess >= $masteredXP) && !App.Data.Careers.Leader.stewardess.includes(getSlave($AS).career)>>
<<set _careers.push("Stewardess")>>
<</if>>
-<<if (getSlave($AS).skill.milkmaid >= $masteredXP)>>
+<<if (getSlave($AS).skill.milkmaid >= $masteredXP) && !App.Data.Careers.Leader.milkmaid.includes(getSlave($AS).career)>>
<<set _careers.push("Milkmaid")>>
<</if>>
-<<if (getSlave($AS).skill.farmer >= $masteredXP)>>
+<<if (getSlave($AS).skill.farmer >= $masteredXP) && !App.Data.Careers.Leader.farmer.includes(getSlave($AS).career)>>
<<set _careers.push("Farmer")>>
<</if>>
-<<if (getSlave($AS).skill.wardeness >= $masteredXP)>>
+<<if (getSlave($AS).skill.wardeness >= $masteredXP) && !App.Data.Careers.Leader.wardeness.includes(getSlave($AS).career)>>
<<set _careers.push("Wardeness")>>
<</if>>
-<<if (getSlave($AS).skill.servant >= $masteredXP)>>
+<<if (getSlave($AS).skill.servant >= $masteredXP) && !App.Data.Careers.Leader.servant.includes(getSlave($AS).career)>>
<<set _careers.push("Servant")>>
<</if>>
-<<if (getSlave($AS).skill.entertainer >= $masteredXP)>>
+<<if (getSlave($AS).skill.entertainer >= $masteredXP) && !App.Data.Careers.General.entertainment.includes(getSlave($AS).career)>>
<<set _careers.push("Entertainer")>>
<</if>>
-<<if (getSlave($AS).skill.whore >= $masteredXP)>>
+<<if (getSlave($AS).skill.whore >= $masteredXP) && !App.Data.Careers.General.whore.includes(getSlave($AS).career)>>
<<set _careers.push("Whore")>>
<</if>>
-<<if (getSlave($AS).skill.matron >= $masteredXP)>>
- <<set _careers.push("Matron")>>
-<</if>>
<<if _careers.length > 0>>
$He has working experience as a
<<if _careers.length > 2>>