diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 62687ab75f7e102cd30e92e5795e6cd12db1dc6b..70f22992473467479916357d332787cd2d7502a6 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.1-0.1.x +3/30/2018 + + 16 + -various corrections to enslaved citizens not being the right race when the supremacist law is in play + -a certain policy is now properly enforced + 3/29/2018 15 diff --git a/src/events/gameover.tw b/src/events/gameover.tw index 3fb54271faa378c101e2fbee78de39f0282892fb..17dfd1afabe6f4cd60141023f16f19f70a17b47f 100644 --- a/src/events/gameover.tw +++ b/src/events/gameover.tw @@ -76,6 +76,14 @@ <br><br> ''GAME OVER'' + +<<elseif $gameover == "Idiot Ball 2 The Dumbassening">> + <<set $ui = "start">> + As you leave your penthouse to conduct your daily rounds, you promptly get tazed by the nearest drone. When you awake, it hits you like a truck; you idiotically enslaved your $PC.origRace ass by decreeing all non-<<print $arcologies[0].FSSupremacistRace>>s slaves, and since you are now a slave, lack the authority to revert the policy. The story of your remaining years may be worth telling, as is your legendary blunder, but it must be told elsewhere. + + <br><br> + ''GAME OVER'' + <<else>> <<set $ui = "start">> Since you are without slaves, Free Cities society no longer considers you a citizen of the first rank. Your personal story may continue, but that part of it worthy of retelling has now ended. diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 4dd68dc94fab9eac5f97d4f9d773ba5fe8f60d9e..4c4909dd5b2e62d512e771c9222c951eddb5c67e 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2803,13 +2803,19 @@ While nearly indistinguishable from a standard satellite antenna, the satellite With the sheer number of children being brought into the world in the average Repopulationist society, society had to come up with a way to rear them all. Breeding schools are publicly funded institutions devoted to raising children into future breeders. Their hormone levels are carefully managed both to encourage early puberty and to maximize fertility. Once a class has become sexual active, boys and girls are encouraged to pair off and explore eachother's bodies. Virginities are quickly lost, and more often than not, girls find themselves pregnant, usually with multiples. The pairings, or groups should females outnumber males, are encouraged to stay together and form caring family-like units. In addition, girls are taught to enjoy and idolize motherhood, while boys are taught that it is their duty to mount and fuck any non-gravid slave girls they see until pregnancy is assured. Free women are encouraged to avoid the schools, lest they get pinned and gang raped by horny adolescents. While administration respects rape fetishests and their desire to have a rape baby, doing this sets a poor example to the impressionable youths and may lead to the rape and impregnation of other free women later on it their lives. <<case "Slave Fertility">> -Placeholder. +When it comes to breeding your slaves, one must ask themselves; "Do I want a single child, or do I want to get her so pregnant she can barely ride me any longer?" +<br><br> +Under normal circumstances, a slave will likely bear a single child from a pregnancy, but with a little extra help from a number of fertility boosting methods, that count can easily be pushed higher. While each fertility agent will only add a chance of an additional ovum, combining treatments will yield a cumulative effect, greatly enhancing the likelihood of multiples. One must exercise caution, however, as a slave's body can only support so many offspring without complications. Miscarriage, discarded embryos and even slave death are all possible with excessive misuse of fertility agents. <<case "Fertility Mix">> -Placeholder +A simple dietary blend designed to encourage ovulation. Fertile slaves will find themselves subconsciously lusting for loads of cum blasting into their pussies and, once they give in to temptation, will likely find their bellies swelling with twins or even triplets. <<case "Breeders Dietary Blend">> -Placeholder +When it comes to slave breeding, the natural chance of conception is just too low for your profit margins. The Breeder's Dietary Blend is the end result of the quest to enhance fertility* and potency in slaves. Sperm will live longer and swim harder, eggs will readily implant post fertilization, and pregnancies will be robust and healthy. This diet tweak guarantees your slaves will be a reproductive bunch or your money back!** +<br><br> +*Twins became prevalant in test pairings. This is unintended behavior, but not an unwelcome one to the funders. +<br> +**Our guarantee does not cover slave owners who underestimate their slaves' potency and wind up pregnant. <<case "Security Expansion">> <<include "encyclopediaSecExpMain">> diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw index 339ebb65b77b44bfcbce5f99e869603039bc0e63..c04423a377529b41526eeaf4ad43ab9ee00948c9 100644 --- a/src/uncategorized/REFS.tw +++ b/src/uncategorized/REFS.tw @@ -251,6 +251,7 @@ On this particular outing you happen to cross paths with a comely female citizen <<replace "#result2">> As your new playmate lies slumbering in bed, you consult with $assistantName as to the cost of the surgery conducted today. With some creative accounting, you settle the citizen's other outstanding debts and then arrange for her to be charged a sum in excess of her financial means for the surgery conducted on her today. Of course, that was not what you agreed, but it was her mistake for undergoing an expensive procedure without a formal contract. When she awakens, though she will retain her new bimbo body, she will be just another slave in your penthouse. <<set $activeSlaveOneTimeMaxAge = 22>> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She was enslaved by you when you overcharged her for surgery.">> <<set $activeSlave.devotion = random(-70,-55)>> @@ -331,6 +332,7 @@ On this particular outing you happen to cross paths with a comely female citizen <br><br> <<set $cash -= 10000>> <<set $activeSlaveOneTimeMaxAge = 22>> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She was enslaved by you when you purchased her debt.">> <<set $activeSlave.devotion = random(-55,0)>> @@ -386,6 +388,7 @@ On this particular outing you happen to cross paths with a comely female citizen <<set $activeSlaveOneTimeMinAge = 36>> <<set $activeSlaveOneTimeMaxAge = 42>> <<set $one_time_age_overrides_pedo_mode = 1>> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She was enslaved by you when you purchased her debt.">> <<set $activeSlave.devotion = random(-90,-75)>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 514972b3890d5460aaeea36dbea7ac07fb17caad..124008f0343f6473e3b47dad653e2d81420a881d 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -16264,11 +16264,12 @@ You tell her kindly that you understand, and that she'll be trained to address t <<set $cash -= 25000>> <<set $fixedNationality = "American">> <<for _ress = 0; _ress < 3; _ress++>> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set _origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while she was serving the public.">> <<set $activeSlave.origin = _origin>> <<set $activeSlave.career = "a student">> - <<set $activeSlave.eyeColor = "blue", $activeSlave.skin = "tanned", $activeSlave.hColor = "blonde", $activeSlave.pubicHColor = "blonde", $activeSlave.markings = "none", $activeSlave.weight = -20>> + <<set $activeSlave.markings = "none", $activeSlave.weight = -20>> <<set $activeSlave.devotion = random(-80,-60)>> <<set $activeSlave.trust = random(-20,-10)>> <<set $activeSlave.muscles = random(0,15)>> diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index bf3008f519b192cd5057a1fb89eac708710f47ae..c9bbd2debd1489be14cccc4b41e15223cd60233a 100644 --- a/src/uncategorized/genericPlotEvents.tw +++ b/src/uncategorized/genericPlotEvents.tw @@ -55,6 +55,7 @@ As you step off the elevator, you hear female shouting. Apparently one of $arcol <<set $contractCost = 1000>> <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>> <<set $activeSlaveOneTimeMaxAge = 42>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<if $PStrip == 1>> <<set $activeSlave.origin = "She offered herself to you as a slave to escape the hard life of a free whore.">> diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw index 2a7163a6251d49e28c9992f1bb8d17ffc6ac14b9..45b019fcf3302c31d3c121c142fd6e375c198fb5 100644 --- a/src/uncategorized/policies.tw +++ b/src/uncategorized/policies.tw @@ -1,7 +1,7 @@ :: Policies [nobr] <<set $nextButton = "Back">> -<<set $nextLink = "Main">> +<<if $arcologies[0].FSSupremacistLawME == 1 && $PC.origRace != $arcologies[0].FSSupremacistRace>><<set $nextLink = "Gameover", $gameover = "Idiot Ball 2 The Dumbassening">><<else>><<set $nextLink = "Main">><</if>> <<set $showEncyclopedia = 1>><<set $encyclopedia = "Future Societies">> <<if $rep < 0>><<set $rep = 0>><</if>> <<set $customRetirementAge = Math.clamp($customRetirementAge, 20, 120)>> diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw index 1e06e9b948454243c688bc2685a49d1e8db915c9..16b3adf4dbae18b2874e1cedc5633a70ae76f07a 100644 --- a/src/uncategorized/reAWOL.tw +++ b/src/uncategorized/reAWOL.tw @@ -78,6 +78,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th <</if>> <<set $activeSlaveOneTimeMaxAge = 43>> <<set $one_time_age_overrides_pedo_mode = 1>> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.">> <<set $activeSlave.career = "a soldier">> @@ -157,6 +158,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th <</if>> <<set $activeSlaveOneTimeMaxAge = 43>> <<set $one_time_age_overrides_pedo_mode = 1>> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.">> <<set $activeSlave.career = "a soldier">> diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw index dca37e65139ed4e58e9f904633a67373df134227..0bc59123acd667a3d842113dec3f5ef36fe053b6 100644 --- a/src/uncategorized/reMilfTourist.tw +++ b/src/uncategorized/reMilfTourist.tw @@ -9,6 +9,7 @@ <<set $activeSlaveOneTimeMinAge = 36>> <<set $activeSlaveOneTimeMaxAge = 42>> <<set $one_time_age_overrides_pedo_mode = 1>> /* middle-aged */ +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She came to your arcology as a tourist and found herself enslaved.">> <<set $activeSlave.devotion = random(-70,-55)>> diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw index 31f53ec5cfff47b20de81f3581a44c0239570507..81453a2da0a1e5f29fed0c7fdb1ee2f03e7bc889 100644 --- a/src/uncategorized/rePokerNight.tw +++ b/src/uncategorized/rePokerNight.tw @@ -67,6 +67,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message <<set $activeSlaveOneTimeMinAge = 38>> <<set $activeSlaveOneTimeMaxAge = 43>> <<set $one_time_age_overrides_pedo_mode = 1>> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She put herself up as collateral at a poker game, and lost.">> <<set $activeSlave.career = "a soldier">> diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw index d4c635b3b800cb10c85d4e4b8983f5bcce00027d..8b8c2338393ae28809c54eb621f46fc03b564b95 100644 --- a/src/uncategorized/reShelterInspection.tw +++ b/src/uncategorized/reShelterInspection.tw @@ -5,6 +5,7 @@ <<set $activeSlaveOneTimeMinAge = 36>> <<set $activeSlaveOneTimeMaxAge = 42>> <<set $one_time_age_overrides_pedo_mode = 1>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<set $contractCost = 10000>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She was once an inspector for the Shelter, but you put a stop to that.">> diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw index 5b6331eacdf97f276af8f562d39f9b431fbfd7ac..4c4b272b7041177b4d8cce19cb0b1d14af898ef6 100644 --- a/src/uncategorized/seWedding.tw +++ b/src/uncategorized/seWedding.tw @@ -542,7 +542,7 @@ <<if $activeSlave.relationship != 0>> <<if $activeSlave.devotion+$activeSlave.trust >= 175>> <<if $activeSlave.relationship > 0>> - Her <<$activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<$activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. + Her <<if $activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<if $activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. <<if $activeSlave.relationship == 4>> <<set $slaves[_m].devotion -= 5, $slaves[_m].trust -= 5>> <<elseif $activeSlave.relationship == 3>> @@ -710,7 +710,7 @@ <<if $activeSlave.relationship != 0>> <<if $activeSlave.devotion+$activeSlave.trust >= 175>> <<if $activeSlave.relationship > 0>> - Her <<$activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<$activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. + Her <<if $activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<if $activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. <<if $activeSlave.relationship == 4>> <<set $slaves[_m].devotion -= 5, $slaves[_m].trust -= 5>> <<elseif $activeSlave.relationship == 3>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 13699405762262e35af4eb52d8f72a23ecc454b6..0279d18f8e979dd97022bd123030f864d0b7ce64 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -2827,6 +2827,7 @@ <<case "indentures">> + <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "You purchased her indenture contract, making her yours for as long as it lasts.">> <<set $activeSlave.indentureRestrictions = either(0,1,1,2,2,2,2)>>