diff --git a/compile b/compile index be24c915eb4dced6c56c8ef7ad90d49331bb53b8..f2694d917ae73ef569d755322d8b0dfd3e3b5a25 100644 --- a/compile +++ b/compile @@ -6,4 +6,8 @@ cp src/config/start.tw.proto start.tw.tmp find src -name '*.tw' -print >>start.tw.tmp mv start.tw.tmp src/config/start.tw -./devTools/tweeGo/tweego -o bin/FC.html src/config/start.tw \ No newline at end of file +HASH=`git log -n1 |grep commit | sed 's/commit //'` + +./devTools/tweeGo/tweego -o bin/FC_pregmod.html src/config/start.tw + +rm src/config/start.tw \ No newline at end of file diff --git a/compile-git b/compile-git new file mode 100644 index 0000000000000000000000000000000000000000..8fb59113335a6fd11e7a41a26a18ae054d0ae7ba --- /dev/null +++ b/compile-git @@ -0,0 +1,15 @@ +#!/bin/bash + +# Will add all *.tw files to StoryIncludes. +rm src/config/start.tw +cp src/config/start.tw.proto start.tw.tmp +find src -name '*.tw' -print >>start.tw.tmp +mv start.tw.tmp src/config/start.tw + +HASH=`git log -n1 |grep -m1 commit | sed 's/commit //'` + +./devTools/tweeGo/tweego -o bin/FC_pregmod_$HASH.html src/config/start.tw + +rm src/config/start.tw + +echo "FC_pregmod_$HASH.html" compilation finished. \ No newline at end of file diff --git a/compile.bat b/compile.bat index 321a0ce5dda51f9a31ebe7d23706c9c1cfa9112a..ad188d23de34ea624b4b778f2be4ecc83edea8d0 100644 --- a/compile.bat +++ b/compile.bat @@ -7,5 +7,7 @@ copy src\config\start.tw.proto start.tw.tmp >nul >>start.tw.tmp (for /r "src" %%F in (*.tw) do echo %%F) move start.tw.tmp src\config\start.tw >nul -CALL "%~dp0devTools\tweeGo\tweego.exe" -o "%~dp0bin/FC.html" "%~dp0src\config\start.tw" +CALL "%~dp0devTools\tweeGo\tweego.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src\config\start.tw" + +del src\config\start.tw ECHO Done diff --git a/compile_debug.bat b/compile_debug.bat index d5a291ee79d48cc4a1e85edcdd378a33bcf06954..f18903d64d566b08371f72820445c7c40b6b9c50 100644 --- a/compile_debug.bat +++ b/compile_debug.bat @@ -8,6 +8,9 @@ copy src\config\start.tw.proto start.tw.tmp >nul >>start.tw.tmp (for /r "src" %%F in (*.tw) do echo %%F) move start.tw.tmp src\config\start.tw >nul -CALL "%~dp0devTools\tweeGo\tweego.exe" -o "%~dp0bin/FC.html" "%~dp0src\config\start.tw" +CALL "%~dp0devTools\tweeGo\tweego.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src\config\start.tw" + +del src\config\start.tw + ECHO Done PAUSE \ No newline at end of file diff --git a/readme.txt b/readme.txt index c74150439d90cf2e3d2f7bbc5b1c11d074bffd6c..55b2c1879a5c9d3a0e249cd2d62fd44126f49466 100644 --- a/readme.txt +++ b/readme.txt @@ -17,8 +17,10 @@ How to mod (basic doc): Second run of compile.but will overwrite bin/FC.html without prompt. Linux: - Ensure executable permission on file devTools/tweeGo/tweego (not tweego.exe!) - in the root dir of sources (where you see src, devTools, bin...) run command "make" from console. Should be installed "build-essential" or at least "make" package. + Ensure executable permission on file "devTools/tweeGo/tweego" (not tweego.exe!) + 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. 4. Simple comparing and merging with original FC: @@ -28,4 +30,4 @@ How to mod (basic doc): 5. All modders will be wery grateful if any, who make some changes to game, with .html file also post his/her resulting src folder tree. -6. For contributors to pregmod: you need to post yours version of src folder tree, not just produced FC.html !!! This html file can't be reverted to proper sources, and useless as contribution! \ No newline at end of file +6. For contributors to pregmod: you need to post yours version of src folder tree, not just produced FC_pregmod.html !!! This html file can't be reverted to proper sources, and useless as contribution! \ No newline at end of file diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw index 5263c03db3366925c3c5c4e28f9ae664dea89422..c53ffb8b6a7071e22b58803b2745e4a1ed85703c 100644 --- a/src/cheats/mod_EditFSCheat.tw +++ b/src/cheats/mod_EditFSCheat.tw @@ -36,7 +36,7 @@ <<radiobutton "$arcologies[0].FSSupremacistRace" southern european>> Southern European | <<radiobutton "$arcologies[0].FSSupremacistRace" semitic>> Semitic - <br>[[Apply and reset Racial Subjugationism|MOD_Edit FS Cheat][$arcologies[0].FSSubjugationist to unset, $arcologies[0].FSSubjugationistRace to 0, $arcologies[0].FSSubjugationistDecoration to 20, $arcologies[0].FSSubjugationistLawME to 0]] + <br>[[Apply and reset Racial Subjugationism|MOD_Edit FS Cheat][$arcologies[0].FSSubjugationist to "unset", $arcologies[0].FSSubjugationistRace to 0, $arcologies[0].FSSubjugationistDecoration to 20, $arcologies[0].FSSubjugationistLawME to 0]] <</nobr>> <<nobr>> @@ -71,7 +71,7 @@ <<radiobutton "$arcologies[0].FSSubjugationistRace" southern european>> Southern European | <<radiobutton "$arcologies[0].FSSubjugationistRace" semitic>> Semitic - <br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][$arcologies[0].FSSupremacist to unset,$arcologies[0].FSSupremacistRace to 0, $arcologies[0].FSSupremacistDecoration to 20, $arcologies[0].FSSupremacistLawME to 0]] + <br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][$arcologies[0].FSSupremacist to "unset",$arcologies[0].FSSupremacistRace to 0, $arcologies[0].FSSupremacistDecoration to 20, $arcologies[0].FSSupremacistLawME to 0]] <</nobr>> <<nobr>> @@ -94,7 +94,7 @@ <<radiobutton "$arcologies[0].FSGenderRadicalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSGenderRadicalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Gender Traditionalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderFundamentalist to unset,$arcologies[0].FSGenderFundamentalistDecoration to 20,$arcologies[0].FSGenderFundamentalistLaw to 0]] + <br>[[Apply and reset Gender Traditionalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderFundamentalist to "unset",$arcologies[0].FSGenderFundamentalistDecoration to 20,$arcologies[0].FSGenderFundamentalistLaw to 0]] <</nobr>> <<nobr>> @@ -117,9 +117,62 @@ <<radiobutton "$arcologies[0].FSGenderFundamentalistSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSGenderFundamentalistSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Gender Radicalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderRadicalist to unset,$arcologies[0].FSGenderRadicalistDecoration to 20,$arcologies[0].FSGenderRadicalistLaw to 0]] + <br>[[Apply and reset Gender Radicalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderRadicalist to "unset",$arcologies[0].FSGenderRadicalistDecoration to 20,$arcologies[0].FSGenderRadicalistLaw to 0]] <</nobr>> +<<nobr>> + <<if $arcologies[0].FSRepopulationFocus != "unset">> + <br>You are ''pursuing'' Repopulation Efforts. + <<else>> + <br>''You are not pursuing'' Repopulation Efforts. + <</if>> + + <br>Repopulation Efforts (0-100 or unset): <<textbox "$arcologies[0].FSRepopulationFocus" $arcologies[0].FSRepopulationFocus>> + <br>Decoration: $arcologies[0].FSRepopulationFocusDecoration + + <br><<radiobutton "$arcologies[0].FSRepopulationFocusDecoration" 20>> 20 (Minimum) + <br><<radiobutton "$arcologies[0].FSRepopulationFocusDecoration" 40>> 40 (Media support.) + <br><<radiobutton "$arcologies[0].FSRepopulationFocusDecoration" 60>> 60 (Decorated public spaces.) + <br><<radiobutton "$arcologies[0].FSRepopulationFocusDecoration" 80>> 80 (Slaves stationed in public spaces.) + <br><<radiobutton "$arcologies[0].FSRepopulationFocusDecoration" 100>> 100 (Remodeled exterior; Fully customized.) + + <br>Law: $arcologies[0].FSRepopulationFocusSMR | + <<radiobutton "$arcologies[0].FSRepopulationFocusSMR" 0>> 0 (Not passed.) + | <<radiobutton "$arcologies[0].FSRepopulationFocusSMR" 1>> 1 (Passed.) + + <br>Law: $arcologies[0].FSRepopulationFocusLaw | + <<radiobutton "$arcologies[0].FSRepopulationFocusLaw" 0>> 0 (Not passed.) + | <<radiobutton "$arcologies[0].FSRepopulationFocusLaw" 1>> 1 (Passed.) + + <br>[[Apply and reset Eugenics|MOD_Edit FS Cheat][$arcologies[0].FSRepopulationFocus to "unset",$arcologies[0].FSRepopulationFocusDecoration to 20,$arcologies[0].FSRepopulationFocusLaw to 0, $arcologies[0].FSRepopulationFocusSMR to 0]] +<</nobr>> + +<<nobr>> + <<if $arcologies[0].FSRestart != "unset">> + <br>You are ''pursuing'' Eugenics. + <<else>> + <br>''You are not pursuing'' Eugenics. + <</if>> + + <br>Eugenics (0-100 or unset): <<textbox "$arcologies[0].FSRestart" $arcologies[0].FSRestart>> + <br>Decoration: $arcologies[0].FSRestartDecoration + + <br><<radiobutton "$arcologies[0].FSRestartDecoration" 20>> 20 (Minimum) + <br><<radiobutton "$arcologies[0].FSRestartDecoration" 40>> 40 (Media support.) + <br><<radiobutton "$arcologies[0].FSRestartDecoration" 60>> 60 (Decorated public spaces.) + <br><<radiobutton "$arcologies[0].FSRestartDecoration" 80>> 80 (Slaves stationed in public spaces.) + <br><<radiobutton "$arcologies[0].FSRestartDecoration" 100>> 100 (Remodeled exterior; Fully customized; Elite established.) + + <br>Law: $arcologies[0].FSRestartSMR | + <<radiobutton "$arcologies[0].FSRestartSMR" 0>> 0 (Not passed.) + | <<radiobutton "$arcologies[0].FSRestartSMR" 1>> 1 (Passed.) + + <br>Law: $arcologies[0].FSRepopulationFocusLaw | + <<radiobutton "$arcologies[0].FSRestartLaw" 0>> 0 (Not passed.) + | <<radiobutton "$arcologies[0].FSRestartLaw" 1>> 1 (Passed.) + + <br>[[Apply and reset Repopulation Efforts|MOD_Edit FS Cheat][$arcologies[0].FSRepopulationFocus to "unset",$arcologies[0].FSRepopulationFocusDecoration to 20,$arcologies[0].FSRestartLaw to 0, $arcologies[0].FSRestartSMR to 0]] +<</nobr>> <<nobr>> <<if $arcologies[0].FSPaternalist != "unset">> <br>You are ''pursuing'' Paternalism. @@ -140,7 +193,7 @@ <<radiobutton "$arcologies[0].FSPaternalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSPaternalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Degradationism|MOD_Edit FS Cheat][$arcologies[0].FSDegradationist to unset,$arcologies[0].FSDegradationistDecoration to 20,$arcologies[0].FSDegradationistLaw to 0]] + <br>[[Apply and reset Degradationism|MOD_Edit FS Cheat][$arcologies[0].FSDegradationist to "unset",$arcologies[0].FSDegradationistDecoration to 20,$arcologies[0].FSDegradationistLaw to 0]] <</nobr>> <<nobr>> @@ -163,7 +216,7 @@ <<radiobutton "$arcologies[0].FSDegradationistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSDegradationistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Paternalism|MOD_Edit FS Cheat][$arcologies[0].FSPaternalist to unset,$arcologies[0].FSPaternalistDecoration to 20,$arcologies[0].FSPaternalistLaw to 0]] + <br>[[Apply and reset Paternalism|MOD_Edit FS Cheat][$arcologies[0].FSPaternalist to "unset",$arcologies[0].FSPaternalistDecoration to 20,$arcologies[0].FSPaternalistLaw to 0]] <</nobr>> <<nobr>> @@ -186,7 +239,7 @@ <<radiobutton "$arcologies[0].FSBodyPuristLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSBodyPuristLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Body Transformationism|MOD_Edit FS Cheat][$arcologies[0].FSTransformationFetishist to unset,$arcologies[0].FSTransformationFetishistDecoration to 20,$arcologies[0].FSTransformationFetishistLaw to 0]] + <br>[[Apply and reset Body Transformationism|MOD_Edit FS Cheat][$arcologies[0].FSTransformationFetishist to "unset",$arcologies[0].FSTransformationFetishistDecoration to 20,$arcologies[0].FSTransformationFetishistLaw to 0]] <</nobr>> <<nobr>> @@ -209,7 +262,7 @@ <<radiobutton "$arcologies[0].FSTransformationFetishistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSTransformationFetishistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Body Purism|MOD_Edit FS Cheat][$arcologies[0].FSBodyPurist to unset,$arcologies[0].FSBodyPuristDecoration to 20,$arcologies[0].FSBodyPuristLaw to 0]] + <br>[[Apply and reset Body Purism|MOD_Edit FS Cheat][$arcologies[0].FSBodyPurist to "unset",$arcologies[0].FSBodyPuristDecoration to 20,$arcologies[0].FSBodyPuristLaw to 0]] <</nobr>> <<nobr>> @@ -233,7 +286,7 @@ <<radiobutton "$arcologies[0].FSYouthPreferentialistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSYouthPreferentialistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Maturity Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSMaturityPreferentialist to unset,$arcologies[0].FSMaturityPreferentialistDecoration to 20,$arcologies[0].FSMaturityPreferentialistLaw to 0]] + <br>[[Apply and reset Maturity Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSMaturityPreferentialist to "unset",$arcologies[0].FSMaturityPreferentialistDecoration to 20,$arcologies[0].FSMaturityPreferentialistLaw to 0]] <</nobr>> <<nobr>> @@ -257,7 +310,7 @@ <<radiobutton "$arcologies[0].FSMaturityPreferentialistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSMaturityPreferentialistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Youth Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSYouthPreferentialist to unset,$arcologies[0].FSYouthPreferentialistDecoration to 20,$arcologies[0].FSYouthPreferentialistLaw to 0]] + <br>[[Apply and reset Youth Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSYouthPreferentialist to "unset",$arcologies[0].FSYouthPreferentialistDecoration to 20,$arcologies[0].FSYouthPreferentialistLaw to 0]] <</nobr>> <<nobr>> @@ -280,7 +333,7 @@ <<radiobutton "$arcologies[0].FSSlimnessEnthusiastSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSSlimnessEnthusiastSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Asset Expansionism|MOD_Edit FS Cheat][$arcologies[0].FSAssetExpansionist to unset,$arcologies[0].FSAssetExpansionistDecoration to 20,$arcologies[0].FSAssetExpansionistLaw to 0]] + <br>[[Apply and reset Asset Expansionism|MOD_Edit FS Cheat][$arcologies[0].FSAssetExpansionist to "unset",$arcologies[0].FSAssetExpansionistDecoration to 20,$arcologies[0].FSAssetExpansionistLaw to 0]] <</nobr>> <<nobr>> @@ -304,7 +357,7 @@ <<radiobutton "$arcologies[0].FSAssetExpansionistSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSAssetExpansionistSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Slimness Enthusiasm|MOD_Edit FS Cheat][$arcologies[0].FSSlimnessEnthusiast to unset,$arcologies[0].FSSlimnessEnthusiastDecoration to 20,$arcologies[0].FSSlimnessEnthusiastLaw to 0]] + <br>[[Apply and reset Slimness Enthusiasm|MOD_Edit FS Cheat][$arcologies[0].FSSlimnessEnthusiast to "unset",$arcologies[0].FSSlimnessEnthusiastDecoration to 20,$arcologies[0].FSSlimnessEnthusiastLaw to 0]] <</nobr>> <<nobr>> diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index f1752d5f80e1643b02f8d515a3c13d095c0af41f..13aa801e2eeafa9503c3a0168b6381b46a4c005c 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -23,10 +23,10 @@ ''Enter the IDs for this slaves parents(-2 or 0:random and untracked by system, -1:PC, all others are applicable):'' <br> ''mother ID'' - <<textbox "$activeSlave.mother" $activeSlave.mother "Starting Girls">> + <<textbox "$activeSlave.mother" $activeSlave.mother>> <br> ''father ID'' - <<textbox "$activeSlave.father" $activeSlave.father "Starting Girls">> + <<textbox "$activeSlave.father" $activeSlave.father>> <<else>> ''Slave Blood Relations (twin, sister, mother, daughter):'' <<textbox "$activeSlave.relation" $activeSlave.relation>> diff --git a/src/config/start.tw b/src/config/start.tw deleted file mode 100644 index 14eedac3b20c56eb738308ed7cc9218d749a19b7..0000000000000000000000000000000000000000 --- a/src/config/start.tw +++ /dev/null @@ -1,415 +0,0 @@ -:: Start [nobr] - - -:: StoryTitle - -Free Cities - -:: StoryIncludes -src\cheats\mod_EditArcologyCheat.tw -src\cheats\mod_EditArcologyCheatDatatypeCleanup.tw -src\cheats\mod_EditFSCheat.tw -src\cheats\mod_EditFSCheatDatatypeCleanup.tw -src\cheats\mod_EditSlaveCheat.tw -src\cheats\mod_EditSlaveCheatDatatypeCleanup.tw -src\config\sugarCubeConfig.tw -src\events\gameover.tw -src\events\intro\economyIntro.tw -src\events\intro\extremeIntro.tw -src\events\intro\genderIntro.tw -src\events\intro\initNationalities.tw -src\events\intro\introSummary.tw -src\events\intro\locationIntro.tw -src\events\intro\pcBodyIntro.tw -src\events\intro\pcExperienceIntro.tw -src\events\intro\pcRumorIntro.tw -src\events\intro\terrainIntro.tw -src\events\intro\tradeIntro.tw -src\facilities\brothel\brothelAssignmentScene.tw -src\gui\css\mainStyleSheet.tw -src\gui\Encyclopedia\encyclopedia.tw -src\gui\mainMenu\AlphaDisclaimer.tw -src\init\storyInit.tw -src\js\storyJS.tw -src\npc\abort.tw -src\npc\acquisition.tw -src\npc\asDump.tw -src\npc\exportSlave.tw -src\npc\fAbuse.tw -src\npc\fFeelings.tw -src\npc\fKiss.tw -src\npc\fPCImpreg.tw -src\npc\fRelation.tw -src\npc\fRival.tw -src\npc\fSlaveImpreg.tw -src\npc\fSlaveImpregConsummate.tw -src\npc\fucktoyWorkaround.tw -src\npc\importSlave.tw -src\npc\removeActiveSlave.tw -src\npc\restWorkaround.tw -src\npc\rgASDump.tw -src\npc\servantWorkaround.tw -src\npc\uploadSlave.tw -src\npc\agent\agentCompany.tw -src\npc\agent\agentRetrieve.tw -src\npc\agent\agentSelect.tw -src\npc\agent\agentWorkaround.tw -src\npc\databases\cheatmodeDatabase.tw -src\npc\databases\customSlavesDatabase.tw -src\npc\databases\ddSlavesDatabase.tw -src\npc\databases\dfSlavesDatabase.tw -src\npc\databases\dSlavesDatabase.tw -src\npc\descriptions\fAnus.tw -src\npc\descriptions\fBoobs.tw -src\npc\descriptions\fButt.tw -src\npc\descriptions\fFuckdollWidgets.tw -src\npc\descriptions\fLips.tw -src\npc\descriptions\fVagina.tw -src\npc\startingGirls\commitStartingGirl.tw -src\npc\startingGirls\moreCustomOptions.tw -src\npc\startingGirls\startingGirls.tw -src\player\actions\fCaress.tw -src\player\actions\fEmbrace.tw -src\player\actions\fondleDick.tw -src\pregmod\agingTest.tw -src\pregmod\birthStorm.tw -src\pregmod\breederProposal.tw -src\pregmod\breedingTest.tw -src\pregmod\fDick.tw -src\pregmod\fillUpButt.tw -src\pregmod\fillUpFace.tw -src\pregmod\fSelf.tw -src\pregmod\fSlaveFeed.tw -src\pregmod\generateChild.tw -src\pregmod\huskSlave.tw -src\pregmod\incubator.tw -src\pregmod\incubatorReport.tw -src\pregmod\incubatorWorkaround.tw -src\pregmod\managePersonalAffairs.tw -src\pregmod\pcAppearanceIntro.tw -src\pregmod\pcPregIntro.tw -src\pregmod\physicalDevelopment.tw -src\pregmod\pInsemination.tw -src\pregmod\pRaped.tw -src\pregmod\pregmodWidgets.tw -src\pregmod\reLegendaryWomb.tw -src\pregmod\reMaleArcologyOwner.tw -src\pregmod\saInflation.tw -src\pregmod\seBurst.tw -src\pregmod\seHuskSlaveDelivery.tw -src\pregmod\sePlayerBirth.tw -src\pregmod\slaveAgeIntro.tw -src\pregmod\slaveOnSlaveFeedingWorkAround.tw -src\uncategorized\addCustomDescriptors.tw -src\uncategorized\arcade.tw -src\uncategorized\arcadeReport.tw -src\uncategorized\arcologyDescription.tw -src\uncategorized\arcologyOpinion.tw -src\uncategorized\assign.tw -src\uncategorized\assistantAutosurgery.tw -src\uncategorized\assistantEvents.tw -src\uncategorized\attendantSelect.tw -src\uncategorized\attendantWorkaround.tw -src\uncategorized\autosurgerySettings.tw -src\uncategorized\barracks.tw -src\uncategorized\bgSelect.tw -src\uncategorized\bodyguardWorkaround.tw -src\uncategorized\bodyModification.tw -src\uncategorized\bodyModificationDegradation.tw -src\uncategorized\bodyModificationReaction.tw -src\uncategorized\bodyModRulesAssistantSettings.tw -src\uncategorized\brothel.tw -src\uncategorized\brothelAdvertisement.tw -src\uncategorized\brothelReport.tw -src\uncategorized\buySlaves.tw -src\uncategorized\cellblock.tw -src\uncategorized\cellblockReport.tw -src\uncategorized\changeLanguage.tw -src\uncategorized\checkAutoRulesActivate.tw -src\uncategorized\checkinChecks.tw -src\uncategorized\classesWorkaround.tw -src\uncategorized\clinic.tw -src\uncategorized\clinicReport.tw -src\uncategorized\club.tw -src\uncategorized\clubAdvertisement.tw -src\uncategorized\clubReport.tw -src\uncategorized\completeCatalog.tw -src\uncategorized\concubineSelect.tw -src\uncategorized\concubineWorkaround.tw -src\uncategorized\confinementWorkaround.tw -src\uncategorized\corporationDevelopments.tw -src\uncategorized\cosmeticRulesAssistantSettings.tw -src\uncategorized\costs.tw -src\uncategorized\costsReport.tw -src\uncategorized\coursingAssociation.tw -src\uncategorized\customSlave.tw -src\uncategorized\dairy.tw -src\uncategorized\dairyReport.tw -src\uncategorized\defaultRules.tw -src\uncategorized\degradingName.tw -src\uncategorized\descriptionOptions.tw -src\uncategorized\discardConfirm.tw -src\uncategorized\dispensary.tw -src\uncategorized\djSelect.tw -src\uncategorized\djWorkaround.tw -src\uncategorized\economics.tw -src\uncategorized\endWeek.tw -src\uncategorized\exportRule.tw -src\uncategorized\fMarry.tw -src\uncategorized\fondleBoobs.tw -src\uncategorized\fondleButt.tw -src\uncategorized\fondleVagina.tw -src\uncategorized\freeRangeDairyAssignmentScene.tw -src\uncategorized\fsDevelopments.tw -src\uncategorized\fullReport.tw -src\uncategorized\futureSocities.tw -src\uncategorized\generateNewSlave.tw -src\uncategorized\generateXXSlave.tw -src\uncategorized\generateXYSlave.tw -src\uncategorized\genericPlotEvents.tw -src\uncategorized\growthResearchInstitute.tw -src\uncategorized\headGirlSuite.tw -src\uncategorized\hgApplication.tw -src\uncategorized\hgSelect.tw -src\uncategorized\hgWorkaround.tw -src\uncategorized\holeWorkaround.tw -src\uncategorized\householdLiquidator.tw -src\uncategorized\importRule.tw -src\uncategorized\incrementPiercings.tw -src\uncategorized\industrialDairyAssignmentScene.tw -src\uncategorized\initRules.tw -src\uncategorized\jeSlaveDispute.tw -src\uncategorized\lawCompliance.tw -src\uncategorized\lecoleDesEnculees.tw -src\uncategorized\longSlaveDescription.tw -src\uncategorized\madamSelect.tw -src\uncategorized\madamWorkaround.tw -src\uncategorized\main.tw -src\uncategorized\manageArcology.tw -src\uncategorized\managePenthouse.tw -src\uncategorized\masterSuite.tw -src\uncategorized\masterSuiteReport.tw -src\uncategorized\matchmaking.tw -src\uncategorized\milkingWorkaround.tw -src\uncategorized\milkmaidSelect.tw -src\uncategorized\milkmaidWorkaround.tw -src\uncategorized\minorInjuryResponse.tw -src\uncategorized\mod_BackwardsCompatibility.tw -src\uncategorized\motherDaughterWorkaround.tw -src\uncategorized\nationalityToAccent.tw -src\uncategorized\nationalityToName.tw -src\uncategorized\neighborDescription.tw -src\uncategorized\neighborInteract.tw -src\uncategorized\neighborsDevelopment.tw -src\uncategorized\neighborsFSAdoption.tw -src\uncategorized\newGamePlus.tw -src\uncategorized\newSlaveIntro.tw -src\uncategorized\newSlaveRaceNationalityAndName.tw -src\uncategorized\nextSlaveInLine.tw -src\uncategorized\nextWeek.tw -src\uncategorized\ngpWorkaround.tw -src\uncategorized\nonRandomEvent.tw -src\uncategorized\nurseSelect.tw -src\uncategorized\nurseWorkaround.tw -src\uncategorized\officeDescription.tw -src\uncategorized\options.tw -src\uncategorized\pBioreactorPerfected.tw -src\uncategorized\pBombing.tw -src\uncategorized\pCitizensAndCivilians.tw -src\uncategorized\pCollaborationChoice.tw -src\uncategorized\pCorpAnnouncement.tw -src\uncategorized\pCoupAftermath.tw -src\uncategorized\pCoupAttempt.tw -src\uncategorized\pCoupCollaboration.tw -src\uncategorized\pCoupLoss.tw -src\uncategorized\pDefenseFears.tw -src\uncategorized\peCombatTraining.tw -src\uncategorized\peConcubineInterview.tw -src\uncategorized\peHeadgirlConcubine.tw -src\uncategorized\peLonelyBodyguard.tw -src\uncategorized\pePitFight.tw -src\uncategorized\pePitFightInvite.tw -src\uncategorized\personalAssistantAppearance.tw -src\uncategorized\personalAssistantOptions.tw -src\uncategorized\personalAttentionSelect.tw -src\uncategorized\PESS.tw -src\uncategorized\PETS.tw -src\uncategorized\pFSAnnouncement.tw -src\uncategorized\pHackerSupport.tw -src\uncategorized\pHostageAcquisition.tw -src\uncategorized\pInvasion.tw -src\uncategorized\pit.tw -src\uncategorized\placeInLine.tw -src\uncategorized\pMercenaries.tw -src\uncategorized\pMercenaryRomeo.tw -src\uncategorized\pMercsHelpCorp.tw -src\uncategorized\policies.tw -src\uncategorized\pRaidInvitation.tw -src\uncategorized\pRaidResult.tw -src\uncategorized\prestigiousSlave.tw -src\uncategorized\previousSlaveInLine.tw -src\uncategorized\pRivalInitiation.tw -src\uncategorized\pRivalryActions.tw -src\uncategorized\pRivalryHostage.tw -src\uncategorized\pRivalryVictory.tw -src\uncategorized\pSchoolSuggestion.tw -src\uncategorized\pSlaveMedic.tw -src\uncategorized\pSnatchAndGrab.tw -src\uncategorized\pSnatchAndGrabResult.tw -src\uncategorized\pTraitorMessage.tw -src\uncategorized\ptWorkaround.tw -src\uncategorized\publicServantWorkaround.tw -src\uncategorized\pUndergroundRailroad.tw -src\uncategorized\randomEventRoll.tw -src\uncategorized\randomEventSelect.tw -src\uncategorized\randomIndividualEvent.tw -src\uncategorized\randomNonindividualEvent.tw -src\uncategorized\reAnalPunishment.tw -src\uncategorized\reBusyArcade.tw -src\uncategorized\reBusyArcadeWorkaround.tw -src\uncategorized\reBusyBrothel.tw -src\uncategorized\reBusyClub.tw -src\uncategorized\reBusyDairy.tw -src\uncategorized\reBusyMasterSuite.tw -src\uncategorized\reBusyServantsQuarters.tw -src\uncategorized\recETS.tw -src\uncategorized\recETSWorkaround.tw -src\uncategorized\RECI.tw -src\uncategorized\recruiterSelect.tw -src\uncategorized\recruiterWorkaround.tw -src\uncategorized\reDevotedMotherDaughter.tw -src\uncategorized\reDevotedTwins.tw -src\uncategorized\reDevotees.tw -src\uncategorized\reFemaleArcologyOwner.tw -src\uncategorized\REFI.tw -src\uncategorized\reFormerAbolitionist.tw -src\uncategorized\reFSAcquisition.tw -src\uncategorized\reFSEgyptianRevivalistAcquisition.tw -src\uncategorized\reFSEgyptianRevivalistAcquisitionWorkaround.tw -src\uncategorized\reFSNonconformist.tw -src\uncategorized\reFullBed.tw -src\uncategorized\reHGReplacement.tw -src\uncategorized\reLegendaryBalls.tw -src\uncategorized\reLegendaryCow.tw -src\uncategorized\reLegendaryEntertainer.tw -src\uncategorized\reLegendaryWhore.tw -src\uncategorized\reMalefactor.tw -src\uncategorized\remFluctuations.tw -src\uncategorized\reMilfTourist.tw -src\uncategorized\remMerger.tw -src\uncategorized\remoteSurgery.tw -src\uncategorized\rename.tw -src\uncategorized\reNickname.tw -src\uncategorized\reNoEvent.tw -src\uncategorized\reRebels.tw -src\uncategorized\reRecruit.tw -src\uncategorized\reRelationshipAdvice.tw -src\uncategorized\reRelativeRecruiter.tw -src\uncategorized\resEndowment.tw -src\uncategorized\resFailure.tw -src\uncategorized\reShelterInspection.tw -src\uncategorized\reShippingContainer.tw -src\uncategorized\reShowerPunishment.tw -src\uncategorized\reSiblingRevenge.tw -src\uncategorized\reSlaveMarriage.tw -src\uncategorized\resMove.tw -src\uncategorized\RESS.tw -src\uncategorized\resSale.tw -src\uncategorized\RESSTR.tw -src\uncategorized\reStaffedMorning.tw -src\uncategorized\reStandardPunishment.tw -src\uncategorized\retrieve.tw -src\uncategorized\RETS.tw -src\uncategorized\rieEligibilityCheck.tw -src\uncategorized\rulesAssistant.tw -src\uncategorized\rulesAutosurgery.tw -src\uncategorized\rulesFacilityRemove.tw -src\uncategorized\rulesSlaveDeselectWorkaround.tw -src\uncategorized\rulesSlaveExclude.tw -src\uncategorized\rulesSlaveExcludeWorkaround.tw -src\uncategorized\rulesSlaveNoExcludeWorkaround.tw -src\uncategorized\rulesSlaveSelect.tw -src\uncategorized\rulesSlaveSelectWorkaround.tw -src\uncategorized\saBeYourHeadGirl.tw -src\uncategorized\saChoosesOwnClothes.tw -src\uncategorized\saChoosesOwnJob.tw -src\uncategorized\saDevotion.tw -src\uncategorized\saDiet.tw -src\uncategorized\saDrugs.tw -src\uncategorized\saGetMilked.tw -src\uncategorized\saGuardsYou.tw -src\uncategorized\saHormoneEffects.tw -src\uncategorized\saLiveWithHG.tw -src\uncategorized\salon.tw -src\uncategorized\saLongTermEffects.tw -src\uncategorized\saPleaseYou.tw -src\uncategorized\saRecruitGirls.tw -src\uncategorized\saRelationships.tw -src\uncategorized\saRest.tw -src\uncategorized\saRivalries.tw -src\uncategorized\saRules.tw -src\uncategorized\saServant.tw -src\uncategorized\saServeThePublic.tw -src\uncategorized\saServeYourOtherSlaves.tw -src\uncategorized\saStayConfined.tw -src\uncategorized\saTakeClasses.tw -src\uncategorized\saWhore.tw -src\uncategorized\saWorkAGloryHole.tw -src\uncategorized\scheduledEvent.tw -src\uncategorized\schoolroom.tw -src\uncategorized\schoolroomReport.tw -src\uncategorized\schoolteacherSelect.tw -src\uncategorized\schoolteacherWorkaround.tw -src\uncategorized\seBirth.tw -src\uncategorized\seCoursing.tw -src\uncategorized\securityForceEOWReport.tw -src\uncategorized\securityForceNamingColonel.tw -src\uncategorized\securityForceProposal.tw -src\uncategorized\seCustomSlaveDelivery.tw -src\uncategorized\seExpiration.tw -src\uncategorized\seIndependenceDay.tw -src\uncategorized\seLethalPit.tw -src\uncategorized\sellSlave.tw -src\uncategorized\seNonlethalPit.tw -src\uncategorized\seRecruiterSuccess.tw -src\uncategorized\seRetirement.tw -src\uncategorized\servantsQuarters.tw -src\uncategorized\servantsQuartersReport.tw -src\uncategorized\seWedding.tw -src\uncategorized\siblingsWorkaround.tw -src\uncategorized\slaveAssignmentsReport.tw -src\uncategorized\slaveInteract.tw -src\uncategorized\slaveMarkets.tw -src\uncategorized\slaveShelter.tw -src\uncategorized\slaveSold.tw -src\uncategorized\slaveSummary.tw -src\uncategorized\spa.tw -src\uncategorized\spaReport.tw -src\uncategorized\specialSlave.tw -src\uncategorized\stClaverPreparatory.tw -src\uncategorized\stewardessSelect.tw -src\uncategorized\stewardessWorkaround.tw -src\uncategorized\storyCaption.tw -src\uncategorized\subordinateTargeting.tw -src\uncategorized\summaryOptions.tw -src\uncategorized\surgeryDegradation.tw -src\uncategorized\tfsFarmUpgrade.tw -src\uncategorized\theFutanariSisters.tw -src\uncategorized\theGymnasiumAcademy.tw -src\uncategorized\theSlavegirlSchool.tw -src\uncategorized\toychest.tw -src\uncategorized\twinsWorkaround.tw -src\uncategorized\universalRules.tw -src\uncategorized\useGuard.tw -src\uncategorized\walkPast.tw -src\uncategorized\wardenessSelect.tw -src\uncategorized\wardenessWorkaround.tw -src\uncategorized\wardrobe.tw -src\uncategorized\whoreWorkaround.tw -src\utility\assayWidgets.tw -src\utility\birthWidgets.tw -src\utility\descriptionWidgets.tw -src\utility\miscWidgets.tw -src\utility\ptWidgets.tw -src\utility\raWidgets.tw -src\utility\slaveCreationWidgets.tw diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index 82a9c12982b77fe06e3af156cc0b19ccaa46e11a..105825f9c78a9f819d2c83b4a2e354dacb4b5530 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -65,7 +65,7 @@ /* SET HEROES */ <<set $heroSlaves = []>> -<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, 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, 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, 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnClothes: 0}>> +<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, 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, 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, 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none"}>> <<if ($seeDicks > 0) && ($seeDicks < 100)>> <<display "D Slaves Database">> <<display "DD Slaves Database">> diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index d4756581669a48189c2b010ea2e6e3bcdeefb43f..0d7722039028354886fc36c2d60cd0d4988d4769 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -556,7 +556,8 @@ Race: ''$PC.race''. [[Amerindian|Intro Summary][$PC.race to "amerindien"]] | [[Pacific Islander|Intro Summary][$PC.race to "pacific islander"]] | [[Malay|Intro Summary][$PC.race to "malay"]] | - [[Mixed Race|Intro Summary][$PC.race to "mixed race"]] + [[Mixed Race|Intro Summary][$PC.race to "mixed race"]] | + <<textbox "$PC.race" $PC.race "Intro Summary">> <br> Skin: ''$PC.skin''. [[White|Intro Summary][$PC.skin to "white"]] | @@ -568,7 +569,8 @@ Skin: ''$PC.skin''. [[Light Brown|Intro Summary][$PC.skin to "light brown"]] | [[Brown|Intro Summary][$PC.skin to "brown"]] | [[Pale|Intro Summary][$PC.skin to "pale"]] | - [[Extremely Pale|Intro Summary][$PC.skin to "extremely pale"]] + [[Extremely Pale|Intro Summary][$PC.skin to "extremely pale"]] | + <<textbox "$PC.skin" $PC.skin "Intro Summary">> <br> Eye color: ''$PC.eyeColor''. <<textbox "$PC.eyeColor" $PC.eyeColor "Intro Summary">> diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 56147e3a2c58676c4e96cb1d10f09460409a671f..4f15a7ad77edcb39df9adf7e95f2dcff9b87f26c 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -915,7 +915,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr ''Wahn'' wrote numerous generic recruitment events. ''Pregmodder'' has modded extensively, including descriptive embellishments for pregnant slaves, 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, better descriptive support for different refreshments, and an expansion to the hostage corruption event chain. ''Lolimodder'' your loli expertise will be missed. -''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Also for ppmod, ramod, implmod and cfpmod. +''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed). ''family mod anon'' for extending extended family mode. ''anon'' for lolimod content, new slave careers, new pubestyles, and general improvements. ''anon'' for considerable bugfixing, most notably that infernal reputation bug. @@ -930,6 +930,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr ''anon'' for HGExclusion and animal pregnancy work. ''anon'' for putting up with my javascript incompetence. ''anon'' for player family listing. +''anon'' for interchangable prosthetics and advanced facial surgeries. ''Bane70'' optimized huge swaths of code with notable professionalism. ''Circle Tritagonist'' provided several new collars and outfits. ''Qotsafan'' submitted bugfixes. diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index da77503a6deb3149f73c9bb7432612a845316d27..3dc8a196737ef9eaf53ba3d54cfc4c9321dfddd4 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -761,6 +761,8 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $inbreeding = 1>> <<set $originOveride = 0>> <<set $playerAging = 2>> +<<set $pregSpeedControl = 0>> +<<set $clinicSpeedGestation = 0>> <<set $fakeBellies to ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"]>> /* lets fake bellies be separated from other .bellyAccessory */ @@ -1376,7 +1378,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $nextLink to "EW Slaves">> <<set $customSlaveOrdered to 0>> -<<set $customSlave to {slaveName: "custom", birthName: "custom", weekAcquired: 1, 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, 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: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>> +<<set $customSlave to {slaveName: "custom", birthName: "custom", weekAcquired: 1, 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", hColor: "brown", pubicHColor: "brown", skin: 0, hLength: 60, hStyle: 0, pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 500, 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: 2, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "no default setting", tonguePiercing: 0, vagina: 1, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 1, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 1, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, actualAge: 18, visualAge: 18, physicalAge: 18, mother: 0, father: 0, sisters: 0, daughters: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none"}>> <<set $huskSlaveOrdered to 0>> <<set $huskSlave to {age: 18, nationality: "slave", race: "white", sex: 1, virgin: 0}>> diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw index 713598356eb1804f999e61fb14a3761beefc0377..10dd3b9cac0c555c17019326bf585380befc004e 100644 --- a/src/npc/databases/cheatmodeDatabase.tw +++ b/src/npc/databases/cheatmodeDatabase.tw @@ -1,6 +1,6 @@ :: Cheatmode Database [nobr] -<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, physicalAge: 18, visualAge: 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>> +<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, physicalAge: 18, visualAge: 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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: "", customImage: 0, currentRules: [], father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none"}>> <<set _HS = clone($activeSlave)>> <<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relation = "mother", _HS.relationTarget = 990004, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ageImplant = 1, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = 1, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 2, _HS.lips = 35, _HS.vagina = 2, _HS.anus = 1, _HS.ovaries = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.intelligence = 3, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She speaks with the rich accent of the Old South.">> diff --git a/src/pregmod/hotswapprosthetics.tw b/src/pregmod/hotswapprosthetics.tw new file mode 100644 index 0000000000000000000000000000000000000000..6c00f916b923028a31800fb14a97934dbbdda3a8 --- /dev/null +++ b/src/pregmod/hotswapprosthetics.tw @@ -0,0 +1,50 @@ +:: Hotswap Prosthetics [nobr] + +<br> + Switch out her prosthetics for + <<if $activeSlave.amp == -1>> + <strong>Basic P-limbs equipped<strong> + <<elseif $activeSlave.readyLimbs.includes(-1)>> + <<click "a basic set">><<set $activeSlave.amp = -1>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</click>> + <<elseif $activeLimbs.type == "simple" && $activeSlave.ID == $activeLimbs.ID>> + //Basic P-limbs being built + <<else>> + //Basic prostheses unavailable + <</if>>| + <<if $activeSlave.amp == -2>> + <strong>Sex focused P-limbs equipped</strong> + <<elseif $activeSlave.readyLimbs.includes(-2)>> + <<click "a sex focused set">><<set $activeSlave.amp = -2>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</click>> + <<elseif $activeLimbs.type == "sex" && $activeSlave.ID == $activeLimbs.ID>> + //Sex focused P-limbs being built + <<else>> + //Sex focused prostheses unavailable + <</if>>| + <<if $activeSlave.amp == -3>> + <strong>Natural looking P-limbs equipped</strong> + <<elseif $activeSlave.readyLimbs.includes(-3)>> + <<click "a natural looking set">><<set $activeSlave.amp = -3>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</click>> + <<elseif $activeLimbs.type == "beauty" && $activeSlave.ID == $activeLimbs.ID>> + //Natural looking P-limbs being built + <<else>> + //Natural looking prostheses unavailable + <</if>>| + <<if $activeSlave.amp == -4>> + <strong>Combat P-limbs equipped</strong> + <<elseif $activeSlave.readyLimbs.includes(-4)>> + <<click "military grade arms">><<set $activeSlave.amp = -4>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</click>> + <<elseif $activeLimbs.type == "combat" && $activeSlave.ID == $activeLimbs.ID>> + //Combat P-limbs being built + <<else>> + //Combat prostheses unavailable + <</if>>| + <<if $activeSlave.amp == -5>> + <strong>Cybernetic P-limbs equipped</strong> + <<elseif $activeSlave.readyLimbs.includes(-5)>> + <<click "advanced cybernetics">><<set $activeSlave.amp = -5>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</click>> + <<elseif $activeLimbs.type == "cyber" && $activeSlave.ID == $activeLimbs.ID>> + //Cybernetic P-limbs being built + <<else>> + //Cybernetic prostheses unavailable + <</if>> +<br> diff --git a/src/pregmod/pregmodWidgets.tw b/src/pregmod/pregmodWidgets.tw index f868763d4e7512778da27d956c7f6e387f908bd5..7d8e91581d351904c3d75487c3cfc369585e3c2d 100644 --- a/src/pregmod/pregmodWidgets.tw +++ b/src/pregmod/pregmodWidgets.tw @@ -115,6 +115,9 @@ <<if ndef $args[0].choosesOwnChastity>> <<set $args[0].choosesOwnChastity = 0>> <</if>> +<<if ndef $args[0].pregControl>> + <<set $args[0].pregControl = "none">> +<</if>> <<if ndef $args[0].pubertyXX>> <<if $args[0].physicalAge >= $args[0].pubertyAgeXX>> @@ -441,7 +444,7 @@ $activeSlave.slaveName is up for review: <<else>> The slave known as "<<print $activeSlave.slaveName>>" has been deemed @@color:green;worthy@@ of being used for breeding and has been marked as such. Please note the increased restrictions on breeding slaves. <br>They are not permitted for public use or anything that may harm their growing child. The child within them is considered a member of the elite class and a such, any harm that comes to them will result in severe penalties to the breeder's owner. Development of the child will be closely monitored; should the fetus be identified as of not the owner's blood (or any other member of the Elite class), said owner shall face severe fines. - <<set $activeSlave.breedingMark = 1>> + <<set $activeSlave.breedingMark = 1, $activeSlave.pregControl = "none">> <</if>> <br>@@color:yellowgreen;¤5000@@ has been deducted from your account as agreed. <<set $activeSlave.assignment = "rest">> @@ -1391,6 +1394,10 @@ $daddy's virile cock and balls. <br> $pronounCap was so tired, $pronoun @@color:red;lacked the energy to effectively push@@. <</if>> +<<if $slaves[$i].preg > 40>> +<br> + $possessiveCap's child had extra time to grow @@color:red;greatly complicating childbirth@@. +<</if>> <<if (($slaves[$i].vagina >= 2 or $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) or $slaves[$i].births > 0 or $slaves[$i].hips > 0 or $nurseCareers.contains($slaves[$i].career) or $slaves[$i].intelligenceImplant > 0>> <br>However: <<if $slaves[$i].mpreg == 1>> diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw index 5a12d58b01127c59a9ebb338c67893a46d750443..3e9b18f36c960ac743e02bf5bae12f7dd5e65239 100644 --- a/src/uncategorized/clinic.tw +++ b/src/uncategorized/clinic.tw @@ -12,6 +12,19 @@ <<for _i to 0; _i < $slaves.length; _i++>> <<if $slaves[_i].assignment is "get treatment in the clinic">> <<set $clinicSlaves++>> + <<if $clinicSpeedGestation == 1>> + <<if $slaves[_i].preg > 0>> + <<set $slaves[_i].pregControl = "speed up">> + <</if>> + <</if>> + <<else>> + <<set $notClinicSlaves++>> + <</if>> +<</for>> + +<<for _i to 0; _i < $slaves.length; _i++>> + <<if $slaves[_i].preg is "get treatment in the clinic">> + <<set $clinicSlaves++>> <<else>> <<set $notClinicSlaves++>> <</if>> @@ -107,6 +120,15 @@ $clinicNameCaps $clinicNameCaps is useful for keeping slaves healthy during long term procedures. $Nurse.slaveName can supervise weekly filling regiments for clinic slaves with fillable belly implants during their stay to maximize growth with minimal health complications. [[Fill belly implants|Clinic][$clinicInflateBelly = 1]] <</if>> +<br> +<<if $pregSpeedControl == 1 && $clinicSpeedGestation == 1>> + It's exceedingly dangerous to speed up gestation without constant supervision. In $clinicName, $Nurse.slaveName will monitor slaves on rapid gestation agents; making sure the growing patients' food demands are met, monitoring their skin and womb and, if need be, perform an emergency c-section should the need arise. [[Limit rapid gestation agents to slected slaves only|Clinic][$clinicSpeedGestation = 0]] +<<elseif $pregSpeedControl == 1 && $Nurse == 0>> + A resident nurse could be used to supervise patients under rapid gestation agents while minimizing strain and health complications. +<<elseif $pregSpeedControl == 1 && $Nurse != 0 && $clinicSpeedGestation != 1>> + $clinicNameCaps is currently not applying rapid gestation agents to pregnant patients. Only individually selected slaves will undergo this procedure [[Speed up gestation for all pregnant patients|Clinic][$clinicSpeedGestation = 1]] +<</if>> + <br><br> <<if $Nurse != 0>> <<set $Flag to 2>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 0028113ddd49dddd649c8009b205d44df6626c04..8b9dd45c98a6d087291126a6ca026a7964eb97d5 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -102,6 +102,11 @@ <<set $slaves[$i].health += 4>> <</if>> <</if>> + <<if $clinicSpeedGestation == 1>> + <<if $slaves[$i].preg > 0>> + <<set $slaves[$i].pregControl = "speed up">> + <</if>> + <</if>> <<if ($slaves[$i].chem > 15)>> <<if ($clinicUpgradeFilters == 1)>> <<set $slaves[$i].chem -= 5>> @@ -114,15 +119,28 @@ <</if>> <</if>> <</if>> - <<if ($slaves[$i].health >= 40)>> - <<if ($slaves[$i].chem <= 20) || ($clinicUpgradeFilters != 1)>> - <<if ($slaves[$i].bellyImplant >= 10000 && $arcologies[0].FSTransformationFetishistResearch != 1) || ($slaves[$i].bellyImplant >= 40000) || ($clinicInflateBelly == 0) || ($slaves[$i].bellyImplant < 1)>> + /* slave release block become too much a mess, need to change structure*/ + <<set _stay = 0>> + <<if ($slaves[$i].health <= 40)>> + <<set _stay += 1>> + <</if>> + <<if ($slaves[$i].chem >= 20) && ($clinicUpgradeFilters == 1)>> + <<set _stay += 1>> + <</if>> + <<if (($clinicSpeedGestation >= 0) && ($slaves[$i].preg >= 1) && $Nurse != 0) || ($Nurse != 0 && $slaves[$i].pregControl == "speed up")>> + <<set _stay += 1>> + <</if>> + <<if (($slaves[$i].bellyImplant <= 40000 && $arcologies[0].FSTransformationFetishistResearch == 1) || ($slaves[$i].bellyImplant <= 10000))>> + <<if ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 100) && $Nurse != 0>> + <<set _stay += 1>> + <</if>> + <</if>> + <<if _stay == 0>> <<set $slaves[$i].assignment to "rest">> <<set $slaves[$i].assignmentVisible to 1>> <<set $restedSlaves += 1>> <</if>> - <</if>> - <</if>> + /* end of rewriten slave release check */ <<elseif ($Nurse != 0) && ($slaves[$i].ID is $Nurse.ID)>> <<silently>> @@ -276,7 +294,7 @@ She does her best to aid the breeder $slaves[$i].slaveName, paying special attention to her fertility and reproductive organs. <</if>> <<if $slaves[$i].bellyImplant > 0 && $clinicInflateBelly == 1 && $slaves[$i].assignment == "get treatment in the clinic">> - ''@@color:pink;$slaves[$i].slaveName@@'' spent a lot of time during the week under IV-like stands with bags of innert filler steadily flowing into her belly implant, slowly pushing her belly further and further out. Careful attention, along with several drug injections, were used to make sure her body was able to safely adjust to the implant's rapid growth. + <br>''@@color:pink;$slaves[$i].slaveName@@'' spent a lot of time during the week under IV-like stands with bags of innert filler steadily flowing into her belly implant, slowly pushing her belly further and further out. Careful attention, along with several drug injections, were used to make sure her body was able to safely adjust to the implant's rapid growth. <<set $slaves[$i].bellyImplant += 1000>> <<set $slaves[$i].health -= 10>> <<if ($slaves[$i].devotion > 50)>> @@ -296,6 +314,23 @@ She filled to the maximum that her body can stand. <</if>> <</if>> + <<if $slaves[$i].preg >= 1 && $slaves[$i].preg < 31 && $slaves[$i].pregControl == "speed up")>> + <br>''@@color:pink;$slaves[$i].slaveName@@'' spends most of her time on bedrest being filled with rapid gestation agents and concentrated slave food. All she can do is <<if $slaves[$i].amp != 1 && canSee($slaves[$i])>>watch and feel her belly pushing further and further out with life<<elseif $slaves[$i].amp != 1>>watch her belly bulging further and further out with life<<elseif !canSee($slaves[$i])>>feel her belly pushing further and further out with life beneath her fingers<<else>>feel the every growing pressure inside her abdomen<</if>>. Careful attention, along with numerous drug injections, are used to make sure her body is able to safely adjust to her pregnancy's rapid growth. + <<set $slaves[$i].health -= 10>> + <<if ($slaves[$i].devotion > 50)>> + <<set $slaves[$i].devotion += 2>> + <<set $slaves[$i].trust += 1>> + <<elseif ($slaves[$i].devotion >= -20)>> + <<set $slaves[$i].trust -= 5>> + <<else>> + <<set $slaves[$i].devotion -= 5>> + <<set $slaves[$i].trust -= 10>> + <</if>> + <<if $slaves[$i].preg >= 31 && $slaves[$i].pregControl == "speed up">> + <<set $slaves[$i].pregControl == "none">> + ''@@color:pink;$slaves[$i].slaveName's@@'' child is ready to pop out of her womb, ''@@color:yellow;her course of rapid gestation agents is finished''. + <</if>> + <</if>> <</for>> <<if ($clinicSlaves < $clinic)>> <<set $seed to random(1,10)+(($clinic-$clinicSlaves)*(random(150,170)+($idleBonus*10)))>> diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw index 87afd8e29d2e5569603e9ec20959aff7734d311c..2d74874f330498290ec306b62777d3cdc4e16e56 100644 --- a/src/uncategorized/costs.tw +++ b/src/uncategorized/costs.tw @@ -73,7 +73,11 @@ <<if $slaves[$i].assignment == "work in the dairy" && $dairyFeedersSetting > 0>> <<elseif ($slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your concubine") && $masterSuiteUpgradePregnancy == 1>> <<else>> - <<set $costs += $foodCost*$slaves[$i].pregType>> + <<if $slaves[$i].pregControl == "speed up">> + <<set $costs += $foodCost*$slaves[$i].pregType*3>> + <<else>> + <<set $costs += $foodCost*$slaves[$i].pregType>> + <</if>> <</if>> <</if>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 7538bf537e8edce89e7c944fce75aead040d04a5..71a6af6e0c788d6056b18bc902dccddab92d99d4 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -182,8 +182,9 @@ <<elseif ($slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your concubine") && $masterSuiteUpgradePregnancy == 1>> <br> Extra feeding costs to support pregnancy are covered by $masterSuiteName luxuries. <<else>> - <br> Extra feeding to support pregnancy: ¤<<print $foodCost*$slaves[$i].pregType>> - <<set $individualCosts += $foodCost*$slaves[$i].pregType>> + <<set _pAccMult = 1>> + <br> Extra feeding to support <<if $slaves[$i].pregControl == "speed up">>accelerated <<set _pAccMult = 3>><</if>>pregnancy: ¤<<print $foodCost*$slaves[$i].pregType*_pAccMult>> + <<set $individualCosts += $foodCost*$slaves[$i].pregType*_pAccMult>> <</if>> <</if>> <<if ($slaves[$i].diet == "XX") || ($slaves[$i].diet == "XY")>> diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw index 99b1d47acec941e221075f43fc789676a9cd9255..34da2ae67a2b1e8b36a33715b8620929bd183c99 100644 --- a/src/uncategorized/dispensary.tw +++ b/src/uncategorized/dispensary.tw @@ -1,7 +1,7 @@ :: Dispensary [nobr] <<set $nextButton to "Back">> -<<set $nextLink to "Main">> +<<set $nextLink to "Manage Arcology">> <<set $showEncyclopedia to 1>><<set $encyclopedia to "The Pharmaceutical Fab.">> <<if $dispensaryUpgrade == 0>> @@ -227,27 +227,30 @@ The hormone replacement therapies <<if (($organFarmUpgrade >= 1) && ($injectionUpgrade != 0) && ($curativeUpgrade == 1) && ($aphrodisiacUpgrade == 1))>> <<if ($rep >= 15000*$upgradeMultiplierMedicine)>> [[Fund research into drug formulations without negative physical side effects|Dispensary][$cash -= 500000*$upgradeMultiplierMedicine,$healthyDrugsUpgrade to 1]] //Costs ¤<<print 500000*$upgradeMultiplierMedicine>>. Will prevent the negative side effects of excessive drug usage on your slaves.// + <br><br> <<else>> // You lack the reputation to access the technology necessary to develop advanced drug formulations. // <</if>> <<else>> // You must purchase all other upgrades before developing advanced drug formulations. // + <br><br> <</if>> <<else>> The fabricator has been upgraded to optimize the structures of your other drugs, eliminating their negative side effects. + <br><br> <</if>> /* Code [draft] contributed by Anon1888 */ -<br><br> <<if ($arcologies[0].FSBodyPuristLaw == 1)>> //The pharmaceutical fabricator is working with your body purist arcology to reduce long term drug side effects.// + <br><br> <</if>> -<br><br> <<if ($ImplantProductionUpgrade == 0) && ($rep <= 2000*$upgradeMultiplierMedicine)>> //You lack the reputation to access experimental implant manufacturer parts// + <br><br> <</if>> <<if ($ImplantProductionUpgrade == 0) && ($rep > 2000*$upgradeMultiplierMedicine)>> @@ -272,9 +275,32 @@ The hormone replacement therapies <<elseif ($permaPregImplant > 0)>> The fabricator is capable of crafting pregnancy generators. <</if>> +<br><br> <</if>> +<<if $seeHyperPreg == 1>> +<<if $superFertilityDrugs == 1 && ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl to 1, $clinicSpeedGestation to 0]] + //Costs ¤<<print 200000*$upgradeMultiplierMedicine>>// + <br> // Fund underground research labs to develop methods for controlling pregnancy progress. // +<<elseif ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + //You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.// +<<elseif ($pregSpeedControl == 1)>> + The fabricator is producing extremly complex gestation control agents. They can be used to control gestation speed, and even supress labor for some time. // +<</if>> +<br><br> +<<elseif $birthsTotal > 10>> +<<if ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl to 1, $clinicSpeedGestation to 0]] + //Costs ¤<<print 200000*$upgradeMultiplierMedicine>>// + <br> // Fund underground research labs to develop methods for controlling pregnancy progress. // +<<elseif ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + //You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.// +<<elseif ($pregSpeedControl == 1)>> + The fabricator is producing extremly complex gestation control agents. They can be used to control gestation speed, and even supress labor for some time. // +<</if>> <br><br> +<</if>> <<if $ImplantProductionUpgrade == 1>> <<if ($bellyImplants == 0) && ($rep <= 2000*$upgradeMultiplierMedicine)>> @@ -288,9 +314,9 @@ The hormone replacement therapies <<elseif ($bellyImplants > 0)>> The fabricator is capable of crafting fillable abdominal implants. <</if>> +<br><br> <</if>> -<br><br> <<if $ImplantProductionUpgrade == 1>> <<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep <= 6000*$upgradeMultiplierMedicine)>> /* show only after belly implants already researched */ @@ -298,7 +324,7 @@ The hormone replacement therapies <</if>> <<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep >6000*$upgradeMultiplierMedicine)>> /* nanotech like technology much more impressive and costly than simple implant */ - [[Purchase schematics for fillable abdominal implants|Dispensary][$cash -= 70000*$upgradeMultiplierMedicine, $cervixImplants to 1]] + [[Purchase schematics for cervix filter micropumps|Dispensary][$cash -= 70000*$upgradeMultiplierMedicine, $cervixImplants to 1]] //Costs ¤<<print 70000*$upgradeMultiplierMedicine>>// <br> //Will allow the fabrication of cervix filter micropumps for fillable abdominal implants using the autosurgery.// <<elseif ($cervixImplants > 0)>> @@ -308,7 +334,7 @@ The hormone replacement therapies <br><br> __Societal Focused Research__ -<br> +<br><br> <<if $arcologies[0].FSGenderRadicalistDecoration == 100 && $organFarmUpgrade > 0>> <<if ($arcologies[0].FSGenderRadicalistResearch == 0)>> @@ -320,9 +346,9 @@ __Societal Focused Research__ <<else>> The organ farm has been upgraded with schematics for modified uteri and ovaries. <</if>> +<br><br> <</if>> -<br><br> <<if ($ImplantProductionUpgrade == 1) and ($arcologies[0].FSTransformationFetishistDecoration >= 100)>> <<if ($arcologies[0].FSTransformationFetishistResearch == 0) and ($rep <= 5000*$upgradeMultiplierMedicine)>> //You lack the reputation to access experimental gigantic implants and elasticizing filler// @@ -334,9 +360,9 @@ __Societal Focused Research__ <<elseif ($arcologies[0].FSTransformationFetishistResearch > 0)>> The fabricator is capable of crafting gigantic implants and elasticizing filler designed to overfill existing implants. <</if>> +<br><br> <</if>> -<br><br> <<if $arcologies[0].FSAssetExpansionistDecoration == 100>> <<if ($arcologies[0].FSAssetExpansionistResearch == 0)>> <<if ($rep >= 5000*$upgradeMultiplierMedicine)>> @@ -347,9 +373,9 @@ __Societal Focused Research__ <<else>> The fabricator has been upgraded to manufacture extremely powerful growth drugs. <</if>> +<br><br> <</if>> -<br><br> <<if $arcologies[0].FSYouthPreferentialistDecoration == 100>> <<if ($arcologies[0].FSYouthPreferentialistResearch == 0)>> <<if ($rep >= 5000*$upgradeMultiplierMedicine)>> @@ -360,4 +386,6 @@ __Societal Focused Research__ <<else>> The fabricator has been upgraded to manufacture extremely effective beauty creams designed to combat aging. <</if>> +<br><br> <</if>> + diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw index a92a677fe668e5b2735bc7833f4a7151b2e98b21..ab5e14b7e3a4e4187436d00a58f1867fadaa5308 100644 --- a/src/uncategorized/generateXXSlave.tw +++ b/src/uncategorized/generateXXSlave.tw @@ -1,6 +1,6 @@ :: Generate XX Slave [nobr] -<<set $activeSlave to {slaveName: "blank", birthName: "blank", 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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: 1, 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, balls: 0, scrotum: 0, ovaries: 1, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>> +<<set $activeSlave to {slaveName: "blank", birthName: "blank", 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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: 1, 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, balls: 0, scrotum: 0, ovaries: 1, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none"}>> <<set $activeSlave.publicCount to 0>> <<if $activeSlaveOneTimeMaxAge > 998>> diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw index f66afeb2dffee9c25f9d386c3cec00c173471861..72cb0e72ab434e22868d38a7ad005ab8113efdad 100644 --- a/src/uncategorized/generateXYSlave.tw +++ b/src/uncategorized/generateXYSlave.tw @@ -1,6 +1,6 @@ :: Generate XY Slave [nobr] -<<set $activeSlave to {slaveName: "blank", birthName: "blank", 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 10, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0}>> +<<set $activeSlave to {slaveName: "blank", birthName: "blank", 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, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 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", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 10, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 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, 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", intelligence: 0, intelligenceImplant: 0, energy: 50, 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, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, underArmHStyle: "waxed", physicalAge: 18, actualAge: 18, visualAge: 18, father: 0, mother: 0, sisters: 0, daughters: 0, canRecruit: 1, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none"}>> <<set $activeSlave.publicCount to 0>> <<if $activeSlaveOneTimeMaxAge > 998>> diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index b7051810a358acb4adf7895f465471fb65f537f3..41dbdfd2c7fa2149db1126c3dfea0f64a883d9c3 100644 --- a/src/uncategorized/genericPlotEvents.tw +++ b/src/uncategorized/genericPlotEvents.tw @@ -27,6 +27,17 @@ The firm promptly pays @@color:yellowgreen;fair compensation@@ for the minor dam <<case "bad breasts">> +<<set $activeSlave to 0>> +<<for $i to 0; $i < $slaves.length; $i++>> + <<if $slaves[$i].drugs == "breast injections">> + <<set $slaves[$i].health -= random(1,2)>> + <<set $activeSlave to $slaves[$i]>> + <</if>> +<</for>> +<<if $activeSlave == 0>> + <<goto "Random Nonindividual Event">> +<</if>> + Early one morning, you hear heaving coming from one of the bathrooms. On investigation, it seems that $activeSlave.slaveName woke up feeling terribly nauseous. She's in no danger, but you've hardly checked her over before more slaves stagger in. Every one of your slaves on A-HGH has been struck by the mysterious malady and has @@color:red;sickened.@@ <br><br> It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate Pharmacuetical concern is drownning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel much better, and appear positively glowing. However, their breasts swell slightly and their bellies bulge, pointing to the issue being the contamination of the A-HGH production line with fertility agents. diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 3b019e08833da6f9966e8d9cc4c2041d128908a0..69fb86dbdbc2514d3f612d620a0cf914eea81d9f 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1694,8 +1694,6 @@ $pronounCap is <<else>> $pronounCap is @@color:pink;pregnant@@, though it isn't too visible yet. <</if>> -<<elseif $activeSlave.pubertyXX == 0 && $activeSlave.ovaries > 0>> - $pronounCap is too young to be fertile. <</if>> <<if $activeSlave.bellyImplant >= 32000>> $pronounCap looks @@color:pink;ready to pop!@@ $pronounCap belly is massively stretched by $possessive <<print $activeSlave.bellyImplant>>cc belly implant. diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index 1470b3f53ff5ab5e04c06121ffb894a4904e36a9..e85462215eb7d0e7d57517e01ed0c2c4625c74a8 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -28,6 +28,12 @@ <<if ndef $clinicUpgradePurge>> <<set $clinicUpgradePurge = 0>> <</if>> +<<if ndef $pregSpeedControl>> + <<set $pregSpeedControl = 0>> +<</if>> +<<if ndef $clinicSpeedGestation>> + <<set $clinicSpeedGestation = 0>> +<</if>> <<if ndef $playerAging>> <<set $playerAging = 0>> <</if>> @@ -56,6 +62,7 @@ <<set $PC.birthWeek = 0>> <</if>> + <<set $currentRule to $defaultRules[0]>> <<switch $sortSlavesBy>> @@ -281,7 +288,22 @@ __''MAIN MENU''__ //[[Summary Options]] <</if>> | <<print "[[Abuse her|FAbuse][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> <<else>> - all of her holes equally. + all of her holes equally, but for now:// + <br> <<print "[[Use her mouth|FLips][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> + <<if canDoVaginal($slaves[$i])>> + | <<print "[[Fuck her|FVagina][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> + <<if canDoAnal($slaves[$i])>> + | <<print "[[Use her holes|FButt][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> + <</if>> + <</if>> + <<if canDoAnal($slaves[$i])>> + | <<print "[[Fuck her ass|FAnus][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> + <</if>> + /*check*/ + <<if canAchieveErection($slaves[$i])>> + | <<print "[[Ride her|FDick][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> + <</if>> + | <<print "[[Abuse her|FAbuse][$activeSlave to $slaves[" + $i + "],$nextButton to $j,$nextLink to $k,$returnTo to $l]]">> <</if>> <<else>> <<if $slaves[$i].toyHole != "all her holes">> diff --git a/src/uncategorized/nurseSelect.tw b/src/uncategorized/nurseSelect.tw index d13177ebe8372fa7cdd10ed8252e8d93581d6a2f..89ea64783ab8b415e0a28843a86e0b388b093d63 100644 --- a/src/uncategorized/nurseSelect.tw +++ b/src/uncategorized/nurseSelect.tw @@ -10,7 +10,7 @@ ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Nurse. <<set $slaves[_i].assignment to "be the Nurse">> <<set $slaves[_i].assignmentVisible to 0>> - <br><br>She will help heal your slaves. + <br><br>She will help heal and care for your slaves. <<break>> <</if>> <</for>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index eda17af9a381e64b800d51a0d5d51f5c65f9e8cc..157e746815c57f1e58fb3f07fe31d89139b2f1a3 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -184,10 +184,10 @@ $possessiveCap $activeSlave.faceShape face is <<if $activeSlave.indentureRestrictions >= 2>> //$possessiveCap indenture forbids elective surgery// -<<elseif (($activeSlave.faceImplant < 2) || ($surgeryUpgrade == 1)) && ($activeSlave.face < 3)>> - Facial surgery can either rework it and improve its attractiveness, or simply make it more attractive. +<<elseif ($activeSlave.faceImplant < 2) || ($surgeryUpgrade == 1)>> + Facial surgery can <<if $activeSlave.face < 3>> either<</if>> rework it and improve its attractiveness<<if $activeSlave.face < 3>>, or simply make it more attractive<</if>>. Make her look <<if $activeSlave.faceShape != "normal">> - [[Make conventionally feminine|Surgery Degradation][$activeSlave.faceShape to "normal",$activeSlave.faceImplant += 1,$activeSlave.face += 1,$cash -= $surgeryCost,$activeSlave.health -= 10,$surgeryType to "face"]] | + [[conventionally feminine|Surgery Degradation][$activeSlave.faceShape to "normal",$activeSlave.faceImplant += 1,$activeSlave.face += 1,$cash -= $surgeryCost,$activeSlave.health -= 10,$surgeryType to "face"]] | <</if>> <<if $activeSlave.faceShape is "masculine">> [[Soften to androgynous|Surgery Degradation][$activeSlave.faceShape to "androgynous",$activeSlave.faceImplant += 1,$activeSlave.face += 1,$cash -= $surgeryCost,$activeSlave.health -= 10,$surgeryType to "face"]] | @@ -207,7 +207,9 @@ $possessiveCap $activeSlave.faceShape face is [[Masculine|Surgery Degradation][$activeSlave.faceShape to "masculine",$activeSlave.faceImplant += 1,$activeSlave.face += 1,$cash -= $surgeryCost,$activeSlave.health -= 10,$surgeryType to "face"]] <</if>> <</if>> + <<if $activeSlave.face < 3>> | [[Just improve attractiveness|Surgery Degradation][$activeSlave.faceImplant += 1,$activeSlave.face += 1,$cash -= $surgeryCost,$activeSlave.health -= 10,$surgeryType to "face"]] + <</if>> <</if>> <<if $activeSlave.faceImplant == 1>> //Further facial surgery will unavoidably give $possessive a somewhat artificial appearance// @@ -1654,7 +1656,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <br> <<if $prostheticsUpgrade == 1>> - <<click "Construct basic prosthetic limbs">> + <<click "Construct basic prosthetic limbs" && $activeSlave.readyLimbs.includes(-1) != 1>> <<set $cash -= 10000>> <<set $activeLimbs to {weeksToCompletion: 12, ID: 0, type: "simple"}>> <<set $activeLimbs.ID to $activeSlave.ID>> @@ -1671,7 +1673,7 @@ The prosthesis facility is not currently building a set of artificial limbs for Modify $possessive prosthetics: <</if>> - <<if $activeSlave.amp != -1>> + <<if $activeSlave.amp != -1 && $activeSlave.readyLimbs.includes(-1) != 1>> <<click "Basic prosthetic limbs">> <<set $cash -= 10000>> <<set $activeLimbs to {weeksToCompletion: 6, ID: 0, type: "simple"}>> @@ -1684,7 +1686,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <</click>> //Costs ¤10000// <</if>> | - <<if $activeSlave.amp != -2>> + <<if $activeSlave.amp != -2 && $activeSlave.readyLimbs.includes(-2) != 1>> <<click "Sexual functions">> <<set $cash -= 10000>> <<set $activeLimbs to {weeksToCompletion: 6, ID: 0, type: "sex"}>> @@ -1697,7 +1699,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <</click>> //Costs ¤10000// <</if>> | - <<if $activeSlave.amp != -3>> + <<if $activeSlave.amp != -3 && $activeSlave.readyLimbs.includes(-3) != 1>> <<click "Beauty and grace">> <<set $cash -= 10000>> <<set $activeLimbs to {weeksToCompletion: 6, ID: 0, type: "beauty"}>> @@ -1710,7 +1712,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <</click>> //Costs ¤10000// <</if>> | - <<if $activeSlave.amp != -4>> + <<if $activeSlave.amp != -4 && $activeSlave.readyLimbs.includes(-4) != 1>> <<click "Combat effectiveness">> <<set $cash -= 10000>> <<set $activeLimbs to {weeksToCompletion: 6, ID: 0, type: "combat"}>> @@ -1731,7 +1733,7 @@ The prosthesis facility is not currently building a set of artificial limbs for Modify $possessive prosthetics: <</if>> - <<if $activeSlave.amp != -1>> + <<if $activeSlave.amp != -1 && $activeSlave.readyLimbs.includes(-1) != 1>> <<click "Basic prosthetic limbs">> <<set $cash -= 5000>> <<set $activeLimbs to {weeksToCompletion: 6, ID: 0, type: "simple"}>> @@ -1743,7 +1745,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <<goto "Remote Surgery">> <</click>> //Costs ¤5000// <</if>> - <<if $activeSlave.amp != -2>> + <<if $activeSlave.amp != -2 && $activeSlave.readyLimbs.includes(-2) != 1>> | <<click "Sexual functions">> <<set $cash -= 10000>> @@ -1756,7 +1758,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <<goto "Remote Surgery">> <</click>> //Costs ¤10000// <</if>> - <<if $activeSlave.amp != -3>> + <<if $activeSlave.amp != -3 && $activeSlave.readyLimbs.includes(-3) != 1>> | <<click "Beauty and grace">> <<set $cash -= 10000>> @@ -1769,7 +1771,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <<goto "Remote Surgery">> <</click>> //Costs ¤10000// <</if>> - <<if $activeSlave.amp != -4>> + <<if $activeSlave.amp != -4 && $activeSlave.readyLimbs.includes(-4) != 1>> | <<click "Combat effectiveness">> <<set $cash -= 10000>> @@ -1782,7 +1784,7 @@ The prosthesis facility is not currently building a set of artificial limbs for <<goto "Remote Surgery">> <</click>> //Costs ¤10000// <</if>> - <<if $activeSlave.amp != -5>> + <<if $activeSlave.amp != -5 && $activeSlave.readyLimbs.includes(-5) != 1>> | <<click "Highly advanced cybernetics">> <<set $cash -= 15000>> @@ -1834,6 +1836,33 @@ The prosthesis facility has constructed $possessive prosthetic limbs. <</for>> <<goto "Remote Surgery">> <</click>> + | + <<click "Put into storage">> + <<for _i to 0; _i < $limbs.length; _i++>> + <<if $activeSlave.ID == $limbs[_i].ID>> + <<break>> + <</if>> + <</for>> + + <<switch $limbs[_i].type>> + <<case "simple">> + <<set $activeSlave.readyLimbs.push(-1)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "sex">> + <<set $activeSlave.readyLimbs.push(-2)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "beauty">> + <<set $activeSlave.readyLimbs.push(-3)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "combat">> + <<set $activeSlave.readyLimbs.push(-4)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "cyber">> + <<set $activeSlave.readyLimbs.push(-5)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <</switch>> + <<goto "Remote Surgery">> + <</click>> <<else>> <br> <<click "Attach">> @@ -1879,6 +1908,33 @@ The prosthesis facility has constructed $possessive prosthetic limbs. <</for>> <<goto "Remote Surgery">> <</click>> + | + <<click "Put into storage">> + <<for _i to 0; _i < $limbs.length; _i++>> + <<if $activeSlave.ID == $limbs[_i].ID>> + <<break>> + <</if>> + <</for>> + + <<switch $limbs[_i].type>> + <<case "simple">> + <<set $activeSlave.readyLimbs.push(-1)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "sex">> + <<set $activeSlave.readyLimbs.push(-2)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "beauty">> + <<set $activeSlave.readyLimbs.push(-3)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "combat">> + <<set $activeSlave.readyLimbs.push(-4)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <<case "cyber">> + <<set $activeSlave.readyLimbs.push(-5)>> + <<set $dump to $limbs.pluck([_i], [_i])>> + <</switch>> + <<goto "Remote Surgery">> + <</click>> <</if>> <</if>> <</if>> @@ -2155,7 +2211,7 @@ $pronounCap has doorway-jamming hips. <</if>> <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>> <<if isFertile($activeSlave)>> - [[Implant a pregnancy generator|Surgery Degradation][$activeSlave.preg to 1,$activeSlave.pregType to 50,$cash -= $surgeryCost,$activeSlave.health -= 10,$surgeryType to "preg"]] //This will have severe effects on $possessive health and mind// + [[Implant a pregnancy generator|Surgery Degradation][$activeSlave.preg to 1,$activeSlave.pregType to 50,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType to "preg"]] //This will have severe effects on $possessive health and mind// <</if>> <</if>> <<else>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index a936d1dc4990d8a8993f7d6bb5d753fcb97730e3..0c1a286696e4225818ec731a938904b3d110bde3 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -513,6 +513,60 @@ <</if>> <</switch>> +<<switch $slaves[$i].pregControl>> +<<case "slow gestation">> + <<set $slaves[$i].chem += 1>> + <<if $slaves[$i].preg > 30>> + $pronounCap is full term; gestation restriction agents @@color:red;can't supress labor@@ and $possessive regimen is ended to prevent health damage. + <<set $slaves[$i].pregControl = "none">> + <<elseif $slaves[$i].preg > 0>> + $possessiveCap belly feels very docile, $possessive gestation rate is @@color:yellow;greatly reduced@@. + <</if>> +<<case "speed up">> + <<set $slaves[$i].chem += 2>> + <<if $slaves[$i].assignment != "get treatment in the clinic" && $Nurse == 0>> + <<if $slaves[$i].pregType > 1>><<set _childCount = "children are">><<else>><<set _childCount = "child is">><</if>> + $possessiveCap _childCount growing rapidly within $possessive womb, far faster than $possessive @@color:red;poor body can handle.@@<<if $slaves[$i].pregType >= 10>> $possessiveCap rate of growth is straining $possessive womb, she is @@color:red;at risk of bursting!@@<</if>> + <<set $slaves[$i].health -= ($slaves[$i].preg+$slaves[$i].pregType)>> + <<if $slaves[$i].health <= -100>> + $possessiveCap critically poor health @@color:orange;caused her to miscarry.@@ + <<if ($slaves[$i].assignmentVisible == 1) && (_currentRule.preg is -1)>><<set $slaves[$i].preg to -1>><<else>><<set $slaves[$i].preg to 0>><</if>> + <<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>> + $pronounCap is + <<if $slaves[$i].devotion < -50>> + @@color:mediumorchid;filled with violent, consuming hatred@@ and @@color:gold;fear.@@ Even though $pronoun knew $possessive baby was destined for a slave orphanage, it seems $pronoun cared for it and views you as its killer. + <<set $slaves[$i].devotion -= 25, $slaves[$i].trust -= 25>> + <<elseif $slaves[$i].devotion < -20>> + @@color:mediumorchid;afflicted by desperate, inconsolable grief@@ and @@color:gold;horror.@@ Even though $pronoun knew $possessive baby was destined for a slave orphanage, it seems $pronoun cared for it. + <<set $slaves[$i].devotion -= 10, $slaves[$i].trust -= 20>> + <<elseif $slaves[$i].devotion <= 20>> + @@color:mediumorchid;consumed by enduring sorrow@@ and @@color:gold;horror.@@ Even though $pronoun knew $possessive baby was destined for a slave orphanage, it seems $pronoun cared for it. + <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>> + <<elseif $slaves[$i].devotion <= 50>> + dully obedient. $pronounCap has been broken to slave life so thoroughly that even this is neither surprising nor affecting. + <<else>> + @@color:hotpink;pleased by this stark development@@, since $pronoun is so attentive to your will. $pronounCap also expects $pronoun will be able to fuck better now once her health recovers. + <<set $slaves[$i].devotion += 4>> + <</if>> + <</if>> + <</if>> + <</if>> +<<case "labor supressors">> + <<set $slaves[$i].chem += 2>> + <<if $slaves[$i].preg > 43>> + <<set $slaves[$i].health -= 20>> + <<set $slaves[$i].labor = 1>> + <<set $slaves[$i].induce = 1>> + $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@color:red;greatly affects $possessive health@@. $pronounCap may @@color:red;have trouble@@ giving birth to $possessive oversized child. $pronounCap seems to be in distress, $possessive body is @@color:red;forcing her child out!@@ + <<elseif $slaves[$i].preg > 40>> + <<set $slaves[$i].health -= 20>> + $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@color:red;greatly affects $possessive health@@. $pronounCap may @@color:red;have trouble@@ giving birth to $possessive oversized child. + <<elseif $slaves[$i].preg > 30>> + <<set $slaves[$i].health -= 10>> + Labor supressing agents @@color:yellow;negatively affect $possessive health@@. + <</if>> +<</switch>> + <<if $slaves[$i].curatives > 1>> <<if ($slaves[$i].health > 90)>> $possessiveCap health is already outstanding and cannot be improved with further drug treatment. @@color:yellow;$possessiveCap drug regimen has defaulted to preventatives.@@ @@ -593,8 +647,8 @@ <<if $slaves[$i].fetish != "mindbroken">> $pronounCap understands that $pronoun owes $possessive near-perfect health to you and @@color:hotpink;believes@@ that life with you is better than freedom in some ways. <<set $slaves[$i].trust += 1>> -<</if>> -<</if>> + <</if>> + <</if>> <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 95d46ee8944279c2d12108b46129374fd110f89e..4bc7604abe683f6cd4ea4f23e4003a4fa9e4b019 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -1955,6 +1955,9 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<elseif $slaves[$i].pregType >= 50 && $slaves[$i].preg > 0>> She knows she will be pregnant until her body gives out, and @@color:hotpink;she couldn't be happier.@@ <<set $slaves[$i].devotion += 5>> + <<elseif $slaves[$i].pregControl == "labor supressors" && $slaves[$i].preg >= 30>> + Under the effects of labor supression drugs, she knows she will be pregnant until you decided to allow her birth. @@color:hotpink;She couldn't be happier.@@ + <<set $slaves[$i].devotion += 5>> <<elseif $slaves[$i].pregType >= 10 && $slaves[$i].preg > 0>> Her growing hyperpregnancy feeds her paraphilia and @@color:hotpink;fulfilling her deepest fantasies.@@ <<set $slaves[$i].devotion += 3>> @@ -2042,13 +2045,16 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<elseif $slaves[$i].career is "a breeder">> <<if $slaves[$i].preg > 1 && $arcologies[0].FSRepopulation != "unset">> Her life used to revolve around being pregnant all the time, and nothing has changed. However, being surrounded with happy, heavily pregnant women leaves her @@color:hotpink;slightly more accepting@@ of her fate and @@color:mediumaquamarine;hopeful@@ that her trained body will be useful to you. - <<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>> + <<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>> + <<elseif $slaves[$i].pregControl == "speed up">> + Her life used to revolve around being pregnant all the time, and nothing has changed. She @@color:gold;watches in horror@@ as her middle visibly swells before her eyes. She @@color:hotpink;slips more into submission@@ as the pressure in her womb increases. + <<set $slaves[$i].trust -= 10, $slaves[$i].devotion += 5>> <<elseif $slaves[$i].preg > 1>> Her life used to revolve around being pregnant all the time, and nothing has changed. She @@color:gold;fears@@ that her entire life will revolve around pregnancy and @@color:hotpink;slips more into submission@@ of her fate. - <<set $slaves[$i].trust -= 1, $slaves[$i].devotion += 1>> + <<set $slaves[$i].trust -= 1, $slaves[$i].devotion += 1>> <<else>> She remembers how her womb used to be swollen with children as often as possible, and is @@color:hotpink;thankful@@ and @@color:mediumaquamarine;grateful@@ that she isn't just meat to fuck pregnant anymore. - <<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>> + <<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>> <</if>> <<elseif $slaves[$i].career is "a bioreactor">> She remembers what it was like to be a living, breathing, milk-jetting,<<if isFertile($slaves[$i]) && ($dairyPregUpgrade > 0)>> baby-filled,<</if>><<if ($slaves[$i].balls != 0)>> cum-squirting,<</if>> drug-filled piece of industrial equipment, and is @@color:hotpink;thankful@@ and @@color:mediumaquamarine;grateful@@ that she isn't any more. @@ -3337,10 +3343,10 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<if $slaves[$i].preg >= 10>> <<if $slaves[$i].fuckdoll == 0>> <<if $slaves[$i].fetish != "mindbroken">> - <<if ($slaves[$i].devotion) <= 20 && ($slaves[$i].pregSource == -1)>> + <<if $slaves[$i].devotion <= 20 && ($slaves[$i].pregSource == -1)>> She is filled with a feeling of @@color:mediumorchid;revulsion@@ that your child is growing within her body. <<set $slaves[$i].devotion -= 1>> - <<elseif ($slaves[$i].devotion) > 50 && ($slaves[$i].pregSource == -1)>> + <<elseif $slaves[$i].devotion > 50 && ($slaves[$i].pregSource == -1)>> She @@color:hotpink;loves@@ that your child is growing within her. <<set $slaves[$i].devotion += 1>> <</if>> @@ -3357,6 +3363,38 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<set $slaves[$i].trust -= 1>> <</if>> <</if>> + <<switch $slaves[$i].pregControl>> + <<case "speed up">> + <<if $slaves[$i].assignment != "get treatment in the clinic" && $Nurse == 0>> + <<if $slaves[$i].devotion <= 20 && $slaves[$i].trust <= 50 && $slaves[$i].pregType >= 10>> + <<if $slaves[$i].sexualFlaw == "self hating">> + She is @@color:hotpink;delirious with joy@@ over her straining womb. Every week she gets bigger, fuller and tighter; in her mind, it won't be long until she bursts, bringing her children into the world. + <<set $slaves[$i].devotion += 10>> + <<else>> + She is @@color:gold;utterly terrified@@ by her straining womb. Every week she gets bigger, fuller and tighter; in her mind, it won't be long until she bursts, bringing her children into @@color:mediumorchid;this wretched world.@@<<if $slaves[$i].pregType >= 20 && $slaves[$i].preg > 30>> She is absolutely huge, her stretchmark streaked orb of a belly keeps her painfully immobilized. She counts every second, hoping that she can make it to the next. Her mind @@color:red;can't handle it and shatters,@@ leaving her nothing more than an overfilled broodmother.<<set $slaves[$i].fetish = "mindbroken">><</if>> + <<set $slaves[$i].devotion -= 10>> + <<set $slaves[$i].trust -= 10>> + <</if>> + <<elseif $slaves[$i].devotion <= 20 && $slaves[$i].trust <= 20>> + She is @@color:gold;utterly terrified@@ by her straining womb and filled @@color:mediumorchid;with disgust@@ that you've turned her into nothing more than a rapid breeding vessel. + <<set $slaves[$i].devotion -= 10>> + <<set $slaves[$i].trust -= 10>> + <<elseif $slaves[$i].devotion <= 80 && $slaves[$i].trust <= 80>> + She trusts you, but deep down @@color:gold;she can't help but worry@@ over how fast she is growing. + <<set $slaves[$i].trust -= 2>> + <</if>> + <</if>> + <<case "labor supressors">> + <<if $slaves[$i].devotion <= 20 && ($slaves[$i].pregSource == -1)>> + She is filled with @@color:mediumorchid;hate@@ that you're forcing her to continue carrying you child. + <<set $slaves[$i].devotion -= 5>> + <</if>> + <<case "slow gestation">> + <<if $slaves[$i].devotion <= 20 && ($slaves[$i].pregSource == -1)>> + She is filled with @@color:mediumorchid;hate@@ that you're tormenting her by prolonging her pregnancy. + <<set $slaves[$i].devotion -= 5>> + <</if>> + <</switch>> <<if $slaves[$i].induce == 1>> Her child<<if $slaves[$i].pregType > 1>>ren visibly shift<<else>> visibly shifts<</if>> within her womb as they prepare to enter the world. She experiences several contractions, but not enough to deter her from her work. <<elseif $slaves[$i].preg > 34 && $slaves[$i].pregType < 50>> @@ -3856,14 +3894,23 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<if $slaves[$i].bellySag < 20>> <<set $slaves[$i].bellySag += 0.5>> <</if>> + <<if $slaves[$i].pregControl == "speed up">> + <<set $slaves[$i].bellySag += 1>> + <</if>> <<elseif ((($activeSlave.preg > 20) && ($activeSlave.pregType >= 20)) || (($activeSlave.preg > 30) && ($activeSlave.pregType >= 10)) || ($activeSlave.bellyImplant >= 16000))>> <<if $slaves[$i].bellySag < 10>> <<set $slaves[$i].bellySag += 0.3>> <</if>> + <<if $slaves[$i].pregControl == "speed up">> + <<set $slaves[$i].bellySag += 0.5>> + <</if>> <<elseif ((($activeSlave.preg > 10) && ($activeSlave.pregType >= 20)) || (($activeSlave.preg > 20) && ($activeSlave.pregType >= 10)) || ($activeSlave.preg > 30) || ($activeSlave.bellyImplant >= 8000))>> <<if $slaves[$i].bellySag < 5>> <<set $slaves[$i].bellySag += 0.1>> <</if>> + <<if $slaves[$i].pregControl == "speed up">> + <<set $slaves[$i].bellySag += 0.2>> + <</if>> <</if>> <<if $slaves[$i].bellySag > 0>> @@ -5943,10 +5990,10 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<set $burstee to 1>> <</if>> -<<if ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && (random(1,100) > 90)>> +<<if ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && (random(1,100) > 90) && $slaves[$i].pregControl != "labor supressors">> <<set $slaves[$i].labor to 1>> <<set $birthee to 1>> -<<elseif ($slaves[$i].preg > 35) && ($slaves[$i].pregType < 50)>> +<<elseif ($slaves[$i].preg > 35) && ($slaves[$i].pregType < 50) && $slaves[$i].pregControl != "labor supressors">> <<set $slaves[$i].labor to 1>> <<set $birthee to 1>> <<elseif ($slaves[$i].preg > 30) && ($slaves[$i].pregType is 50) && ($slaves[$i].assignment != "labor in the production line")>> diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index 04cf466f4a31060293030dffe33025e56675f85a..66727e665e02927606580d85fc4af152b5d241e5 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -9,6 +9,7 @@ <<for $i to 0; $i < $slaves.length; $i++>> <<if $slaves[$i].labor is 1>> +<<set $slaves[$i].pregControl == "none">> <<SlavePronouns $slaves[$i]>> @@ -59,6 +60,18 @@ <<if $slaves[$i].tired > 0>> <<set $birthDamage += 2>> <</if>> +<<if $slaves[$i].preg > 40>> + <<if $slaves[$i].physicalAge < 6>> + <<set $birthDamage += 5>> + <<elseif $slaves[$i].physicalAge < 9>> + <<set $birthDamage += 3>> + <<elseif $slaves[$i].physicalAge < 13>> + <<set $birthDamage += 1>> + <</if>> + <<if $slaves[$i].hips < 0>> + <<set $birthDamage += (2-$slaves[$i].hips)>> + <</if>> +<</if>> <<if $slaves[$i].mpreg == 1>> <<if $slaves[$i].anus >= 2>> <<set $birthDamage -= 2>> @@ -561,6 +574,10 @@ $daddy's virile cock and balls. <br> $pronounCap was so tired, $pronoun @@color:red;lacked the energy to effectively push@@. <</if>> +<<if $slaves[$i].preg > 40>> +<br> + $possessiveCap's child had extra time to grow @@color:red;greatly complicating childbirth@@. +<</if>> <<if (($slaves[$i].vagina >= 2 or $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) or $slaves[$i].births > 0 or $slaves[$i].hips > 0 or $nurseCareers.contains($slaves[$i].career) or $slaves[$i].intelligenceImplant > 0>> <br>However: <<if $slaves[$i].mpreg == 1>> diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index 7463c3dbb41788caafd2121dd436b64becc5780b..026495197c5998f95cd6e2d98d70f1425e769e0a 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -300,9 +300,17 @@ <<if $slaves[_i].bellyPain != 0>> <<set $slaves[_i].bellyPain = 0>> <</if>> +/* preg speed control changes*/ <<if $slaves[_i].preg > 0>> - <<set $slaves[_i].preg++>> + <<if $slaves[_i].pregControl == "slow gestation">> + <<set $slaves[_i].preg += 0.5>> + <<elseif $slaves[_i].pregControl == "speed up">> + <<set $slaves[_i].preg += 2>> + <<else>> + <<set $slaves[_i].preg++>> + <</if>> <</if>> +/* end of preg speed control changes*/ <<if ($slaves[_i].scars == 3)>> <<set $slaves[_i].scarheal += 1>> <</if>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 2fbfe0afb914a1c73e06f6e9cfa9bf7ce5c1ebf8..46c0d4f5253eb78e335878de09c1f3706fcd5bab 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -331,7 +331,18 @@ __Rules Assistant__ <</for>> <</if>> <br><br> - +/* START hotswap prosthetics */ +<<if ndef $activeSlave.readyLimbs>> + <<set $activeSlave.readyLimbs to []>> +<</if>> +<<if $activeSlave.amp < 0 && $activeSlave.readyLimbs.includes($activeSlave.amp) <0>> /* imports current P-limbs to array for vanilla slaves */ + <<set $activeSlave.readyLimbs.push($activeSlave.amp)>> +<</if>> +<<if $activeSlave.readyLimbs.length > -1 && $activeSlave.amp != 0>> +<span id = "LimbOptions"><<display "Hotswap Prosthetics">></span> +<</if>> +/* END hotswap prosthetics */ +<br><br> <<if $activeSlave.assignment is "recover from surgery">> //She is recovering from surgery this week// <<elseif $activeSlave.assignment is "guard you">> @@ -605,6 +616,29 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><< <</if>> <</if>> <</if>> +<<if ($activeSlave.preg > 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.pregType < 50)>> +<br> + __Pregnancy control__: <span id="pregControl"><<if $activeSlave.pregControl == "labor supressors">>Labor is supressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation<<elseif $activeSlave.pregControl == "speed up">>Faster gestation<<else>>Normal gestation<</if>></span> + <<if ($activeSlave.preg >= 30)>> + <br> + <<if $activeSlave.pregControl == "labor supressors">> + <<click "Normal Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>natural birth<</replace>><</click>> + <<else>> + <<click "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be supressed<</replace>><</click>> + <</if>> + <<elseif ($activeSlave.preg < 30)>> + <br> + <<if $activeSlave.pregControl != "none">> + <<click "Normal Gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</click>> | + <</if>> + <<if $activeSlave.pregControl != "slow Gestation">> + <<click "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed gestation speed<</replace>><</click>> | + <</if>> + <<if $activeSlave.pregControl != "speed up">> + <<click "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>fast gestation speed, staffed clinic recommended<</replace>><</click>> + <</if>> + <</if>> +<</if>> <<if $incubator > 0>> <<if $activeSlave.pregType < 50 && $activeSlave.preg > 3 && $activeSlave.eggType == "human">> <<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 3dbe00fe1931fe6c74f38de14eb83ea574adf7ec..986bd7cbab7472e96871b6fc824a7a4cd7a65c33 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -189,7 +189,7 @@ <<if $Flag == 0>> <<if $clinic <= $clinicSlaves>><<continue>><</if>> <<if _Slave.assignmentVisible != 1>><<continue>><</if>> - <<if (_Slave.health < 20) || ((_Slave.chem > 15) && ($clinicUpgradeFilters == 1)) || ((_Slave.bellyImplant > 100) && ($bellyImplants == 1))>> + <<if (_Slave.health < 20) || ((_Slave.chem > 15) && ($clinicUpgradeFilters == 1)) || ((_Slave.bellyImplant > 100) && ($bellyImplants == 1)) || _Slave.preg > 1 >> <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">> <<else>> <br>//_Slave.slaveName cannot benefit from the clinic// diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw index db89b1275c1455b834c9c33f4fe9ba55bda5876b..8da660d61bfa6b9f98ad5d767c4f0c5cd0ebcb01 100644 --- a/src/uncategorized/walkPast.tw +++ b/src/uncategorized/walkPast.tw @@ -513,7 +513,7 @@ drain her milky <<if $seeRace is 1>>_partnerSlave.race <</if>>udders; <</if>> <<case "please you">> - wait next to you and wait for you to fuck $object;= + wait next to you and wait for you to fuck $object; <<case "be a subordinate slave">> service your other slaves; <<case "be a servant">> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index c195b88c75723c603a807bd996be1a6315384a70..1525a93f46835862645820e3c61aa6a198a6198d 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -370,6 +370,29 @@ <</if>> <</if>> <</if>> +<<if ($activeSlave.preg > 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.pregType < 50)>> +<br> + __Pregnancy control__: <span id="pregControl"><<if $activeSlave.pregControl == "labor supressors">>Labor is supressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation<<elseif $activeSlave.pregControl == "speed up">>Faster gestation<<else>>Normal gestation<</if>></span> + <<if ($activeSlave.preg >= 30)>> + <br> + <<if $activeSlave.pregControl == "labor supressors">> + <<click "Normal Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>natural birth<</replace>><</click>> + <<else>> + <<click "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be supressed<</replace>><</click>> + <</if>> + <<elseif ($activeSlave.preg < 30)>> + <br> + <<if $activeSlave.pregControl != "none">> + <<click "Normal Gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</click>> | + <</if>> + <<if $activeSlave.pregControl != "slow Gestation">> + <<click "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed gestation speed<</replace>><</click>> | + <</if>> + <<if $activeSlave.pregControl != "speed up">> + <<click "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>fast gestation speed, staffed clinic recommended<</replace>><</click>> + <</if>> + <</if>> +<</if>> <</replace>> <</widget>> /%