diff --git a/sanityCheck b/sanityCheck index 1fa48d66de7992341a2b58f28041c1c93534c311..b4526dc937ee694158cd67749900bc547aa26ec0 100755 --- a/sanityCheck +++ b/sanityCheck @@ -50,7 +50,7 @@ $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets" # Check for too many <<<. e.g.: <<</if>> $GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets" # Check for wrong capitalization on 'activeslave' and other common typos -$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\)" -- "src/*" | myprint "WrongCapitilization" +$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|setBellySize\|SetbellySize\|setbellySize\)" -- "src/*" | myprint "WrongCapitilization" $GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\)" -- 'src/*' | myprint "SpellCheck" $GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves" # Check for strange spaces e.g. $slaves[$i]. lips diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index ff4b2386ff757741a4e1a48e7bc6a5aaee12fd32..b30f22b6c81adff7b812800fa5af14b278dd13ca 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -119,6 +119,7 @@ $whoreCareers "a mistress" "a serial divorcee" "a pageant star" +"an exotic dancer" $HGCareers "a lawyer" @@ -127,7 +128,7 @@ $HGCareers "a model-UN star" "a student council president" "a leading arcology citizen" -"the Queen of an ancient kingdom" +"a Queen" $recruiterCareers "a military recruiter" @@ -137,7 +138,7 @@ $recruiterCareers "a missionary" "a cult leader" "a political activist" -"the princess of an ancient kingdom" +"a princess" $madamCareers "a procuress" @@ -166,7 +167,7 @@ $bodyguardCareers "a military brat" "captain of the kendo club" "a kunoichi" -"the crown prince of an ancient kingdom" +"a prince" $wardenessCareers "a security guard" @@ -175,9 +176,9 @@ $wardenessCareers "a private detective" "a bouncer" "a prison guard" -"an enforcer" "a street thug" "a gang member" +"a bounty hunter" $nurseCareers "a nurse" @@ -229,6 +230,9 @@ $schoolteacherCareers "a fuckdoll" "a bioreactor" "a slave" +"a dairy slave" +"a dairy cow" +"a breeding bull" ID: @@ -497,7 +501,7 @@ slave's weight 10 - -10 - neither to fat nor to skinny -11 - -30 - thin -31 - -95 - very thin --95- - emaciated +-95- - emaciated muscles: @@ -508,7 +512,7 @@ slave's muscles -5 - 5 - none -30 - -6 - weak -95 - -31 - very weak ---95 - frail +--95 - frail height: @@ -532,89 +536,111 @@ nationality: slave's nationality accepts string "slave" +"Afghan" +"Albanian" +"Algerian" "American" -"Chinese" -"Korean" -"Indonesian" -"Japanese" +"Argentinian" +"Armenian" +"Australian" +"Austrian" "Bangladeshi" -"Pakistani" -"Filipina" -"Indian" -"Russian" -"Egyptian" -"Nigerian" -"Saudi" -"Turkish" +"Belarusian" +"Belgian" +"Bermudian" +"Bolivian" "Brazilian" -"Argentinian" +"British" +"Bruneian" +"Burmese" +"Cambodian" +"Cameroonian" +"Canadian" +"Chilean" +"Chinese" "Colombian" -"Nigerian" -"Australian" +"Congolese" +"Cuban" +"Czech" +"Danish" +"Dominican" +"Dutch" +"Egyptian" +"Emirati" +"Estonian" "Ethiopian" +"Filipina" +"Finnish" +"French" +"Gabonese" "German" -"Mexican" -"Vietnamese" +"Ghanan" +"Greek" +"Greenlandic" +"Guatemalan" +"Haitian" +"Hungarian" +"Icelandic" +"Indian" +"Indonesian" "Iranian" -"Congolese" -"French" -"Thai" -"British" +"Iraqi" +"Irish" +"Israeli" "Italian" -"Spanish" +"Jamaican" +"Japanese" +"Jordanian" +"Kazakh" "Kenyan" -"Ukrainian" -"Canadian" -"Peruvian" -"Venezuelan" +"Korean" +"Lebanese" +"Libyan" +"Lithuanian" +"Malaysian" +"Malian" +"Marshallese" +"Mexican" +"Monégasque" +"Montenegrin" +"Moroccan" +"Nepalese" "a New Zealander" -"Irish" -"Icelandic" -"Finnish" +"Nigerian" +"Norwegian" +"Omani" +"Pakistani" +"Peruvian" "Polish" -"Israeli" -"Armenian" -"Greek" -"Moroccan" +"Portuguese" +"Puerto Rican" "Romanian" -"Swedish" -"Lithuanian" -"Bolivian" -"Haitian" -"Cuban" -"South African" -"Chilean" -"Belgian" -"Danish" -"Czech" +"Russian" +"Sammarinese" +"Saudi" +"Scottish" "Serbian" +"Singaporean" "Slovak" -"Norwegian" -"Dutch" -"Austrian" +"South African" +"Spanish" +"Sudanese" +"Swedish" "Swiss" -"Portuguese" -"Hungarian" -"Estonian" -"Puerto Rican" -"Jamaican" -"Kazakh" -"Zimbabwean" +"Syrian" "Tanzanian" -"Ugandan" -"Malaysian" -"Guatemalan" -"Ghanan" -"Lebanese" +"Thai" "Tunisian" -"Emirati" -"Libyan" -"Jordanian" -"Omani" -"Malian" -"Belarusian" -"Dominican" -"Scottish" +"Turkish" +"Ugandan" +"Ukrainian" +"Uruguayan" +"Uzbek" +"Venezuelan" +"Vietnamese" +"Yemeni" +"Zimbabwean" + race: @@ -886,7 +912,7 @@ slave boob size boobsImplant: slave implant size -0 - no implants +0 - no implants 1-199 - small implants 200-399 - normal implants 400-599 - large implants @@ -1581,40 +1607,40 @@ takes one of the following strings or 0 vaginalSkill: 0-10 - unskilled -11-30 - basic -31-60 - skilled +11-30 - basic +31-60 - skilled 61-99 - expert 100+ - master oralSkill: 0-10 - unskilled -11-30 - basic -31-60 - skilled +11-30 - basic +31-60 - skilled 61-99 - expert 100+ - master analSkill: 0-10 - unskilled -11-30 - basic -31-60 - skilled +11-30 - basic +31-60 - skilled 61-99 - expert 100+ - master whoreSkill: 0-10 - unskilled -11-30 - basic -31-60 - skilled +11-30 - basic +31-60 - skilled 61-99 - expert 100+ - master entertainSkill: 0-10 - unskilled -11-30 - basic -31-60 - skilled +11-30 - basic +31-60 - skilled 61-99 - expert 100+ - master @@ -1978,64 +2004,64 @@ is fetish known to player 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 +"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 +"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 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 +"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 +"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 +"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: @@ -2199,13 +2225,13 @@ Slave's internals have ruptured. Used with poor health and overinflation. bellyImplant: Does the slave have a fillable abdominal implant. --1 no -0+ yes -2000+ Early pregnancy -4000+ looks pregnant -8000+ looks full term -16000+ hyperpregnant 1 -32000+ hyperpregnant 2 +-1 - no +0+ - yes +2000+ - Early pregnancy +4000+ - looks pregnant +8000+ - looks full term +16000+ - hyperpregnant 1 +32000+ - hyperpregnant 2 bellyPain: @@ -2463,3 +2489,4 @@ To test if your slave is functioning, start up a normal game, swap to cheat mode @@.lightcoral; - fetish + diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index 979e96dcf168b8b9c00dbda8021db7896be7886f..2d53f382cdec35f1fb51f41996a96f9a1037f2b6 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -196,13 +196,13 @@ <<set setup.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", "an exotic dancer"]>> -<<set setup.HGCareers = ["a lawyer", "a military officer", "a politician", "a model-UN star", "a student council president", "a leading arcology citizen", "the Queen of an ancient kingdom"]>> +<<set setup.HGCareers = ["a lawyer", "a military officer", "a politician", "a model-UN star", "a student council president", "a leading arcology citizen", "a Queen"]>> <<set setup.madamCareers = ["a procuress", "a pimp", "a business owner", "a manager"]>> <<set setup.DJCareers = ["a dancer", "a musician", "a classical dancer", "a classical musician", "a house DJ", "an aspiring pop star"]>> -<<set setup.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", "a kunoichi", "the crown prince of an ancient kingdom"]>> +<<set setup.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", "a kunoichi", "a prince"]>> <<set setup.wardenessCareers = ["a security guard", "a mercenary", "an enforcer", "a private detective", "a bouncer", "a prison guard", "a street thug", "a gang member", "a bounty hunter",]>> @@ -216,7 +216,7 @@ <<set setup.schoolteacherCareers = ["a principal", "a teaching assistant", "a teacher", "a scientist", "a professor", "a private instructor", "a librarian", "a scholar"]>> -<<set setup.recruiterCareers = ["a military recruiter", "a club recruiter", "a college scout", "a girl scout","the princess of an ancient kingdom", "a missionary", "a cult leader", "a political activist"]>> /* pregmod */ +<<set setup.recruiterCareers = ["a military recruiter", "a club recruiter", "a college scout", "a girl scout", "a princess", "a missionary", "a cult leader", "a political activist"]>> /* pregmod */ <<set setup.baseNationalities = ["Afghan", "Albanian", "Algerian", "American", "Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belgian", "Bermudian", "Bolivian", "Brazilian", "British", "Bruneian", "Burmese", "Cambodian", "Cameroonian", "Canadian", "Chilean", "Chinese", "Colombian", "Congolese", "Cuban", "Czech", "Danish", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "Gabonese", "German", "Ghanan", "Greek", "Greenlandic", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indian", "Indonesian", "Iranian", "Iraqi", "Irish", "Israeli", "Italian", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Marshallese", "Mexican", "Monégasque", "Montenegrin", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Sammarinese", "Saudi", "Serbian", "Singaporean", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Syrian", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uruguayan", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean", "Belarusian", "Dominican", "Scottish"]>> diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 005030776d1e046226b6312916c3799139576b96..d5b0e9e94818cf963d5e0e7566d65c86fb9347b5 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -1302,6 +1302,26 @@ Her nationality is $activeSlave.nationality. <<link "Devout">><<set $activeSlave.behavioralFlaw = "devout">><<replace "#behavioralFlaw">>@@.red;$activeSlave.behavioralFlaw.@@<</replace>><<StartingGirlsCost>><</link>> | <<link "Liberated">><<set $activeSlave.behavioralFlaw = "liberated">><<replace "#behavioralFlaw">>@@.red;$activeSlave.behavioralFlaw.@@<</replace>><<StartingGirlsCost>><</link>> +<br>''Behavioral Quirk:'' +<span id="behavioralQuirk"> +<<if $activeSlave.behavioralQuirk == "none">> + //$activeSlave.behavioralQuirk.// +<<else>> + @@.green;$activeSlave.behavioralQuirk.@@ +<</if>> +</span> +<br> +<<link "None">><<set $activeSlave.behavioralQuirk = "none">><<replace "#behavioralQuirk">>//$activeSlave.behavioralQuirk.//<</replace>><<StartingGirlsCost>><</link>> | +<<link "Confident">><<set $activeSlave.behavioralQuirk = "confident">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Cutting">><<set $activeSlave.behavioralQuirk = "cutting">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Funny">><<set $activeSlave.behavioralQuirk = "funny">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Men">><<set $activeSlave.behavioralQuirk = "adores men">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Women">><<set $activeSlave.behavioralQuirk = "adores women">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Insecure">><<set $activeSlave.behavioralQuirk = "insecure">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Fitness">><<set $activeSlave.behavioralQuirk = "fitness">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Sinful">><<set $activeSlave.behavioralQuirk = "sinful">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Advocate">><<set $activeSlave.behavioralQuirk = "advocate">><<replace "#behavioralQuirk">>@@.green;$activeSlave.behavioralQuirk.@@<</replace>><<StartingGirlsCost>><</link>> + <br>''Sexual Flaw:'' <span id="sexualFlaw"> <<if $activeSlave.sexualFlaw == "none">> @@ -1322,6 +1342,26 @@ Her nationality is $activeSlave.nationality. <<link "Judgemental">><<set $activeSlave.sexualFlaw = "judgemental">><<replace "#sexualFlaw">>@@.red;$activeSlave.sexualFlaw.@@<</replace>><<StartingGirlsCost>><</link>> | <<link "Sexually idealistic">><<set $activeSlave.sexualFlaw = "idealistic">><<replace "#sexualFlaw">>@@.red;$activeSlave.sexualFlaw.@@<</replace>><<StartingGirlsCost>><</link>> +<br>''Sexual Quirk:'' +<span id="sexualQuirk"> +<<if $activeSlave.sexualQuirk == "none">> + //$activeSlave.sexualQuirk.// +<<else>> + @@.green;$activeSlave.sexualQuirk.@@ +<</if>> +</span> +<br> +<<link "None">><<set $activeSlave.sexualQuirk = "none">><<replace "#sexualQuirk">>//$activeSlave.sexualQuirk.//<</replace>><<StartingGirlsCost>><</link>> | +<<link "Oral">><<set $activeSlave.sexualQuirk = "gagfuck queen">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Anal">><<set $activeSlave.sexualQuirk = "painal queen">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Penetration">><<set $activeSlave.sexualQuirk = "strugglefuck queen">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Perverted">><<set $activeSlave.sexualQuirk = "perverted">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Tease">><<set $activeSlave.sexualQuirk = "tease">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Caring">><<set $activeSlave.sexualQuirk = "caring">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Unflinching">><<set $activeSlave.sexualQuirk = "unflinching">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Size queen">><<set $activeSlave.sexualQuirk = "size queen">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> | +<<link "Romantic">><<set $activeSlave.sexualQuirk = "romantic">><<replace "#sexualQuirk">>@@.green;$activeSlave.sexualQuirk.@@<</replace>><<StartingGirlsCost>><</link>> + <br> <span id="finalize"> <<slaveCost $activeSlave>> diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index 2c969b4c8cb80d70098d5bf5d8d36b9697d27b06..980aaa3396c838801b21405dab5ac16513f82212 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -346,9 +346,9 @@ She's sitting on the end of the couch, though only her legs, crotch and hands ar $activeSlave.slaveName is using the biggest dildo $subSlave.slaveName's <<if $subSlave.anus > 2>>loose<<elseif $subSlave.anus > 1>>welcoming<<else>>tight<</if>> anus can handle, and she's bouncing her anal bottom up and down fast. <</if>> Surprisingly, the slave on top doesn't seem too unhappy with this. She's no slavishly devoted buttslut, but -<<if ($subSlave.dickAccessory == "chastity")>> +<<if ($subSlave.dickAccessory == "chastity" || $subSlave.dickAccessory == "combined chastity")>> she's taking it well, and even looking a little uncomfortable as the beginnings of a hardon press against her chastity cage. -<<elseif ($subSlave.dick > 0) && canAchieveErection($subSlave.balls)>> +<<elseif ($subSlave.dick > 0) && canAchieveErection($subSlave)>> her cock is proudly erect, sticking straight up as she reclines against $activeSlave.slaveName beneath her, wiggling a little with the rhythm of the pounding. <<elseif ($subSlave.dick > 0)>> she looks aroused, though her flopping dick can't show it. diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 45de8d52b7a3085f99a66a9f32a39f54437e6923..13c600eafd50879a995859ba10a5f4f57060fad1 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -341,7 +341,7 @@ <<set _seed++>> <</if>> <<elseif $brothelAdsImplanted == -1>> - <<if $slaves[$i].boobsImplant == 0 && $slaves[$i].buttImplant == 0 && $slaves[$i].waist >= -95 && $slaves[$i].lipsImplant == 0 && $slaves[$i].faceImplant < 30 && $slaves[$i].bellyImplant == -1>> + <<if $slaves[$i].boobsImplant == 0 && $slaves[$i].buttImplant == 0 && $slaves[$i].waist >= -95 && $slaves[$i].lipsImplant == 0 && $slaves[$i].faceImplant < 30 && $slaves[$i].bellyImplant <= 0>> <<set _seed++>> <</if>> <</if>> diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw index e3a539ef57ac63f8d3f9e1a83c2bdf696535d434..7563eac012959e59766217dd9d74e0cc5fa1e152 100644 --- a/src/uncategorized/jeSlaveDispute.tw +++ b/src/uncategorized/jeSlaveDispute.tw @@ -128,7 +128,7 @@ <<set $activeSlave.vagina = 2>> <<set $activeSlave.ovaries = 1>> <<if isFertile($activeSlave)>> - <<KnockMeUp $activeSlave 100 2 -2>> + <<KnockMeUp $activeSlave 100 2 -2 1>> <</if>> <</if>> <</switch>> diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index b69d81eee1a2a0cd2cd694e2c5f85437b8b2482a..d01b6b965839788220b30b551626729a6bbcf969 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -345,7 +345,7 @@ <br> She <<include "SA please you">> <br> <<include "SA chooses own clothes">> - <<include "SA diet">> + <<include "SA drugs">> <<include "SA long term effects">> <<include "SA drugs">> <<include "SA relationships">> diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw index f2b37b0cc8d075b06989163e0d3bb608a6fce3ff..fe9f4d23f539c72c388089f89d43d4b51a547af0 100644 --- a/src/uncategorized/pePitFight.tw +++ b/src/uncategorized/pePitFight.tw @@ -83,15 +83,32 @@ Across the ring, her opponent's owner nods civilly to you and examines $activeSl Her swollen, <<print $activeSlave.bellyImplant>>cc implant filled belly is heavy and makes her less effective. <</if>> -<<if $activeSlave.preg > 10>> - <<if $activeSlave.pregType >= 20>> - Her massive belly is nearly a guaranteed loss, she can barely stand let alone fight. - <<elseif $activeSlave.pregType >= 10>> +<<if $activeSlave.pregKnown == 1 || $activeSlave.bellyPreg >= 1500>> + <<if $activeSlave.bellyPreg >= 750000>> + Her monolithic pregnancy guarantees her loss; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent. + <<elseif $activeSlave.bellyPreg >= 600000>> + Her titanic pregnancy is practically a guaranteed loss; she can barely stand let alone fight. + <<elseif $activeSlave.bellyPreg >= 450000>> + Her gigantic pregnancy is nearly a guaranteed loss; it presents an unmissable, indefensible target for her adversary. + <<elseif $activeSlave.bellyPreg >= 300000>> + Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend her bulk. + <<elseif $activeSlave.bellyPreg >= 150000>> + Her giant pregnancy obstructs her movement and greatly slows her down. + <<elseif $activeSlave.bellyPreg >= 100000>> + Her giant belly gets in her way and weighs her down. + <<elseif $activeSlave.bellyPreg >= 10000>> Her huge belly is unwieldy and hinders her efforts. - <<else>> + <<elseif $activeSlave.bellyPreg >= 5000>> Her advanced pregnancy makes her much less effective. + <<elseif $activeSlave.bellyPreg >= 1500>> + Her growing pregnancy distracts her from the fight. <</if>> <</if>> +<<if $activeSlave.labor == 1>> + She's feeling labor pains. Her child<<if $activeSlave.pregType > 1>>ren are<<else>> is<</if>> ready to be born. +<<elseif $activeSlave.preg >= 40 && $activeSlave.pregControl != "labor supressors">> + She'll be going into labor any time now and she knows it. +<</if>> <<if $deadliness > 5>> $activeSlave.slaveName seems supremely confident, even eager to please you. diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 7b1a7a47eeb1286ab69a83cd390c6fad72ac8f27..f2f3e0347a9ea6df476760ff87f388bd2533ee8d 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -421,7 +421,7 @@ Work on her chest: <<if $activeSlave.indentureRestrictions < 2>> $pronounCap has big areolae that could be reshaped into a pattern. Graft skin to make $possessive areolae: [[Heart-shaped|Surgery Degradation][$activeSlave.areolae = 4,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] - | [[Star-shaped|Surgery Degradation][$activeSlave.areolae = 5,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] + | [[Star-shaped|Surgery Degradation][$activeSlave.areolae = 5,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] | <</if>> <<elseif $activeSlave.areolae == 4>> $possessiveCap huge areolae have been surgically altered to be heart-shaped. diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index 5b6ae59647a8b51c767de22d495430528283631a..dfb0ee53624aaf621bccc72675c955adeffbb7da 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -464,6 +464,16 @@ On formal occasions, you are announced as $PCTitle. <</if>> <</if>> +<<if $TCR.schoolPresent == 1>> + <<if $arcologies[0].FSRestart != "unset">> + Your Eugenics focused society @@.red;disagrees@@ with the local branch of The Cattle Ranch's views on slave breeding. Until society sees them as nothing more than mindless cattle and not human, they are in conflict with current reproduction standards. + <<FSChange "Eugenics" -1>> + <<elseif $arcologies[0].FSPaternalist != "unset">> + While they can't stop what happens to slaves outside of your arcology, they can @@.red;disapprove and protest@@ you allowing a branch of the mentally and physically abusive Cattle Ranch to be established in your arcology. + <<FSChange "Paternalist" -2>> + <</if>> +<</if>> + <<if $Cash4Babies == 1>> <<if $arcologies[0].FSDegradationist != "unset">> Society @@.green;approves@@ of your poor treatment of slave infants. diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw index 3f95f82e0c6c9d4df59e571aa4dfbd8955181946..17bec5197042f412860b9ca05964bdf18091bf76 100644 --- a/src/uncategorized/saGetMilked.tw +++ b/src/uncategorized/saGetMilked.tw @@ -84,7 +84,7 @@ gets milked this week. <</if>> <</if>> - <<if ($slaves[$i].preg > 5)>> + <<if ($slaves[$i].preg > 5) && ($slaves[$i].pregKnown == 1)>> Her pregnancy helps her body produce more milk naturally<<if $slaves[$i].lactationAdaptation < 100>>, and also helps it adapt to milk production<<set $slaves[$i].lactationAdaptation += 1>><</if>>. <</if>> diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw index 492879460a8cec307b00951aa4f0c1a2f1858bc4..cbb3da58ca1170c03f3af9ffa2168162e4cc599b 100644 --- a/src/uncategorized/saGuardsYou.tw +++ b/src/uncategorized/saGuardsYou.tw @@ -89,9 +89,9 @@ carries arms in your defense. <</if>> <<if $slaves[$i].bellyImplant >= 32000>> - Her immense, <<print $slaves[$i].bellyImplant>>cc implant filled belly greatly hinders her movement and terribly reduces her effectiveness in combat. It also limits where she can follow you, as doors and small passages don't agree with her bloated figure. + Her immense, <<print $slaves[$i].bellyImplant>>cc implant filled belly greatly hinders her movement and terribly reduces her effectiveness in combat. It also limits where she can follow you, as doors and small passages don't agree with her bloated figure. <<elseif $slaves[$i].bellyImplant >= 16000>> - Her massive, <<print $slaves[$i].bellyImplant>>cc implant filled belly greatly hinders her movement and terribly reduces her effectiveness in combat. It also limits where she can follow you, as doors and small passages don't agree with her bloated figure. + Her massive, <<print $slaves[$i].bellyImplant>>cc implant filled belly greatly hinders her movement and terribly reduces her effectiveness in combat. It also limits where she can follow you, as doors and small passages don't agree with her bloated figure. <<elseif $slaves[$i].bellyImplant >= 8000>> Her huge, <<print $slaves[$i].bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective. <<elseif $slaves[$i].bellyImplant >= 4000>> @@ -100,10 +100,29 @@ carries arms in your defense. Her swollen, <<print $slaves[$i].bellyImplant>>cc implant filled belly is heavy and makes her less effective. <</if>> -<<if ($slaves[$i].preg > 10) && ($slaves[$i].pregType >= 10)>> - Her massive belly greatly hinders her movement and terribly reduces her effectiveness in combat. It also limits where she can follow you, as doors and small passages don't agree with her bloated figure. -<<elseif ($slaves[$i].preg > 10)>> - Her advanced pregnancy limits her effectiveness. +<<if $fighterTwo.pregKnown == 1 || $fighterTwo.bellyPreg >= 1500>> + <<if $fighterTwo.bellyPreg >= 750000>> + Her monolithic pregnancy greatly restricts her movement and renders her nearly useless in combat. She can barely waddle after you, and when she does, finds doors and small passages don't agree with her bloated figure. + <<elseif $fighterTwo.bellyPreg >= 450000>> + Her gigantic pregnancy greatly hinders her movement and terribly reduces her effectiveness in combat. It also limits where she can follow you, as doors and small passages don't agree with her bloated figure. + <<elseif $fighterTwo.bellyPreg >= 300000>> + Her massive pregnancy obstructs her movement and greatly hinders her ability to protect you. It also limits where she can follow you, as doors and small passages don't agree with her bloated figure. + <<elseif $fighterTwo.bellyPreg >= 150000>> + Her giant pregnancy obstructs her movement and greatly slows her down. It also limits where she can follow you, as she has trouble waddling through crowds. + <<elseif $fighterTwo.bellyPreg >= 100000>> + Her giant belly gets in her way and weighs her down. + <<elseif $fighterTwo.bellyPreg >= 10000>> + Her huge belly is unwieldy and hinders her. + <<elseif $fighterTwo.bellyPreg >= 5000>> + Her advanced pregnancy limits her effectiveness. + <<elseif $fighterTwo.bellyPreg >= 1500>> + Her growing pregnancy distracts occasionally distracts her from her job. + <</if>> +<</if>> +<<if $fighterTwo.labor == 1>> + She's feeling labor pains, greatly detracting from her ability to protect you. +<<elseif $fighterTwo.preg >= 40 && $fighterTwo.pregControl != "labor supressors">> + She'll be going into labor any time now detracting from her ability to protect you. <</if>> <<if $slaves[$i].teeth == "pointy">> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 4ffa0bc4f95af08429aad71d51e18ee982bbd6b6..f38aa46a78e7f611834268a4ab4e46cdffbb2f72 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -318,9 +318,10 @@ <<elseif $HeadGirl.fetishKnown == 1>> $HeadGirl.slaveName knows better than to even consider getting knocked up by $slaves[$i].slaveName. <</if>> -<<elseif $HeadGirl.fetish != "pregnancy" && $slaves[$i].preg > 4 && $slaves[$i].preg < 20 && $arcologies[0].FSRepopulationFocus == "unset" && $HGSuiteDrugs == 1>> +<<elseif $HeadGirl.fetish != "pregnancy" && $slaves[$i].pregKnown == 1 && $slaves[$i].preg < 30 && $arcologies[0].FSRepopulationFocus == "unset" && $HGSuiteDrugs == 1>> $HeadGirl promptly aborts the child growing in $slaves[$i].slaveName since she prefers her girls not harboring someone else's child or loaded down with her own unwanted spawn. - <<set $slaves[$i].preg = 0, $slaves[$i].pregType = 0, $slaves[$i].pregSource = 0>> + <<set $slaves[$i].preg = 0, $slaves[$i].pregType = 0, $slaves[$i].pregSource = 0, $slaves[$i].pregWeek = 0, $slaves[$i].pregKnown = 0>> + <<SetBellySize $slaves[$i]>> <</if>> <<if ($slaves[$i].devotion > 50)>> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index dea075fc7fc2735f20e8fe1e02c24684e6c6a45c..deab07dd67d5410a104df6990ef0d85b2284c652 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -66,7 +66,7 @@ uses your online resources and some @@.yellowgreen;modest funds@@ to convince $r <</if>> <<if ($slaves[$i].pregType >= 10) && ($slaves[$i].preg > 20)>> - Her massive overfilled womb is detrimental to her efforts to recruit girls. It instills a fear of being turned into nothing more than a baby filled sack. + Her massive overfilled womb is detrimental to her efforts to recruit girls. It instills a fear of being turned into nothing more than a baby filled sack. <<set $recruiterProgress -= 3>> <</if>> @@ -81,14 +81,18 @@ uses your online resources and some @@.yellowgreen;modest funds@@ to convince $r <<if $recruiterTarget == "desperate whores">> <<if ($Recruiter.analCount + $Recruiter.oralCount) > 200>> - As a veteran slut, she speaks from experience when she says that being your slave whore will be safer and healthier than streetwalking. - <<set $recruiterProgress += 1>> + As a veteran slut, she speaks from experience when she says that being your slave whore will be safer and healthier than streetwalking. + <<set $recruiterProgress += 1>> <<else>> - She does her best to convince them that being your slave whore will be safer and healthier than streetwalking. + She does her best to convince them that being your slave whore will be safer and healthier than streetwalking. <</if>> <<elseif $recruiterTarget is "expectant mothers">> /* now you can ginger too */ - <<if $Recruiter.preg > 5 || $Recruiter.inflation == 3 || $Recruiter.bellyImplant >= 2000 || setup.fakeBellies.includes($bellyAccessory)>> - Since she's visibly pregnant herself, she speaks with authority when she says that Free Cities medicine can keep them and their pregnancies safe and healthy. + <<if $Recruiter.bellyPreg >= 1500 || $Recruiter.inflation == 3 || $Recruiter.bellyImplant >= 2000 || setup.fakeBellies.includes($bellyAccessory)>> + <<if $Recruiter.preg > 5>> + Since she's visibly pregnant herself, she speaks with authority when she says that Free Cities medicine can keep them and their pregnancies safe and healthy. + <<else>> + Since she looks visibly pregnant, she's more convincing when she says that Free Cities medicine can keep them and their pregnancies safe and healthy. + <</if>> <<set $recruiterProgress += 1>> <<else>> She does her best to convince them that Free Cities medicine can keep them and their pregnancies safe and healthy. @@ -215,8 +219,8 @@ She uses her extra time and @@.yellowgreen;recruitment allowance@@ this week to <<set _seed += 1>> <</if>> <<else>> - <<if $slaves[$i].balls < 1 && ($slaves[$i].preg > 5 || setup.fakeBellies.includes($bellyAccessory))>> - <<if $slaves[$i].preg > 5>> <<set _seed += 4>> + <<if $slaves[$i].balls < 1 && ($slaves[$i].bellPreg >= 1500 || setup.fakeBellies.includes($bellyAccessory))>> + <<if $slaves[$i].bellPreg >= 1500>> <<set _seed += 4>> <<else>> <<set _seed += 1>> <</if>> <<set _FSmatch++, $arcologies[0].FSGenderFundamentalist += 0.01*$FSSingleSlaveRep>> @@ -293,7 +297,7 @@ She uses her extra time and @@.yellowgreen;recruitment allowance@@ this week to <<set _seed += 2>> <</if>> <<set _FSmatch++, $arcologies[0].FSRepopulationFocus += 0.01*$FSSingleSlaveRep>> - <<elseif $slaves[$i].preg > 10>> + <<elseif $slaves[$i].pregBelly >= 1500>> <<if $slaves[$i].pregType >= 20>> <<set _seed += 3>> <<elseif $slaves[$i].pregType >= 10>> @@ -308,16 +312,16 @@ She uses her extra time and @@.yellowgreen;recruitment allowance@@ this week to <</if>> <</if>> <<if $arcologies[0].FSRestart != "unset">> - <<if $slaves[$i].preg > 5 && $slaves[$i].breedingMark == 1>> + <<if $slaves[$i].bellyPreg >= 1500 && $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)>> - <<set _seed += 2, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>> - <<elseif ($slaves[$i].vaginalAccessory == "chastity belt" || $slaves[$i].dickAccessory == "chastity" || $slaves[$i].vaginalAccessory == "combined chastity" || $slaves[$i].dickAccessory == "combined chastity") || (($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1) && $slaves[$i].preg < -1)>> - <<set _seed += 1, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>> - <</if>> + <<elseif $slaves[$i].pregBelly < 100>> + <<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)>> + <<set _seed += 2, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>> + <<elseif ($slaves[$i].vaginalAccessory == "chastity belt" || $slaves[$i].dickAccessory == "chastity" || $slaves[$i].vaginalAccessory == "combined chastity" || $slaves[$i].dickAccessory == "combined chastity") || (($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1) && $slaves[$i].preg < -1)>> + <<set _seed += 1, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>> + <</if>> <</if>> <</if>> <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> @@ -487,9 +491,9 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els She just doesn't have the right combination of body parts to personally demonstrate your utopia of eager, girly-dicked buttsluts. <</if>> <</if>> <<if $arcologies[0].FSRepopulationFocus != "unset">> - <<if $slaves[$i].preg > 20>> + <<if $slaves[$i].preg > 30>> She makes a habit of allowing the public to fondle and enjoy the movements within her baby filled belly. - <<elseif $slaves[$i].preg > 10>> + <<elseif $slaves[$i].preg > 15>> She makes a habit of allowing the public to fondle and enjoy baby rounded belly. <<elseif $slaves[$i].births > 0>> Any time she stars in an erotic photoshoot, she always makes sure to follow up with a, hopefully positive, pregnancy test. Though she makes sure to hype up her viewers to sign up to be the one to knock her up should it come up negative. @@ -505,18 +509,18 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els <</if>> <</if>> <<if $arcologies[0].FSRestart != "unset">> - <<if $slaves[$i].preg > 5 && $slaves[$i].breedingMark == 1>> + <<if $slaves[$i].bellyPreg >= 1500 && $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")>> - In all her public appearances, her choice of clothing is always crotchless, leaving her chastity gear as the only thing protecting her modesty. - <<elseif (($slaves[$i].ovaries == 0 && $slaves[$i].mpreg == 0) || $slaves[$i].preg < -1)>> - She frequently livestreams massive orgies involving herself at the center, making sure to always follow up with her negative pregnancy tests. - <<else>> - Her lack of commitment to sterilization and eugenics drive away potential listeners. - <</if>> + <<elseif $slaves[$i].bellyPreg < 100>> + <<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")>> + In all her public appearances, her choice of clothing is always crotchless, leaving her chastity gear as the only thing protecting her modesty. + <<elseif (($slaves[$i].ovaries == 0 && $slaves[$i].mpreg == 0) || $slaves[$i].preg < -1)>> + She frequently livestreams massive orgies involving herself at the center, making sure to always follow up with her negative pregnancy tests. + <<else>> + Her lack of commitment to sterilization and eugenics drive away potential listeners. + <</if>> <<else>> No-one cares what bloated trash has to say. <</if>> @@ -524,7 +528,7 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els <<if $arcologies[0].FSGenderFundamentalist != "unset">> <<if $slaves[$i].balls < 1>> <<if $arcologies[0].FSRestart != "unset">> - <<if $slaves[$i].preg > 5>> + <<if $slaves[$i].bellyPreg >= 1500>> She unashamedly live streams an obstetric health check in the nude, promising to broadcast similar footage right up until, and during, the birth. <<elseif setup.fakeBellies.includes($bellyAccessory)>> With some discreet editing, she uploads fake ultrasounds to match her plastic pregnancy, bringing a little more attention to your fertility campaigns. diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index 6f17043449f9de0cd6731d4d33f70f66b1f44e93..381e9921e56928e743748710b76dc3f23a89ba49 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -86,26 +86,16 @@ the public. <</if>> <</if>> <<if $clubAdsPreg == 1>> - <<if ($slaves[$i].preg > 10) || ($slaves[$i].bellyImplant >= 4000)>> + <<if ($slaves[$i].bellyPreg >= 5000) || ($slaves[$i].bellyImplant >= 4000)>> <<set $beautyMultiplier += 0.05>> Her gravid body fits $clubName's ad campaign, getting her more attention. <</if>> <<elseif $clubAdsPreg == -1>> - <<if ($slaves[$i].pregType < 10)>> - <<if ($slaves[$i].preg < 1)>> - <<if ($slaves[$i].weight < 30)>> - <<if (!setup.fakeBellies.includes($bellyAccessory))>> - <<if ($slaves[$i].bellyImplant <= 0)>> - <<if ($slaves[$i].inflation == 0)>> + <<if ($slaves[$i].belly < 100) && ($slaves[$i].weight < 30) && (!setup.fakeBellies.includes($bellyAccessory)) && ($slaves[$i].bellyImplant <= 0) && ($slaves[$i].inflation == 0)>> <<set $beautyMultiplier += 0.05>> Her flat belly fits $clubName's ad campaign, getting her more attention. <</if>> <</if>> - <</if>> - <</if>> - <</if>> - <</if>> - <</if>> <<if $clubAdsModded == 1>> <<if $modScore > 15 || ($piercingScore > 8 && $tatScore > 5)>> <<set $beautyMultiplier += 0.05>> @@ -753,7 +743,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau She appeals to citizens who like lactation play, or just like sluts they can drink milk from. <</if>> -<<if $slaves[$i].preg > 10 || setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 2000>> +<<if $slaves[$i].bellyPreg >= 1500 || setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 2000>> <<if $arcologies[0].FSRepopulationFocus != "unset">> In the new culture of $arcologies[0].name, her pregnancy gets her lots of attention. <<elseif $arcologies[0].FSRestart != "unset">> @@ -1409,7 +1399,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau <<if ($slaves[$i].addict > 50)>> <<set $vignettes.push({text: "she zoned out badly due to a low point between aphrodisiac doses, disappointing a citizen,", type: "rep", effect: -1})>> <</if>> -<<if ($slaves[$i].preg > 20)>> +<<if ($slaves[$i].bellyPreg >= 10000) || ($slaves[$i].bellyImplant >= 10000)>> <<set $vignettes.push({text: "she earned extra gratitude from a citizen who likes to do nothing more than cuddle with her swollen belly,", type: "rep", effect: 1})>> <<set $vignettes.push({text: "a night with guy who likes rough, hard sex with heavily pregnant girls took its toll on her", type: "health", effect: -1})>> <</if>> @@ -1573,7 +1563,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau <</if>> <</if>> <<if $arcologies[0].FSRepopulationFocus != "unset">> - <<if ($slaves[$i].pregType > 1)>> + <<if ($slaves[$i].pregType > 1) && ($slaves[$i].pregKnown > 1) && ($slaves[$i].belly >= 10000)>> <<set $vignettes.push({text: "she gratified a citizen who enjoys the feeling of a womb filled with more than a single child,", type: "rep", effect: 1})>> <</if>> <<elseif $arcologies[0].Restart != "unset">> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index 2dbb2e5b51114c8db81ae45b51068fd3c25d90f8..637b2c252cbdebc7777f19973aa1a96ced06e6fc 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -80,26 +80,16 @@ her body. <</if>> <</if>> <<if $brothelAdsPreg == 1>> - <<if ($slaves[$i].preg > 10) || ($slaves[$i].bellyImplant >= 4000)>> + <<if ($slaves[$i].bellyPreg >= 5000) || ($slaves[$i].bellyImplant >= 4000)>> <<set $beautyMultiplier += 0.05>> Her gravid body fits $brothelName's ad campaign, getting her more attention. <</if>> <<elseif $brothelAdsPreg == -1>> - <<if ($slaves[$i].pregType < 10)>> - <<if ($slaves[$i].preg < 1)>> - <<if ($slaves[$i].weight < 30)>> - <<if (!setup.fakeBellies.includes($bellyAccessory))>> - <<if ($slaves[$i].bellyImplant <= 0)>> - <<if ($slaves[$i].inflation == 0)>> + <<if ($slaves[$i].belly < 100) && ($slaves[$i].weight < 30) && (!setup.fakeBellies.includes($bellyAccessory)) && ($slaves[$i].bellyImplant <= 0) && ($slaves[$i].inflation == 0)>> <<set $beautyMultiplier += 0.05>> Her flat belly fits $brothelName's ad campaign, getting her more attention. <</if>> <</if>> - <</if>> - <</if>> - <</if>> - <</if>> - <</if>> <<if $brothelAdsModded == 1>> <<if $modScore > 15 || ($piercingScore > 8 && $tatScore > 5)>> <<set $beautyMultiplier += 0.05>> @@ -760,7 +750,7 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da She appeals to customers who like lactation play, or just want a whore they can drink milk from. <</if>> -<<if $slaves[$i].preg > 10 || setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 2000>> +<<if $slaves[$i].bellyPreg >= 1500 || setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 2000>> <<if $arcologies[0].FSRepopulationFocus != "unset">> In the new culture of $arcologies[0].name, her pregnancy makes her a profitable whore. <<elseif $arcologies[0].FSRestart != "unset">> @@ -1409,16 +1399,14 @@ In total, you were paid @@.yellowgreen;¤<<print Math.trunc($beauty*$FResult)>>@ <<if ($slaves[$i].addict > 50)>> <<set $vignettes.push({text: "she zoned out badly due to a low point between aphrodisiac doses, disappointing a customer,", type: "rep", effect: -1})>> <</if>> -<<if ($slaves[$i].preg > 20)>> +<<if ($slaves[$i].bellyPreg >= 10000)>> <<set $vignettes.push({text: "she earned repeat business from a customer who likes to do nothing more than cuddle with her swollen belly,", type: "cash", effect: 1})>> <<set $vignettes.push({text: "a night with guy who likes rough, hard sex with heavily pregnant girls took its toll on her", type: "health", effect: -1})>> <</if>> <<if ($slaves[$i].inflation > 1)>> <<set $vignettes.push({text: "she earned repeat business from a customer who loved the way her belly moved as he fucked her,", type: "cash", effect: 1})>> -<<if ($slaves[$i].inflation > 1)>> <<set $vignettes.push({text: "she disgusted a customer when his forceful fucking caused her to release her contained $slaves[$i].inflationType all over him,", type: "rep", effect: -2})>> <</if>> -<</if>> <<if ($slaves[$i].hormones > 0) && !canAchieveErection($slaves[$i])>> <<if ($slaves[$i].dick > 0)>> <<set $vignettes.push({text: "she disappointed a customer who was sure she could get $slaves[$i].slaveName's cock erect,", type: "rep", effect: -1})>> @@ -1597,7 +1585,7 @@ In total, you were paid @@.yellowgreen;¤<<print Math.trunc($beauty*$FResult)>>@ <</if>> <</if>> <<if $arcologies[0].FSRepopulationFocus != "unset">> - <<if ($slaves[$i].pregType > 1)>> + <<if ($slaves[$i].pregType > 1) && ($slaves[$i].pregKnown > 1) && ($slaves[$i].belly >= 10000)>> <<set $vignettes.push({text: "she got repeat business from a customer who loves fucking girls with wombs filled by more than a single child,", type: "cash", effect: 1})>> <</if>> <<elseif $arcologies[0].Restart != "unset">> diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw index 35ce36cf8d417990684e9cc5ba12936df6b67f41..a247cd6110b6ab96f8cb89620fe8399424318d76 100644 --- a/src/uncategorized/seLethalPit.tw +++ b/src/uncategorized/seLethalPit.tw @@ -156,15 +156,32 @@ You review the rules - the combatants will use their choice of swords, and the f Her swollen, <<print $fighterOne.bellyImplant>>cc implant filled belly is heavy and makes her less effective. <</if>> -<<if $fighterOne.preg > 10>> - <<if $fighterOne.pregType >= 20>> - Her massive belly is practically a death sentence, she can barely keep it together while thinking about the lives of her brood. - <<elseif $fighterOne.pregType >= 10>> - Her huge belly gets in her way and weighs her down. She is terrified for the lives of her children. - <<else>> +<<if $fighterOne.pregKnown == 1 || $fighterOne.bellyPreg >= 1500>> + <<if $fighterOne.bellyPreg >= 750000>> + Her monolithic pregnancy guarantees her and her many, many children's deaths; not only is she on the verge of splitting open, but it is an unmissable, indefensible target. She has no hope of attacking around the straining mass, let alone stopping her opponent. She is damned. + <<elseif $fighterOne.bellyPreg >= 600000>> + Her titanic pregnancy is practically a death sentence; not only does she risk bursting, but it is an unmissable, indefensible target. She can barely keep it together while thinking about the lives of her brood. + <<elseif $fighterOne.bellyPreg >= 450000>> + Her gigantic pregnancy practically damns her; it presents an unmissable, indefensible target for her adversary. She can barely keep it together while thinking about the lives of her brood. + <<elseif $fighterOne.bellyPreg >= 300000>> + Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend it from harm. + <<elseif $fighterOne.bellyPreg >= 150000>> + Her giant pregnancy obstructs her movement and greatly slows her down. She tries not to think of how many lives are depending on her. + <<elseif $fighterOne.bellyPreg >= 100000>> + Her giant belly gets in her way and weighs her down. She is terrified for the lives of her many children. + <<elseif $fighterOne.bellyPreg >= 10000>> + Her huge belly gets in her way and weighs her down. She is terrified for the <<if $fighterOne.pregType > 1>>lives of her children<<else>>life of her child<</if>>. + <<elseif $fighterOne.bellyPreg >= 5000>> Her advanced pregnancy makes her much less effective, not to mention terrified for her child. + <<elseif $fighterOne.bellyPreg >= 1500>> + Her growing pregnancy distracts her with concern over the life growing within her. <</if>> <</if>> +<<if $fighterOne.labor == 1>> + She's feeling labor pains. Her child<<if $fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will mean the death of <<if $fighterOne.pregType > 1>>their<<else>>its<</if>> mother. +<<elseif $fighterOne.preg >= 40 && $fighterOne.pregControl != "labor supressors">> + She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight. +<</if>> <<if not canSee($fighterOne)>> Her lack of eyesight is certain death. @@ -278,15 +295,32 @@ You review the rules - the combatants will use their choice of swords, and the f Her swollen, <<print $fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes her less effective. <</if>> -<<if $fighterTwo.preg > 10>> - <<if $fighterTwo.pregType >= 20>> - Her massive belly is practically a death sentence, she can barely stand let alone fight. The lives of her brood way heavily on her. - <<elseif $fighterTwo.pregType >= 10>> - Her huge belly gets in her way and weighs her down. She is terrified for the lives of her children. - <<else>> +<<if $fighterTwo.pregKnown == 1 || $fighterTwo.bellyPreg >= 1500>> + <<if $fighterTwo.bellyPreg >= 750000>> + Her monolithic pregnancy guarantees her and her many, many children's deaths; not only is she on the verge of splitting open, but it is an unmissable, indefensible target. She has no hope of attacking around the straining mass, let alone stopping her opponent. She is damned. + <<elseif $fighterTwo.bellyPreg >= 600000>> + Her titanic pregnancy is practically a death sentence; not only does she risk bursting, but it is an unmissable, indefensible target. She can barely keep it together while thinking about the lives of her brood. + <<elseif $fighterTwo.bellyPreg >= 450000>> + Her gigantic pregnancy practically damns her; it presents an unmissable, indefensible target for her adversary. She can barely keep it together while thinking about the lives of her brood. + <<elseif $fighterTwo.bellyPreg >= 300000>> + Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend it from harm. + <<elseif $fighterTwo.bellyPreg >= 150000>> + Her giant pregnancy obstructs her movement and greatly slows her down. She tries not to think of how many lives are depending on her. + <<elseif $fighterTwo.bellyPreg >= 100000>> + Her giant belly gets in her way and weighs her down. She is terrified for the lives of her many children. + <<elseif $fighterTwo.bellyPreg >= 10000>> + Her huge belly gets in her way and weighs her down. She is terrified for the <<if $fighterTwo.pregType > 1>>lives of her children<<else>>life of her child<</if>>. + <<elseif $fighterTwo.bellyPreg >= 5000>> Her advanced pregnancy makes her much less effective, not to mention terrified for her child. + <<elseif $fighterTwo.bellyPreg >= 1500>> + Her growing pregnancy distracts her with concern over the life growing within her. <</if>> <</if>> +<<if $fighterTwo.labor == 1>> + She's feeling labor pains. Her child<<if $fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will mean the death of <<if $fighterTwo.pregType > 1>>their<<else>>its<</if>> mother. +<<elseif $fighterTwo.preg >= 40 && $fighterTwo.pregControl != "labor supressors">> + She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight. +<</if>> <<if not canSee($fighterTwo)>> Her lack of eyesight is certain death. diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw index b0263bc2d3f83bbff135a6a89480547e917e237b..28a705e7c1da9f9073f2806529b17465e00beb36 100644 --- a/src/uncategorized/seNonlethalPit.tw +++ b/src/uncategorized/seNonlethalPit.tw @@ -135,15 +135,32 @@ You review the rules - the combatants are wearing light gloves, and the fight wi Her swollen, <<print $fighterOne.bellyImplant>>cc implant filled belly is heavy and makes her less effective. <</if>> -<<if $fighterOne.preg > 10>> - <<if $fighterOne.pregType >= 20>> - Her massive belly is nearly a guaranteed loss, she can barely stand let alone fight. - <<elseif $fighterOne.pregType >= 10>> +<<if $fighterOne.pregKnown == 1 || $fighterOne.bellyPreg >= 1500>> + <<if $fighterOne.bellyPreg >= 750000>> + Her monolithic pregnancy guarantees her loss; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent. The fear of what would happen should her adversary land a hit on her belly also weighs upon her mind. + <<elseif $fighterOne.bellyPreg >= 600000>> + Her titanic pregnancy is practically a guaranteed loss; she can barely stand let alone fight. The worry of a solid hit striking her life swollen womb also weighs on her mind. + <<elseif $fighterOne.bellyPreg >= 450000>> + Her gigantic pregnancy is nearly a guaranteed loss; it presents an unmissable, indefensible target for her adversary. + <<elseif $fighterOne.bellyPreg >= 300000>> + Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend her bulk. + <<elseif $fighterOne.bellyPreg >= 150000>> + Her giant pregnancy obstructs her movement and greatly slows her down. + <<elseif $fighterOne.bellyPreg >= 100000>> + Her giant belly gets in her way and weighs her down. + <<elseif $fighterOne.bellyPreg >= 10000>> Her huge belly is unwieldy and hinders her efforts. - <<else>> + <<elseif $fighterOne.bellyPreg >= 5000>> Her advanced pregnancy makes her much less effective. + <<elseif $fighterOne.bellyPreg >= 1500>> + Her growing pregnancy distracts her from the fight. <</if>> <</if>> +<<if $fighterOne.labor == 1>> + She's feeling labor pains. Her child<<if $fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if $fighterOne.pregType > 1>>their<<else>>its<</if>> mother at tehe mercy of her opponent. +<<elseif $fighterOne.preg >= 40 && $fighterOne.pregControl != "labor supressors">> + She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight. +<</if>> <<if not canSee($fighterOne)>> Her lack of eyesight means certain defeat. @@ -245,15 +262,32 @@ You review the rules - the combatants are wearing light gloves, and the fight wi Her swollen, <<print $fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes her less effective. <</if>> -<<if $fighterTwo.preg > 10>> - <<if $fighterTwo.pregType >= 20>> - Her massive belly is nearly a guaranteed loss, she can barely stand let alone fight. - <<elseif $fighterTwo.pregType >= 10>> +<<if $fighterTwo.pregKnown == 1 || $fighterTwo.bellyPreg >= 1500>> + <<if $fighterTwo.bellyPreg >= 750000>> + Her monolithic pregnancy guarantees her loss; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent. The fear of what would happen should her adversary land a hit on her belly also weighs upon her mind. + <<elseif $fighterTwo.bellyPreg >= 600000>> + Her titanic pregnancy is practically a guaranteed loss; she can barely stand let alone fight. The worry of a solid hit striking her life swollen womb also weighs on her mind. + <<elseif $fighterTwo.bellyPreg >= 450000>> + Her gigantic pregnancy is nearly a guaranteed loss; it presents an unmissable, indefensible target for her adversary. + <<elseif $fighterTwo.bellyPreg >= 300000>> + Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend her bulk. + <<elseif $fighterTwo.bellyPreg >= 150000>> + Her giant pregnancy obstructs her movement and greatly slows her down. + <<elseif $fighterTwo.bellyPreg >= 100000>> + Her giant belly gets in her way and weighs her down. + <<elseif $fighterTwo.bellyPreg >= 10000>> Her huge belly is unwieldy and hinders her efforts. - <<else>> + <<elseif $fighterTwo.bellyPreg >= 5000>> Her advanced pregnancy makes her much less effective. + <<elseif $fighterTwo.bellyPreg >= 1500>> + Her growing pregnancy distracts her from the fight. <</if>> <</if>> +<<if $fighterTwo.labor == 1>> + She's feeling labor pains. Her child<<if $fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if $fighterTwo.pregType > 1>>their<<else>>its<</if>> mother at tehe mercy of her opponent. +<<elseif $fighterTwo.preg >= 40 && $fighterTwo.pregControl != "labor supressors">> + She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight. +<</if>> <<if not canSee($fighterTwo)>> Her lack of eyesight means certain defeat. diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 324716e4412d098751ce604fdb7f38370c27674d..3d467311bbf09f35d69aa81cc7edffcd97744c67 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1456,17 +1456,33 @@ <<set $deadliness -= 1>> <</if>> -<<if $args[0].preg > 10>> - <<if $args[0].pregType >= 20 && $args[0].preg > 30>> +<<if $args[0].pregKnown == 1 || $args[0].bellyPreg >= 1500>> + <<if $args[0].bellyPreg >= 750000>> + <<set $deadliness -= 50>> + <<elseif $args[0].bellyPreg >= 600000>> + <<set $deadliness -= 25>> + <<elseif $args[0].bellyPreg >= 450000>> <<set $deadliness -= 15>> - <<elseif $args[0].pregType >= 20>> + <<elseif $args[0].bellyPreg >= 300000>> + <<set $deadliness -= 10>> + <<elseif $args[0].bellyPreg >= 150000>> + <<set $deadliness -= 8>> + <<elseif $args[0].bellyPreg >= 100000>> + <<set $deadliness -= 7>> + <<elseif $args[0].bellyPreg >= 10000>> <<set $deadliness -= 3>> - <<elseif $args[0].pregType >= 10>> + <<elseif $args[0].bellyPreg >= 5000>> <<set $deadliness -= 2>> - <<else>> + <<elseif $args[0].bellyPreg >= 1500>> <<set $deadliness -= 1>> <</if>> <</if>> +<<if $args[0].labor == 1>> + <<set $deadliness -= 15>> +<<elseif $args[0].preg >= 40 && $args[0].pregControl != "labor supressors">> + <<set $deadliness -= 5>> +<</if>> + <<if $args[0].balls >= 15>> <<set $deadliness -= 1>> <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 459a88a777073d8bd355267826e906c8d823b2d1..dbe5f336c6b05b6226631095beda4ddfb114b385 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -2656,6 +2656,7 @@ This experience $args[1] is the % chance to concieve. $args[2] control's the hole involved (0 - vagina, 1 - ass, 2 - both). .mpreg did this. $args[3] is the ID of her sire or 0 if undefined. + $args[4] is an override if defined - $args[3] must be defined in this case. */ <<widget "KnockMeUp">> <<if random(0,99) < $args[1]>> @@ -2667,7 +2668,7 @@ This experience <</if>> <<SetPregType $args[0]>> <<if $menstruation == 1>> - <<else>> + <<elseif ndef $args[4]>> <<set $args[0].pregKnown = 1>> <<if $args[0].ID == -1>> /*@@.lime;You have gotten pregnant.@@*/ @@ -2676,6 +2677,8 @@ This experience <<else>> @@.lime;It has become pregnant.@@ <</if>> + <<else>> + <<set $args[0].pregKnown = 1>> <</if>> <<elseif $args[2] == 2>> <<set $args[0].preg = 1>> @@ -2685,7 +2688,7 @@ This experience <</if>> <<SetPregType $args[0]>> <<if $menstruation == 1>> - <<else>> + <<elseif ndef $args[4]>> <<set $args[0].pregKnown = 1>> <<if $args[0].ID == -1>> /*@@.lime;You have gotten pregnant.@@*/ @@ -2694,6 +2697,8 @@ This experience <<else>> @@.lime;It has become pregnant.@@ <</if>> + <<else>> + <<set $args[0].pregKnown = 1>> <</if>> <</if>> <</if>>