From 300709642e46ca4cc4781366241cdd05efce3f5b Mon Sep 17 00:00:00 2001 From: x <okp57855@psoxs.com> Date: Fri, 8 Jun 2018 22:18:00 +1200 Subject: [PATCH] Changes --- readme.txt | 37 +++++++---- src/uncategorized/brothelReport.tw | 14 ++-- src/uncategorized/clubReport.tw | 14 ++-- src/uncategorized/longSlaveDescription.tw | 49 +++----------- src/uncategorized/saServant.tw | 6 ++ src/uncategorized/saServeThePublic.tw | 11 +++- src/uncategorized/saWhore.tw | 6 ++ src/uncategorized/sellSlave.tw | 72 +++++++++++++-------- src/uncategorized/slaveAssignmentsReport.tw | 26 ++------ 9 files changed, 117 insertions(+), 118 deletions(-) diff --git a/readme.txt b/readme.txt index a732390ae40..27fdcbe2559 100644 --- a/readme.txt +++ b/readme.txt @@ -9,6 +9,18 @@ I get an error on gamestart. I can't save more than once or twice. -Known issue caused by sugarcube level changes. Save to file doesn't have this problem and will likely avoid the first problem as well. +I wish to report a sanityCheck issue. +-Great, however a large majority of the results are false positives coming from those specific sections being split over several lines in the name of readability and git grep's intentionally (http://git.661346.n2.nabble.com/bug-git-grep-P-and-multiline-mode-td7613900.html ) lacking support for multiline. An Attempt to add -Pzl (https://gitgud.io/pregmodfan/fc-pregmod/merge_requests/2108 ) created a sub condition black hole. What follows are examples of common false positives that can safely be ignored; + + [MissingClosingAngleBracket]src/art/vector/Generate_Stylesheet.tw:11:<<print "<style>."+_art_display_class+" { + <<print "<style>."+_art_display_class+" { + position: absolute; + height: 100%; + margin-left: auto; + margin-right: auto; + left: 0; + right: 0; + } How to mod (basic doc): @@ -16,32 +28,32 @@ How to mod (basic doc): 2. Special files and dir's: - src/config - configuration of the story is here. - - src/config/start.tw - contains list of .tw passage files, regenerated automatic, by building scripts. Do not change by hands. (origial passage Start from pregmod renamed and moved to src/events/intro/introSummary.tw) - - src/js/storyJS.tw - special passage with [script] tag - contain all native JavaScript from pregmod. + - src/config/start.tw - contains list of .tw passage files, regenerated automatic, by building scripts. Do not change by hands. (origial passage Start from pregmod renamed and moved to src/events/intro/introSummary.tw) + - src/js/storyJS.tw - special passage with [script] tag - contain all native JavaScript from pregmod. - devTools/tweeGo/targets/sugarcube-2/userlib.js - on original FC JS moved here (I deleted it after moving JS to storyJS.tw). Compare to storyJS.tw but do not copy file here. May conflict with src/js/storyJS.tw if copied. - src/pregmod - I put all pregmod-only passages here. - .gitignore - special file for git - to ignore some files. For example - compilation results. - -3. Compilation: - + +3. Compilation: + Windows: Run compile.bat - result will be file bin/FC_pregmod.html Second run of compile.but will overwrite bin/FC_pregmod.html without prompt. Linux: Ensure executable permission on file "devTools/tweeGo/tweego" (not tweego.exe!) - Ensure executable permission on file "compile" + Ensure executable permission on file "compile" In the root dir of sources (where you see src, devTools, bin...) run command "./compile" from console compile-git will produce the same result file but with current commit hash in filename. - Mac: - Not supported directly (I don't have access to Mac for testing). + Mac: + Not supported directly (I don't have access to Mac for testing). But you can use linux compilation script if you download tweego for mac from here: https://bitbucket.org/tmedwards/tweego/downloads/ and replace linux executable with mac executable in ./devTools/tweeGo/ folder. This is not tested though, so be warned. - + 4. Simple comparing and merging with original FC: Use meld tool. Place folder FreeCities (original FC sources tree) near FreeCitiesPregmod (this sources tree) and use command: - meld FreeCities FreeCitiesPregmod + meld FreeCities FreeCitiesPregmod or just select these folders in meld's GUI. 5. All modders will be very grateful if anyone who makes some changes to game with .html file also post his/her resulting src folder tree. @@ -50,13 +62,12 @@ How to mod (basic doc): 7. Git workflow: - Master branch is pregmod-master. Only Pregmodder can add something to it directly. Always contain his last public changes. - - pregmod-dev - branch with experimental code mainly by pregmodfan. + - pregmod-dev - branch with experimental code mainly by pregmodfan. - Any contributions will be placed in separate branches like pregmod-mod-<something> (if it's ready to merge with master complete feature/mod) or pregmod-contrib-<something> if it's partial work until contributions is reviewed. - + Typical cycle with git: 1. Make account on gitgud if you don't have usable one. 2. Fork main repository through gitgud interface. (Or pull changes from main repo if you already have fork.) 3. Clone your fork to local machine with git client (Or pull changes if already cloned.) 4. Make you changes as you like, commit, and push result into your forked repository (with git client). 5. Make merge request through gitgud interface. - \ No newline at end of file diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index b827093608e..099647834e0 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -190,13 +190,13 @@ <</if>> <</if>> - <<if setup.whoreCareers.includes($slaves[$i].career)>> - She has sex work experience from her life before she was a slave, making her more effective. - <<elseif $slaves[$i].skillS >= $masteredXP>> - She has sex work experience from working for you, making her more effective. - <<else>> - <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> - <</if>> + <<if setup.whoreCareers.includes($slaves[$i].career)>> + She has sex work experience from her life before she was a slave, making her more effective. + <<elseif $slaves[$i].skillS >= $masteredXP>> + "She has experience as a prostitute from working for you, making her more effective." + <<else>> + <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> + <</if>> <</for>> <<set _oldCash = $cash>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 9669514095d..1aceb98b6b7 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -301,13 +301,13 @@ <<set _pregNo += 1>> <</if>> - <<if setup.entertainmentCareers.includes($slaves[$i].career)>> - She has experience with entertainment from her life before she was a slave, making her more effective. - <<elseif $slaves[$i].skillS >= $masteredXP>> - She has experience with entertainment from working for you, making her more effective. - <<else>> - <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> - <</if>> + <<if setup.entertainmentCareers.includes($slaves[$i].career)>> + She has experience with entertainment from her life before she was a slave, making her more effective. + <<elseif $slaves[$i].skillS >= $masteredXP>> + "She has learned to be entertaining from working for you, making her more effective." + <<else>> + <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> + <</if>> <</for>> <br><br> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index bcb2453d46a..a4f43f5f4e6 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1299,46 +1299,6 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <</if>> <</if>> -<<if !setup.bodyguardCareers.includes($activeSlave.career) && $activeSlave.skillBG >= $masteredXP>> - She's gotten enough experience as a Bodyguard that she has the added value of a girl with a history in personal protection from before she was a slave. -<</if>> -<<if !setup.wardenessCareers.includes($activeSlave.career) && $activeSlave.skillWA >= $masteredXP>> - She's gotten enough experience as a Wardeness that she has the added value of a girl with a history in wardenessing from before she was a slave. -<</if>> -<<if !setup.attendantCareers.includes($activeSlave.career) && $activeSlave.skillAT >= $masteredXP>> - She's gotten enough experience as a Attendant that she has the added value of a girl with a history in attendancy from before she was a slave. -<</if>> -<<if !setup.schoolteacherCareers.includes($activeSlave.career) && $activeSlave.skillTE >= $masteredXP>> - She's gotten enough experience as a Schoolteacher that she has the added value of a girl with a history in teaching from before she was a slave. -<</if>> -<<if !setup.stewardessCareers.includes($activeSlave.career) && $activeSlave.skillST >= $masteredXP>> - She's gotten enough experience as a Stewardess that she has the added value of a girl with a history in teaching from before she was a slave. -<</if>> -<<if !setup.milkmaidCareers.includes($activeSlave.career) && $activeSlave.skillMM >= $masteredXP>> - She's gotten enough experience as a Milkmaid that she has the added value of a girl with a history in farming from before she was a slave. -<</if>> -<<if !setup.madamCareers.includes($activeSlave.career) && $activeSlave.skillMD >= $masteredXP>> - She's gotten enough experience as a Madam that she has the added value of a girl with a history in farming from before she was a slave. -<</if>> -<<if !setup.DJCareers.includes($activeSlave.career) && $activeSlave.skillDJ >= $masteredXP>> - She's gotten enough experience as a DJ that she has the added value of a girl with a history in music from before she was a slave. -<</if>> -<<if !setup.HGCareers.includes($activeSlave.career) && $activeSlave.skillHG >= $masteredXP>> - She's gotten enough experience as a Head Girl that she has the added value of a girl with a history in leadership from before she was a slave. -<</if>> -<<if !setup.recruiterCareers.includes($activeSlave.career) && $activeSlave.skillRC >= $masteredXP>> - She's gotten enough experience as a Recruiter that she has the added value of a girl with a history in recruiting from before she was a slave. -<</if>> -<<if !setup.entertainmentCareers.includes($activeSlave.career) && $activeSlave.skillE>= $masteredXP>> - She's gotten enough experience as a entertainer that she has the added value of a girl with a history in entertainment from before she was a slave. -<</if>> -<<if !setup.whoreCareers.includes($activeSlave.career) && $activeSlave.skillW>= $masteredXP>> - She's gotten enough experience as a whore that she has the added value of a girl with a history in sex work from before she was a slave. -<</if>> -<<if !setup.servantCareers.includes($activeSlave.career) && $activeSlave.skillS>= $masteredXP>> - She's gotten enough experience as a servant that she has the added value of a girl with a history in house keeping from before she was a slave. -<</if>> - <<set _careers = []>> <<if ($activeSlave.skillHG >= $masteredXP)>> <<set _careers.push("Head Girl")>> @@ -1373,6 +1333,15 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower <<if ($activeSlave.skillWA >= $masteredXP)>> <<set _careers.push("Wardeness")>> <</if>> +<<if ($activeSlave.skillE>= $masteredXP)>> + <<set _careers.push("Entertainer")>> +<</if>> +<<if ($activeSlave.skillW>= $masteredXP)>> + <<set _careers.push("Whore")>> +<</if>> +<<if ($activeSlave.skillS>= $masteredXP)>> + <<set _careers.push("Servant")>> +<</if>> <<if _careers.length > 0>> $He has working experience as a <<if _careers.length > 2>> diff --git a/src/uncategorized/saServant.tw b/src/uncategorized/saServant.tw index 020497a1320..e8afd8ff964 100644 --- a/src/uncategorized/saServant.tw +++ b/src/uncategorized/saServant.tw @@ -68,3 +68,9 @@ works as a servant. $pronounCap performs the lowest jobs in your penthouse, clea <</if>> as a drink dispenser at mealtimes, and makes a meaningful contribution to $possessive fellow slaves' nutrition in concert with the feeding systems. <</if>> + +<<if $slaves[$i].assignment == "be a servant">> + <<if !setup.servantCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> + <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> + <</if>> +<</if>> diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index 9c390badc70..df219735d9d 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -510,7 +510,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau <</if>> <</if>> <<if $slaves[$i].relationship > 0>> - <<set $j = $slaveIndices[$slaves[$i].relationshipTarget]>> + <<set $j = $slaveIndices[$slaves[$i].relationshipTarget]>> <<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>> Her <<if $slaves[$j].relationship <= 1>> @@ -530,7 +530,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau She relies on citizens' desire to fuck her for emotional support, making her an excellent, if occasionally disturbing, slut. <</if>> <<if $slaves[$i].rivalry != 0>> - <<set $j = $slaveIndices[$slaves[$i].rivalryTarget]>> + <<set $j = $slaveIndices[$slaves[$i].rivalryTarget]>> <<if def $j && $slaves[$j].assignment == $slaves[$i].assignment>> She's a little less effective due to her mutual dislike with $slaves[$j].slaveName. <</if>> @@ -624,7 +624,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau <<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>> <<if $genderLawPass == 1>> <<if $arcologies[0].FSAssetExpansionist != "unset">> - The public enjoys her fashionably feminine body. + The public enjoys her fashionably feminine body. <<else>> The public enjoys her sleek, girlish figure. <</if>> @@ -1801,3 +1801,8 @@ __This week__ _vignette.text <<set $slaves[$i].bellyImplant += _cervixPump*20>> <</if>> +<<if $slaves[$i].assignment == "serve the public">> + <<if !setup.entertainmentCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> + <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> + <</if>> +<</if>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index a39701878ed..4c8238ec755 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -1822,3 +1822,9 @@ __This week__ _vignette.text She notices her @@.lime;belly has grown@@ from vaginal sex throughout week. <<set $slaves[$i].bellyImplant += _cervixPump*20>> <</if>> + +<<if $slaves[$i].assignment == "whore">> + <<if !setup.whoreCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> + <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> + <</if>> +<</if>> diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw index 04ac8d58d9a..6807d65bf9a 100644 --- a/src/uncategorized/sellSlave.tw +++ b/src/uncategorized/sellSlave.tw @@ -254,44 +254,64 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual <</if>> <</if>> -<<if !setup.bodyguardCareers.includes($activeSlave.career) && $activeSlave.skillBG >= $masteredXP>> - She's gotten enough experience as a Bodyguard that she has the added value of a girl with a history in personal protection from before she was a slave. +<<set _careers = []>> +<<if ($activeSlave.skillHG >= $masteredXP)>> + <<set _careers.push("Head Girl")>> <</if>> -<<if !setup.wardenessCareers.includes($activeSlave.career) && $activeSlave.skillWA >= $masteredXP>> - She's gotten enough experience as a Wardeness that she has the added value of a girl with a history in wardenessing from before she was a slave. +<<if ($activeSlave.skillRC >= $masteredXP)>> + <<set _careers.push("Recruiter")>> <</if>> -<<if !setup.attendantCareers.includes($activeSlave.career) && $activeSlave.skillAT >= $masteredXP>> - She's gotten enough experience as a Attendant that she has the added value of a girl with a history in attendancy from before she was a slave. +<<if ($activeSlave.skillBG >= $masteredXP)>> + <<set _careers.push("Bodyguard")>> <</if>> -<<if !setup.schoolteacherCareers.includes($activeSlave.career) && $activeSlave.skillTE >= $masteredXP>> - She's gotten enough experience as a Schoolteacher that she has the added value of a girl with a history in teaching from before she was a slave. +<<if ($activeSlave.skillMD >= $masteredXP)>> + <<set _careers.push("Madam")>> <</if>> -<<if !setup.stewardessCareers.includes($activeSlave.career) && $activeSlave.skillST >= $masteredXP>> - She's gotten enough experience as a Stewardess that she has the added value of a girl with a history in teaching from before she was a slave. +<<if ($activeSlave.skillDJ >= $masteredXP)>> + <<set _careers.push("DJ")>> <</if>> -<<if !setup.milkmaidCareers.includes($activeSlave.career) && $activeSlave.skillMM >= $masteredXP>> - She's gotten enough experience as a Milkmaid that she has the added value of a girl with a history in farming from before she was a slave. +<<if ($activeSlave.skillNU >= $masteredXP)>> + <<set _careers.push("Nurse")>> <</if>> -<<if !setup.madamCareers.includes($activeSlave.career) && $activeSlave.skillMD >= $masteredXP>> - She's gotten enough experience as a Madam that she has the added value of a girl with a history in farming from before she was a slave. +<<if ($activeSlave.skillTE >= $masteredXP)>> + <<set _careers.push("Schoolteacher")>> <</if>> -<<if !setup.DJCareers.includes($activeSlave.career) && $activeSlave.skillDJ >= $masteredXP>> - She's gotten enough experience as a DJ that she has the added value of a girl with a history in music from before she was a slave. +<<if ($activeSlave.skillAT >= $masteredXP)>> + <<set _careers.push("Attendant")>> <</if>> -<<if !setup.HGCareers.includes($activeSlave.career) && $activeSlave.skillHG >= $masteredXP>> - She's gotten enough experience as a Head Girl that she has the added value of a girl with a history in leadership from before she was a slave. +<<if ($activeSlave.skillST >= $masteredXP)>> + <<set _careers.push("Stewardess")>> <</if>> -<<if !setup.recruiterCareers.includes($activeSlave.career) && $activeSlave.skillRC >= $masteredXP>> - She's gotten enough experience as a Recruiter that she has the added value of a girl with a history in recruiting from before she was a slave. +<<if ($activeSlave.skillMM >= $masteredXP)>> + <<set _careers.push("Milkmaid")>> <</if>> -<<if !setup.entertainmentCareers.includes($activeSlave.career) && $activeSlave.skillE>= $masteredXP>> - She's gotten enough experience as a entertainer that she has the added value of a girl with a history in entertainment from before she was a slave. +<<if ($activeSlave.skillWA >= $masteredXP)>> + <<set _careers.push("Wardeness")>> <</if>> -<<if !setup.whoreCareers.includes($activeSlave.career) && $activeSlave.skillW>= $masteredXP>> - She's gotten enough experience as a whore that she has the added value of a girl with a history in sex work from before she was a slave. +<<if ($activeSlave.skillE>= $masteredXP)>> + <<set _careers.push("Entertainer")>> <</if>> -<<if !setup.servantCareers.includes($activeSlave.career) && $activeSlave.skillS>= $masteredXP>> - She's gotten enough experience as a servant that she has the added value of a girl with a history in house keeping from before she was a slave. +<<if ($activeSlave.skillW>= $masteredXP)>> + <<set _careers.push("Whore")>> +<</if>> +<<if ($activeSlave.skillS>= $masteredXP)>> + <<set _careers.push("Servant")>> +<</if>> +<<if _careers.length > 0>> + $He has working experience as a + <<if _careers.length > 2>> + <<for _j = 0; _j < _careers.length; _j++>> + <<if _j < _careers.length-1>> + <<print _careers[_j]>>, + <<else>> + and <<print _careers[_j]>>. + <</if>> + <</for>> + <<elseif _careers.length > 1>> + _careers[1] and <<print _careers[0]>>. + <<else>> + <<print _careers[0]>>. Providing $him the same additional value if he had a revelant career. + <</if>> <</if>> <<if $activeSlave.behavioralFlaw != "none">> diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index 56f401ec398..686b94f205e 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -27,24 +27,6 @@ <<set $slaves[$i].oralSkill = 0>> <</if>> -<<if $slaves[$i].assignment == "be a servant">> - <<if !setup.servantCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> - <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> - <</if>> -<</if>> - -<<if $slaves[$i].assignment == "serve the public">> - <<if !setup.entertainmentCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> - <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> - <</if>> -<</if>> - -<<if $slaves[$i].assignment == "whore">> - <<if !setup.whoreCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>> - <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>> - <</if>> -<</if>> - <<if ($seeDicks > 0) && (canPenetrate($slaves[$i])) && ($slaves[$i].releaseRules != "restrictive") && ($slaves[$i].releaseRules != "masturbation")>> <<set $averageDick += $slaves[$i].dick, $slavesWithWorkingDicks++>> <</if>> @@ -333,9 +315,9 @@ <</if>> <<if $slaves[$i].broodmother == 1 && $slaves[$i].broodmotherOnHold != 1>> /* broodmother advance block */ - <<if ($week / $slaves[$i].broodmotherFetuses == Math.round($week / $slaves[$i].broodmotherFetuses)) && $slaves[$i].broodmotherFetuses < 1>> + <<if ($week / $slaves[$i].broodmotherFetuses == Math.round($week / $slaves[$i].broodmotherFetuses)) && $slaves[$i].broodmotherFetuses < 1>> /*one fetus in few week - selection and adding*/ - <<set WombImpregnate($slaves[$i], 1, $slaves[$i].pregSource, 0)>> + <<set WombImpregnate($slaves[$i], 1, $slaves[$i].pregSource, 0)>> <<else>> /*one or more fetuses in one week*/ <<set WombImpregnate($slaves[$i], Math.floor($slaves[$i].broodmotherFetuses), $slaves[$i].pregSource, 0)>> /* really 0, it's will be advanced right few lines down.*/ @@ -345,7 +327,7 @@ <<set $slaves[$i].broodmotherCountDown = 37 - WombMinPreg($slaves[$i])>> <</if>> <</if>> - + <<set WombProgress($slaves[$i], _pregSpeed)>> <<set $slaves[$i].pregKnown = 1>> @@ -382,7 +364,7 @@ <</if>> <</if>> -<<if ($slaves[$i].scars == 3)>> +<<if ($slaves[$i].scars == 3)>> <<set $slaves[$i].scarheal += 1>> <</if>> <<if $slaves[$i].fetish == "mindbroken" && $slaves[$i].relationship == -3>> -- GitLab