diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index c8c8485662de827ac86024e8a1102b4e1cf715e8..4ef5662919343fa0ad02e18c4431cf088e5fcffa 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1267,6 +1267,9 @@ erectileImplant: 0 <<set $showSecExp = 0>> <<set $wasToggledBefore = 0>> +/* Career-skill gain */ +<<set $masteredXP = 200>> + <<include "secInit">> <<goto "Alpha disclaimer">> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index fc2e6456b9f073fde448e40c57be3fb0ddb9c057..60bccc1646d81295b74dd7183c387ec31f225ba1 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -206,6 +206,39 @@ <<set $args[0].pubertyXY = 0>> <</if>> <</if>> +<<if ndef $args[0].skillHG>> + <<set $args[0].skillHG = 0>> +<</if>> +<<if ndef $args[0].skillRC>> + <<set $args[0].skillRC = 0>> +<</if>> +<<if ndef $args[0].skillBG>> + <<set $args[0].skillBG = 0>> +<</if>> +<<if ndef $args[0].skillMD>> + <<set $args[0].skillMD = 0>> +<</if>> +<<if ndef $args[0].skillDJ>> + <<set $args[0].skillDJ = 0>> +<</if>> +<<if ndef $args[0].skillNU>> + <<set $args[0].skillNU = 0>> +<</if>> +<<if ndef $args[0].skillTE>> + <<set $args[0].skillTE = 0>> +<</if>> +<<if ndef $args[0].skillAT>> + <<set $args[0].skillAT = 0>> +<</if>> +<<if ndef $args[0].skillST>> + <<set $args[0].skillST = 0>> +<</if>> +<<if ndef $args[0].skillMM>> + <<set $args[0].skillMM = 0>> +<</if>> +<<if ndef $args[0].skillWA>> + <<set $args[0].skillWA = 0>> +<</if>> <</widget>> <<widget "AgeImplantAdjustment">> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 007a817eab3b4f7f63b53d25a9881a399c024c0c..512a1d72b976d16026c579a696597940489a92b7 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -2818,3 +2818,7 @@ Done! <br> <<include "SecExpBackwardCompatibility">> <</if>> + +<<if ndef $masteredXP>> + <<set $masteredXP = 200>> +<</if>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index cf9d8e800e5c856a489902641ca41e4b28bcd65e..bbe5ae25bd58f0febb6e0803b756559951a10b65 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -78,6 +78,12 @@ <<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 $slaves[_FLs].skillMD >= $masteredXP>> + 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 1f41e480a68a325563a502b1c15babb52e56b3b5..15a633c96abf2cad4a81c885201f3aa8625d45d3 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -57,6 +57,12 @@ <<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 $slaves[_FLs].skillWA >= $masteredXP>> + <<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 79d232e71cacb379da4110baf57d0be75918e16d..69248ac7f45354e3b139720fcbddc282f002853d 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -48,6 +48,12 @@ <<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 $slaves[_FLs].skillNU >= $masteredXP>> + 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 60e43ba8a1880299887da4ef3c343a511ae89555..549f45b1d0e01c4d8ac3dcf25a33167c6ad88bcb 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -87,6 +87,12 @@ <<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 $slaves[_FLs].skillDJ >= $masteredXP>> + 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 f7462317acda5151dba9f2f41b3d0dff000d4731..db4925d04f4a6978960d2e4e07837d7981fa625f 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -154,6 +154,12 @@ <<if setup.milkmaidCareers.includes($Milkmaid.career)>> <<set $milkmaidHealthBonus++>> She has career experience dealing with milk animals. + <<else>> + <<if $slaves[_FLs].skillMM >= $masteredXP>> + <<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 40ca31843029294ee3062896a764183e4d488ef5..7ee2287916a1a240b2041d67e9a99efc831e7e07 100644 --- a/src/uncategorized/hgApplication.tw +++ b/src/uncategorized/hgApplication.tw @@ -49,6 +49,11 @@ 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 $HeadGirl.skillHG >= $masteredXP>> + 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 a84dff63a8435aa996e271ff2cdb4f803ffbcd38..56489da0e7ea14bb836f1b91ddfd399570165551 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1258,6 +1258,145 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <</if>> <</if>> +<<set _numCareers = 0>> +<<if ($activeSlave.skillHG >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillRC >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillBG >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillMD >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillDJ >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillNU >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillTE >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillAT >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillST >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillMM >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if ($activeSlave.skillWA >= $masteredXP)>> + <<set _numCareers += 1>> +<</if>> +<<if _numCareers > 0>> + She has working experience as a + <<if $activeSlave.skillHG >= $masteredXP>> + <<if _numCareers == 1>> + Head Girl. + <<elseif _numCareers == 2>> + Head Girl and + <<else>> + Head Girl, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillRC >= $masteredXP>> + <<if _numCareers == 1>> + Recruiter. + <<elseif _numCareers == 2>> + Recruiter and + <<else>> + Recruiter, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillBG >= $masteredXP>> + <<if _numCareers == 1>> + Bodyguard. + <<elseif _numCareers == 2>> + Bodyguard and + <<else>> + Bodyguard, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillMD >= $masteredXP>> + <<if _numCareers == 1>> + Madam. + <<elseif _numCareers == 2>> + Madam and + <<else>> + Madam, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillDJ >= $masteredXP>> + <<if _numCareers == 1>> + DJ. + <<elseif _numCareers == 2>> + DJ and + <<else>> + DJ, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillNU >= $masteredXP>> + <<if _numCareers == 1>> + Nurse. + <<elseif _numCareers == 2>> + Nurse and + <<else>> + Nurse, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillTE >= $masteredXP>> + <<if _numCareers == 1>> + Schoolteacher. + <<elseif _numCareers == 2>> + Schoolteacher and + <<else>> + Schoolteacher, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillAT >= $masteredXP>> + <<if _numCareers == 1>> + Attendant. + <<elseif _numCareers == 2>> + Attendant and + <<else>> + Attendant, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillST >= $masteredXP>> + <<if _numCareers == 1>> + Stewardess. + <<elseif _numCareers == 2>> + Stewardess and + <<else>> + Stewardess, + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillMM >= $masteredXP>> + <<if _numCareers == 1>> + Milkmaid. + <<else>> + Milkmaid and + <</if>> + <<set _numCareers -= 1>> + <</if>> + <<if $activeSlave.skillWA >= $masteredXP>> + 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 492c71496aaad171f59a4e1e9602d0262fdd23d2..8aa7fd3d694589459b6ca41de96222c072f1d9a4 100644 --- a/src/uncategorized/saBeYourHeadGirl.tw +++ b/src/uncategorized/saBeYourHeadGirl.tw @@ -169,3 +169,7 @@ <<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)>> + <<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 c3f6efa11b8f610584b33a9f7ea686914439085b..8bafe6f726044443f15b41a48693c1f2b1bd6317 100644 --- a/src/uncategorized/saGuardsYou.tw +++ b/src/uncategorized/saGuardsYou.tw @@ -10,6 +10,11 @@ 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 $slaves[$i].skillBG >= $masteredXP>> + 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 64a843d4fab7b80d5492a82078b737a728643d2a..613f2e0862be0e6519b949a1e1b70df48ca784f8 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -264,6 +264,12 @@ 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 $slaves[$i].skillRC >= $masteredXP>> + 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 99a47e6c965b8d024f56e337dffc023eecc75658..75b9dc59c136f8a32672d15503bbb2d24b62759e 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -49,6 +49,11 @@ <</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 $slaves[_FLs].skillTE >= $masteredXP>> + 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 31246eb029f7a7ccad0c316b8965173452cb7e00..fd54d7809a8e7b75e29d4e3ea5c172911c1a40a5 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -83,6 +83,12 @@ <<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 $slaves[_FLs].skillST >= $masteredXP>> + <<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 1c6294f15d7acc4e2a146e6700034ca2fdcf8d88..5c44c8cdcb08d51c37f771ae9f3872de43b78ece 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) || (_Slave.skillHG >= $masteredXP)>> <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) || (_Slave.skillRC >= $masteredXP)>> <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) || (_Slave.skillBG >= $masteredXP)>> <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) || (_Slave.skillAT >= $masteredXP)>> <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) || (_Slave.skillMD >= $masteredXP)>> <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) || (_Slave.skillDJ >= $masteredXP)>> <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) || (_Slave.skillNU >= $masteredXP)>> <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) || (_Slave.skillTE >= $masteredXP)>> <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) || (_Slave.skillMM >= $masteredXP)>> <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) || (_Slave.skillST >= $masteredXP)>> <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) || (_Slave.skillWA >= $masteredXP)>> <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 b09a2c880e37d5ba47fccabdb2f3cd646bee2afc..50c844255858831c647f44690e36cb72d91c0903 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -47,6 +47,12 @@ <<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 $slaves[_FLs].skillAT >= $masteredXP>> + 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 01b0fd2aad738721b854e0550cb755b02e143af5..ccde97abca85e3f601134bdd362e246e9d653e8d 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1429,6 +1429,10 @@ <<if setup.bodyguardCareers.includes($Bodyguard.career)>> <<set $deadliness += 1>> +<<else>> + <<if $Bodyguard.skillBG >= $masteredXP>> + <<set $deadliness += 1>> + <</if>> <</if>> <<if ($args[0].muscles > 30) && ($args[0].muscles <= 95)>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 878fba4229374142ead3591b041923722a709059..ab47743da3acb1131f12abad72a6eac81f927c7e 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -6,7 +6,7 @@ Called from Gen XX, Gen XY, CheatMode DB, InitNationalities. %/ <<widget "BaseSlave">> - <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0}>> + <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0}>> <</widget>> /%