diff --git a/readme.txt b/readme.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c74150439d90cf2e3d2f7bbc5b1c11d074bffd6c
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1,31 @@
+How to mod (basic doc):
+
+1. All sources now in the src subdir, in separate files. 1 passage = 1 file.
+
+2. Special files and dir's:
+ - src/config - configuration of the story is here.
+ - src/config/start.tw - contains list of .tw passage files, regenerated automatic, by building scripts. Do not change by hands. (origial passage Start from pregmod renamed and moved to src/events/intro/introSummary.tw)
+ - src/js/storyJS.tw - special passage with [script] tag - contain all native JavaScript from pregmod.
+ - devTools/tweeGo/targets/sugarcube-2/userlib.js - on original FC JS moved here (I deleted it after moving JS to storyJS.tw). Compare to storyJS.tw but do not copy file here. May conflict with src/js/storyJS.tw if copied.
+ - src/pregmod - I put all pregmod-only passages here.
+ - .gitignore - special file for git - to ignore some files. For example - compilation results or this file.
+
+3. Compilation:
+
+ Windows:
+ Run compile.bat - result will be file bin/FC.html
+ 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.
+
+4. Simple comparing and merging with original FC:
+
+ Use meld tool. Place folder FreeCities (original FC sources tree) near FreeCitiesPregmod (this sources tree) and use command:
+ meld FreeCities FreeCitiesPregmod
+ or just select these folders in meld's GUI.
+
+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
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6bd775c5ec7bf11b4bd2af2f2a00998fdb330aa3
--- /dev/null
+++ b/slave variables documentation - Pregmod.txt
@@ -0,0 +1,2122 @@
+
+**anything labeled accepts string will return any string entered into it**
+
+slaveName:
+
+Slave's current name
+accepts string
+
+birthName:
+
+slave's original name
+accepts string
+
+weekAcquired:
+
+game week slave was acquired
+accepts int
+
+origin:
+
+slave's origin
+accepts string
+
+career:
+
+career prior to enlavement
+accepts string
+
+$gratefulCareers
+"unemployed"
+"a prisoner"
+"a refugee"
+"homeless"
+"a street urchin"
+"a sweatshop worker"
+"a child soldier"
+"an orphan"
+"a student from a boarding school"
+"a beggar"
+"a pick-pocket"
+"from a lower class family"
+"a shut-in"
+
+$menialCareers
+"an athlete"
+"an apprentice"
+"a courier"
+"an engineer"
+"a mechanic"
+"a pilot"
+"a ride attendant"
+"an arcade attendant"
+"a dropout"
+"a mail carrier"
+"a student from a private school"
+"a fisherwoman"
+"a truck driver"
+"a factory worker"
+"a farm laborer"
+"a cook"
+"a service worker"
+"a paper girl"
+"a part-time farm laborer"
+"a maid", "a housewife"
+"a student"
+"from an upper class family"
+"a programmer"
+"a student from a public school"
+"from a middle class family"
+"a nun"
+"being homeschooled by her parents"
+"a housesitter"
+"a babysitter"
+"a handmaiden"
+
+$entertainmentCareers
+"a party girl"
+"a racing driver"
+"a child actress"
+"a camgirl"
+"an actress"
+"a journalist"
+"a writer"
+"a local news anchor"
+"a weathergirl"
+"a camwhore"
+"a cocktail waitress"
+"a cheerleader"
+"a waitress"
+
+$whoreCareers
+"a prostitute"
+"a child prostitute"
+"a stripper"
+"a saleswoman"
+"a criminal"
+"a porn star"
+"a trophy wife"
+"a Futanari Sister"
+"a model"
+"a juvenile delinquent"
+"a mistress"
+"a serial divorcee"
+"a pageant star"
+
+$HGCareers
+"a lawyer"
+"a military officer"
+"a politician"
+"a model-UN star"
+"a student council president"
+
+$recruiterCareers
+"a military recruiter"
+"a club recruiter"
+"a college scout"
+"a girl scout"
+
+$madamCareers
+"a procuress"
+"a pimp"
+"a business owner"
+"a manager"
+
+$DJCareers
+"a dancer"
+"a musician"
+"a classical dancer"
+"a classical musician"
+"a house DJ"
+"an aspiring pop star"
+
+$bodyguardCareers
+"a soldier"
+"an assassin"
+"a transporter"
+"an MS pilot"
+"a bodyguard"
+"a law enforcement officer"
+"a child soldier"
+"in a militia"
+"a revolutionary"
+"a military brat"
+"captain of the kendo club"
+"an assassin"
+
+$wardenessCareers
+"a security guard"
+"a mercenary"
+"an enforcer"
+"a private detective"
+"a bouncer"
+"a prison guard"
+"an enforcer"
+"a street thug"
+"a gang member"
+
+$nurseCareers
+"a nurse"
+"a doctor"
+"a medic"
+"a paramedic"
+"a medical student"
+
+$attendantCareers
+"a masseuse"
+"a dispatch officer"
+"a counselor"
+"a lifeguard"
+"a therapist"
+"a psychologist"
+
+$milkmaidCareers
+"a dairy worker"
+"a rancher"
+"a veterinarian"
+"a farmer's daughter"
+
+$stewardessCareers
+"a secretary"
+"a barista"
+"a bartender"
+"an air hostess"
+"a professional bartender"
+"an office worker"
+"an investor"
+"a charity worker"
+"a caregiver"
+"a wedding planner"
+"an estate agent"
+
+$schoolteacherCareers
+"a principal"
+"a teacher"
+"a scientist"
+"a professor"
+"a teaching assistant"
+"a private instructor"
+"a librarian"
+"a scholar"
+
+ID:
+
+slave's ID
+accepts int
+
+prestige:
+
+slave's prestige
+0 - no prestige
+1 - well known
+2 - famous
+3 - world famous
+
+pornFame:
+
+how famous her porn is?
+accepts int
+
+pornFameSpending:
+
+how much money is being spent on promoting her porn
+accepts int
+
+prestigeDesc:
+
+reason for prestige
+accepts string
+"She is notorious as a former abolitionist turned devoted slave."
+"She is remembered for winning best in show as a cockmilker."
+"She is remembered for winning best in show as a dairy cow."
+"She is remembered for winning best in show as a breeder."
+"She is a famed Free Cities slut, and can please anyone."
+"She is a famed Free Cities whore, and commands top prices."
+
+recruiter:
+
+slave's relation to recruited slave? (used in some events)
+"mother"
+"daughter"
+"older sister"
+"younger sister"
+"twin"
+good idea to leave at 0
+
+relation:
+
+relation to relationTarget
+accepts string
+"twin"
+"sister"
+"mother"
+"daughter"
+
+relationTarget:
+
+target of relation
+accepts ID
+
+relationship:
+
+slave's relationship
+-3 - married to you
+-2 - emotionally bound to you
+-1 - emotional slut
+ 0 - none
+ 1 - friends with relationshipTarget
+ 2 - best friends with relationshipTarget
+ 3 - friends with benefits with relationshipTarget
+ 4 - lover with relationshipTarget
+ 5 - relationshipTarget's slave wife
+
+relationshipTarget:
+
+target of relationship
+accepts ID
+
+rivalry:
+
+slave's rivalry
+0 - none
+1 - dislikes rivalryTarget
+2 - rival of rivalryTarget
+3 - bitterly hates rivalryTarget
+
+rivalryTarget:
+
+target of rival
+accepts ID
+
+subTarget:
+
+slave will serve subTarget
+accepts ID
+
+choosesOwnAssignment:
+
+can slave choose own assignment
+0 - no
+1 - yes
+
+assignment:
+
+slave's assignment
+"rest"
+"be a subordinate slave"
+"whore"
+"serve the public"
+"work a glory hole"
+"work in the dairy"
+"get milked"
+"guard you"
+"please you"
+"stay confined"
+"guard you"
+"recruit girls"
+"be your Head Girl"
+"work as a servant"
+"serve in the master suite"
+"serve in the club"
+"choose her own job"
+"rest in the spa"
+"learn in the schoolroom"
+"take classes"
+"work in the brothel"
+"be the DJ"
+"be the Attendant"
+"be the Madam"
+"be the Schoolteacher"
+"be the Stewardess"
+"be the Milkmaid"
+"be the Wardeness"
+"be your Concubine"
+"be the Nurse"
+"live with your Head Girl"
+"be confined in the arcade"
+"get treatment in the clinic"
+"work in the brothel"
+"be confined in the cellblock"
+"be your Recruiter"
+"stay confined"
+
+assignmentVisable:
+
+shows assignment in descriptions
+0 - yes
+1 - no
+
+sentance:
+
+how many weeks a slave is sentance to work a job
+accepts int
+
+training:
+how far along slave is with being trained (skills, flaws, quirks)
+
+
+toyHole:
+
+which hole to focus on when serving you
+"all her holes"
+"mouth"
+"boobs"
+"pussy"
+"ass"
+
+indenture:
+
+How long her servitude will be.
+-1 - not
+ 0+ - number of weeks remaining
+
+indentureRestrictions:
+
+2 - complete protection
+1 - some protection
+0 - no protection
+
+birthWeek:
+
+week she was born
+int between 0-51
+
+acutalAge:
+
+How old she really is.
+Accepts int
+starting retirement age is 45
+
+physicalAge:
+
+How old her body is.
+Accepts int
+
+visualAge:
+
+How old her body looks.
+Accepts int
+
+ageImplant:
+
+has age implant
+0 - no
+1 - yes
+
+health:
+
+slave's health
+-90 - very sick
+-90 - -60 - sick
+-50 - -30 - ill
+-20 - 10 -
+20 - 40 - healthy
+50 - very healthy
+60 - best of health
+
+minorInjury:
+
+slave has a minor injury
+accepts string
+"black eye"
+"bruise"
+"split lip"
+
+trust:
+
+slave's trust
+-96- - abjectly terrified
+-95 - -51 - terrified
+-50 - -21 - frightened
+-20 - 20 - fearful
+ 21 - 50 - careful
+ 51 - 95 - trusting
+ 96+ - profoundly trusting
+
+oldTrust:
+
+used to calculate trust loss/gain
+set to trust to start
+
+devotion:
+
+slave's devotion
+-96- - hate-filled
+-95 - -51 - hateful
+-50 - -21 - reluctant
+-20 - 20 - careful
+ 21 - 50 - accepting
+ 51 - 95 - devoted
+ 96+ - worshipful
+
+oldDevotion:
+
+used to calculate trust loss/gain
+set to devotion to start
+
+weight:
+
+slave's weight
+
+95 - fat
+30 - chubby
+10 - curvy
+0 - neither to fat nor to skinny
+-10 - thin
+-30 - very thin
+-95 - emaciated
+
+muscles:
+
+slave's muscles
+96+ - extremely muscular
+31-95 - muscular
+6-30 - toned
+0-5 - none
+
+height:
+
+accepts int
+slave's height in cm
+<150 - petite
+150-159 - short
+160-169 - average
+170-185 - tall
+185+ - very tall
+
+heightImplant:
+
+slave has height implant
+-1 - -10 cm
+0 - none
+1 - +10 cm
+
+nationality:
+
+slave's nationality
+accepts string
+"slave"
+"American"
+"Chinese"
+"Korean"
+"Indonesian"
+"Japanese"
+"Bangladeshi"
+"Pakistani"
+"Filipina"
+"Indian"
+"Russian"
+"Egyptian"
+"Nigerian"
+"Saudi"
+"Turkish"
+"Brazilian"
+"Argentinian"
+"Colombian"
+"Nigerian"
+"Australian"
+"Ethiopian"
+"German"
+"Mexican"
+"Vietnamese"
+"Iranian"
+"Congolese"
+"French"
+"Thai"
+"British"
+"Italian"
+"Spanish"
+"Kenyan"
+"Ukrainian"
+"Canadian"
+"Peruvian"
+"Venezuelan"
+"a New Zealander"
+"Irish"
+"Icelandic"
+"Finnish"
+"Polish"
+"Israeli"
+"Armenian"
+"Greek"
+"Moroccan"
+"Romanian"
+"Swedish"
+"Lithuanian"
+"Bolivian"
+"Haitian"
+"Cuban"
+"South African"
+"Chilean"
+"Belgian"
+"Danish"
+"Czech"
+"Serbian"
+"Slovak"
+"Norwegian"
+"Dutch"
+"Austrian"
+"Swiss"
+"Portuguese"
+"Hungarian"
+"Estonian"
+"Puerto Rican"
+"Jamaican"
+"Kazakh"
+"Zimbabwean"
+"Tanzanian"
+"Ugandan"
+"Malaysian"
+"Guatemalan"
+"Ghanan"
+"Lebanese"
+"Tunisian"
+"Emirati"
+"Libyan"
+"Jordanian"
+"Omani"
+"Malian"
+"Belarusian"
+"Dominican"
+"Scottish"
+
+race:
+
+slave's race
+accepts string
+"white"
+"asian"
+"latina"
+"black"
+"pacific islander"
+"southern european"
+"amerindian"
+"semitic"
+"middle eastern"
+"indo-aryan"
+"mixed race"
+
+pubicHColor:
+
+pubic hair color
+accepts string
+
+skin:
+
+skin color
+accepts string
+"tanned"
+"lightened"
+"pale"
+"fair"
+"white"
+"dark"
+"olive"
+"black"
+"brown"
+"light brown"
+"light"
+"extremely pale"
+
+markings:
+
+slave markings
+accepts string
+"beauty mark"
+"birthmark"
+"freckles"
+"heavily freckled"
+
+eyes:
+
+slave eyesight
+-2 - blind
+-1 - nearsighted
+ 1 - normal
+
+
+eyeColor:
+
+eye color
+accepts string
+"blue"
+"black"
+"brown"
+"green"
+"turquoise"
+"sky-blue"
+"hazel"
+"pale-grey"
+"white"
+"pink"
+"amber"
+"red"
+"catlike"
+"serpent-like"
+"devilish"
+"demonic"
+"hypnotic"
+"heart-shaped"
+
+eyeWear:
+
+Accepts String
+"none"
+"glasses"
+"blurring glasses"
+"corrective glasses"
+"blurring contacts"
+"corrective contacts"
+
+hColor:
+
+hair color
+accepts string
+"blonde"
+"golden"
+"platinum blonde"
+"strawberry-blonde"
+"copper"
+"ginger"
+"red"
+"green"
+"blue"
+"pink"
+"dark brown"
+"brown"
+"auburn"
+"burgundy"
+"chocolate brown"
+"chestnut"
+"hazel"
+"black"
+"grey"
+"silver"
+"white"
+
+hLength:
+
+hair length
+accpets int
+150 - calf-length
+149-100 - ass-length
+99-30 - long
+29-10 - shoulder-length
+9-0 - short
+
+hStyle:
+
+hair style
+accepts string
+"shaved bald"
+"buzzcut"
+"trimmed"
+"afro"
+"cornrows"
+"bun"
+"neat"
+"strip"
+"tails"
+"up"
+"ponytail"
+"braided"
+"dreadlocks"
+"permed"
+"curls"
+"luxurious"
+
+pubicHStyle:
+
+pubic hair style
+accepts string
+"hairless"
+"waxed"
+"in a strip"
+"neat"
+"bushy"
+"bushy in the front and neat in the rear"
+
+waist:
+
+slave waist
+0 - normal
+1 - narrow waist
+2 - unnaturally narrow waist
+
+corsetPiercing:
+
+series of rings up the back that can be tied together
+0 - no
+1 - yes
+
+
+amp:
+
+is slave amputee
+-5 - swiss army limbs
+-4 - artificial limbs - Combat
+-3 - artificial limbs - Beauty
+-2 - artificial limbs - Sex
+-1 - artificial limbs
+ 0 - no
+ 1 - yes
+
+heels:
+
+are heels clipped
+0 - no
+1 - yes
+
+voice:
+
+slave voice
+0 - mute
+1 - deep
+2 - feminine
+3 - high, girly
+
+voiceImplant:
+
+has voice implant
+0 - no
+1 - yes
+
+accent:
+
+slave accent
+0 - none
+1 - attractive
+2 - heavy
+3 - does not speak language
+
+shoulders:
+
+shoulder width
+-2 - very narrow
+-1 - narrow
+ 0 - feminine
+ 1 - broad
+ 2 - very broad
+
+shouldersImplant:
+
+has shoulder implant
+-1 - shoulders -1
+ 0 - none
+ 1 - shoulders +1
+
+boobs:
+
+slave boob size
+0-299 - flat
+300-399 - A cup
+400-499 - B cup
+500-649 - C cup
+650-799 - D cup
+800-999 - DD cup
+1000-1199 - F cup
+1200-1399 - G cup
+1400-1599 - H cup
+1600-1799 - I cup
+1800-2049 - J cup
+2050-2299 - K cup
+2300-2599 - L cup
+2600-2899 - M cup
+2900-3249 - N cup
+3250-3599 - O cup
+3600-3949 - P cup
+3950-4299 - Q cup
+4300-4699 - R cup
+4700-5099 - S cup
+5100-10499- massive
+
+boobsImplant:
+
+slave implant size
+0 - no implants
+1-199 - small implants
+200-399 - normal implants
+400-599 - large implants
+600+ - boobsImplant size fillable implants
+
+boobsImplantType:
+
+0 - normal/none
+1 - string
+
+boobShape:
+
+breast shape
+accepts string
+"normal"
+"perky"
+"saggy"
+"torpedo-shaped"
+"downward-facing"
+"wide-set"
+
+nipples:
+
+nipple shape
+accepts string
+"huge"
+"puffy"
+"inverted"
+"tiny"
+"cute"
+"partially inverted"
+
+nipplesPiercing:
+
+nipple are peirced
+0 - none
+1 - yes
+2 - heavily
+
+areolae:
+
+slave areolae
+0 - normal
+1 - large
+2 - unusually wide
+3 - huge
+4 - heart shaped
+5 - star shaped
+
+areolaePiercing:
+
+edge of areolae are pierced
+0 - none
+1 - yes
+2 - heavy
+
+boobsTat:
+
+boobs tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+lactation:
+
+slave lactation
+0 - none
+1 - natural
+2 - implant
+
+lactationAdaptation:
+
+0 - 10 - not used to producing milk (no bonuses)
+11 - 50 - used to producing milk
+51 - 100 - heavily adapted to producing milk (big bonus)
+
+milk:
+
+amount of milk given
+accepts int
+
+cum:
+
+amount of cum given
+accepts int
+
+hips:
+
+hip size
+-2 - very narrow
+-1 - narrow
+ 0 - normal
+ 1 - wide hips
+ 2 - very wide hips
+ 3 - inhumanly wide hips
+
+hipsImplant:
+
+slave has hip implant
+-1 - hips -1
+ 0 - none
+ 1 - hips +1
+
+butt:
+
+butt size
+0 - flat
+1 - small
+2 - plump*
+3 - big bubble butt
+4 - huge
+5 - enormous
+6 - gigantic
+7 - ridiculous
+8 - 10 - immense
+11 - 20- inhuman
+
+*Descriptions vary for just how big 2 is, as such, it may be better to just go with 3
+
+buttImplant:
+
+butt implant type
+0 - none
+1 - butt implant
+2 - big butt implant
+3 - fillable butt implants
+
+buttImplantType:
+
+0 - normal/none
+1 - string
+
+buttTat:
+
+butt tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+face:
+
+face attractiveness
+-3 - very ugly
+-2 - ugly
+-1 - unnattractive
+ 0 - attractive
+ 1 - very pretty
+ 2 - gorgeous
+ 3 - mind blowing
+
+faceImplant:
+
+has face implant
+0 - none
+1 - slight work
+2 - heavy work
+
+faceShape:
+
+accepts string (will be treated as "normal")
+"normal"
+"masculine"
+"androgynous"
+"cute"
+"sensual"
+"exotic"
+
+lips:
+
+lip size (0-100)
+0 - 10 - thin
+11 - 20 - normal
+21 - 40 - pretty
+41 - 70 - plush
+71 - 95 - huge (lisps)
+96 - 100- facepussy (mute)
+
+lipsImplants:
+
+how large her lip implants are
+See .lips
+
+lipsPiercing:
+
+lips pierced
+0 - no
+1 - yes
+2 - heavy
+
+lipsTat:
+
+lip tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"permanent makeup"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+teeth:
+
+teeth type
+accepts string
+"normal"
+"crooked"
+"straightening braces"
+"cosmetic braces"
+"removable"
+"pointy"
+
+tonguePiercing:
+
+has tongue piercing
+0 - no
+1 - yes
+2 - heavy
+
+vagina:
+
+vagina type
+-1 - no vagina
+ 0 - virgin
+ 1 - tight
+ 2 - reasonably tight
+ 3 - loose
+ 4 - cavernous
+10 - ruined
+
+vaginaLube:
+
+how wet she is
+0 - dry
+1 - wet
+2 - soaking wet
+
+vaginaPiercing:
+
+has vagina piercing
+0 - no
+1 - yes
+2 - heavy
+
+vaginaTat:
+
+vigina tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+preg:
+
+pregnancy type
+-3 - sterilized
+-2 - sterile
+-1 - contraceptives
+ 0 - fertile
+1-10 - pregnant, not showing
+11-20 - showing
+21-30 - pregnant
+30-35 - very pregnant
+
+pregSource:
+
+accepts ID
+Who sired her pregnancy
+-1 - You
+ 0 - Unidentifiable (whoring, slutting, ect)
+
+pregType:
+
+number of children
+1,2,3,4,5,10-19,20-29,50*
+50 - permanantly pregnant
+
+labor:
+
+variable used to set off the birth events
+1 - birth this week
+0 - not time yet
+
+births:
+
+number of births
+accepts int
+
+cSec:
+
+does she have a c-section scar
+1 - yes
+0 - no
+
+bellyAccessory:
+
+may accept strings, use at own risk
+"none"
+
+
+"a small empathy belly"
+"a medium empathy belly"
+"a large empathy belly"
+"a huge empathy belly"
+"a corset"
+"an extreme corset"
+
+labia:
+
+labia type
+0 - minimal
+1 - big
+2 - huge
+3 - huge dangling
+
+clit:
+
+clit size
+0 - normal
+1 - large
+2 - huge
+3 - enormous
+
+clitPiercing:
+
+is clit pierced
+0 - no
+1 - yes
+2 - heavy
+3 - smart
+
+clitSetting:
+
+smart piercing setting
+"off"
+"none"
+"all"
+"no default setting"
+"women"
+"men"
+"vanilla"
+"oral"
+"anal"
+"boobs"
+"submissive"
+"humiliation"
+"pregnancy"
+"dom"
+"masochist"
+"sadist"
+
+dick:
+
+dick size
+0 - none
+1 - tiny
+2 - little
+3 - normal
+4 - big
+5 - huge
+6 - gigantic
+7 - massive/gigantic
+8 - truly imposing/titanic
+9 - monstrous/absurd
+10 - awe-inspiring/inhuman
+11+- hypertrophied
+
+foreskin:
+
+0 - circumcised
+1+ - uncut*
+
+*also affects foreskin size
+
+anus:
+
+anus size
+0 - virgin
+1 - tight
+2 - loose
+3 - very loose
+4 - gaping
+
+analArea:
+
+used to calculate size of area around anus.
+accepts int
+
+dickPiercing:
+
+is dick pireced
+0 - no
+1 - yes
+2 - heavy
+
+dickTat:
+
+dick tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+balls:*
+
+ball size
+0 - none
+1 - vestigal
+2 - small
+3 - average
+4 - big
+5 - huge
+6 - enormous
+7+ - hypertrophied
+
+
+scrotum:*
+
+scrotum size
+function relative to .ballSize
+
+*If .balls gt 0 and .scrotum is 0, balls are internal
+
+ovaries:
+
+has ovaries
+0 - no
+1 - yes
+
+anusPiercing:
+
+has anus piercing
+0 - no
+1 - yes
+2 - heavy
+
+anusTat:
+
+anus tattoo
+takes one of the following strings or 0
+
+"bleached"
+"tribal patterns"
+"flowers"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+makeup:
+
+has makeup
+0 - none
+1 - minimal
+2 - color-coordinated with hair
+3 - heavy
+
+nails:
+
+nail type
+0 - neatly clipped
+1 - long and elegant
+2 - color-coordinated with hair
+3 - sharp and claw-like
+4 - bright and glittery
+5 - very long and garish
+
+brand:
+
+has brand
+0 - no
+1 - yes
+
+brandLocation:
+
+brand location
+accepts string
+"back"
+"chest"
+"ankles"
+"wrists"
+"thighs"
+
+earPiercing:
+
+has pierced ears
+0 - no
+1 - yes
+2 - heavy
+
+nosePiercing:
+
+has pierced nose
+0 - no
+1 - yes
+2 - heavy
+
+eyebrowPiercing:
+
+has eyebrow piercing
+0 - no
+1 - yes
+2 - heavy
+
+navelPiercing:
+
+has navel pirecing
+0 - no
+1 - yes
+2 - heavy
+
+cosmeticPiercing:
+
+???????
+
+shouldersTat:
+
+shoulder tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+armsTat:
+
+arm tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+legsTat:
+
+leg tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+backTat:
+
+back tattoo
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+stampTat:
+
+tramp stamp
+takes one of the following strings or 0
+
+"tribal patterns"
+"flowers"
+"scenes"
+"Asian art"
+"degradation"
+"counting"
+"advertisements"
+"rude words"
+"bovine patterns"
+
+vaginalSkill:
+
+0-10 - unskilled
+11-30 - basic
+31-60 - skilled
+61-99 - expert
+100+ - master
+
+oralSkill:
+
+0-10 - unskilled
+11-30 - basic
+31-60 - skilled
+61-99 - expert
+100+ - master
+
+analSkill:
+
+0-10 - unskilled
+11-30 - basic
+31-60 - skilled
+61-99 - expert
+100+ - master
+
+whoreSkill:
+
+0-10 - unskilled
+11-30 - basic
+31-60 - skilled
+61-99 - expert
+100+ - master
+
+entertainSkill:
+
+0-10 - unskilled
+11-30 - basic
+31-60 - skilled
+61-99 - expert
+100+ - master
+
+combatSkill:
+
+0 - unskilled
+1 - skilled
+
+livingRules:
+
+"spare"
+"normal"
+"luxurious"
+
+speechRules:
+
+"restrictive"
+"permissive"
+"accent elimination"
+
+releaseRules:
+
+"permissive"
+"sapphic"
+"restrictive"
+
+relationshipRules:
+
+"restrictive"
+"just friends"
+"permissive"
+
+standardPunishment:
+
+"Confinement"
+"Whipping"
+"Chastity"
+"Situational"
+
+standardReward:
+
+"Relaxation"
+"Drugs"
+"Orgasm"
+"Situational"
+
+useRulesAssistant:
+
+follows rules or is exept from them
+0 - exempt
+1 - obeys
+
+diet:
+
+"healthy"
+"cum"
+"restricted"
+"muscle building"
+"fattening"
+"slimming"
+"XX"
+"XY"
+"XXY"
+"cum production"
+
+tired:
+
+affects work performance, i.e. decreased pay for whoring
+caused by poor/overcrowded sleeping conditions
+0 - not tired
+1 - tired
+
+hormones:
+
+-2 - heavy male hormones
+-1 - male hormones
+ 0 - none
+ 1 - female hormones
+ 2 - heavy female hormones
+
+drugs:
+
+"no drugs"
+"breast injections"
+"butt injections"
+"lip injections"
+"fertility drugs"
+"penis enhancement"
+"testicle enhancement"
+"psychosuppressants"
+"steroids"
+"hormone enhancers"
+"super fertility drugs"
+"hyper breast injections"
+"hyper butt injections"
+"hyper penis enhancement"
+"hyper testicle enhancement"
+"female hormone injections"
+"male hormone injections"
+"anti-aging cream"
+
+aphrodisiacs:
+
+0 - none
+1 - standard
+2 - powerful
+
+curatives:
+
+0 - none
+1 - preventatives
+2 - curatives
+
+chem:
+
+if greater than 10 triggers side effects from drug use.
+accepts int
+
+addict:
+
+how addict to aphrodisiacs slave is
+0 - not
+1-2 - new addict
+3-9 - confirmed addict
+10+ - dependant
+
+choosesOwnClothes:
+
+0 - no
+1 - yes
+
+clothes:
+
+may accept strings, use at own risk
+"none"
+"attractive lingerie"
+"a string bikini"
+"cutoffs and a t-shirt"
+"a slutty outfit"
+"uncomfortable straps"
+"a fallen nun's habit"
+"a penitent nun's habit"
+"slutty jewelry"
+"harem gauze"
+"a slave gown"
+"slutty business attire"
+"nice business attire"
+"a comfortable bodysuit"
+"a slutty maid outfit"
+"a nice nurse outfit"
+"a slutty nurse outfit"
+"a schoolgirl outfit"
+"a kimono"
+"a hijab"
+"battledress"
+"a nice maid outfit"
+"restrictive latex"
+"a latex catsuit"
+"a military uniform"
+"a minidress"
+"a very tight corset"
+"conservative clothing"
+"chains"
+"a cheerleader outfit"
+"clubslut netting"
+"shibari ropes"
+"Western clothing"
+"body oil"
+"a toga"
+"a slutty qipao"
+"a bunny outfit"
+"a leotard"
+"a chattel habit"
+"a halter top dress"
+"a ball gown"
+"a succubus outfit"
+"attractive lingerie for a pregnant woman"
+"a maternity dress"
+
+collar:
+
+may accept strings, use at own risk
+"none"
+"cruel retirement counter"
+"uncomfortable leather"
+"tight steel"
+"shock punishment"
+"dildo gag"
+"heavy gold"
+"pretty jewelry"
+"nice retirement counter"
+"leather with cowbell"
+"bowtie"
+"neck corset"
+"stylish leather"
+"satin choker"
+"preg biometrics"
+"massive dildo gag"
+"silk ribbon"
+
+shoes:
+
+may accept strings, use at own risk
+"none"
+"heels"
+"extreme heels"
+"boots"
+"flats"
+
+vaginalAccessory:
+
+may accept strings, use at own risk
+"none"
+"chastity belt"
+"combined chastity"
+"anal chastity"
+"dildo"
+"large dildo"
+"huge dildo"
+"long dildo"
+"long, large dildo"
+"long, huge dildo"
+
+dickAccessory:
+
+may accept strings, use at own risk
+"none"
+"chastity"
+"anal chastity"
+"combined chastity"
+
+buttplug:
+
+may accept strings, use at own risk
+"none"
+"plug"
+"large plug"
+"huge plug"
+"long plug"
+"long, large plug"
+"long, huge plug"
+
+intelligence:
+
+slave intelligence
+-3 - borderline retarded
+-2 - very slow
+-1 - slow
+ 0 - average
+ 1 - smart
+ 2 - very smart
+ 3 - brilliant
+
+intelligenceImplant:
+
+if slave is educated or not
+0 - no
+1 - yes
+
+energy:
+
+sex drive
+0-20 - no sex drive
+21-40 - poor sex drive
+41-60 - average sex drive
+61-80 - good sex drive
+81-95 - powerful sex drive
+95+ - nymphomaniac
+
+attrXX:
+
+attraction to women
+0-5 - disgusted by women
+6-15 - turned off by women
+15-35 - not attracted to women
+36-65 - indifferent to women
+66-85 - attracted to women
+86-95 - aroused by women
+96+ - passionate about women
+
+attrXY:
+
+attraction to men
+0-5 - disgusted by men
+6-15 - turned off by men
+15-35 - not attracted to men
+36-65 - indifferent to men
+66-85 - attracted to men
+86-95 - aroused by men
+96+ - passionate about men
+
+*if both attrXX and attrXY > 95, slave will be omnisexual*
+*if energy > 95 and either attrXX or attrXY > 95, slave will be nypmhomanic
+
+attrKnown:
+
+0 - no
+1 - yes
+
+fetish:
+
+"none"
+"mindbroken"
+"submissive"
+"cumslut"
+"humiliation"
+"buttslut"
+"boobs"
+"sadist"
+"masochist"
+"dom"
+"pregnancy"
+
+fetishStrength:
+
+how strong her fetish is (10-100)
+
+10+ - enjoys fetish
+60+ - likes fetish
+95+ - loves fetish
+
+fetishKnown:
+
+is fetish known to player
+0 - no
+1 - yes
+
+behavioralFlaw:
+
+"none"
+"arrogant" - clings to her dignity, thinks slavery is beneath her
+"bitchy" - can't keep her opinions to herself
+"odd" - says and does odd things
+"hates men" - hates men
+"hates women" - hates women
+"gluttonous" - likes eating, gains weight
+"anorexic" - dislikes eating and being forced to eat, loses weight
+"devout" - resistance through religious faith
+"liberated" - believes slavery is wrong
+
+behavioralQuirk:
+
+"none"
+"confident" - believes she has value as a slave
+"cutting" - often has as witty or cunning remark ready, knows when to say it
+"funny" - is funny
+"fitness" - loves working out
+"adores women" - likes spending time with women
+"adores men" - likes spending time with men
+"insecure" - defines herself on the thoughts of others
+"sinful" - breaks cultural norms
+"advocate" - advocates slavery
+
+sexualFlaw:
+
+"none"
+"hates oral" - hates oral sex
+"hates anal" - hates anal sex
+"hates penetration" - dislikes penetrative sex
+"shamefast" - nervous when naked
+"idealistic" - believes sex should be based on love and consent
+"repressed" - dislikes sex
+"apathetic" - inert during sex
+"crude" - sexually crude and has little sense of what partners find disgusting during sex
+"judgemental" - sexually judgemental and often judges her sexual partners' performance
+"neglectful" - disregards herself in sex
+"cum addict" - addicted to cum
+"anal addict" - addicted to anal
+"attention whore" - addicted to being the center of attention
+"breast growth" - addicted to her own breasts
+"abusive" - sexually abusive
+"malicious" - loves causing pain and suffering
+"self hating" - hates herself
+"breeder" - addicted to being pregnant
+
+
+sexualQuirk:
+
+"none"
+"gagfuck queen" - can take a facefucking
+"painal queen" - knows how far she can go without getting hurt
+"strugglefuck queen" - knows how much resistance her partners want
+"tease" - is a tease
+"romantic" - enjoys the closeness of sex
+"perverted" - enjoys breaking sexual bondaries
+"caring" - enjoys bring her partners to orgasm
+"unflinching" - willing to do anything
+"size queen" - prefers big cocks
+
+oralCount:
+
+oral sex count
+accepts int
+
+vaginalCount:
+
+vaginal sex count
+accepts int
+
+analCount:
+
+anal sex count
+accepts int
+
+mammaryCount:
+
+breast sex count
+accepts int
+
+penetrativeCount:
+
+penetrative sex count
+accepts int
+
+pitKills:
+
+number of slaves killed in pit fights
+accepts int
+
+customTat:
+
+adds a custom tattoo
+accepts string
+
+customLabel:
+
+seems to just be a label appended after the slave's name
+accepts string
+
+customDesc:
+
+adds a custom description
+accepts string
+
+currentRules: []
+
+array that holds active rules for the slave
+wouldn't mess with it
+
+bellyTat:
+
+Slave has a tattoo that is only recognizable when she has a big belly.
+"a heart"
+"a star"
+"a butterfly"
+
+bellySag:
+
+How saggy her belly is after being distended for too long.
+1+ changes belly description
+
+induce:
+
+Slave will give birth this week.
+1 - true
+0 - false
+
+mpreg:
+
+Male slave has an anal womb and can get pregnant.
+1 - true
+0 - false
+
+inflation:
+
+How much fluid is distending the slave.
+1 - 2L
+2 - 4L
+3 - 8L
+
+inflationType:
+
+What kind of fluid is in the slave.
+Accepts string
+"water"
+"cum"
+"milk"
+
+inflationMethod:
+
+How she is being filled.
+0 - not
+1 - oral
+2 - anal
+3 - orally by another slave
+
+milkSource:
+
+If inflationMethod 3, ID of the slave filling her with milk.
+accepts ID
+
+cumSource:
+
+If inflationMethod 3, ID of the slave filling her with cum.
+accepts ID
+
+burst:
+
+Slave's internals have ruptured. Used with poor health and overinflation.
+1 - true
+0 - false
+
+bellyImplant:
+
+Does the slave have a fillable abdominal implant.
+0+ yes
+2000+ Early pregnancy
+4000+ looks pregnant
+8000+ looks full term
+16000+ hyperpregnant 1
+32000+ hyperpregnant 2
+
+bellyPain:
+
+Has the slave's belly implant been filled this week. Causes health damage for overfilling.
+0 - no pain
+1 - will experiance pain
+2 - cannot be filled this week
+
+cervixImplant:
+
+Does the slave have a cervical implant that slowly feeds cum from bing fucked into a fillable implant.
+0 - no
+1 - yes
+
+birthsTotal:
+
+How many known times the slave has given birth.
+accepts int
+
+pubertyAgeXX:
+
+Target .physicalAge for female puberty to occur.
+accepts int
+
+pubertyXX:
+
+Has the slave gone through female puberty.
+0 - no
+1 - yes
+
+pubertyAgeXY:
+
+Target .physicalAge for male puberty to occur.
+accepts int
+
+pubertyXY:
+
+Has the slave gone through male puberty.
+0 - no
+1 - yes
+
+scars:
+
+not fully implemented.
+0 - no scars
+1 - light scarring
+2 - heavy scarring
+3 - fresh scarring
+4 - burns
+5 - menacing scar
+6 - exotic scar
+
+breedingMark:
+
+In a eugenics society, this slave is a designated breeder.
+1 - yes
+0 - no
+
+postateImplant:
+
+Slave has a prostate implant to generate 20% more semen.
+1 - true
+0 - false
+
+underArmHColor:
+
+underArmHStyle:
+
+accepts string
+"hairless"
+"waxed"
+"shaved"
+"neat"
+"bushy"
+
+bodySwap:
+
+Slave is in original body.
+0 - yes
+1 - no
+
+
+
+
+How to set up your own hero slave.
+
+-The default slave template used:
+
+<<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, lactaionAdaption: 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, cosmeticPiercings: 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", tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 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: "", 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}>>
+
+Making your slave; add their name to the following, then go down the documentation adding in your changes.
+-each variable must be seperated from the last by a comma followed by a space
+-each variable must be assigned to _HS
+-if your slave's variable matches the default, you do not have to list it
+-strings MUST be in " or your slave will not compile properly
+
+<<set _HS = clone($activeSlave)>>
+<<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _HS.ID = _i++>>
+<<set $heroSlaves.push(clone(_HS))>>
+
+Once finished, add it into "D Slaves Database" for females or "DD Slaves Database" for males.
+To test if your slave is functioning, start up a normal game, swap to cheat mode, max your rep, and view other slave owner's stock in the slave market. If you can not find your slave in the list, and you didn't start the game with your slave, you should double check your slave for errors. If a slave named "Blank" is present, then you likely messed up. Once you find your slave, check their description to make sure it is correct. If it is not, you messed up somewhere in setting them up.
+
+
+
+
+@@color:green; - something good or health gain
+@@color:red; - something bad or health loss
+@@color:hotpink; - devotion gain
+@@color:mediumorchid; - devotion loss
+@@color:mediumaquamarine; - trust gain
+@@color:gold; - trust loss
+@@color:lightcoral; - fetish
+
+
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 14206c35c22d341100dc145b8a73c0ea2d5ded8a..73a2e496446266482d7a5c793d1241a3f8b439a0 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -65,6 +65,7 @@
<<display "D Slaves Database">>
<<display "DD Slaves Database">>
<<display "DF Slaves Database">>
+ <<display "custom Slaves Database">>
<<elseif $seeDicks == 100>>
<<display "DD Slaves Database">>
<<else>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index d800f125bfd783cbfcb4552589a2c4fbbf430f04..382670e35156a5ade6df146e12bbb6062547a7b2 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -915,6 +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.
+''anon'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home.
''anon'' for lolimod content, new slave careers, new pubestyles, and general improvements.
''anon'' for considerable bugfixing, most notably that infernal reputation bug.
''anon'' for ppmod, ramod, implmod and cfpmod.
diff --git a/src/npc/databases/customSlavesDatabase.tw b/src/npc/databases/customSlavesDatabase.tw
new file mode 100644
index 0000000000000000000000000000000000000000..931e106339fceab7002f68786f1c16952f768a05
--- /dev/null
+++ b/src/npc/databases/customSlavesDatabase.tw
@@ -0,0 +1,3 @@
+:: custom Slaves Database
+
+<<set _i = 1000000>>
\ No newline at end of file
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 8243707576eb696d9ee5a294ed5d0f3e673c60f1..209daf8e21f2795e09e9baf94ab7d01eb87aca8b 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -1,5 +1,5 @@
:: Dispensary [nobr]
-
+
<<set $nextButton to "Back">>
<<set $nextLink to "Main">>
<<set $showEncyclopedia to 1>><<set $encyclopedia to "The Pharmaceutical Fab.">>
@@ -23,14 +23,30 @@
<br><br>
-<<if ($organFarmUpgrade == 0) && ($rep <= 10000*$upgradeMultiplierMedicine)>>
+<<if ($organFarmUpgrade < 3) && ($rep <= 10000*$upgradeMultiplierMedicine)>>
//You lack the reputation to access experimental organ farm parts//
-<</if>>
-
-<<if ($organFarmUpgrade == 0) && ($rep > 10000*$upgradeMultiplierMedicine)>>
+<<elseif $dispensaryUpgrade == 0 && $organFarmUpgrade == 2>>
+ //The fabricator must updgraded before it can be fitted with perfected organ farm parts//
+<<elseif $organs.length > 0>>
+ //The organ farm can not be upgraded while it is use//
+<<elseif ($organFarmUpgrade == 2) && ($rep > 10000*$upgradeMultiplierMedicine)>>
+ [[Upgrade to the organ farm to the cutting edge model|Dispensary][$cash -= 150000*$upgradeMultiplierMedicine, $organFarmUpgrade to 3]]
+ //Costs ¤<<print 150000*$upgradeMultiplierMedicine>>//
+ <br> //Will allow the organ farm to rapidly grow organs without risk to the implantee's health.//
+<<elseif ($organFarmUpgrade == 1) && ($rep > 10000*$upgradeMultiplierMedicine)>>
+ [[Upgrade the organ farm with an experimental growth accelerator|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $organFarmUpgrade to 2]]
+ //Costs ¤<<print 50000*$upgradeMultiplierMedicine>>//
+ <br> //Will allow the organ farm to quickly grow organs. Implanted organs may cause health issues.//
+<<elseif ($organFarmUpgrade == 0) && ($rep > 10000*$upgradeMultiplierMedicine)>>
[[Upgrade the fabricator with an experimental organ farm|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $organFarmUpgrade to 1]]
//Costs ¤<<print 50000*$upgradeMultiplierMedicine>>//
<br> //Will allow the fabrication of tailored organs using the autosurgery.//
+<</if>>
+<br>
+<<if $organFarmUpgrade > 2>>
+ The fabricator is capable of rapidly growing organs.
+<<elseif $organFarmUpgrade > 1>>
+ The fabricator is capable of quickly growing organs, though not without side effects.
<<elseif ($organFarmUpgrade > 0)>>
The fabricator is capable of growing organs.
<</if>>
@@ -45,7 +61,7 @@ It is currently working on the following organs:
<<if $organs[$i].weeksToCompletion <= 0>>
ready for implantation.
<<else>>
- $organs[$i].weeksToCompletion weeks from completion.
+ <<if $organFarmUpgrade == 1>><<print $organs[$i].weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.trunc($organs[$i].weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.trunc($organs[$i].weeksToCompletion/4)>><</if>> weeks from completion.
<</if>>
<<break>>
<</if>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index dc3702eba90d04aa44c036381212e62d6d29598e..920323d75b7153df9c416c3819b49d228132095e 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -1,5 +1,5 @@
:: End Week [nobr]
-
+
<<set $gingering = 0>>
<<set $oralUseWeight to 5>>
@@ -51,9 +51,15 @@
<<if $organs.length > 0>>
<<for _i to 0; _i < $organs.length; _i++>>
<<if $organs[_i].weeksToCompletion > 0>>
- <<set $organs[_i].weeksToCompletion-->>
+ <<if $organFarmUpgrade == 3>>
+ <<set $organs[_i].weeksToCompletion -= 4>>
+ <<elseif $organFarmUpgrade == 2>>
+ <<set $organs[_i].weeksToCompletion -= 2>>
+ <<else>>
+ <<set $organs[_i].weeksToCompletion-->>
+ <</if>>
<</if>>
- <<if $organs[_i].weeksToCompletion == 0>>
+ <<if $organs[_i].weeksToCompletion <= 0>>
<<set $organsCompleted++>>
<</if>>
<</for>>
@@ -129,4 +135,4 @@
<<set $gameover to "ownership">><<goto "Gameover">>
<<else>>
<<goto "Slave Assignments Report">>
-<</if>>
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 051ebf7bcdd6c009a7d0285a2324e4bf8399b673..d2777304fd7bbf3c775598419fb938b7dcef332c 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1,5 +1,5 @@
:: Long Slave Description [nobr]
-
+
<<if $seeImages == 1>><<SlaveImage $activeSlave 3 1>><</if>>
<<PMODinit>>
@@ -1099,9 +1099,9 @@ she's
<</if>>
<</for>>
<<elseif $children.length > 1>>
- She @@color:lightgreen;fathered a pair of kids: $children[0].slaveName, and $children[1].slaveName.@@
+ She @@color:lightgreen;fathered a pair of your slaves: $children[0].slaveName, and $children[1].slaveName.@@
<<elseif $children.length > 0>>
- She @@color:lightgreen;fathered a single child: $children[0].slaveName.@@
+ She @@color:lightgreen;fathered a single slave of yours: $children[0].slaveName.@@
<</if>>
<<set $children = []>>
@@ -1120,9 +1120,9 @@ she's
<</if>>
<</for>>
<<elseif $children.length > 1>>
- She @@color:lightgreen;gave birth to a pair of kids: $children[0].slaveName, and $children[1].slaveName.@@
+ She @@color:lightgreen;gave birth to a pair of your slaves: $children[0].slaveName, and $children[1].slaveName.@@
<<elseif $children.length > 0>>
- She @@color:lightgreen;gave birth to a single child: $children[0].slaveName.@@
+ She @@color:lightgreen;gave birth to a single of your slaves: $children[0].slaveName.@@
<</if>>
<<set $children = []>>
@@ -2218,4 +2218,4 @@ She's wearing a pair of
She is a confirmed @@color:cyan;aphrodisiac addict@@.
<<elseif ($activeSlave.addict > 0)>>
She is completely @@color:cyan;dependent on aphrodisiacs@@, and it is unlikely you will ever be able to wean her off them.
-<</if>>
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index ec7f9d66ed533512cf9065ead27a0392aa1b2e34..3e74fb34bbd524dcbab26e0e412278b33d0f65f9 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1,5 +1,4 @@
:: Remote Surgery
-
<<nobr>>
<<set $nextButton to "Continue">>
@@ -657,7 +656,7 @@ She has
<</if>>
<</if>>
-<<if $organFarmUpgrade == 1>>
+<<if $organFarmUpgrade >= 1>>
<<if $activeSlave.indentureRestrictions < 2>>
<br><br>
@@ -750,7 +749,7 @@ The fabricator is not currently growing an organ for her. Extract tissue to begi
<</if>>
<<elseif $activeOrgan.weeksToCompletion > 0>>
-The fabricator is currently growing her $activeOrgan.type, which is projected to be ready for implantation in $activeOrgan.weeksToCompletion weeks.
+The fabricator is currently growing her $activeOrgan.type, which is projected to be ready for implantation in <<if $organFarmUpgrade == 1>><<print $activeOrgan.weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.trunc($activeOrgan.weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.trunc($activeOrgan.weeksToCompletion/4)>><</if>> weeks.
<<else>>
The fabricator has completed her $activeOrgan.type.
@@ -781,6 +780,9 @@ The fabricator has completed her $activeOrgan.type.
<<set $activeSlave.clit to 0>>
<<set $activeSlave.foreskin to $activeSlave.dick>>
<<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
<<set $surgeryType to "addDick">>
<<goto "Surgery Degradation">>
<</click>>
@@ -833,6 +835,9 @@ The fabricator has completed her $activeOrgan.type.
<<set $activeSlave.balls to 2>>
<<set $activeSlave.scrotum to 2>>
<<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
<<if $activeSlave.pubertyXY == 0>>
<<if $precociousPuberty == 1>>
<<set $activeSlave.pubertyXY to ($activeSlave.physicalAge+1)>>
@@ -893,6 +898,9 @@ The fabricator has completed her $activeOrgan.type.
<</for>>
<<set $activeSlave.scrotum to $activeSlave.balls>>
<<set $activeSlave.health -= 10>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 10>>
+ <</if>>
<<set $surgeryType to "addScrotum">>
<<goto "Surgery Degradation">>
<</click>>
@@ -944,6 +952,9 @@ The fabricator has completed her $activeOrgan.type.
<</for>>
<<set $activeSlave.foreskin to $activeSlave.balls>>
<<set $activeSlave.health -= 10>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 10>>
+ <</if>>
<<set $surgeryType to "addForeskin">>
<<goto "Surgery Degradation">>
<</click>>
@@ -1008,6 +1019,9 @@ The fabricator has completed her $activeOrgan.type.
<<set $activeSlave.ovaries to 1>>
<<set $activeSlave.preg to 0>>
<<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
<<set $activeSlave.pubertyXX to ($activeSlave.physicalAge+1)>>
@@ -1058,6 +1072,9 @@ The fabricator has completed her $activeOrgan.type.
<<set $activeSlave.eyeColor to "pale pink">>
/* no way to salvage original eye color */
<<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
<<set $surgeryType to "unblind">>
<<goto "Surgery Degradation">>
<</click>>
@@ -1098,6 +1115,9 @@ The fabricator has completed her $activeOrgan.type.
<<set $activeSlave.mpreg to 1>>
<<set $activeSlave.preg to 0>>
<<set $activeSlave.health -= 40>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
<<set $activeSlave.pubertyXX to ($activeSlave.physicalAge+1)>>
@@ -1152,6 +1172,9 @@ The fabricator has completed her $activeOrgan.type.
<<set $activeSlave.voice to 2>>
<</if>>
<<set $activeSlave.health -= 10>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 10>>
+ <</if>>
<<set $surgeryType to "restoreVoice">>
<<goto "Surgery Degradation">>
<</click>>
@@ -1728,4 +1751,4 @@ She has doorway-jamming hips.
<</if>>
<</if>>
<</if>>
-<</nobr>>
+<</nobr>>
\ No newline at end of file
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index f06c99bc71a4b9c287008582bf7901d02f272f7f..afcdf3854100c870ff1373095d2377b28b97523d 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -17,7 +17,7 @@
<<if ($slaves[$i].intelligence < 0)>>
<<if ($slaves[$i].fetishStrength <= 60)>>
<<if ($slaves[$i].fetish != "submissive")>>
- <<<if $fetishChangeChance > random(0,100)>>
+ <<if $fetishChangeChance > random(0,100)>>
The willingness to @@color:lightcoral;submit@@ created by the drugs invades her sexuality, too.
<<set $slaves[$i].fetish to "submissive">>
<<set $slaves[$i].fetishKnown to 1>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 91e56156b452ed248392c97b341823e56386ec1d..09b8ba4fb8f3f93450039afc5e654cc704a420f6 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -788,9 +788,9 @@ Since she is mindbroken, she @@color:lightsalmon;can't really maintain@@ any mea
<<set $relationType = "half-sister">>
<</if>>
<<set $relation = $slaves[$j]>>
+ <<break>>
<</if>>
<</if>>
- <<break>>
<</for>>
<<if $relation != 0>>
$slaves[$i].slaveName
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index e703aee6e6c2c81ccfec11447f430c1389514fd0..50ce374c01c8204e71e4c325b8047dfb9db26c33 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -113,7 +113,7 @@
<</if>>
<<if ($arcologies[0].FSTransformationFetishist > 20)>>
- <<if $args[0].hips > 3>>
+ <<if $args[0].hips >= 3>>
<<set $beauty += 1>>
<</if>>
<</if>>
@@ -121,7 +121,7 @@
<<if $args[0].hips < -1>>
<<if $args[0].butt > 2>>
<<if $arcologies[0].FSTransformationFetishist is "unset">>
- <<set $beauty += $args[0].butt>>
+ <<set $beauty += 2-$args[0].butt>>
<<else>>
<<set $beauty += 1>>
<</if>>
@@ -131,7 +131,7 @@
<<elseif $args[0].hips < 0>>
<<if $args[0].butt > 4>>
<<if $arcologies[0].FSTransformationFetishist is "unset">>
- <<set $beauty += $args[0].butt>>
+ <<set $beauty += 4-$args[0].butt>>
<<else>>
<<set $beauty += 1>>
<</if>>
@@ -153,7 +153,7 @@
<<elseif $args[0].hips > 0>>
<<if $args[0].butt > 8>>
<<if $arcologies[0].FSTransformationFetishist is "unset">>
- <<set $beauty += $args[0].butt>>
+ <<set $beauty += 8-$args[0].butt>>
<<else>>
<<set $beauty += 1>>
<</if>>
@@ -165,7 +165,7 @@
<<else>>
<<if $args[0].butt > 6>>
<<if $arcologies[0].FSTransformationFetishist is "unset">>
- <<set $beauty += $args[0].butt>>
+ <<set $beauty += 6-$args[0].butt>>
<<else>>
<<set $beauty += 1>>
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 6503b446a28e9ffab02a33b651ee24f40ae271e1..d3fcbe12b7e69b75d87ed09f9b007ba9c2a93a49 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -1,5 +1,5 @@
:: description widgets [widget nobr]
-
+
<<widget "MainLinks">>
<center>
<<if ($personalAttention is "business")>>You plan to focus on business this week.
@@ -43,7 +43,7 @@
<<for _i to 0; _i < $slaves.length; _i++>>
<<set _Slave to $slaves[_i]>>
<<for _j to 0; _j < $organs.length; _j++>>
- <<if ($organs[_j] != 0) && ($organs[_j].ID == _Slave.ID) && ($organs[_j].weeksToCompletion == 0)>>
+ <<if ($organs[_j] != 0) && ($organs[_j].ID == _Slave.ID) && ($organs[_j].weeksToCompletion <= 0)>>
<br>@@color:yellow;The fabricator has completed an organ for@@ <span id="name"><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">></span>, @@color:yellow; which is ready to be implanted.@@
<</if>>
<</for>>
@@ -9690,4 +9690,4 @@ She is
The Societal Elites' mark designating her as a breeder is prominently displayed across her lower belly, beneath her navel.
<</if>>
-<</widget>>
+<</widget>>
\ No newline at end of file