From 116992dc814834c954cc276562444adf8bc012aa Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 4 Aug 2020 22:17:45 -0400 Subject: [PATCH] Add societal thoughts on crawling slaves + learning speedbumps --- src/endWeek/saTakeClasses.js | 68 ++++++++++++++++++++------ src/uncategorized/saLongTermEffects.tw | 6 +++ 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js index c4a0a172f42..25dbbfa45d6 100644 --- a/src/endWeek/saTakeClasses.js +++ b/src/endWeek/saTakeClasses.js @@ -3,6 +3,7 @@ App.SlaveAssignment.takeClasses = (function() { let r; + // eslint-disable-next-line no-unused-vars let he, him, his, hers, himself, girl, loli, He, His; let learning; @@ -362,6 +363,7 @@ App.SlaveAssignment.takeClasses = (function() { * */ function generalLessons(slave) { + // speedbumps at 0 and 15 allow players to fine tune education to meet FS demands. if (V.schoolroomRemodelBimbo === 1 && slave.assignment === Job.SCHOOL) { if (slave.intelligenceImplant > -15) { r += ` ${He} makes some progress `; @@ -370,30 +372,66 @@ App.SlaveAssignment.takeClasses = (function() { } else { r += `in undoing ${his} education.`; } - slave.intelligenceImplant -= Math.max(1, learning); - if (slave.intelligenceImplant <= -15) { - slave.intelligenceImplant = -15; - r += ` ${He} has completed ${his} special education, and for most purposes ${he} has become <span class="education neg">less intelligent.</span>`; + if (slave.intelligenceImplant > 15) { + slave.intelligenceImplant -= Math.max(1, learning); + if (slave.intelligenceImplant <= 15) { + slave.intelligenceImplant = 15; + r += ` ${He} is <span class="education neg">no longer burderned by an advanced education.</span>`; + } + } else if (slave.intelligenceImplant > 0) { + slave.intelligenceImplant -= Math.max(1, learning); + if (slave.intelligenceImplant <= 0) { + slave.intelligenceImplant = 0; + r += ` ${He} is <span class="education neg">no longer burderned by anything resembling an education.</span>`; + } + } else { + slave.intelligenceImplant -= Math.max(1, learning); + if (slave.intelligenceImplant <= -15) { + slave.intelligenceImplant = -15; + r += ` ${He} has completed ${his} special education, and for most purposes ${he} has become <span class="education neg">less intelligent.</span>`; + } } } } else if (slave.intelligenceImplant < 30 && slave.assignment === Job.SCHOOL) { r += ` ${He} makes some progress `; - if (slave.intelligenceImplant < 15) { + if (slave.intelligenceImplant < 0) { + r += `in correcting ${his} thought processes.`; + slave.intelligenceImplant -= Math.max(1, learning); + if (slave.intelligenceImplant >= 0) { + slave.intelligenceImplant = 0; + r += ` ${His} disastrous education has been undone, and for most purposes ${he} has become <span class="intelligent">more intelligent.</span>`; + } + } else if (slave.intelligenceImplant < 15) { r += `towards a basic education.`; + slave.intelligenceImplant -= Math.max(1, learning); + if (slave.intelligenceImplant >= 15) { + slave.intelligenceImplant = 15; + r += ` ${He} has completed ${his} basic courses, and for most purposes ${he} has become <span class="intelligent">more intelligent.</span>`; + } } else { r += `in furthering ${his} education.`; - } - slave.intelligenceImplant += Math.max(1, learning); - if (slave.intelligenceImplant >= 30) { - slave.intelligenceImplant = 30; - r += ` ${He} has completed ${his} advanced education, and for most purposes ${he} has become <span class="intelligent">more intelligent.</span>`; + slave.intelligenceImplant += Math.max(1, learning); + if (slave.intelligenceImplant >= 30) { + slave.intelligenceImplant = 30; + r += ` ${He} has completed ${his} advanced education, and for most purposes ${he} has become <span class="intelligent">more intelligent.</span>`; + } } } else if (slave.intelligenceImplant < 15 && slave.assignment === Job.CLASSES) { - r += ` ${He} makes some progress towards a basic education.`; - slave.intelligenceImplant += Math.max(1, learning); - if (slave.intelligenceImplant >= 15) { - slave.intelligenceImplant = 15; - r += ` ${He} has completed a course of slave education, and for most purposes ${he} has become <span class="intelligent">more intelligent.</span>`; + r += ` ${He} makes some progress `; + if (slave.intelligenceImplant < 0) { + r += `in correcting ${his} thought processes.`; + slave.intelligenceImplant -= Math.max(1, learning); + if (slave.intelligenceImplant >= 0) { + slave.intelligenceImplant = 0; + r += ` ${His} disastrous education has been undone, and for most purposes ${he} has become <span class="intelligent">more intelligent.</span>`; + } + } else { + r += `towards a basic education.`; + slave.intelligenceImplant += Math.max(1, learning); + if (slave.intelligenceImplant >= 15) { + slave.intelligenceImplant = 15; + r += ` ${He} has completed a course of slave education, and for most purposes ${he} has become <span class="intelligent">more intelligent.</span>`; + } } } } diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 3aae7a82cbe..eaedcb3e88b 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6345,6 +6345,9 @@ <<if $slaves[$i].fuckdoll > 0>> Society @@.red;strongly disapproves@@ of your owning a Fuckdoll. <<= FutureSocieties.ChangePorn("Paternalist", -2)>> + <<elseif !canWalk($slaves[$i]) && canMove($slaves[$i]) && $slaves[$i].rules.mobility != "permissive">> + Society @@.red;disapproves@@ that you are forcing $him to crawl instead of aiding $his mobility. + <<= FutureSocieties.ChangePorn("Paternalist", -1)>> <</if>> <<elseif $arcologies[0].FSDegradationist != "unset">> <<if ($slaves[$i].fetish == "mindbroken")>> @@ -6400,6 +6403,9 @@ <<if $slaves[$i].fuckdoll > 0>> Society @@.green;approves@@ of your owning a Fuckdoll. <<= FutureSocieties.ChangePorn("Degradationist", 1)>> + <<elseif !canWalk($slaves[$i]) && canMove($slaves[$i]) && $slaves[$i].rules.mobility == "restrictive">> + Society @@.green;approves@@ that $he is forced to crawl like the dog $he is. + <<= FutureSocieties.ChangePorn("Degradationist", 1)>> <</if>> <</if>> -- GitLab