From 38c7c19f59e63db7316c790019abe77b3e6c5439 Mon Sep 17 00:00:00 2001 From: Sotisi <Sotisi@tzi.de> Date: Thu, 7 Dec 2017 22:05:46 +0100 Subject: [PATCH] Basic support for skill-gain for "leadership" positions. --- src/uncategorized/brothelReport.tw | 9 +++ src/uncategorized/cellblockReport.tw | 9 +++ src/uncategorized/clinicReport.tw | 9 +++ src/uncategorized/clubReport.tw | 9 +++ src/uncategorized/dairyReport.tw | 9 +++ src/uncategorized/hgApplication.tw | 8 ++ src/uncategorized/longSlaveDescription.tw | 83 +++++++++++++++++++++ src/uncategorized/saBeYourHeadGirl.tw | 7 ++ src/uncategorized/saGuardsYou.tw | 8 ++ src/uncategorized/saRecruitGirls.tw | 9 +++ src/uncategorized/schoolroomReport.tw | 8 ++ src/uncategorized/servantsQuartersReport.tw | 9 +++ src/uncategorized/slaveSummary.tw | 22 +++--- src/uncategorized/spaReport.tw | 9 +++ src/utility/assayWidgets.tw | 7 ++ 15 files changed, 204 insertions(+), 11 deletions(-) diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index cf9d8e800e5..c3cac6e2309 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -78,6 +78,15 @@ <<if setup.madamCareers.includes($Madam.career)>> She has experience from her life before she was a slave that helps her in the seedy business of selling other people's bodies for sex. <<set $madamCashBonus += 0.05>> + <<else>> + <<if ndef $slaves[_FLs].skillMD>> + <<set $slaves[_FLs].skillMD = 0>> + <</if>> + <<if $slaves[_FLs].skillMD >= 200>> + She has experience from working for you that helps her in the seedy business of selling other people's bodies for sex. + <<set $madamCashBonus += 0.05>> + <</if>> + <<set $slaves[_FLs].skillMD += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if ($Madam.intelligence > 0)>> She is a clever manager. diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 1f41e480a68..ed85f4be742 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -57,6 +57,15 @@ <<if setup.wardenessCareers.includes($Wardeness.career)>> <<set _devBonus++, _trustMalus++, _idleBonus++>> She has experience with detecting security issues and grinding down potential miscreants from her life before she was a slave, making her more effective. + <<else>> + <<if ndef $slaves[_FLs].skillWA>> + <<set $slaves[_FLs].skillWA = 0>> + <</if>> + <<if $slaves[_FLs].skillWA >= 200>> + <<set _devBonus++, _trustMalus++, _idleBonus++>> + She has experience with detecting security issues and grinding down potential miscreants from working for you, making her more effective. + <</if>> + <<set $slaves[_FLs].skillWA += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if $Wardeness.fetish == "sadist">> She uses the prisoners to gratify her sadism, terrifying them and quickly breaking their resistance. diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 79d232e71ca..237b12be71b 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -48,6 +48,15 @@ <<if setup.nurseCareers.includes($Nurse.career)>> She has experience with medicine from her life before she was a slave, and can often recognize conditions before even the medical scanners can. <<set _idleBonus++, _healthBonus++>> + <<else>> + <<if ndef $slaves[_FLs].skillNU>> + <<set $slaves[_FLs].skillNU = 0>> + <</if>> + <<if $slaves[_FLs].skillNU >= 200>> + She has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can. + <<set _idleBonus++, _healthBonus++>> + <</if>> + <<set $slaves[_FLs].skillNU += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if ($Nurse.fetish == "dom")>> She raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions. diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 60e43ba8a18..77802370fee 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -87,6 +87,15 @@ <<if setup.DJCareers.includes($DJ.career)>> She has musical experience from her life before she was a slave, a grounding that gives her tracks actual depth. <<set $DJRepBonus += 0.05>> + <<else>> + <<if ndef $slaves[_FLs].skillDJ>> + <<set $slaves[_FLs].skillDJ = 0>> + <</if>> + <<if $slaves[_FLs].skillDJ >= 200>> + She has musical experience from working for you, giving her tracks actual depth. + <<set $DJRepBonus += 0.05>> + <</if>> + <<set $slaves[_FLs].skillDJ += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if (_DL < 10)>> <<set $slavesGettingHelp = 0>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index f7462317acd..993f4bd6d37 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -154,6 +154,15 @@ <<if setup.milkmaidCareers.includes($Milkmaid.career)>> <<set $milkmaidHealthBonus++>> She has career experience dealing with milk animals. + <<else>> + <<if ndef $slaves[_FLs].skillMM>> + <<set $slaves[_FLs].skillMM = 0>> + <</if>> + <<if $slaves[_FLs].skillMM >= 200>> + <<set $milkmaidHealthBonus++>> + She has experience dealing with milk animals from working for you. + <</if>> + <<set $slaves[_FLs].skillMM += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>> <<for _dI = 0; _dI < _DL; _dI++>> diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw index 40ca3184302..bfbf5e716fd 100644 --- a/src/uncategorized/hgApplication.tw +++ b/src/uncategorized/hgApplication.tw @@ -49,6 +49,14 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i <<elseif setup.HGCareers.includes($HeadGirl.career)>> She was used to giving commands and being obeyed in her life before she was a slave, experience she can call on now. <<set _effectiveness += 5>> +<<else>> + <<if ndef $slaves[$i].skillHG>> + <<set $slaves[$i].skillHG = 0>> + <</if>> + <<if $slaves[$i].skillHG >= 200>> + She is used to giving commands and being obeyed because of her experience being your Head Girl, making her more effective. + <<set _effectiveness += 5>> + <</if>> <</if>> <<if $HeadGirl.actualAge > 30>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index a84dff63a84..c6e29375cdc 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1258,6 +1258,89 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <</if>> <</if>> +<<set _anyCareer = 0>> +<<if (def $activeSlave.skillHG && $activeSlave.skillHG >= 200) || (def $activeSlave.skillRC && $activeSlave.skillRC >= 200) || (def $activeSlave.skillBG && $activeSlave.skillBG >= 200) || (def $activeSlave.skillMD && $activeSlave.skillMD >= 200) || (def $activeSlave.skillDJ && $activeSlave.skillDJ >= 200) || (def $activeSlave.skillNU && $activeSlave.skillNU >= 200) || (def $activeSlave.skillTE && $activeSlave.skillTE >= 200) || (def $activeSlave.skillAT && $activeSlave.skillAT >= 200) || (def $activeSlave.skillST && $activeSlave.skillST >= 200) || (def $activeSlave.skillMM && $activeSlave.skillMM >= 200) || (def $activeSlave.skillWA && $activeSlave.skillWA >= 200)>> + <<set _anyCareer = 1>> +<</if> +<<if _anyCareer == 1>> + She has working experience as a + <<set _commaNeeded = 0>> + <<if def $activeSlave.skillHG && $activeSlave.skillHG >= 200>> + Head Girl + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillRC && $activeSlave.skillRC >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Recruiter + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillBG && $activeSlave.skillBG >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + BodyGuard + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillMD && $activeSlave.skillMD >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Madam + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillDJ && $activeSlave.skillDJ >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + DJ + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillNU && $activeSlave.skillNU >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Nurse + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillTE && $activeSlave.skillTE >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Schoolteacher + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillAT && $activeSlave.skillAT >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Attendant + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillST && $activeSlave.skillST >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Stewardess + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillMM && $activeSlave.skillMM >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Milkmaid + <<set _commaNeeded = 1>> + <</if>> + <<if def $activeSlave.skillWA && $activeSlave.skillWA >= 200>> + <<if _commaNeeded == 1>> + , + <</if>> + Wardeness + <</if>> + . +<</if>> + <<if $activeSlave.prestige > 0>> <<if $activeSlave.prestigeDesc>>$activeSlave.prestigeDesc<</if>> <<if $activeSlave.prestige > 2>> diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw index 492c71496aa..ae7d3861dae 100644 --- a/src/uncategorized/saBeYourHeadGirl.tw +++ b/src/uncategorized/saBeYourHeadGirl.tw @@ -169,3 +169,10 @@ <<set $slaves[$i].prestigeDesc = "Many citizens respect her long and able service as your Head Girl.">> <</if>> <</if>> + +<<if !setup.HGCareers.includes($slaves[$i].career)>> + <<if ndef $slaves[$i].skillHG>> + <<set $slaves[$i].skillHG = 0>> + <</if>> + <<set $slaves[$i].skillHG += random(1,($slaves[$i].intelligence+4)*2)>> +<</if>> diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw index c3f6efa11b8..2114c572093 100644 --- a/src/uncategorized/saGuardsYou.tw +++ b/src/uncategorized/saGuardsYou.tw @@ -10,6 +10,14 @@ carries arms in your defense. <<if setup.bodyguardCareers.includes($Bodyguard.career)>> She has experience in personal defense from before she was a slave. +<<else>> + <<if ndef $slaves[$i].skillBG>> + <<set $slaves[$i].skillBG = 0>> + <</if>> + <<if $slaves[$i].skillBG >= 200>> + She has experience in personal defense from working for you. + <</if>> + <<set $slaves[$i].skillBG += random(1,($slaves[$i].intelligence+4)*2)>> <</if>> <<if ($slaves[$i].muscles > 30) && ($slaves[$i].muscles <= 95)>> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index 64a843d4fab..6b416c8faf5 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -264,6 +264,15 @@ uses your online resources and some @@.yellowgreen;modest funds@@ to convince $r <<if setup.recruiterCareers.includes($slaves[$i].career)>> She has experience in recruitment from before she was a slave. <<set $recruiterProgress += 2>> +<<else>> + <<if ndef $slaves[$i].skillRC>> + <<set $slaves[$i].skillRC = 0>> + <</if>> + <<if $slaves[$i].skillRC >= 200>> + She has experience in recruitment from working for you. + <<set $recruiterProgress += 2>> + <</if>> + <<set $slaves[$i].skillRC += random(1,($slaves[$i].intelligence+4)*2)>> <</if>> <<if $slaves[$i].intelligence >= 2>> diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index 99a47e6c965..122b302f9de 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -49,6 +49,14 @@ <</if>> <<if setup.schoolteacherCareers.includes($Schoolteacher.career)>> She has experience with students and learning from her life before she was a slave, making her more effective. + <<else>> + <<if ndef $slaves[_FLs].skillTE>> + <<set $slaves[_FLs].skillTE = 0>> + <</if>> + <<if $slaves[_FLs].skillTE >= 200>> + She has experience with students and learning from working for you, making her more effective. + <</if>> + <<set $slaves[_FLs].skillTE += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if ($Schoolteacher.visualAge > 35)>> Her age earns her the respect of her students. diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index 31246eb029f..9f00e73b73d 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -83,6 +83,15 @@ <<if setup.stewardessCareers.includes($Stewardess.career)>> <<set $stewardessBonus += 25>> She has applicable experience with daily sums and organizational trifles from her life before she was a slave. + <<else>> + <<if ndef $slaves[_FLs].skillST>> + <<set $slaves[_FLs].skillST = 0>> + <</if>> + <<if $slaves[_FLs].skillST >= 200>> + <<set $stewardessBonus += 25>> + She has applicable experience with daily sums and organizational trifles from working for you. + <</if>> + <<set $slaves[_FLs].skillST += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if ($Stewardess.actualAge > 35)>> <<set $stewardessBonus += 25>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 1c6294f15d7..3988dd86ebd 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -646,7 +646,7 @@ will <<case "Main">> <<continue>> <<case "HG Select">> - <<if setup.HGCareers.includes(_Slave.career)>> + <<if setup.HGCareers.includes(_Slave.career) || (def _Slave.skillHG && _Slave.skillHG >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Head Girl Suite">> @@ -658,11 +658,11 @@ will <<break>> <</if>> <<case "Recruiter Select">> - <<if setup.recruiterCareers.includes(_Slave.career)>> + <<if setup.recruiterCareers.includes(_Slave.career) || (def _Slave.skillRC && _Slave.skillRC >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "BG Select">> - <<if setup.bodyguardCareers.includes(_Slave.career)>> + <<if setup.bodyguardCareers.includes(_Slave.career) || (def _Slave.skillBG && _Slave.skillBG >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Spa">> @@ -676,7 +676,7 @@ will <<break>> <</if>> <<case "Attendant Select">> - <<if setup.attendantCareers.includes(_Slave.career)>> + <<if setup.attendantCareers.includes(_Slave.career) || (def _Slave.skillAT && _Slave.skillAT >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Brothel">> @@ -690,7 +690,7 @@ will <<break>> <</if>> <<case "Madam Select">> - <<if setup.madamCareers.includes(_Slave.career)>> + <<if setup.madamCareers.includes(_Slave.career) || (def _Slave.skillMD && _Slave.skillMD >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Club">> @@ -711,7 +711,7 @@ will [[Release her from the Arcade|Retrieve][$i = _ssi]] <</if>> <<case "DJ Select">> - <<if setup.DJCareers.includes(_Slave.career)>> + <<if setup.DJCareers.includes(_Slave.career) || (def _Slave.skillDJ && _Slave.skillDJ >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Clinic">> @@ -728,7 +728,7 @@ will <<break>> <</if>> <<case "Nurse Select">> - <<if setup.nurseCareers.includes(_Slave.career)>> + <<if setup.nurseCareers.includes(_Slave.career) || (def _Slave.skillNU && _Slave.skillNU >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Schoolroom">> @@ -742,7 +742,7 @@ will <<break>> <</if>> <<case "Schoolteacher Select">> - <<if setup.schoolteacherCareers.includes(_Slave.career)>> + <<if setup.schoolteacherCareers.includes(_Slave.career) || (def _Slave.skillTE && _Slave.skillTE >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Dairy">> @@ -756,7 +756,7 @@ will <<break>> <</if>> <<case "Milkmaid Select">> - <<if setup.milkmaidCareers.includes(_Slave.career)>> + <<if setup.milkmaidCareers.includes(_Slave.career) || (def _Slave.skillMM && _Slave.skillMM >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Servants' Quarters">> @@ -770,7 +770,7 @@ will <<break>> <</if>> <<case "Stewardess Select">> - <<if setup.stewardessCareers.includes(_Slave.career)>> + <<if setup.stewardessCareers.includes(_Slave.career) || (def _Slave.skillST && _Slave.skillST >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "Master Suite">> @@ -794,7 +794,7 @@ will <<break>> <</if>> <<case "Wardeness Select">> - <<if setup.wardenessCareers.includes(_Slave.career)>> + <<if setup.wardenessCareers.includes(_Slave.career) || (def _Slave.skillWA && _Slave.skillWA >= 200)>> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@.lime;Has applicable career experience.@@ <</if>> <<case "New Game Plus">> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index b09a2c880e3..fa12e4dd281 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -47,6 +47,15 @@ <<if setup.attendantCareers.includes($Attendant.career)>> She has experience with counseling from her life before she was a slave, making her better at building a rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks. <<set _bonusToggle = 1, _idleBonus++>> + <<else>> + <<if ndef $slaves[_FLs].skillAT>> + <<set $slaves[_FLs].skillAT = 0>> + <</if>> + <<if $slaves[_FLs].skillAT >= 200>> + She has experience with counseling from working for you, making her better at building a rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks. + <<set _bonusToggle = 1, _idleBonus++>> + <</if>> + <<set $slaves[_FLs].skillAT += random(1,($slaves[_FLs].intelligence+4)*2)>> <</if>> <<if ($Attendant.eyes == -2)>> Her blindness allows her to deeply connect with her girls. diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 01b0fd2aad7..ea293257d49 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1429,6 +1429,13 @@ <<if setup.bodyguardCareers.includes($Bodyguard.career)>> <<set $deadliness += 1>> +<<else>> + <<if ndef $Bodyguard.skillBG>> + <<set $Bodyguard.skillBG = 0>> + <</if>> + <<if $Bodyguard.skillBG >= 200>> + <<set $deadliness += 1>> + <</if>> <</if>> <<if ($args[0].muscles > 30) && ($args[0].muscles <= 95)>> -- GitLab