diff --git a/Makefile b/Makefile
deleted file mode 100644
index fff7afb5c1ffe44b03b8b80bed149c92da8a49ed..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-PYTHON?= python
-ifeq (${MAKE_HOST}, x86_64-unknown-cygwin)
- TWEEGOBIN?= tweego.exe
-else
- TWEEGOBIN?= tweego
-endif
-
-SRCDIR?= src
-STARTFILE?= $(SRCDIR)/config/start.tw
-FCTARG?= bin/FC.html
-GENINCLUDES?= ./devTools/scripts/includes.py
-all: $(FCTARG)
-
-$(STARTFILE): $(SRCDIR)/config/start.tw.proto $(GENINCLUDES) \
- $(shell find ${SRCDIR} -type d -print)
- $(PYTHON) $(GENINCLUDES) $< $@ $(SRCDIR)
-
-$(FCTARG): $(STARTFILE) $(shell find ${SRCDIR} -type f -name \*.tw -print)
- ./devTools/tweeGo/$(TWEEGOBIN) -o $(FCTARG) $(STARTFILE)
-
-clean:
- -$(RM) $(STARTFILE) $(FCTARG)
diff --git a/compile b/compile
new file mode 100644
index 0000000000000000000000000000000000000000..be24c915eb4dced6c56c8ef7ad90d49331bb53b8
--- /dev/null
+++ b/compile
@@ -0,0 +1,9 @@
+#!/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
+
+./devTools/tweeGo/tweego -o bin/FC.html src/config/start.tw
\ No newline at end of file
diff --git a/compile.bat b/compile.bat
index 541043a8b6f1f3d96f9fb0ce73e2566a92a036af..321a0ce5dda51f9a31ebe7d23706c9c1cfa9112a 100644
--- a/compile.bat
+++ b/compile.bat
@@ -1,9 +1,11 @@
@echo off
:: Free Cities Basic Compiler - Windows x86_64
-:: Uses embedded Python 3.5.3 x86_64
:: Will add all *.tw files to StoryIncludes.
-"%~dp0devTools\python-3.5.3\python.exe" "%~dp0devTools\scripts\includes.py" "src\config\start.tw.proto" "src\config\start.tw" "src" "%*"
+del src\config\start.tw
+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"
ECHO Done
diff --git a/compile_debug.bat b/compile_debug.bat
index 0d94e4fda8d6afc25f07df22ba2b97f8b9c60b77..d5a291ee79d48cc4a1e85edcdd378a33bcf06954 100644
--- a/compile_debug.bat
+++ b/compile_debug.bat
@@ -2,10 +2,12 @@
:: Free Cities Basic Compiler - Windows x86_64
:: Will wait for keypress before terminating.
-:: Uses embedded Python 3.5.3 x86_64
:: Will add all *.tw files to StoryIncludes.
-"%~dp0devTools\python-3.5.3\python.exe" "%~dp0devTools\scripts\includes.py" "src\config\start.tw.proto" "src\config\start.tw" "src" "%*"
+del src\config\start.tw
+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"
ECHO Done
-PAUSE
+PAUSE
\ No newline at end of file
diff --git a/devTools/python-3.5.3/_bz2.pyd b/devTools/python-3.5.3/_bz2.pyd
deleted file mode 100644
index 0c312bd7a5921652ddf3861a2bcafe45d89ec279..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_bz2.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_ctypes.pyd b/devTools/python-3.5.3/_ctypes.pyd
deleted file mode 100644
index 581152fe653a2e37c2e454addd2a52247e600ece..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_ctypes.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_decimal.pyd b/devTools/python-3.5.3/_decimal.pyd
deleted file mode 100644
index 7cd2a0648811fb1100ba968c2c9d7540db89e9e3..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_decimal.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_elementtree.pyd b/devTools/python-3.5.3/_elementtree.pyd
deleted file mode 100644
index 5bf4622b298c30a11ca87af8d6363308d2ba75cd..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_elementtree.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_hashlib.pyd b/devTools/python-3.5.3/_hashlib.pyd
deleted file mode 100644
index 4634c1545fb1e953964570bf055ba617cb7c1edb..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_hashlib.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_lzma.pyd b/devTools/python-3.5.3/_lzma.pyd
deleted file mode 100644
index 17a62a03002c28ca1e573ba18e56f891c13ceaee..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_lzma.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_msi.pyd b/devTools/python-3.5.3/_msi.pyd
deleted file mode 100644
index 7e6847d1c599a4f7d9e094a0ebd77b99df9e1015..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_msi.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_multiprocessing.pyd b/devTools/python-3.5.3/_multiprocessing.pyd
deleted file mode 100644
index 6f106d66d9a73d98e120deb2b9435c09951a93dd..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_multiprocessing.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_overlapped.pyd b/devTools/python-3.5.3/_overlapped.pyd
deleted file mode 100644
index 526d20f2e78e2739f7420bde1f51da1e25168ee1..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_overlapped.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_socket.pyd b/devTools/python-3.5.3/_socket.pyd
deleted file mode 100644
index 2faf13a36be06cdef552e2a7e5ca15b72b8d9e22..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_socket.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_sqlite3.pyd b/devTools/python-3.5.3/_sqlite3.pyd
deleted file mode 100644
index fed14435c795550d7197da2566257f16aeece4c8..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_sqlite3.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/_ssl.pyd b/devTools/python-3.5.3/_ssl.pyd
deleted file mode 100644
index da709fd154b1a11b600cc4e66b5421d0c558ead2..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/_ssl.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/pyexpat.pyd b/devTools/python-3.5.3/pyexpat.pyd
deleted file mode 100644
index b950ad092bfec3fbf09841566a8e096ab983b68c..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/pyexpat.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/pyshellext.dll b/devTools/python-3.5.3/pyshellext.dll
deleted file mode 100644
index da64fedb1b3f93faab82eaf9d5b95cfe54382de9..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/pyshellext.dll and /dev/null differ
diff --git a/devTools/python-3.5.3/python.exe b/devTools/python-3.5.3/python.exe
deleted file mode 100644
index 60f9c77a2e46e44fe90e1c453a8ad8c49e4aa8c2..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/python.exe and /dev/null differ
diff --git a/devTools/python-3.5.3/python3.dll b/devTools/python-3.5.3/python3.dll
deleted file mode 100644
index 56f0fe618783ac167f06d1e2e8b705b619971b73..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/python3.dll and /dev/null differ
diff --git a/devTools/python-3.5.3/python35.dll b/devTools/python-3.5.3/python35.dll
deleted file mode 100644
index 1ca7924b20389d1dbcd18159fba506c2f64cfb88..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/python35.dll and /dev/null differ
diff --git a/devTools/python-3.5.3/python35.zip b/devTools/python-3.5.3/python35.zip
deleted file mode 100644
index 2849f7ffe7afdc7bfac5838fdaa4cec26d7f2c8e..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/python35.zip and /dev/null differ
diff --git a/devTools/python-3.5.3/pythonw.exe b/devTools/python-3.5.3/pythonw.exe
deleted file mode 100644
index 1d3f9dc27cda9e57ad5792c5fe3f6c93c19125be..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/pythonw.exe and /dev/null differ
diff --git a/devTools/python-3.5.3/pyvenv.cfg b/devTools/python-3.5.3/pyvenv.cfg
deleted file mode 100644
index d70b999908a17824119a3fad090cfa10391326d7..0000000000000000000000000000000000000000
--- a/devTools/python-3.5.3/pyvenv.cfg
+++ /dev/null
@@ -1 +0,0 @@
-applocal = true
diff --git a/devTools/python-3.5.3/select.pyd b/devTools/python-3.5.3/select.pyd
deleted file mode 100644
index f44ea687b4cc3a07c15b63fb6d869cb3d246686d..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/select.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/sqlite3.dll b/devTools/python-3.5.3/sqlite3.dll
deleted file mode 100644
index 3c4c9f6bdb0d5af77bc46d6d4a78541cad175075..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/sqlite3.dll and /dev/null differ
diff --git a/devTools/python-3.5.3/unicodedata.pyd b/devTools/python-3.5.3/unicodedata.pyd
deleted file mode 100644
index 2890bc97d00f042085f616a61b5c078bc9874ccf..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/unicodedata.pyd and /dev/null differ
diff --git a/devTools/python-3.5.3/vcruntime140.dll b/devTools/python-3.5.3/vcruntime140.dll
deleted file mode 100644
index 52fe06bd612e47835444a68b4863ca254519cc8b..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/vcruntime140.dll and /dev/null differ
diff --git a/devTools/python-3.5.3/winsound.pyd b/devTools/python-3.5.3/winsound.pyd
deleted file mode 100644
index df46559f65859e2c83b34549df61525335c3a347..0000000000000000000000000000000000000000
Binary files a/devTools/python-3.5.3/winsound.pyd and /dev/null differ
diff --git a/devTools/scripts/includes.py b/devTools/scripts/includes.py
deleted file mode 100644
index 35a7727d4c2b3f34312e26d0ef3301525b4d144b..0000000000000000000000000000000000000000
--- a/devTools/scripts/includes.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!python
-
-import sys
-import os.path
-
-FN = sys.argv[1]
-OUT = sys.argv[2]
-DIR = sys.argv[3]
-
-def main():
- if not os.path.exists(FN):
- print >>sys.stderr, FN, 'not found'
- sys.exit(1)
-
- with open(FN, 'r') as fin:
- lines = fin.readlines()
- fin.close()
- fout = open(OUT, 'w')
- fout.write("".join(lines))
-
- # os.sep can be changed to \\ or / as appropriate
- # can also os.path.abspath() which will canonicalize
-
- pnames = []
- for path, subdirs, files in os.walk(DIR):
- for filename in files:
- if filename.endswith('.tw'):
- pathname = os.path.join(path, filename)
- if pathname != OUT:
- pnames.append(pathname + '\n')
-
- fout.write("".join(sorted(pnames)))
- fout.close()
-
- return 0
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/src/config/start.tw b/src/config/start.tw
index 7168173c20596d6fb0acb38a41d2cd0965932c21..14eedac3b20c56eb738308ed7cc9218d749a19b7 100644
--- a/src/config/start.tw
+++ b/src/config/start.tw
@@ -26,29 +26,14 @@ src\events\intro\pcRumorIntro.tw
src\events\intro\terrainIntro.tw
src\events\intro\tradeIntro.tw
src\facilities\brothel\brothelAssignmentScene.tw
-src\gui\Encyclopedia\encyclopedia.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\agent\agentCompany.tw
-src\npc\agent\agentRetrieve.tw
-src\npc\agent\agentSelect.tw
-src\npc\agent\agentWorkaround.tw
src\npc\asDump.tw
-src\npc\databases\cheatmodeDatabase.tw
-src\npc\databases\customSlavesDatabase.tw
-src\npc\databases\dSlavesDatabase.tw
-src\npc\databases\ddSlavesDatabase.tw
-src\npc\databases\dfSlavesDatabase.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\exportSlave.tw
src\npc\fAbuse.tw
src\npc\fFeelings.tw
@@ -64,10 +49,25 @@ 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\npc\uploadSlave.tw
src\player\actions\fCaress.tw
src\player\actions\fEmbrace.tw
src\player\actions\fondleDick.tw
@@ -76,20 +76,21 @@ src\pregmod\birthStorm.tw
src\pregmod\breederProposal.tw
src\pregmod\breedingTest.tw
src\pregmod\fDick.tw
-src\pregmod\fSelf.tw
-src\pregmod\fSlaveFeed.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\pInsemination.tw
-src\pregmod\pRaped.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
@@ -99,13 +100,6 @@ src\pregmod\seHuskSlaveDelivery.tw
src\pregmod\sePlayerBirth.tw
src\pregmod\slaveAgeIntro.tw
src\pregmod\slaveOnSlaveFeedingWorkAround.tw
-src\uncategorized\PESS.tw
-src\uncategorized\PETS.tw
-src\uncategorized\RECI.tw
-src\uncategorized\REFI.tw
-src\uncategorized\RESS.tw
-src\uncategorized\RESSTR.tw
-src\uncategorized\RETS.tw
src\uncategorized\addCustomDescriptors.tw
src\uncategorized\arcade.tw
src\uncategorized\arcadeReport.tw
@@ -119,11 +113,11 @@ src\uncategorized\attendantWorkaround.tw
src\uncategorized\autosurgerySettings.tw
src\uncategorized\barracks.tw
src\uncategorized\bgSelect.tw
-src\uncategorized\bodyModRulesAssistantSettings.tw
+src\uncategorized\bodyguardWorkaround.tw
src\uncategorized\bodyModification.tw
src\uncategorized\bodyModificationDegradation.tw
src\uncategorized\bodyModificationReaction.tw
-src\uncategorized\bodyguardWorkaround.tw
+src\uncategorized\bodyModRulesAssistantSettings.tw
src\uncategorized\brothel.tw
src\uncategorized\brothelAdvertisement.tw
src\uncategorized\brothelReport.tw
@@ -229,15 +223,31 @@ 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
@@ -247,23 +257,9 @@ src\uncategorized\pSlaveMedic.tw
src\uncategorized\pSnatchAndGrab.tw
src\uncategorized\pSnatchAndGrabResult.tw
src\uncategorized\pTraitorMessage.tw
-src\uncategorized\pUndergroundRailroad.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\pit.tw
-src\uncategorized\placeInLine.tw
-src\uncategorized\policies.tw
-src\uncategorized\prestigiousSlave.tw
-src\uncategorized\previousSlaveInLine.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
@@ -276,15 +272,21 @@ 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\reFemaleArcologyOwner.tw
-src\uncategorized\reFormerAbolitionist.tw
src\uncategorized\reFullBed.tw
src\uncategorized\reHGReplacement.tw
src\uncategorized\reLegendaryBalls.tw
@@ -292,33 +294,32 @@ 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\reStaffedMorning.tw
-src\uncategorized\reStandardPunishment.tw
-src\uncategorized\recETS.tw
-src\uncategorized\recETSWorkaround.tw
-src\uncategorized\recruiterSelect.tw
-src\uncategorized\recruiterWorkaround.tw
-src\uncategorized\remFluctuations.tw
-src\uncategorized\remMerger.tw
-src\uncategorized\remoteSurgery.tw
-src\uncategorized\rename.tw
-src\uncategorized\resEndowment.tw
-src\uncategorized\resFailure.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
@@ -339,6 +340,7 @@ 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
@@ -353,7 +355,6 @@ src\uncategorized\saStayConfined.tw
src\uncategorized\saTakeClasses.tw
src\uncategorized\saWhore.tw
src\uncategorized\saWorkAGloryHole.tw
-src\uncategorized\salon.tw
src\uncategorized\scheduledEvent.tw
src\uncategorized\schoolroom.tw
src\uncategorized\schoolroomReport.tw
@@ -361,20 +362,20 @@ 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\seWedding.tw
-src\uncategorized\securityForceEOWReport.tw
-src\uncategorized\securityForceNamingColonel.tw
-src\uncategorized\securityForceProposal.tw
-src\uncategorized\sellSlave.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
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 7b05968e785bb97697be8285fe68b90b063f7b05..3b0667a94c35ad4c9d070eaca144ca858641472b 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -14,6 +14,8 @@ You may review your settings before clicking "Continue" to begin.
<<set $retirementAge = Math.clamp($retirementAge, 25, 120)>>
<<set $fertilityAge = variableAsNumber($fertilityAge, 13, 3, 18)>>
<<set $potencyAge = variableAsNumber($potencyAge, 13, 3, 18)>>
+<<set $PC.mother = Number($PC.mother)>>
+<<set $PC.father = Number($PC.father)>>
__''World Settings''__
@@ -467,9 +469,12 @@ Genitalia:
[[Do not take contraceptives|Intro Summary][$PC.preg = 0]]
<<elseif $PC.preg == 0>>
Contraceptives: ''off''. Can get pregnant; some scene alterations.
- [[Take contraceptives|Intro Summary][$PC.preg = -1]] | [[Too late for that|Start][$PC.preg = 10]]
-<<else>>
+ [[Take contraceptives|Intro Summary][$PC.preg = -1]] | [[Too late for that|Intro Summary][$PC.preg = 10]]
+<<elseif $PC.preg == 10>>
Contraceptives: ''pregnant''. Already pregnant; some scene alterations, more difficult reputation management, larger increase to living expenses.
+ [[Not pregnant|Intro Summary][$PC.preg = 0]] | [[Heavily pregnant|Intro Summary][$PC.preg = 43]]
+<<else>>
+ Contraceptives: ''heavily pregnant''. About to give birth; some scene alterations, more difficult reputation management, larger increase to living expenses.
[[Not pregnant|Intro Summary][$PC.preg = 0]]
<</if>>
@@ -477,13 +482,13 @@ Genitalia:
<<if $PC.pregMood == 1>>
Hormones affect mood: ''caring and motherly''. Sex scene alterations; slaves will trust you more, but may try to take advantage of your mercy.
- [[Change to no change|Intro Summary][$PC.pregMood = 0]] | [[Change to aggressive|Start][$PC.pregMood = 2]]
+ [[Change to no change|Intro Summary][$PC.pregMood = 0]] | [[Change to aggressive|Intro Summary][$PC.pregMood = 2]]
<<elseif $PC.pregMood == 0>>
Hormones affect mood: ''no change''. Vanilla setting.
- [[Change to motherly|Intro Summary][$PC.pregMood = 1]] | [[Change to aggressive|Start][$PC.pregMood = 2]]
+ [[Change to motherly|Intro Summary][$PC.pregMood = 1]] | [[Change to aggressive|Intro Summary][$PC.pregMood = 2]]
<<else>>
Hormones affect mood: ''aggressive and domineering''. Sex scene alterations; slaves will fear you more, but will become more submissive to you.
- [[Change to no change|Intro Summary][$PC.pregMood = 0]] | [[Change to motherly|Start][$PC.pregMood = 1]]
+ [[Change to no change|Intro Summary][$PC.pregMood = 0]] | [[Change to motherly|Intro Summary][$PC.pregMood = 1]]
<</if>>
<</if>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 03645963bcdbb55977c294a893ba656bcc33441c..c80108559c2e7e24ac0e9e8e1fc0717e86fa1841 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -916,6 +916,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''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.
+''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.
''anon'' added a pair of fairy PA appearances.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index dcb518b4374dde381c03cd09d03ba11221f87cc7..97e7b4a2ebcbbcb9d8222979bc134202626065ec 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1003,7 +1003,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $egyptianSlaveNames to ["Shaimaa", "Fatma", "Maha", "Farida", "Aya", "Shahd", "Ashraqat", "Sahar", "Fatin", "Dalal", "Doha", "Suha", "Rowan", "Hosniya", "Hasnaa", "Hosna", "Gamila", "Gamalat", "Habiba", "Aya", "Rania", "Sarah", "Reem", "Hoda", "Marwa", "Fatima", "Eisha", "Nesreen", "Fatoumata", "Mariam", "Aminata", "Hawa", "Awa", "Oumou", "Djeneba", "Bintou", "Fanta", "Kadiatou", "Fatima", "Khadija", "Aicha", "Malika", "Naima", "Rachida", "Nadia", "Karima", "Saida", "Mariam", "Shayma", "Khawla"]>>
-<<set $brazilianSlaveNames to ["Ana", "Amanda", "Fernanda", "Julia", "Mariana", "Camila", "leticia", "Larissa", "Beatriz", "Natália", "Thais", "Juliana", "Vitoria", "Jessica", "Luana", "Laura", "Bruna", "Rafaela", "Maria", "Isabela", "Barbara", "Carolina", "Aline", "Anna", "Brenda", "LÃvia", "Victória", "Gabrielle", "Andressa", "Maria", "Clara", "Raquel", "Daniela", "Ana", "Clara", "Marcela", "Luiza", "Giovanna", "Stephanie", "Caroline", "Raissa", "Aléxia", "Milena", "Nathalia", "Clara", "Taynara", "Sabrina", "Ana", "Luiza", "Yasmin", "Carla", "Helena"]>>
+<<set $brazilianSlaveNames to ["Ana", "Amanda", "Fernanda", "Julia", "Mariana", "Camila", "Leticia", "Larissa", "Beatriz", "Natália", "Thais", "Juliana", "Vitoria", "Jessica", "Luana", "Laura", "Bruna", "Rafaela", "Maria", "Isabela", "Barbara", "Carolina", "Aline", "Anna", "Brenda", "LÃvia", "Victória", "Gabrielle", "Andressa", "Maria", "Clara", "Raquel", "Daniela", "Ana", "Clara", "Marcela", "Luiza", "Giovanna", "Stephanie", "Caroline", "Raissa", "Aléxia", "Milena", "Nathalia", "Clara", "Taynara", "Sabrina", "Ana", "Luiza", "Yasmin", "Carla", "Helena"]>>
<<set $chineseSlaveNames to ["Ah", "Ai", "An", "Bai", "Bao", "Bi", "Bo", "Cai", "Chang", "Chao", "Chen", "Cheng", "Chin", "Chun", "Da", "Dan", "Fang", "Fen", "Fu", "Guanting", "Guanyu", "Guiying", "Guo", "Hai", "He", "Heng", "Hong", "Hua", "Huan", "Huang", "Hui", "Jia", "Jian", "Jiang", "Jie", "Jin", "Jing", "Jingyi", "Ju", "Juan", "Jun", "Kun", "Lan", "Lei", "Li", "Lian", "Lili", "Lim", "Lin", "Ling", "Mei", "Min", "Ming", "Mu", "Na", "Ni", "Ning", "Nuan", "Ping", "Qian", "Qing", "Qiong", "Qiu", "Rong", "Ru", "Shan", "Shi", "Shu", "Shufen", "Shui", "Shun", "Su", "Tai", "Ting", "Tingting", "Tu", "Wei", "Wen", "Wu", "Xia", "Xian", "Xiang", "Xiaomei", "Xiaoyan", "Xinyi", "Xiu", "Xiulan", "Xiuying", "Xue", "Xun", "Ya", "Yahui", "Yaling", "Yan", "Yang", "Yating", "Yawen", "Yazhu", "Yi", "Yijun", "Yin", "Ying", "Yong", "Yu", "Yun", "Zan", "Zedong", "Zhen", "Zheng", "Zhi", "Zhihao", "Zhong", "Zhou"]>>
@@ -1287,6 +1287,7 @@ FertilityAge($fertilityAge)
<<set $activeSlaveOneTimeMaxAge to 999>>
<<set $AgePenalty to 1>>
<<set $precociousPuberty to 0>>
+<<set $targetAge = $minimumSlaveAge>>
/% Begin mod section: toggle whether slaves lisp. %/
<<set $disableLisping to 0>>
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index 71d3ccf24966228f4c828d75efd65ae395e2e943..02f0b4c20c9eafb9c1532345a88f461f35d1d6b4 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -285,7 +285,7 @@
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
<<if $mom.addict > 0>>
- <<set $activeSlave.addict = Math.trunc($mom.addict/2)
+ <<set $activeSlave.addict = Math.trunc($mom.addict/2)>>
<</if>>
<</if>>
@@ -306,6 +306,47 @@
<<set $activeSlave.scrotom = 1>>
<</if>>
+/* Int and facial attractiveness changes to bolster eugenics and add negatives for excessive inbreeding */
+<<if $activeSlave.mother == -1 && $PC.pregSource == -1>>
+ <<set $activeSlave.face = either(2,2,2,3)>>
+ <<set $activeSlave.intelligence = either(2,2,2,2,3,3)>>
+<<elseif $activeSlave.mother == -1>>
+ <<if $activeSlave.face < 2>>
+ <<set $activeSlave.face++>>
+ <</if>>
+ <<if $activeSlave.intelligence < 2>>
+ <<set $activeSlave.intelligence++>>
+ <</if>>
+<<elseif $activeSlave.father == -1 && $mom > 0>>
+ <<if $mom.breedingMark == 1>>
+ <<set $activeSlave.face = either(2,2,2,3)>>
+ <<set $activeSlave.intelligence = either(2,2,2,2,3,3)>>
+ <<else>>
+ <<if $activeSlave.face < 2>>
+ <<set $activeSlave.face++>>
+ <</if>>
+ <<if $activeSlave.intelligence < 2>>
+ <<set $activeSlave.intelligence++>>
+ <</if>>
+ <</if>>
+<<elseif $activeSlave.father == -1>>
+ <<if $activeSlave.face < 2>>
+ <<set $activeSlave.face++>>
+ <</if>>
+ <<if $activeSlave.intelligence < 2>>
+ <<set $activeSlave.intelligence++>>
+ <</if>>
+<<else>>
+ <<set $activeSlave.face to random($mergeDad.face, $mergeMom.face)>>
+ <<if $activeSlave.face > -3 && random(1,100) < 90>>
+ <<set $activeSlave.face-->>
+ <</if>>
+ <<set $activeSlave.intelligence to random($mergeDad.intelligence, $mergeMom.intelligence)>>
+ <<if $activeSlave.intelligence > -3 && random(1,100) < 90>>
+ <<set $activeSlave.intelligence-->>
+ <</if>>
+<</if>>
+
<<set $activeSlave.corsetPiercing = 0>>
<<set $activeSlave.boobsImplant = 0>>
<<set $activeSlave.boobsImplantType = 0>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index b94c9e47d409e3aea6eb6af1fc0573afb3d0d805..bbb546e6e53e37ca253afc710801040c3537931f 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -4,6 +4,7 @@
<<set $nextButton to "Back to Main">>
<<set $nextLink to "Main">>
<<set $returnTo to "Incubator">>
+<<set $targetAge to Math.clamp($targetAge, $minimumSlaveAge, 18)>>
<<if $tanks == 0>>
<<set $tanks = [0]>>
@@ -39,17 +40,26 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
<</if>>
[[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology), $incubator += 1, $tanks.push(0)]] //Costs ¤<<print Math.trunc(60000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
+<br>
+Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimum Legal Age|Incubator][$targetAge to $minimumSlaveAge]] | [[Average Age of Fertility|Incubator][$targetAge to $fertilityAge]] | [[Average Age of Potency|Incubator][$targetAge to $potencyAge]] | [[Legal Adulthood|Incubator][$targetAge to 18]]
+//Setting will not be applied to tanks in use.//
+
<br>
<<if $incubatorUpgradeSpeed == 4>>
It has been upgraded with perfected growth accelerants; children grow at the rate of 1 week to 1 year.
+ <<set _speed = 12>>
<<elseif $incubatorUpgradeSpeed == 3>>
It has been upgraded with advanced experimental growth accelerants; children grow at the rate of 3 weeks to 1 year. [[Fund speculative research into maximizing growth rate|Incubator][$cash -= Math.trunc(500000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed to 4]] //Costs ¤<<print Math.trunc(500000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
+ <<set _speed = 9>>
<<elseif $incubatorUpgradeSpeed == 2>>
It has been upgraded with advanced growth accelerants; children grow at the rate of 6 weeks to 1 year. [[Fund research into increasing growth rate even further|Incubator][$cash -= Math.trunc(75000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed to 3]] //Costs ¤<<print Math.trunc(75000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
+ <<set _speed = 6>>
<<elseif $incubatorUpgradeSpeed == 1>>
It has been upgraded with growth accelerants; children grow at the rate of 9 weeks to 1 year. [[Further upgrade the incubators with specialized stem cells to speed growth|Incubator][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed to 2]] //Costs ¤<<print Math.trunc(30000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
+ <<set _speed = 6>>
<<else>>
The incubation tanks are basic; children grow at the rate of 12 weeks to 1 year. [[Upgrade the incubators with growth accelerating drugs|Incubator][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $incubatorUpgradeSpeed to 1]] //Costs ¤<<print Math.trunc(30000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
+ <<set _speed = 1>>
<</if>>
<br>
@@ -77,7 +87,7 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
<<if $tanks[$i] == 0>>
<br><br>Tank #<<print $i + 1>> is currently empty.
<<else>>
- <br><br>Tank #<<print $i + 1>> is currently accelerating <<print $tanks[$i].slaveName>>'s growth. She will be ready for release in $tanks[$i].growth weeks.
+ <br><br>Tank #<<print $i + 1>> is currently accelerating <<print $tanks[$i].slaveName>>'s growth. She will be ready for release in about Math.round($tanks[$i].growth/_speed) weeks.
<<if $incubatorUpgradeWeight == 1>>
<br>
<<if $incubatorWeightSetting == 1>>
@@ -108,6 +118,53 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
Reproduction management systems are offline; she will undergo normal puberty.
<</if>>
<</if>>
+ <br>
+ Choose a name for her. <<textbox "$tanks[$i].birthName" $tanks[$i].birthName "Incubator">>
+ <<if $tanks[$i].mother > 0>>
+ <<for _j to 0; _j < $slaves.length; _j++>>
+ <<if $tanks[$i].mother == $slaves[_j].ID>>
+ <<if $slaves[_j].ID == $Concubine.ID>>
+ | [[Permit your Concubine to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].relationship == -4>>
+ | [[Permit your wife to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].ID == $Bodyguard.ID>>
+ | [[Permit your bodyguard to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].ID == $HeadGirl.ID>>
+ | [[Permit your headgirl to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>>
+ | [[Permit her devoted mother to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if $tanks[$i].father > 0>>
+ <<for _j to 0; _j < $slaves.length; _j++>>
+ <<if $tanks[$i].father == $slaves[_j].ID>>
+ <<if $slaves[_j].ID == $Concubine.ID>>
+ | [[Permit your Concubine to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].relationship == -4>>
+ | [[Permit your wife to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].ID == $Bodyguard.ID>>
+ | [[Permit your bodyguard to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].ID == $HeadGirl.ID>>
+ | [[Permit your headgirl to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50 && slaves[_j].fuckdoll == 0>>
+ | [[Permit her devoted father to name her daughter|Incubator][$tanks[$i].birthName = <<ParentNames $slaves[_j], $tanks[$i]>>]]
+ <<break>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<set $tanks[$i].slaveName = $tanks[$i].birthName>>
<</if>>
<</for>>
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index b37b26652e0cbc0a2cbcd93cc1ad4612c43c8431..6d46cf2006f938803301c91d501378057b880cb5 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -1 +1,16 @@
-/*:: Incubator Report [nobr]*/
\ No newline at end of file
+:: Incubator Report [nobr]
+
+''Incubator Report''<hr style="margin:0">
+
+<<set $incubatorSlaves to 0>>
+
+<<for $i to 0; $i < $tanks.length; $i++>>
+<<if $tanks[$i] > 0>>
+ <<set $incubatorSlaves += 1>>
+<</if>>
+<</for>>
+
+<<if $incubatorSlaves == 0>>
+ ''$incubatorNameCaps is empty.''
+<</if>>
+<br><br>
diff --git a/src/pregmod/incubatorWorkaround.tw b/src/pregmod/incubatorWorkaround.tw
new file mode 100644
index 0000000000000000000000000000000000000000..7e5b0794bc529cb363005be962ced351d66b40b6
--- /dev/null
+++ b/src/pregmod/incubatorWorkaround.tw
@@ -0,0 +1,12 @@
+:: Incubator Workaround
+
+<<for _i to 0; _i < $tanks.length; _i++>>
+ <<if $tanks[_i] == 0>>
+ <<set $tanks[_i] = $activeSlave>>
+ <<set $incubatorSlaves++>>
+ <<set $tanks[_i].growth = ($targetAge*52)>>
+ <<break>>
+ <</if>>
+<</for>>
+
+<<set $activeSlave = 0>>
\ No newline at end of file
diff --git a/src/pregmod/pregmodWidgets.tw b/src/pregmod/pregmodWidgets.tw
index e58840a876624883f525795b29689ed33743e54e..5e6a50e61baabbb52da7c680ab007c25ca4af5c8 100644
--- a/src/pregmod/pregmodWidgets.tw
+++ b/src/pregmod/pregmodWidgets.tw
@@ -879,6 +879,213 @@ extremely pale -5
<</widget>>
+<<widget "ParentNames">>
+
+<<switch $args[0].nationality>>
+<<case "American">>
+ <<if $args[1].race is "black">>
+ <<set $args[1].birthName to $africanAmericanSlaveNames.random()>>
+ <<elseif $args[1].race is "latina">>
+ <<set $args[1].birthName to $latinaSlaveNames.random()>>
+ <<elseif $args[1].race is "asian">>
+ <<set $args[1].birthName to $asianAmericanSlaveNames.random()>>
+ <<elseif $args[1].race is "middle eastern">>
+ <<set $args[1].birthName to $egyptianSlaveNames.random()>>
+ <<else>>
+ <<set $args[1].birthName to $whiteAmericanSlaveNames.random()>>
+ <</if>>
+<<case "Canadian">>
+ <<set $args[1].birthName to $canadianSlaveNames.random()>>
+<<case "Mexican">>
+ <<set $args[1].birthName to $mexicanSlaveNames.random()>>
+<<case "Dominican">>
+ <<set $args[1].birthName to $dominicanSlaveNames.random()>>
+<<case "Puerto Rican">>
+ <<set $args[1].birthName to $puertoRicanSlaveNames.random()>>
+<<case "Haitian">>
+ <<set $args[1].birthName to $haitianSlaveNames.random()>>
+<<case "Jamaican">>
+ <<set $args[1].birthName to $jamaicanSlaveNames.random()>>
+<<case "Cuban">>
+ <<set $args[1].birthName to $cubanSlaveNames.random()>>
+<<case "Guatemalan">>
+ <<set $args[1].birthName to $guatemalanSlaveNames.random()>>
+<<case "Chilean">>
+ <<set $args[1].birthName to $chileanSlaveNames.random()>>
+<<case "Peruvian">>
+ <<set $args[1].birthName to $peruvianSlaveNames.random()>>
+<<case "Bolivian">>
+ <<set $args[1].birthName to $bolivianSlaveNames.random()>>
+<<case "Venezuelan">>
+ <<set $args[1].birthName to $venezuelanSlaveNames.random()>>
+<<case "Belarusian">>
+ <<set $args[1].birthName to $belarusianSlaveNames.random()>>
+<<case "Russian">>
+ <<set $args[1].birthName to $russianSlaveNames.random()>>
+<<case "Ukrainian">>
+ <<set $args[1].birthName to $ukrainianSlaveNames.random()>>
+<<case "Italian">>
+ <<set $args[1].birthName to $italianSlaveNames.random()>>
+<<case "Spanish">>
+ <<set $args[1].birthName to $spanishSlaveNames.random()>>
+<<case "British">>
+ <<set $args[1].birthName to $britishSlaveNames.random()>>
+<<case "Scottish">>
+ <<set $args[1].birthName to $scottishSlaveNames.random()>>
+<<case "French">>
+ <<set $args[1].birthName to $frenchSlaveNames.random()>>
+<<case "German">>
+ <<set $args[1].birthName to $germanSlaveNames.random()>>
+<<case "Lithuanian">>
+ <<set $args[1].birthName to $lithuanianSlaveNames.random()>>
+<<case "Norwegian">>
+ <<set $args[1].birthName to $norwegianSlaveNames.random()>>
+<<case "Slovak">>
+ <<set $args[1].birthName to $slovakSlaveNames.random()>>
+<<case "Danish">>
+ <<set $args[1].birthName to $danishSlaveNames.random()>>
+<<case "Dutch">>
+ <<set $args[1].birthName to $dutchSlaveNames.random()>>
+<<case "Austrian">>
+ <<set $args[1].birthName to $austrianSlaveNames.random()>>
+<<case "Swiss">>
+ <<set $args[1].birthName to $swissSlaveNames.random()>>
+<<case "Serbian">>
+ <<set $args[1].birthName to $serbianSlaveNames.random()>>
+<<case "Belgian">>
+ <<set $args[1].birthName to $belgianSlaveNames.random()>>
+<<case "Czech">>
+ <<set $args[1].birthName to $czechSlaveNames.random()>>
+<<case "Portuguese">>
+ <<set $args[1].birthName to $portugueseSlaveNames.random()>>
+<<case "Swedish">>
+ <<set $args[1].birthName to $swedishSlaveNames.random()>>
+<<case "Romanian">>
+ <<set $args[1].birthName to $romanianSlaveNames.random()>>
+<<case "Hungarian">>
+ <<set $args[1].birthName to $hungarianSlaveNames.random()>>
+<<case "Estonian">>
+ <<set $args[1].birthName to $estonianSlaveNames.random()>>
+<<case "Irish">>
+ <<set $args[1].birthName to $irishSlaveNames.random()>>
+<<case "Icelandic">>
+ <<set $args[1].birthName to $icelandicSlaveNames.random()>>
+<<case "Finnish">>
+ <<set $args[1].birthName to $finnishSlaveNames.random()>>
+<<case "Greek">>
+ <<set $args[1].birthName to $greekSlaveNames.random()>>
+<<case "Polish">>
+ <<set $args[1].birthName to $polishSlaveNames.random()>>
+<<case "Brazilian">>
+ <<set $args[1].birthName to $brazilianSlaveNames.random()>>
+<<case "Egyptian">>
+ <<set $args[1].birthName to $egyptianSlaveNames.random()>>
+<<case "Colombian">>
+ <<set $args[1].birthName to $colombianSlaveNames.random()>>
+<<case "Argentinian">>
+ <<set $args[1].birthName to $argentinianSlaveNames.random()>>
+<<case "Turkish">>
+ <<set $args[1].birthName to $turkishSlaveNames.random()>>
+<<case "Iranian">>
+ <<set $args[1].birthName to $iranianSlaveNames.random()>>
+<<case "Armenian">>
+ <<set $args[1].birthName to $armenianSlaveNames.random()>>
+<<case "Israeli">>
+ <<set $args[1].birthName to $israeliSlaveNames.random()>>
+<<case "Saudi">>
+ <<set $args[1].birthName to $saudiSlaveNames.random()>>
+<<case "South African">>
+ <<if $args[1].race is "black">>
+ <<set $args[1].birthName to $blackSouthAfricanSlaveNames.random()>>
+ <<else>>
+ <<set $args[1].birthName to $whiteSouthAfricanSlaveNames.random()>>
+ <</if>>
+<<case "Nigerian">>
+ <<set $args[1].birthName to $nigerianSlaveNames.random()>>
+<<case "Congolese">>
+ <<set $args[1].birthName to $congoleseSlaveNames.random()>>
+<<case "Kenyan">>
+ <<set $args[1].birthName to $kenyanSlaveNames.random()>>
+<<case "Tanzanian">>
+ <<set $args[1].birthName to $tanzanianSlaveNames.random()>>
+<<case "Zimbabwean">>
+ <<if $args[1].race == "white">>
+ <<set $args[1].birthName to $britishSlaveNames.random()>>
+ <<else>>
+ <<set $args[1].birthName to $zimbabweanSlaveNames.random()>>
+ <</if>>
+<<case "Ghanan">>
+ <<set $args[1].birthName to $ghananSlaveNames.random()>>
+<<case "Ugandan">>
+ <<set $args[1].birthName to $ugandanSlaveNames.random()>>
+<<case "Ethiopian">>
+ <<set $args[1].birthName to $ethiopianSlaveNames.random()>>
+<<case "Moroccan">>
+ <<set $args[1].birthName to $moroccanSlaveNames.random()>>
+<<case "Chinese">>
+ <<set $args[1].birthName to $chineseSlaveNames.random()>>
+<<case "Korean">>
+ <<set $args[1].birthName to $koreanSlaveNames.random()>>
+<<case "Thai">>
+ <<set $args[1].birthName to $thaiSlaveNames.random()>>
+<<case "Vietnamese">>
+ <<set $args[1].birthName to $vietnameseSlaveNames.random()>>
+<<case "Japanese">>
+ <<set $args[1].birthName to $japaneseSlaveNames.random()>>
+<<case "Indonesian">>
+ <<set $args[1].birthName to $indonesianSlaveNames.random()>>
+<<case "Filipina">>
+ <<set $args[1].birthName to $filipinaSlaveNames.random()>>
+<<case "Bangladeshi">>
+ <<set $args[1].birthName to $bangladeshiSlaveNames.random()>>
+<<case "Malaysian">>
+ <<set $args[1].birthName to $malaysianSlaveNames.random()>>
+<<case "Uzbek">>
+ <<set $args[1].birthName to $uzbekSlaveNames.random()>>
+<<case "Afghan">>
+ <<set $args[1].birthName to $afghanSlaveNames.random()>>
+<<case "Nepalese">>
+ <<set $args[1].birthName to $nepaleseSlaveNames.random()>>
+<<case "Burmese">>
+ <<set $args[1].birthName to $burmeseSlaveNames.random()>>
+<<case "Iraqi">>
+ <<set $args[1].birthName to $iraqiSlaveNames.random()>>
+<<case "Yemeni">>
+ <<set $args[1].birthName to $yemeniSlaveNames.random()>>
+<<case "Sudanese">>
+ <<set $args[1].birthName to $sudaneseSlaveNames.random()>>
+<<case "Algerian">>
+ <<set $args[1].birthName to $algerianSlaveNames.random()>>
+<<case "Tunisian">>
+ <<set $args[1].birthName to $tunisianSlaveNames.random()>>
+<<case "Libyan">>
+ <<set $args[1].birthName to $libyanSlaveNames.random()>>
+<<case "Omani">>
+ <<set $args[1].birthName to $omaniSlaveNames.random()>>
+<<case "Malian">>
+ <<set $args[1].birthName to $malianSlaveNames.random()>>
+<<case "Jordanian">>
+ <<set $args[1].birthName to $jordanianSlaveNames.random()>>
+<<case "Lebanese">>
+ <<set $args[1].birthName to $lebaneseSlaveNames.random()>>
+<<case "Emirati">>
+ <<set $args[1].birthName to $emiratiSlaveNames.random()>>
+<<case "Kazakh">>
+ <<set $args[1].birthName to $kazakhSlaveNames.random()>>
+<<case "Pakistani">>
+ <<set $args[1].birthName to $pakistaniSlaveNames.random()>>
+<<case "Indian">>
+ <<set $args[1].birthName to $indianSlaveNames.random()>>
+<<case "Australian">>
+ <<set $args[1].birthName to $australianSlaveNames.random()>>
+<<case "a New Zealander">>
+ <<set $args[1].birthName to $newZealanderSlaveNames.random()>>
+<<default>>
+ <<set $args[1].birthName to $whiteAmericanSlaveNames.random()>>
+<</switch>>
+
+<</widget>>
+
<<widget "Family">>
/*testtest PC parent passage - determines if the current slave is your mother or father*/
@@ -1550,8 +1757,7 @@ extremely pale -5
<</if>>
<<set $children = []>>
-/*
-/*testtest brother - determines how many brothers a slave has*/
+/*testtest brother - determines how many brothers a slave has
<<for $i to 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].ID != $activeSlave.ID>>
<<if areSisters($activeSlave, $slaves[$i]) == 2 && $slaves[$i].dick > 0 && $slaves[$i].vagina == -1>>
@@ -1600,8 +1806,7 @@ extremely pale -5
<</if>>
<<set $children = []>>
-/*
-/*testtest half-brother - determines how many half-brothers a slave has*/
+/*testtest half-brother - determines how many half-brothers a slave has
<<for $i to 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].ID != $activeSlave.ID>>
<<if areSisters($activeSlave, $slaves[$i]) == 3 && $slaves[$i].dick > 0 && $slaves[$i].vagina == -1>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 40df45481a541f3e298770476bdf9efaffeaf404..c023652110cd8de82b169f3fb4ac24d82960fd5c 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -3,6 +3,9 @@
<<set $nextButton to "Continue">>
<<set $nextLink to "Scheduled Event">>
+<<set _gaveBirth = 0>>
+<<set _PCDegree = 0>>
+
/*
PC.pregSource documentation
0 - unknown
@@ -107,20 +110,47 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<</if>>
<</if>>
-<br><br>
+<<if _gaveBirth == 0>>
+
+<<display "Generate Child">>
+
+<<if $activeSlave.race == $PC.race>>
+ <<set _PCDegree++>>
+<</if>>
+<<if $activeSlave.hColor == $PC.hColor>>
+ <<set _PCDegree++>>
+<</if>>
+<<if $activeSlave.skin == $PC.skin>>
+ <<set _PCDegree++>>
+<</if>>
+<<if $activeSlave.eyeColor == $PC.eyeColor>>
+ <<set _PCDegree++>>
+<</if>>
+
+Your little <<if $babyGender == 1>>girl<<else>>boy<</if>>
+<<if _PCDegree == 4>>
+ looks just like you; she will likely grow up to closely resemble yourself.
+<<elseif $activeSlave.eyeColor == $PC.eyeColor>>
+ has your lovely $PC.eyeColor eyes.
+<<elseif _PCDegree > 0>>
+ looks a little like you, enough that <<if $babyGender == 1>>she<<else>>he<</if>>'ll be recognizable as yours.
+<<else>>
+ looks nothing like you; it's hard to believe <<if $babyGender == 1>>she's your daughter<<else>>he's you son<</if>>
+<</if>>
+
<<if $PC.pregSource > 0>>
<<for $i to 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].ID == $PC.pregSource>>
Rumors spread that your child was fathered by a slave, @@color:red;harming your lasting reputation.@@
<<set $PC.degeneracy += 20>>
<<if $arcologies[0].FSSupremacist != "unset">>
- <<if $slaves[$i].race != $arcologies[0].FSSupremacistRace>>
+ <<if $activeSlave.race != $arcologies[0].FSSupremacistRace>>
Furthermore, word is that your child was not $arcologies[0].FSSupremacistRace, @@color:red;hurting your lasting reputation.@@
<<set $PC.degeneracy += 10>>
<</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
- <<if $slaves[$i].race == $arcologies[0].FSSubjugationistRace>>
+ <<if $activeSlave.race == $arcologies[0].FSSubjugationistRace>>
In addition, there is a nasty rumor that you gave birth to a $arcologies[0].FSSubjugationistRace child, @@color:red;devastating your lasting reputation.@@
<<set $PC.degeneracy += 50>>
<</if>>
@@ -130,14 +160,21 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<</if>>
<br><br>
-Now you are faced with a decision of what to do with your new child. You're far too busy to keep it yourself, but you could @@color:orange;send your <<if $babyGender == 1>>daughter<<else>>son<</if>> to a boarding school to be raised until they are of age to serve as your heir.@@ The other option is to @@color:orange;send them to become a slave at a slave orphanage.@@<<if $Cash4Babies == 1>> Alternatively, since it is @@color:orange;legal to sell slave babies@@, your child should be worth quite a pretty ¤ at auction.<</if>>
+Now you are faced with a decision of what to do with your new child. You're far too busy to keep it yourself, but you could @@color:orange;send your <<if $babyGender == 1>>daughter<<else>>son<</if>> to a boarding school to be raised until they are of age to serve as your heir.@@ The other option is to @@color:orange;send them to become a slave at a slave orphanage.@@<<if $Cash4Babies == 1>> Alternatively, since it is @@color:orange;legal to sell slave babies@@, your child should be worth quite a pretty ¤ at auction.<</if>><<if $incubator > 0>><<if $incubator > $incubatorSlaves>> An incubation tank is empty and ready to accept a child, should you wish to @@color:orange;keep your child as a slave@@<<else>>All the incubation tanks are occupied; there is no room for your newborn child<</if>>.<</if>>
<br><br>
<span id="choice">What will it be?
<br>
-<<click "Boarding School">><<replace "#choice">><<print "You have decided to send them away to be raised in your stead.">><</replace>><</click>> | <<click "Slave Orphanage">><<replace "#choice">><<print "You have decided to send them to a slave orphanage to be raised to $minimumSlaveAge and sold. Perhaps you'll even see them again, though you are unlikely to recognize them if you do.">><</replace>><</click>><<if $Cash4Babies == 1>> | <<click "Auction Them">><<replace "#choice">><<print "You send the child to be sold at auction amongst other prestigious slaves. The winning big for your offspring came in at @@color:yellowgreen;¤<<print 1000*$seed>>.@@">><</replace>><<set $cash += 1000*$seed>><</click>><</if>></span>
+<<click "Boarding School">><<replace "#choice">><<print "You have decided to send them away to be raised in your stead.">><</replace>><</click>> |
+<<click "Slave Orphanage">><<replace "#choice">><<print "You have decided to send them to a slave orphanage to be raised to $minimumSlaveAge and sold. Perhaps you'll even see them again, though you are unlikely to recognize them if you do.">><</replace>><</click>>
+<<if $Cash4Babies == 1>> | <<click "Auction Them">><<replace "#choice">><<print "You send the child to be sold at auction amongst other prestigious slaves. The winning big for your offspring came in at @@color:yellowgreen;¤<<print 1000*$seed>>.@@">><</replace>><<set $cash += 1000*$seed>><</click>><</if>>
+<<if $incubator > $incubatorSlaves>>
+ | <<click "Incubation">><<replace "#choice">><<print "You place the child into an incubation chamber to be aged until they can legally serve as your slave.">><</replace>><<display "Incubator Workaround">><</click>>
<</if>>
+</span>
+
+<</if>> /*closes gaveBirth*/
+<</if>> /*closes SE*/
<<set $badBirth = 0>>
<<set $PC.pregSource = 0>>
-<<set $seed = 0>>
-
+<<set $seed = 0>>
\ No newline at end of file
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 4799a53a35fa873a4cfabfe18121f8a61b0dba28..a216f1dc92135cdff0fea82e1c211b44ed990f29 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -31,9 +31,20 @@
<<for $i to 0; $i < $slaves.length; $i++>>
<<if ($slaves[$i].ID is $DJ.ID)>>
<<silently>>
- <<display "SA long term effects">>
- <<display "SA relationships">>
- <<display "SA rivalries">>
+ <<display [[SA serve the public]]>>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<set $slaves[$i].devotion -= 5>>
+ <<else>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
<</silently>>
<<if ($slaves[$i].health < -80)>>
<<set $slaves[$i].health += 20>>
@@ -69,7 +80,7 @@
<<break>>
<</if>>
<</for>>
-$DJ.slaveName is serving as the DJ.<<if $DJ.relationship is -3>> She tries her best to be your energetic, cheerful wife.<</if>>
+$DJ.slaveName is performing as the DJ.<<if $DJ.relationship is -3>> She tries her best to be your energetic, cheerful wife.<</if>>
<<if ($DJFetish == 1)>>
She's expected to be the innovative, beautiful DJ spinning beats one minute, and come out of her booth to grind on the floor the next; she enjoys the interplay, and finds greater @@color:lightcoral;pleasure in exhibitionism.@@
<<elseif ($DJFetish == 2)>>
@@ -150,10 +161,20 @@ $DJ.slaveName is serving as the DJ.<<if $DJ.relationship is -3>> She tries her
<<set $legendaryWombID to $slaves[$i].ID>>
<</if>>
<<silently>>
- <<display [[SA serve the public]]>>
- <<display "SA long term effects">>
- <<display "SA relationships">>
- <<display "SA rivalries">>
+ <<display [[SA serve the public]]>>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<set $slaves[$i].devotion -= 5>>
+ <<else>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
<</silently>>
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
<<set $slaves[$i].devotion -= 5>>
@@ -264,4 +285,101 @@ $DJ.slaveName is serving as the DJ.<<if $DJ.relationship is -3>> She tries her
''Business in $clubName is normal.''
<<set $clubSpots to $club>>
<</if>>
+
+<<if ($DJ != 0)>>
+ <br><br>
+<<for $i to 0; $i < $slaves.length; $i++>>
+<<if ($slaves[$i].ID is $DJ.ID)>>
+ <<if $showEWD == 0>>
+ <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryEntertainerID to $slaves[$i].ID>>
+ <</if>>
+ <<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryWombID to $slaves[$i].ID>>
+ <</if>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is performing as the DJ in the club.<br>
+ <<silently>>
+ <<display [[SA serve the public]]>>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <</silently>>
+ <<else>>
+ <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryEntertainerID to $slaves[$i].ID>>
+ <</if>>
+ <<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryWombID to $slaves[$i].ID>>
+ <</if>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is performing as the DJ in the club.
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <br>
+ <<display "SA devotion">>
+ <br><br>
+ <</if>>
+<</if>>
+<</for>>
+<<else>>
+ <br><br>
+<</if>>
+
+<<if ($clubSlaves > 0)>>
+<<for $i to 0; $i < $slaves.length; $i++>>
+<<if ($slaves[$i].assignment is "serve in the club")>>
+ <<if $showEWD == 0>>
+ <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryEntertainerID to $slaves[$i].ID>>
+ <</if>>
+ <<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryWombID to $slaves[$i].ID>>
+ <</if>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving in the club.<br>
+ <<silently>>
+ <<display [[SA serve the public]]>>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <</silently>>
+ <<else>>
+ <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryEntertainerID to $slaves[$i].ID>>
+ <</if>>
+ <<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
+ <<set $legendaryWombID to $slaves[$i].ID>>
+ <</if>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__''
+ <<display [[SA serve the public]]>>
+ <br>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <br>
+ <<display "SA devotion">>
+ <br><br>
+ <</if>>
+<</if>>
+<</for>>
+<</if>>
<br><br>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index b0d222638dce947e0a7217380b72c67127abb0bd..70359ccc9c0bce68c4cf0a1a2a1a954f0cc55d6d 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1565,15 +1565,21 @@ and
The proportions of $possessive arms and legs are odd, as though they have been surgically shortened.
<</if>>
-<<if $activeSlave.muscles > 5>>
$pronounCap is
<<if $activeSlave.muscles > 95>>
@@color:pink;extremely muscular,@@ with defined pecs, powerful glutes, and massive traps.
<<elseif $activeSlave.muscles > 30>>
@@color:pink;quite muscular,@@ with ripped abs, strong shoulders, and defined lats.
-<<else>>
+<<elseif $activeSlave.muscles > 5>>
@@color:pink;well built,@@ yet feminine, with just-visible muscles.
-<</if>>
+<<elseif $activeSlave.muscles > -6>>
+ @@color:pink;soft and feminine,@@ with no visible muscles.
+<<elseif $activeSlave.muscles > -31>>
+ @@color:red;rather weak,@@ with barely any muscles.
+<<elseif $activeSlave.muscles > -96>>
+ @@color:red;very weak;@@ she struggles with day-to-day tasks.
+<<else>>
+ @@color:red;frail;@@ she can barely hold herself up.
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index b5b113e58b2a798c69d7a7c7e1005c1bbf5fb5e4..a3061369951d1af64aef9a226c86eb88f7d7d65b 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -21,7 +21,7 @@ Seated at your desk, you glance at the visual representation of $assistantName,
<<if $assistant > 0>>
<<if $assistantPower > 0>>
<br><br>
- Though <<if $assistant == 0>>it<<else>>she<</if>> remains short of a true AI, the arcology's upgraded computer core allows <<if $assistant == 0>>it<<else>>she<</if>> to use brute force to simulate sentient behavior quite well. <<if $assistant == 0>>It<<else>>She<</if>> is not truly self aware, but <<if $assistant == 0>>it<<else>>she<</if>> is able to predict what a sentient being with a certain character might say or do in common situations. The increased power has other applications; for example, it has improved the accuracy of your estimates of economic activity in the Free City.
+ Though <<if $assistant == 0>>it<<else>>she<</if>> remains short of a true AI, the arcology's upgraded computer core allows <<if $assistant == 0>>it<<else>>her<</if>> to use brute force to simulate sentient behavior quite well. <<if $assistant == 0>>It<<else>>She<</if>> is not truly self aware, but <<if $assistant == 0>>it<<else>>she<</if>> is able to predict what a sentient being with a certain character might say or do in common situations. The increased power has other applications; for example, it has improved the accuracy of your estimates of economic activity in the Free City.
<<else>>
<<if $assistant == 0>>It<<else>>She<</if>> is well short of a true AI, but with extensive access to information on past human behavior and the processing power to query that information quickly, <<if $assistant == 0>>it<<else>>she<</if>> can often seem self aware by modeling herself after others' past behavior.
<</if>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index d366f08c7f2e1ccee9063546dc7aa28267eeeb8a..24432000502b96568cde66109ac266fb80b91012 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -307,7 +307,9 @@ She uses her extra time and @@color:yellowgreen;recruitment allowance@@ this wee
<</if>>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
- <<if $slaves[$i].preg < 6>>
+ <<if $slaves[$i].preg > 5 && $slaves[$i].breedingMark == 1>>
+ <<set _seed += 4, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>>
+ <<elseif $slaves[$i].preg < 6>>
<<if ($slaves[$i].ovaries == 0 && $slaves[$i].balls == 0)>>
<<set _seed += 4, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>>
<<elseif ($slaves[$i].ovaries == 0 || $slaves[$i].balls == 0)>>
@@ -491,7 +493,9 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els
<</if>>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
- <<if $slaves[$i].preg < 6>>
+ <<if $slaves[$i].preg > 5 && $slaves[$i].breedingMark == 1>>
+ She prominently displays her pregnancy and the mark branded upon it signifying the superior child growing within her. Her audience is enamoured by her distinct status.
+ <<elseif $slaves[$i].preg < 6>>
<<if ($slaves[$i].dick > 0 && $slaves[$i].balls == 0)>>
She makes sure to wear tight fitting clothes to show off the bulge of her dick and, most notably, the lack of testicles under it in all her photoshoots.
<<elseif ($slaves[$i].vaginalAccessory == "chastity belt" || $slaves[$i].dickAccessory == "chastity" || $slaves[$i].vaginalAccessory == "combined chastity" || $slaves[$i].dickAccessory == "combined chastity")>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index f38550fb0457dc1a66f72c8d5c1a3fd0e3e3f711..0b149e8f16a8f9e9d09947fbd410b2af4bb9a4a7 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -1557,6 +1557,13 @@ Release rules: _Slave.releaseRules.
Musc+
<<elseif _Slave.muscles > 5>>
Toned
+<<elseif _Slave.muscles > -6>>
+<<elseif _Slave.muscles > -31>>
+ @@color:red;weak@@
+<<elseif _Slave.muscles > -96>>
+ @@color:red;weak+@@
+<<else>>
+ @@color:red;weak++@@
<</if>>
<<if _Slave.amp != 0>>
<<if _Slave.amp == -1>>
@@ -1769,6 +1776,13 @@ _Slave.faceShape face.
Muscular.
<<elseif _Slave.muscles > 5>>
Toned.
+<<elseif _Slave.muscles > -6>>
+<<elseif _Slave.muscles > -31>>
+ @@color:red;Weak.@@
+<<elseif _Slave.muscles > -96>>
+ @@color:red;Very weak.@@
+<<else>>
+ @@color:red;Frail.@@
<</if>>
<<if _Slave.amp != 0>>
<<if _Slave.amp == -1>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 77774d06aa2b6d0acbabd60efcab2efe65622abd..b750f259642930cefb69322f3d655458a0bb1528 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -2608,10 +2608,10 @@ $pronounCap's got a
$activeSlave.slaveName's
<<if ($activeSlave.dick > 5) and canAchieveErection($activeSlave) && ($activeSlave.devotion > 20)>>
erection is so big that closing $possessive jean cutoffs is hopeless. $pronounCap's got $possessive fly unbuttoned and $possessive dick sticking out proudly.
- <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- jean cutoffs are pretty brief, but decently cover $possessive cock and pussy.
<<elseif $activeSlave.dick > 5>>
jean cutoffs are pretty brief, and $possessive huge cock sticks out, trapped against one leg.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ jean cutoffs are pretty brief, but decently cover $possessive cock and pussy.
<<elseif $activeSlave.dick > 0>>
jean cutoffs are pretty brief, but decently cover $possessive cock.
<<else>>
@@ -2619,12 +2619,12 @@ $pronounCap's got a
<</if>>
<<case "a slave gown">>
$activeSlave.slaveName's
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- hermaphroditic genitalia are hidden by $possessive lovely gown.
- <<elseif $activeSlave.dick > 6>>
+ <<if $activeSlave.dick > 6>>
lovely gown cannot hide the fact that something massive is lurking between $possessive legs.
<<elseif $activeSlave.dick > 3>>
cock tents the front of $possessive lovely gown.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ hermaphroditic genitalia are hidden by $possessive lovely gown.
<<elseif $activeSlave.dick > 0>>
cock is hidden by $possessive lovely gown.
<<else>>
@@ -2632,10 +2632,10 @@ $pronounCap's got a
<</if>>
<<case "a halter top dress">>
$activeSlave.slaveName's
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- hermaphroditic genitalia are hidden by $possessive beautiful halter top dress.
- <<elseif $activeSlave.dick > 3>>
+ <<if $activeSlave.dick > 3>>
cock tents the front of $possessive beautiful halter top dress.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ hermaphroditic genitalia are hidden by $possessive beautiful halter top dress.
<<elseif $activeSlave.dick > 0>>
cock is hidden by $possessive beautiful halter top dress.
<<else>>
@@ -2643,10 +2643,10 @@ $pronounCap's got a
<</if>>
<<case "a ball gown">>
$activeSlave.slaveName's
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- hermaphroditic genitalia are hidden by $possessive fabulous silken ball gown.
- <<elseif $activeSlave.dick > 3>>
+ <<if $activeSlave.dick > 3>>
cock tents the front of $possessive fabulous silken ball gown.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ hermaphroditic genitalia are hidden by $possessive fabulous silken ball gown.
<<elseif $activeSlave.dick > 0>>
cock is hidden by $possessive fabulous silken ball gown.
<<else>>
@@ -2654,10 +2654,10 @@ $pronounCap's got a
<</if>>
<<case "slutty business attire">>
$activeSlave.slaveName's
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- hermaphroditic genitalia are barely hidden by $possessive skirt.
- <<elseif $activeSlave.dick > 3>>
+ <<if $activeSlave.dick > 3>>
dickhead dangles down beneath the hem of $possessive short skirt.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ hermaphroditic genitalia are barely hidden by $possessive skirt.
<<elseif $activeSlave.dick > 0>>
cock is barely hidden by $possessive skirt.
<<else>>
@@ -2665,10 +2665,10 @@ $pronounCap's got a
<</if>>
<<case "nice business attire">>
$activeSlave.slaveName's
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- hermaphroditic genitalia are decently hidden by $possessive skirt.
- <<elseif $activeSlave.dick > 3>>
+ <<if $activeSlave.dick > 3>>
conservative skirt bulges forward in front.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ hermaphroditic genitalia are decently hidden by $possessive skirt.
<<elseif $activeSlave.dick > 0>>
conservative skirt gives no hint of the cock behind it.
<<else>>
@@ -2693,12 +2693,12 @@ $pronounCap's got a
latex encased pussy is just waiting to be exposed through $possessive crotch zipper.
<</if>>
<<case "a military uniform">>
- <<if ($activeSlave.dick > 0) and ($activeSlave.vagina > -1)>>
+ <<if $activeSlave.dick > 3>>
+ $activeSlave.slaveName's uniform skirt bulges forward in front.
+ <<elseif ($activeSlave.dick > 0) and ($activeSlave.vagina > -1)>>
$activeSlave.slaveName's hermaphroditic genitalia are decently hidden by $possessive skirt.
<<elseif $activeSlave.vagina > -1>>
$activeSlave.slaveName's uniform skirt gives no hint of the pussy behind it.
- <<elseif $activeSlave.dick > 3>>
- $activeSlave.slaveName's uniform skirt bulges forward in front.
<<elseif $activeSlave.dick > 0>>
$activeSlave.slaveName's uniform skirt gives no hint of the cock behind it.
<</if>>
@@ -2750,10 +2750,10 @@ $pronounCap's got a
<</if>>
<<case "a slutty maid outfit">>
$activeSlave.slaveName's
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- hermaphroditic genitalia are poorly concealed by $possessive short apron.
- <<elseif $activeSlave.dick > 3>>
+ <<if $activeSlave.dick > 3>>
cockhead dangles down beneath the hem of $possessive short apron.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ hermaphroditic genitalia are poorly concealed by $possessive short apron.
<<elseif $activeSlave.dick > 0>>
cock is barely concealed by $possessive short apron.
<<else>>
@@ -2769,20 +2769,20 @@ $pronounCap's got a
pussy is protected by $possessive functional apron.
<</if>>
<<case "a nice nurse outfit">>
- <<if ($activeSlave.dick > 0) and ($activeSlave.vagina > -1)>>
- $activeSlave.slaveName's hermaphroditic genitalia are decently hidden by $possessive trousers.
- <<elseif $activeSlave.dick > 3>>
+ <<if $activeSlave.dick > 3>>
$activeSlave.slaveName's trousers bulge forward in front.
+ <<elseif ($activeSlave.dick > 0) and ($activeSlave.vagina > -1)>>
+ $activeSlave.slaveName's hermaphroditic genitalia are decently hidden by $possessive trousers.
<<elseif $activeSlave.dick > 0>>
$activeSlave.slaveName's trousers give no hint of the cock behind it.
<<elseif $activeSlave.vagina > -1>>
$activeSlave.slaveName's trousers give no hint of the pussy behind it.
<</if>>
<<case "a slutty nurse outfit">>
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
- $activeSlave.slaveName's skirt is tight enough to reveal the outline of the hermaphroditic genitalia behind it.
- <<elseif $activeSlave.dick > 3>>
+ <<if $activeSlave.dick > 3>>
$activeSlave.slaveName's skirt is tight enough to reveal the massive outline of $possessive dick behind it.
+ <<elseif ($activeSlave.dick > 0) && ($activeSlave.vagina > -1)>>
+ $activeSlave.slaveName's skirt is tight enough to reveal the outline of the hermaphroditic genitalia behind it.
<<elseif $activeSlave.dick > 0>>
$activeSlave.slaveName's skirt is tight enough to reveal the outline of $possessive dick behind it.
<<elseif $activeSlave.vagina > -1>>