From da28e9b21c80a3e2bf67c1c11500b7b234549fad Mon Sep 17 00:00:00 2001 From: Sotisi <Sotisi@tzi.de> Date: Fri, 8 Dec 2017 07:18:10 +0100 Subject: [PATCH] Removed magic number (career exp cap), added global variable $masteredXP --- src/init/storyInit.tw | 3 +++ src/uncategorized/brothelReport.tw | 2 +- src/uncategorized/cellblockReport.tw | 2 +- src/uncategorized/clinicReport.tw | 2 +- src/uncategorized/clubReport.tw | 2 +- src/uncategorized/dairyReport.tw | 2 +- src/uncategorized/hgApplication.tw | 2 +- src/uncategorized/longSlaveDescription.tw | 24 ++++++++++----------- src/uncategorized/saGuardsYou.tw | 2 +- src/uncategorized/saRecruitGirls.tw | 2 +- src/uncategorized/schoolroomReport.tw | 2 +- src/uncategorized/servantsQuartersReport.tw | 2 +- src/uncategorized/slaveSummary.tw | 22 +++++++++---------- src/uncategorized/spaReport.tw | 2 +- src/utility/assayWidgets.tw | 2 +- 15 files changed, 38 insertions(+), 35 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index c8c8485662d..4ef56629193 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/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 861acbf4fa7..bbe5ae25bd5 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -79,7 +79,7 @@ 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 >= 200>> + <<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>> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index e91b606da6e..15a633c96ab 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -58,7 +58,7 @@ <<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 >= 200>> + <<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>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 7dc5927f2a1..69248ac7f45 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -49,7 +49,7 @@ 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 >= 200>> + <<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>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 67647afe4e4..549f45b1d0e 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -88,7 +88,7 @@ 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 >= 200>> + <<if $slaves[_FLs].skillDJ >= $masteredXP>> She has musical experience from working for you, giving her tracks actual depth. <<set $DJRepBonus += 0.05>> <</if>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 451d11e9345..db4925d04f4 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -155,7 +155,7 @@ <<set $milkmaidHealthBonus++>> She has career experience dealing with milk animals. <<else>> - <<if $slaves[_FLs].skillMM >= 200>> + <<if $slaves[_FLs].skillMM >= $masteredXP>> <<set $milkmaidHealthBonus++>> She has experience dealing with milk animals from working for you. <</if>> diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw index 8447d79d6b3..36082d18fc5 100644 --- a/src/uncategorized/hgApplication.tw +++ b/src/uncategorized/hgApplication.tw @@ -50,7 +50,7 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i 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 $slaves[$i].skillHG >= 200>> + <<if $slaves[$i].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>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index a2595ff1268..f2fad170daf 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1259,80 +1259,80 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <</if>> <<set _anyCareer = 0>> -<<if ($activeSlave.skillHG >= 200) || ($activeSlave.skillRC >= 200) || ($activeSlave.skillBG >= 200) || ($activeSlave.skillMD >= 200) || ($activeSlave.skillDJ >= 200) || ($activeSlave.skillNU >= 200) || ($activeSlave.skillTE >= 200) || ($activeSlave.skillAT >= 200) || ($activeSlave.skillST >= 200) || ($activeSlave.skillMM >= 200) || ($activeSlave.skillWA >= 200)>> +<<if ($activeSlave.skillHG >= $masteredXP) || ($activeSlave.skillRC >= $masteredXP) || ($activeSlave.skillBG >= $masteredXP) || ($activeSlave.skillMD >= $masteredXP) || ($activeSlave.skillDJ >= $masteredXP) || ($activeSlave.skillNU >= $masteredXP) || ($activeSlave.skillTE >= $masteredXP) || ($activeSlave.skillAT >= $masteredXP) || ($activeSlave.skillST >= $masteredXP) || ($activeSlave.skillMM >= $masteredXP) || ($activeSlave.skillWA >= $masteredXP)>> <<set _anyCareer = 1>> <</if> <<if _anyCareer == 1>> She has working experience as a <<set _commaNeeded = 0>> - <<if $activeSlave.skillHG >= 200>> + <<if $activeSlave.skillHG >= $masteredXP>> Head Girl <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillRC >= 200>> + <<if $activeSlave.skillRC >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> Recruiter <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillBG >= 200>> + <<if $activeSlave.skillBG >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> BodyGuard <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillMD >= 200>> + <<if $activeSlave.skillMD >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> Madam <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillDJ >= 200>> + <<if $activeSlave.skillDJ >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> DJ <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillNU >= 200>> + <<if $activeSlave.skillNU >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> Nurse <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillTE >= 200>> + <<if $activeSlave.skillTE >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> Schoolteacher <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillAT >= 200>> + <<if $activeSlave.skillAT >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> Attendant <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillST >= 200>> + <<if $activeSlave.skillST >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> Stewardess <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillMM >= 200>> + <<if $activeSlave.skillMM >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> Milkmaid <<set _commaNeeded = 1>> <</if>> - <<if $activeSlave.skillWA >= 200>> + <<if $activeSlave.skillWA >= $masteredXP>> <<if _commaNeeded == 1>> , <</if>> diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw index 456d4991ab2..8bafe6f7260 100644 --- a/src/uncategorized/saGuardsYou.tw +++ b/src/uncategorized/saGuardsYou.tw @@ -11,7 +11,7 @@ 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 >= 200>> + <<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)>> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index ac32ff150af..613f2e0862b 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -265,7 +265,7 @@ uses your online resources and some @@.yellowgreen;modest funds@@ to convince $r She has experience in recruitment from before she was a slave. <<set $recruiterProgress += 2>> <<else>> - <<if $slaves[$i].skillRC >= 200>> + <<if $slaves[$i].skillRC >= $masteredXP>> She has experience in recruitment from working for you. <<set $recruiterProgress += 2>> <</if>> diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index cfa972a174a..75b9dc59c13 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -50,7 +50,7 @@ <<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 >= 200>> + <<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)>> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index 88bd3e5cd99..fd54d7809a8 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -84,7 +84,7 @@ <<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 >= 200>> + <<if $slaves[_FLs].skillST >= $masteredXP>> <<set $stewardessBonus += 25>> She has applicable experience with daily sums and organizational trifles from working for you. <</if>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 137b94ee475..5c44c8cdcb0 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) || (_Slave.skillHG >= 200)>> + <<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) || (_Slave.skillRC >= 200)>> + <<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) || (_Slave.skillBG >= 200)>> + <<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) || (_Slave.skillAT >= 200)>> + <<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) || (_Slave.skillMD >= 200)>> + <<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) || (_Slave.skillDJ >= 200)>> + <<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) || (_Slave.skillNU >= 200)>> + <<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) || (_Slave.skillTE >= 200)>> + <<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) || (_Slave.skillMM >= 200)>> + <<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) || (_Slave.skillST >= 200)>> + <<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) || (_Slave.skillWA >= 200)>> + <<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 5263f26b576..50c84425585 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -48,7 +48,7 @@ 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 >= 200>> + <<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>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index a1261c57912..ccde97abca8 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1430,7 +1430,7 @@ <<if setup.bodyguardCareers.includes($Bodyguard.career)>> <<set $deadliness += 1>> <<else>> - <<if $Bodyguard.skillBG >= 200>> + <<if $Bodyguard.skillBG >= $masteredXP>> <<set $deadliness += 1>> <</if>> <</if>> -- GitLab