diff --git a/src/js/utilsSlave.js b/src/js/utilsSlave.js
index d28521102afe05fa5a72d11a0e6314e289215a5c..9746a90674cc8143719a0ee4c4fac579c8bc0571 100644
--- a/src/js/utilsSlave.js
+++ b/src/js/utilsSlave.js
@@ -3293,132 +3293,139 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
}
return false;
};
-
- if (slave.skill[targetSkill] <= 10) {
- switch (targetSkill) {
- case 'oral':
- case 'vaginal':
- case 'anal':
- skillDec = `knowledge about ${targetSkill} sex,`; break;
- case 'whoring':
- skillDec = `knowledge about how to whore,`; break;
- case 'entertainment':
- skillDec = `knowledge about how to be entertaining,`; break;
- }
- if (isleadershipRole()) {
- skillDec = `${capFirstChar(targetSkill)} skills.`;
+ if (isleadershipRole()) {
+ if (slave.skill[targetSkill] <= 20) {
+ if (slave.skill[targetSkill] + skillIncrease > 20) {
+ r = `<span class="green">${He} now has basic skills as a ${capFirstChar(targetSkill)}</span>`;
+ }
+ } else if (slave.skill[targetSkill] <= 60) {
+ if (slave.skill[targetSkill] + skillIncrease > 60) {
+ r = `<span class="green">${He} now has some skill as a ${capFirstChar(targetSkill)} under ${his} belt.</span>`;
+ }
+ } else if (slave.skill[targetSkill] <= 120) {
+ if (slave.skill[targetSkill] + skillIncrease > 120) {
+ r = `<span class="green">${He} is becoming well-versed as a ${capFirstChar(targetSkill)} candidate.</span>`;
+ }
+ } else if (slave.skill[targetSkill] < 200) {
+ if (slave.skill[targetSkill] + skillIncrease >= 200) {
+ r = `<span class="green">${He} now has knowledge on par with those with applicable career experience for a ${capFirstChar(targetSkill)}.</span>`;
+ V.tutorGraduate.push(slave.ID);
+ V.slaveTutor[capFirstChar(targetSkill)].delete(slave.ID);
+ }
+ } else { // failsafe
+ V.tutorGraduate.push(slave.ID);
+ V.slaveTutor[capFirstChar(targetSkill)].delete(slave.ID);
}
-
- if (slave.skill[targetSkill] + skillIncrease > 10) {
- r = `<span class="green">${He} now has basic ${skillDec}</span>`;
+ } else {
+ if (slave.skill[targetSkill] <= 10) {
switch (targetSkill) {
case 'oral':
- r += ` and at least suck a dick without constant gagging.`; break;
case 'vaginal':
- r += ` and can avoid some of the common pitfalls and turnoffs.`; break;
case 'anal':
- r += ` and can accept penetration of ${his} anus without danger.`; break;
+ skillDec = `knowledge about ${targetSkill} sex,`; break;
case 'whoring':
- r += ` and can avoid some potentially dangerous situations.`; break;
+ skillDec = `knowledge about how to whore,`; break;
case 'entertainment':
- r += ` and can usually avoid serious faux pas.`; break;
+ skillDec = `knowledge about how to be entertaining,`; break;
}
- }
- } else if (slave.skill[targetSkill] <= 30) {
- switch (targetSkill) {
- case 'oral':
- case 'vaginal':
- case 'anal':
- skillDec = `${targetSkill} skills,`; break;
- case 'whoring':
- skillDec = `skill as a whore,`; break;
- case 'entertainment':
- skillDec = `skill as an entertainer,`; break;
- }
- if (isleadershipRole()) {
- skillDec = `skill as a ${capFirstChar(targetSkill)}.`;
- }
- if (slave.skill.oral + skillIncrease > 30) {
- r = `<span class="green">${He} now has some ${skillDec}</span>`;
+ if (slave.skill[targetSkill] + skillIncrease > 10) {
+ r = `<span class="green">${He} now has basic ${skillDec}</span>`;
+ switch (targetSkill) {
+ case 'oral':
+ r += ` and at least suck a dick without constant gagging.`; break;
+ case 'vaginal':
+ r += ` and can avoid some of the common pitfalls and turnoffs.`; break;
+ case 'anal':
+ r += ` and can accept penetration of ${his} anus without danger.`; break;
+ case 'whoring':
+ r += ` and can avoid some potentially dangerous situations.`; break;
+ case 'entertainment':
+ r += ` and can usually avoid serious faux pas.`; break;
+ }
+ }
+ } else if (slave.skill[targetSkill] <= 30) {
switch (targetSkill) {
case 'oral':
- r += ` and can reliably bring dicks and pussies to climax with ${his} mouth.`; break;
case 'vaginal':
- r += ` and can do more than just lie there and take it.`; break;
case 'anal':
- r += ` and needs less preparation before taking rough penetration.`; break;
+ skillDec = `${targetSkill} skills,`; break;
case 'whoring':
- r += ` and knows how to sell ${his} body at a good price.`; break;
+ skillDec = `skill as a whore,`; break;
case 'entertainment':
- r += ` and can flirt, dance, and strip acceptably.`; break;
+ skillDec = `skill as an entertainer,`; break;
}
- }
- } else if (slave.skill[targetSkill] <= 60) {
- switch (targetSkill) {
- case 'oral':
- case 'vaginal':
- case 'anal':
- skillDec = `${targetSkill} sex expert,`; break;
- case 'whoring':
- skillDec = `expert whore,`; break;
- case 'entertainment':
- skillDec = `expert entertainer,`; break;
- }
- if (isleadershipRole()) {
- skillDec = `expert ${capFirstChar(targetSkill)}.`;
- }
- if (slave.skill[targetSkill] + skillIncrease > 60) {
- r = `<span class="green">${He} is now an ${skillDec}</span>`;
+ if (slave.skill[targetSkill] + skillIncrease > 30) {
+ r = `<span class="green">${He} now has some ${skillDec}</span>`;
+ switch (targetSkill) {
+ case 'oral':
+ r += ` and can reliably bring dicks and pussies to climax with ${his} mouth.`; break;
+ case 'vaginal':
+ r += ` and can do more than just lie there and take it.`; break;
+ case 'anal':
+ r += ` and needs less preparation before taking rough penetration.`; break;
+ case 'whoring':
+ r += ` and knows how to sell ${his} body at a good price.`; break;
+ case 'entertainment':
+ r += ` and can flirt, dance, and strip acceptably.`; break;
+ }
+ }
+ } else if (slave.skill[targetSkill] <= 60) {
switch (targetSkill) {
case 'oral':
- r += ` and has a delightfully experienced tongue.`; break;
case 'vaginal':
- r += ` and has the muscular control to massage anything that's inside ${him}.`; break;
case 'anal':
- r += ` and knows how to use ${his} sphincter to please.`; break;
+ skillDec = `${targetSkill} sex expert,`; break;
case 'whoring':
- r += ` and can often make clients forget that $he's a prostitute they're paying for.`; break;
+ skillDec = `expert whore,`; break;
case 'entertainment':
- r += ` and can flirt engagingly, dance alluringly, and strip arousingly.`; break;
+ skillDec = `expert entertainer,`; break;
}
- }
- } else if (slave.skill[targetSkill] < 100) {
- switch (targetSkill) {
- case 'oral':
- case 'vaginal':
- case 'anal':
- skillDec = `has mastered ${targetSkill} sex,`; break;
- case 'whoring':
- skillDec = `is now a masterful whore,`; break;
- case 'entertainment':
- skillDec = `is now a masterful entertainer,`; break;
- }
- if (isleadershipRole()) {
- skillDec = `is now a masterful ${capFirstChar(targetSkill)}.`;
- }
- if (slave.skill[targetSkill] + skillIncrease >= 100) {
- r = `<span class="green">${He} ${skillDec}</span>`;
+ if (slave.skill[targetSkill] + skillIncrease > 60) {
+ r = `<span class="green">${He} is now an ${skillDec}</span>`;
+ switch (targetSkill) {
+ case 'oral':
+ r += ` and has a delightfully experienced tongue.`; break;
+ case 'vaginal':
+ r += ` and has the muscular control to massage anything that's inside ${him}.`; break;
+ case 'anal':
+ r += ` and knows how to use ${his} sphincter to please.`; break;
+ case 'whoring':
+ r += ` and can often make clients forget that $he's a prostitute they're paying for.`; break;
+ case 'entertainment':
+ r += ` and can flirt engagingly, dance alluringly, and strip arousingly.`; break;
+ }
+ }
+ } else if (slave.skill[targetSkill] < 100) {
switch (targetSkill) {
case 'oral':
- r += ` and can learn nothing more about sucking dick or eating pussy.`; break;
case 'vaginal':
- r += ` and can learn nothing more about tribbing or taking dick.`; break;
case 'anal':
- r += ` and can learn nothing more about taking it up the ass.`; break;
+ skillDec = `has mastered ${targetSkill} sex,`; break;
case 'whoring':
- r += ` and can learn nothing more about prostitution.`; break;
+ skillDec = `is now a masterful whore,`; break;
case 'entertainment':
- r += ` and can learn nothing more about flirting, dancing, or stripping.`; break;
+ skillDec = `is now a masterful entertainer,`; break;
}
- }
- }
- if (isleadershipRole() && slave.skill[targetSkill] + skillIncrease >= 100) {
- V.tutorGraduate.push(slave.ID);
- V.slaveTutor[capFirstChar(targetSkill)].delete(slave.ID);
+ if (slave.skill[targetSkill] + skillIncrease >= 100) {
+ r = `<span class="green">${He} ${skillDec}</span>`;
+ switch (targetSkill) {
+ case 'oral':
+ r += ` and can learn nothing more about sucking dick or eating pussy.`; break;
+ case 'vaginal':
+ r += ` and can learn nothing more about tribbing or taking dick.`; break;
+ case 'anal':
+ r += ` and can learn nothing more about taking it up the ass.`; break;
+ case 'whoring':
+ r += ` and can learn nothing more about prostitution.`; break;
+ case 'entertainment':
+ r += ` and can learn nothing more about flirting, dancing, or stripping.`; break;
+ }
+ }
+ }
}
slave.skill[targetSkill] += skillIncrease;
return r;