diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt index 83245d0f8bdf8fcbb8e3017acb0be28aad342c53..d6fe46c9ed3091a313e74cf7157481bf0ecd8748 100644 --- a/devNotes/Useful JS Function Documentation.txt +++ b/devNotes/Useful JS Function Documentation.txt @@ -246,6 +246,13 @@ SoftenBehavioralFlaw(slave) - Replaces the slave's behavioral flaw with the corr SoftenSexualFlaw(slave) - Replaces the slave's sexual flaw with the corresponding quirk. +SkillIncrease.Oral(slave, value) +SkillIncrease.Vaginal(slave, value) +SkillIncrease.Anal(slave, value) +SkillIncrease.Whore(slave, value) +SkillIncrease.Entertain(slave, value) +- Increases the slave's skill by value or 1. Returns a string if the skill is boosted over a threshold. + UtilJS [script] Height.mean(nationality, race, genes, age) - returns the mean height for the given combination and age in years (>=2). Height.mean(nationality, race, genes) - returns the mean adult height for the given combination. diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index de2fb790e89bf1f85012fe462bf9e5506b49e3e0..8b751810777ccfc3ecf3313a757e06c808623190 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -5,6 +5,7 @@ Pregmod 9 -unified cybermod with vanilla -slave assignment links improved + -facility transfer tab added to facility assignment -breast implants now impact milk production based on % implant -many new names added to lacking name pools -fixes diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw index 6f9e1ec35c5bc29378cf24e4da56e2ff1089f3bc..ce107fe63906013ef8c77f0c9801fb77887f765f 100644 --- a/src/facilities/farmyard/farmyardReport.tw +++ b/src/facilities/farmyard/farmyardReport.tw @@ -264,9 +264,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<_dump = saWorkTheFarm($slaves[$i])>> - $He <<= saWorkTheFarm($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saWorkTheFarm($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw index 8adf96ded21aaefbe941ae791974bec0dbe595b8..aa35b8d37c9754c83f52387f6d7f70b8d6b7d0bd 100644 --- a/src/facilities/nursery/nurseryReport.tw +++ b/src/facilities/nursery/nurseryReport.tw @@ -184,8 +184,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> - <<set _dump = saRest($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> + <<run saRest($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 3ce93df56ec0bd35a54e11432029e601a6ee40e4..7f0a12977557a9b1005b7c68c4abc1c9b465494c 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2548,7 +2548,7 @@ LORE: INTERVIEWS <br>''Wahn'' wrote numerous generic recruitment events. <br>''PregModder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, an expansion to the hostage corruption event chain, slave specific player titles, gagging and several basic gags, extended family mode, oversized sex toys, buttplug attachment system, and other, likely forgotten, things. (And that's just the vanilla added stuff!) <br>''Lolimodder'' your loli expertise will be missed. - <br>''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Revamped pregnancy tracking as well. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed). + <br>''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Revamped pregnancy tracking as well then further expanded it. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed). <br>''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, height overhauling, proper slave summary caching, new shelter slaves, some crazy ass shit with vector art, fixing seDeath, coding jquery in ui support and likely one to two of these other anon credits. <br>''family mod anon'' for extending extended family mode. <br>''anon'' for lolimod content, new slave careers, new pubestyles, and general improvements. @@ -2615,7 +2615,10 @@ LORE: INTERVIEWS <br>''DCoded'' for creating the favicon and adding animals to the Pit, as well as nursery and bestiality content, scenes, facilities and fixes. Also added a pussy licking scene and created and fixed a number of bugs. <br>''HiveBro'' for giving hyperpregnant slaves some serious loving. <br>''Quin2k'' for overwriting save function and expired tweak via Vrelnir & co. - <br>''ezsh'' for bugfixing and creating a tool to build twineJS for me. + <br>''ezsh'' for bugfixing and creating a tool to build twineJS for me. Has contributed massive revisions to the game's structure. + <br>''Sonofrevvan'' for fDance and fBeg. + <br>''skriv'' for fixes and endless code cleaning. + <br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics. <br>''git contributors lost to time'' for their submissions and work through pregmod's git. <br>''Bane70'' optimized huge swaths of code with notable professionalism. <br>''Circle Tritagonist'' provided several new collars and outfits. @@ -2634,8 +2637,8 @@ LORE: INTERVIEWS <br>''freecitiesbandit'' wrote a number of recruitment, future society, mercenary and random events, provided tailed buttplugs, new eyes and tattoos, and contributed the code for the mercenary raiders policy. <br>''DrNoOne'' wrote the bulk slave purchase and persistent summary code. <br>''Mauve'' provided vector art for chastity belts and limp dicks. - <br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing and aprons. Also the hearing overhaul. Has declared war on bad spelling, grammar and formatting. - <br>''lowercasedonkey'' for various additions, not limited to the budget overhaul. + <br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing, overalls and aprons. Also the hearing overhaul. Has declared war on bad spelling, grammar and formatting. + <br>''lowercasedonkey'' for various additions, not limited to the budget overhaul. Set up all the tabs too. <br>''amomynous0'' for bug reports and testing in addition to SFmod unit descriptions. <br>''wepsrd'' for QOL (hormonal balance cheat and lactation adaptation to new menu) fixes. diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw index 8d1549144dea6c8d881f622226b44cc1cb423b7d..21c9224fab9e150de1a9c8c9ba936a9bdd20e2ac 100644 --- a/src/pregmod/rePregInventor.tw +++ b/src/pregmod/rePregInventor.tw @@ -94,7 +94,7 @@ <<else>> surprisingly resilient, tight little pussy, <</if>> - <<set _dump = VaginalVCheck()>> + <<run VaginalVCheck()>> <<else>> clench your legs around $his slutty head as $he drives your pussy over the edge with $his tongue, <<set $activeSlave.counter.oral++, $oralTotal++>> diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw index 6c6646c06f2f4054ab299a8d828b2404bafcb904..5ee020d75dd215af039e1bf082f780351a77ad60 100644 --- a/src/uncategorized/arcadeReport.tw +++ b/src/uncategorized/arcadeReport.tw @@ -76,11 +76,11 @@ <<else>> is confined in $arcadeName. <</if>> - <br> $He <<print saWorkAGloryHole($slaves[$i])>> + <br> $He <<= saWorkAGloryHole($slaves[$i])>> <<else>> <<silently>> <<include "SA chooses own job">> - <<print saWorkAGloryHole($slaves[$i])>> + <<run saWorkAGloryHole($slaves[$i])>> <</silently>> <</if>> <<if ($arcadeUpgradeCollectors > 0)>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 8e11b8eab0c49b81628b85defb9bd602a8f48291..2b300f407645ce88ff57a33a66238043b23b23e3 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -197,7 +197,7 @@ <<if $showEWD != 0>> <br> $He <<= saWhore($slaves[$i])>> <<else>> - <<set _dump = saWhore($slaves[$i])>> + <<run saWhore($slaves[$i])>> <</if>> <<set _seed = $cash-_oldCash, _cashX += Math.trunc(0.5*_seed), _seed = Math.trunc(1.5*_seed), _profits += _seed>> <<run cashX(_cashX, "whore", $Madam)>> @@ -355,8 +355,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saWhore($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saWhore($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 63778fa3315b0e6d1bf36564976762d1fe1e097f..b3d5d40ff90c6eb5e8f9642275587dad28a4aa8b 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -265,7 +265,7 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saStayConfined($slaves[$i])>> + <<run saStayConfined($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index bd774af0ecfbbd122f5f2b52104a0eb16dab7aa6..93d5e51cb5a0c8814022df89e7856abaf6590140 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -318,8 +318,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saRest($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saRest($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index b601dbea3161905611f877b1fa9a594f1ca77c6c..48cc7bbde6aae880a3c679004238347b3467e370 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -100,7 +100,7 @@ <<if $showEWD != 0>> <br> $He <<= saServeThePublic($slaves[$i])>> <<else>> - <<set _dump = saServeThePublic($slaves[$i])>> + <<run saServeThePublic($slaves[$i])>> <</if>> <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[_FLs].skill.entertainment))*0.1*0.5), "club", $slaves[_FLs])>> <</if>> @@ -245,8 +245,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _dump = saServeThePublic($slaves[$i])>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saServeThePublic($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw index 60b6e3fe2edbe8e62ebaefded3f38e0b4efff46d..82cd23ccd10f8a9a87a4ee0a4261193872b0d79d 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -18,7 +18,7 @@ <<case "serve the public">> <<= saServeThePublic($slaves[$i])>> <<case "work a glory hole">> - <<print saWorkAGloryHole($slaves[$i])>> + <<= saWorkAGloryHole($slaves[$i])>> <<case "get milked">> <<set $servantMilkersMultiplier = 1>> <<include "SA get milked">> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index a4fbe817dd8b0a933668da8e69257ca40dedde33..4c07b6f23f47c7dbd8fca761cf94fff6c8cd8aee 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -39,7 +39,7 @@ <<set _oldRepGain = hashSum($lastWeeksRepIncome)>> <<set $pure = 0>> - <<set _dump = saServeThePublic($slaves[$i])>> + <<run saServeThePublic($slaves[$i])>> <<set _influence = Math.clamp((hashSum($lastWeeksRepIncome)-_oldRepGain)*0.01,1,3)>> <<if $arcologies[0].FSSubjugationist != "unset">> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index f37ada6591a4c2023fd96701cd5b85989ef4dc40..72d3b2c3bd9bacf063f73b3975625c8291103392 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -202,7 +202,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -281,12 +281,12 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<_dump = saServant($slaves[$i])>> + <<run saServant($slaves[$i])>> <<if ($servantMilkers == 1) && ($slaves[$i].lactation > 0)>> <<include "SA get milked">> <<set _SQMilk += $milk, _SQMilkSale += $milkSale>> <</if>> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 6f2182e93dedbbe8ba9e097b47e7e47b3502f95e..c7a5f00650f1018dd466b9d23a449c08d3baead8 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -321,8 +321,8 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> - <<set _dump = saRest($slaves[$i])>> + <<run saChoosesOwnClothes($slaves[$i])>> + <<run saRest($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">>