diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index e730727c78bfd16ad63d23b5a8c29a61a0496955..b34c5fa3acc38221e67234c78a0d186d80b7ccb3 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,13 @@ 0.10.7.1-1.5.x +01/05/2019 + + 3 + -fixes + -more cleaning + -[!] appears when you can upgrade an FS now too + 01/03/2019 2 diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index c6a5dc8b48ee7efae3a573846f3f8f5fb9450117..38d9f2902dd536a981d6b679ac8893e6bdf38a6c 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -15110,6 +15110,10 @@ window.DefaultRules = (function() { slave.collar = rule.collar; if ((slave.collar == "none")) r += `${slave.slaveName} has been given no collar.`; + else if ((slave.collar == "pretty jewelry")) + r += `${slave.slaveName} has been given ${slave.collar}.`; + else if ((["dildo gag", "massive dildo gag", "ball gag", "bit gag", "neck corset", "porcelain mask", "bell collar", "bowtie"].includes(slave.collar))) + r += `${slave.slaveName} has been given a ${slave.collar}.`; else r += `${slave.slaveName} has been given a ${slave.collar} collar.`; } diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw index f1cbc3291e05a2a628ebbf0a3d5f41c165d5ba10..3baf4a4b50e69a4af0df9df89f643ad1d805065e 100644 --- a/src/js/DefaultRules.tw +++ b/src/js/DefaultRules.tw @@ -368,6 +368,10 @@ window.DefaultRules = (function() { slave.collar = rule.collar; if ((slave.collar == "none")) r += `${slave.slaveName} has been given no collar.`; + else if ((slave.collar == "pretty jewelry")) + r += `${slave.slaveName} has been given ${slave.collar}.`; + else if ((["dildo gag", "massive dildo gag", "ball gag", "bit gag", "neck corset", "porcelain mask", "bell collar", "bowtie"].includes(slave.collar))) + r += `${slave.slaveName} has been given a ${slave.collar}.`; else r += `${slave.slaveName} has been given a ${slave.collar} collar.`; } diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw index 388cc7a53256508f4a82f78009d90b52cc401913..33fcb0d1e8428f48728f372f6d70c9a6eaaef9af 100644 --- a/src/npc/acquisition.tw +++ b/src/npc/acquisition.tw @@ -248,7 +248,7 @@ The previous owner seems to have left in something of a hurry. <<switch $targetArcology.type>> <<case "Supremacist">> <<set $oneTimeDisableDisability = 1>> - <<set $arcologies[0].FSSupremacistLawME = 1>><<include "Generate New Slave">><<set $arcologies[0].FSSupremacistLawME = 0>> + <<set $fixedRace = $arcologies[0].FSSupremacistRace>><<include "Generate New Slave">> <<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>> <<set $activeSlave.face = random(15,100)>> <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>> @@ -261,7 +261,7 @@ The previous owner seems to have left in something of a hurry. <<set $activeSlave.assignment = "please you">> <<case "Subjugationist">> <<set $oneTimeDisableDisability = 1>> - <<set $fixedRace = $activeArcology.FSSubjugationistRace>><<include "Generate New Slave">> + <<set $fixedRace = $arcologies[0].FSSubjugationistRace>><<include "Generate New Slave">> <<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>> <<set $activeSlave.face = random(15,100)>> <<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index fbcc36d671475773c148d568bc33c10c1dd2d5eb..7df6c9f0452709188cea4742e48779781ab8e8ee 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -12416,7 +12416,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t <<link "Not so fast">> <<EventNameDelink $activeSlave>> <<replace "#result">> - As $he goes, $he follows the natural human impulse when embarrassed, and turns her head resolutely away from you, trying very hard to forget making such a fool of $himself. This means that $he does not see your rapid, predatory pursuit of $him; nor does $he hear your careful stride across the flooring. $His first indication that $he's prey is when your hands grab her around her + As $he goes, $he follows the natural human impulse when embarrassed, and turns $his head resolutely away from you, trying very hard to forget making such a fool of $himself. This means that $he does not see your rapid, predatory pursuit of $him; nor does $he hear your careful stride across the flooring. $His first indication that $he's prey is when your hands grab $him around $his <<if $activeSlave.bellyPreg >= 5000>> pregnant belly <<elseif $activeSlave.belly >= 5000>> @@ -12432,7 +12432,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t <<else>> middle <</if>> - and hug her hard against your + and hug $him hard against your <<if $PC.belly >= 100000>> massive sweaty pregnancy. <<elseif $PC.belly >= 60000>> @@ -12456,30 +12456,30 @@ You tell her kindly that you understand, and that $he'll be trained to address t sweaty, bare chest. <</if>> <</if>> - $He stiffens<<if $activeSlave.voice != 0>> and shrieks<</if>> with surprise, but relaxes obediently within your embrace. Your warm, animal presence has an immediate effect. You hear $him suck in $his breath and then feel her begin to breathe increasingly hard as your scent sinks into $him and her embarrassment fades. + $He stiffens<<if $activeSlave.voice != 0>> and shrieks<</if>> with surprise, but relaxes obediently within your embrace. Your warm, animal presence has an immediate effect. You hear $him suck in $his breath and then feel $him begin to breathe increasingly hard as your scent sinks into $him and $his embarrassment fades. <br><br><span id="result2"> <<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>> - <<link "Fuck her right here">> + <<link "Fuck $him right here">> <<replace "#result2">> <<if $PC.title == 0 || $PC.boobs == 1 || $PC.belly >= 1500>> Despite your feminine appearance, you have capable hands. <<else>> You have strong hands to go with your masculine appeal. <</if>> - They rove across her front, hugging her hard against you as you massage and grope. + They rove across $his front, hugging $him hard against you as you massage and grope. <<if $activeSlave.boobs > 4000>> - $His tits are so big that hefting them creates a bit of a burn in your biceps, in addition to making her writhe against you. + $His tits are so big that hefting them creates a bit of a burn in your biceps, in addition to making $him writhe against you. <<elseif $activeSlave.belly >= 10000>> - The skin that covers her swollen belly is erotically taught, and you run your fingers across it possessively. + The skin that covers $his swollen belly is erotically taught, and you run your fingers across it possessively. <<elseif $activeSlave.nipples == "inverted">> - You wrap your hands around the bases of her inverted nipples, and use your strong grip to stimulate and squeeze them until they protrude, much to the writhing slave's anguish. + You wrap your hands around the bases of $his inverted nipples, and use your strong grip to stimulate and squeeze them until they protrude, much to the writhing slave's anguish. <<elseif $activeSlave.nipples == "fuckable">> - You slip your fingers into $his nipples and spread her wide, making the slave writhe and buck against you. + You slip your fingers into $his nipples and spread $him wide, making the slave writhe and buck against you. <<else>> You pinch $his nipples and tug them hard, making the slave writhe and buck against you. <</if>> <<if $PC.dick == 0>> - You grab one of $his hands and guide it down to her + You grab one of $his hands and guide it down to $his <<if $activeSlave.dick > 0 && !["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>> cock, <<elseif canDoVaginal($activeSlave)>> @@ -12493,16 +12493,16 @@ You tell her kindly that you understand, and that $he'll be trained to address t <<elseif $activeSlave.vagina == -1>> perineum, <</if>> - making $him play with $himself. Meanwhile, you look after your womanhood with your other hand, schlicking expertly while holding her close, ensuring that $he feels every motion of what you're doing. When your fingers are thoroughly coated with pussyjuice, you drop $his hand, letting her continue masturbating on her own, and then use the freed hand to replace the one you're using to touch yourself. Then, you take the wet fingers and push them into $his mouth; $he willingly sucks them clean, using $his tongue to gather every trace of your secretions. You gather sweat from between your breasts, and make $him suck that off her fingers too. When $he orgasms, you shove her against the wall and hump against $him and your hand both, climaxing yourself. + making $him play with $himself. Meanwhile, you look after your womanhood with your other hand, schlicking expertly while holding $him close, ensuring that $he feels every motion of what you're doing. When your fingers are thoroughly coated with pussyjuice, you drop $his hand, letting $him continue masturbating on $his own, and then use the freed hand to replace the one you're using to touch yourself. Then, you take the wet fingers and push them into $his mouth; $he willingly sucks them clean, using $his tongue to gather every trace of your secretions. You gather sweat from between your breasts, and make $him suck that off $his fingers too. When $he orgasms, you shove $him against the wall and hump against $him and your hand both, climaxing yourself. <<else>> - You pull her up onto her toes and slide yourself inside $him, the slave gasping when $he feels your hot dick enter her + You pull $him up onto $his toes and slide yourself inside $him, the slave gasping when $he feels your hot dick enter $his <<if canDoVaginal($activeSlave)>> cunt. <<else>> anus. <</if>> <<if $PC.belly >= 5000 && $activeSlave.belly >= 10000>> - You'd like to lift her up into a standing fuck, but there is so much distended stomach between the both of you that it's impossible so you opt for a position where you can both penetrate $him and continue your work out. + You'd like to lift $him up into a standing fuck, but there is so much distended stomach between the both of you that it's impossible so you opt for a position where you can both penetrate $him and continue your work out. <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>> After a while, you shift positions, freeing your member, and force yourself up $his butt despite the slave's anxious begging. <<= BothVCheck()>> @@ -12515,9 +12515,9 @@ You tell her kindly that you understand, and that $he'll be trained to address t It doesn't take long before you fill $his ass with cum. <</if>> <<elseif $PC.belly >= 5000>> - You'd like to lift her up into a standing fuck, but you are far too pregnant to manage. Instead, you lie on your back and have her work your legs as you fuck $him. + You'd like to lift $him up into a standing fuck, but you are far too pregnant to manage. Instead, you lie on your back and have $him work your legs as you fuck $him. <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>> - After a while, you lift her up as high as you can, freeing your member, and then lower her back down again, forcing yourself up $his butt instead despite the slave's anxious begging. + After a while, you lift $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging. <<= BothVCheck()>> It doesn't take long before you fill $his ass with cum. <<elseif canDoVaginal($activeSlave)>> @@ -12528,9 +12528,9 @@ You tell her kindly that you understand, and that $he'll be trained to address t It doesn't take long before you fill $his ass with cum. <</if>> <<elseif $activeSlave.belly >= 300000>> - You'd like to lift her up into a standing fuck, but even you aren't strong enough to lift $his extreme weight. Instead, you choose to have her ride you; supporting $his _belly middle is a workout in its own right. + You'd like to lift $him up into a standing fuck, but even you aren't strong enough to lift $his extreme weight. Instead, you choose to have $him ride you; supporting $his _belly middle is a workout in its own right. <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>> - After a while, you push her up as high as you can, freeing your member, and then lower her back down again, forcing yourself up $his butt instead despite the slave's anxious begging. + After a while, you push $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging. <<= BothVCheck()>> It doesn't take long before you fill $his ass with cum. <<elseif canDoVaginal($activeSlave)>> @@ -12541,9 +12541,9 @@ You tell her kindly that you understand, and that $he'll be trained to address t It doesn't take long before you fill $his ass with cum. <</if>> <<elseif $activeSlave.belly >= 100000>> - Once you're hilted, you hoist $him up by the underarms, shifting your stance to handle $his _belly stomach's weight, and hold $him in midair, impaled on your dick. You can't pound her all that hard in this challenging position, but the effort of holding her this way forces you to work out hard, producing an excellent sensation.<<if $PC.vagina == 1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of her.<</if>> + Once you're hilted, you hoist $him up by the underarms, shifting your stance to handle $his _belly stomach's weight, and hold $him in midair, impaled on your dick. You can't pound $him all that hard in this challenging position, but the effort of holding $him this way forces you to work out hard, producing an excellent sensation.<<if $PC.vagina == 1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of $him.<</if>> <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>> - After a while, you lift her up as high as you can, freeing your member, and then lower her back down again, forcing yourself up $his butt instead despite the slave's anxious begging. + After a while, you lift $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging. <<= BothVCheck()>> It doesn't take long before you fill $his ass with cum. <<elseif canDoVaginal($activeSlave)>> @@ -12555,9 +12555,9 @@ You tell her kindly that you understand, and that $he'll be trained to address t <</if>> You're going to be feeling this tomorrow. <<else>> - Once you're hilted, you bring $his hands up on either side of her head to grasp your shoulders behind $him, and then scoop $his legs up and hoist $him to rest against your chest, held in midair and impaled on your dick. You can't pound her all that hard in this challenging position, but the effort of holding $himself this way forces $him to tighten her muscles down hard, producing an excellent sensation.<<if $PC.vagina == 1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of her.<</if>> + Once you're hilted, you bring $his hands up on either side of $his head to grasp your shoulders behind $him, and then scoop $his legs up and hoist $him to rest against your chest, held in midair and impaled on your dick. You can't pound $him all that hard in this challenging position, but the effort of holding $himself this way forces $him to tighten $his muscles down hard, producing an excellent sensation.<<if $PC.vagina == 1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of $him.<</if>> <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>> - After a while, you lift her up as high as you can, freeing your member, and then lower her back down again, forcing yourself up $his butt instead despite the slave's anxious begging. + After a while, you lift $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging. <<= BothVCheck()>> It doesn't take long before you fill $his ass with cum. <<elseif canDoVaginal($activeSlave)>> @@ -12569,40 +12569,40 @@ You tell her kindly that you understand, and that $he'll be trained to address t <</if>> <</if>> <</if>> - You tell your quivering sex toy that $he doesn't have to be embarrassed about her needs. @@.mediumaquamarine;$He seems relieved@@ that the sexual being $he's becoming is acceptable, at least to you. + You tell your quivering sex toy that $he doesn't have to be embarrassed about $his needs. @@.mediumaquamarine;$He seems relieved@@ that the sexual being $he's becoming is acceptable, at least to you. <<set $activeSlave.trust += 4>> <</replace>> <</link>><<if (($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0) && canDoVaginal($activeSlave)) && ($PC.dick == 1)>> //This option will take virginity//<</if>> <</if>> - <br><<link "Have her lick you clean">> + <br><<link "Have $him lick you clean">> <<replace "#result2">> - You take $him by the hand and <<if $PC.belly >= 10000>>waddle<<else>>walk<</if>> towards the shower. The sudden loss of your closeness jerks her rudely out of her sexual reverie, but $he follows willingly, perhaps distracted by the view as you shed your workout clothes on the way. When you get there, you pull her in with you, but you do not turn on the water. Instead, you tell $him to wash you. Not understanding, $he turns to switch on the shower, but you catch $him, and insert two sweaty fingers into the slave's compliant mouth. $He sucks on them, taking refuge in the simple task, and then understands what you mean. $He runs $his tongue up your arm, sucking the salty sweat off you as best $he can. Soon, $he bends down and heads for your + You take $him by the hand and <<if $PC.belly >= 10000>>waddle<<else>>walk<</if>> towards the shower. The sudden loss of your closeness jerks $him rudely out of her sexual reverie, but $he follows willingly, perhaps distracted by the view as you shed your workout clothes on the way. When you get there, you pull $him in with you, but you do not turn on the water. Instead, you tell $him to wash you. Not understanding, $he turns to switch on the shower, but you catch $him, and insert two sweaty fingers into the slave's compliant mouth. $He sucks on them, taking refuge in the simple task, and then understands what you mean. $He runs $his tongue up your arm, sucking the salty sweat off you as best $he can. Soon, $he bends down and heads for your <<if $PC.dick == 1>>cock<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>cunt<</if>> - but you pull her up again and tell $him to do that last. + but you pull $him up again and tell $him to do that last. <<if $PC.belly >= 60000>> - $He quickly finds something almost as good by licking and sucking her way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold her there head there for a while, savoring the erotic sensation before pushing her along to the rest of your expansive midriff. + $He quickly finds something almost as good by licking ,and sucking $his way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold $his head there there for a while, savoring the erotic sensation before pushing her along to the rest of your expansive midriff. <<elseif $PC.belly >= 5000>> - $He quickly finds something almost as good by licking and sucking her way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold her there head there for a while, savoring the erotic sensation. + $He quickly finds something almost as good by licking ,and sucking $his way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold $his head there there for a while, savoring the erotic sensation. <<elseif $PC.boobsBonus > 2>> - $He quickly finds something almost as good by licking and sucking her way up the sweaty crevice between your enormous breasts. When $he reaches your nipples, you hold her there head there for a while, enjoying $his tongue. + $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your enormous breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue. <<elseif $PC.boobsBonus == 2>> - $He quickly finds something almost as good by licking and sucking her way up the sweaty crevice between your huge breasts. When $he reaches your nipples, you hold her there head there for a while, enjoying $his tongue. + $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your huge breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue. <<elseif $PC.boobsBonus == 1>> - $He quickly finds something almost as good by licking and sucking her way up the sweaty crevice between your big breasts. When $he reaches your nipples, you hold her there head there for a while, enjoying $his tongue. + $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your big breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue. <<elseif $PC.boobs == 1>> - $He quickly finds something almost as good by licking and sucking her way up the sweaty crevice between your breasts. When $he reaches your nipples, you hold her there head there for a while, enjoying $his tongue. + $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue. <<else>> <<if $PC.title == 0>> - $He settles for kissing and licking her way up your abs, pecs, and non-existent tits. When $he reaches your nipples, you hold her there head there for a while, enjoying $his tongue. + $He settles for kissing and licking $his way up your abs, pecs, and non-existent tits. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue. <<else>> - $He settles for kissing and licking her way up your abs, pecs, and collarbone, before shyly sucking the line of sweat that runs down each of your temples when you perspire heavily off of you. + $He settles for kissing and licking $his way up your abs, pecs, and collarbone, before shyly sucking the line of sweat that runs down each of your temples when you perspire heavily off of you. <</if>> <</if>> - When you've enjoyed the tongue bath enough, you reach over and activate the shower, the warm water producing a hum from the slave. You coach her towards your + When you've enjoyed the tongue bath enough, you reach over and activate the shower, the warm water producing a hum from the slave. You coach $him towards your <<if $PC.dick == 0>> cunt, and $he eats you out with enthusiasm <<else>> - stiff prick, and $he gives you an enthusiastic blowjob<<if $PC.vagina == 1>> before turning her oral attentions to your pussy<</if>> + stiff prick, and $he gives you an enthusiastic blowjob<<if $PC.vagina == 1>> before turning $his oral attentions to your pussy<</if>> <</if>> as the water plays over you both. After looking up and letting the water cascade down your face for a long moment, you quietly tell $him to masturbate before opening your mouth to drink from the downpour. With your eyes closed against the stream, your only indications that $he's obeying the command is a slight increase in the force with which $he sucks, and a faint <<if canDoVaginal($activeSlave)>> @@ -12619,10 +12619,10 @@ You tell her kindly that you understand, and that $he'll be trained to address t </span> <</replace>> <</link>> -<br><<link "Let her go">> +<br><<link "Let $him go">> <<EventNameDelink $activeSlave>> <<replace "#result">> - You let her go, and $he hurries off to go on with her day. But her attraction to you does not go away, and neither does the embarrassment of having made a fool of $himself in front of you. The experience leaves her @@.gold;a bit worried@@ about how life as your slave is affecting $him, but @@.hotpink;increasingly infatuated with you.@@ Before long, love will conquer doubt. + You let $him go, and $he hurries off to go on with $his day. But $his attraction to you does not go away, and neither does the embarrassment of having made a fool of $himself in front of you. The experience leaves $him @@.gold;a bit worried@@ about how life as your slave is affecting $him, but @@.hotpink;increasingly infatuated with you.@@ Before long, love will conquer doubt. <<set $activeSlave.devotion += 4, $activeSlave.trust -= 2>> <</replace>> <</link>> diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw index 6d6e186906efddb38a69bbf7d29d05d55ccda12a..66267d422cf36fe3b71184b0f41b3d429ade3fc9 100644 --- a/src/uncategorized/fsDevelopments.tw +++ b/src/uncategorized/fsDevelopments.tw @@ -704,6 +704,7 @@ <<if $arcologies[0].FSSupremacistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSSupremacist == $arcologies[0].FSSupremacistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSSupremacistSMR == 1>> <<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -733,6 +734,7 @@ <<if $arcologies[0].FSSubjugationistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSSubjugationist == $arcologies[0].FSSubjugationistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSSubjugationistSMR == 1>> <<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -762,6 +764,7 @@ <<if $arcologies[0].FSRepopulationFocusDecoration < $FSLockinLevel>> <<if $arcologies[0].FSRepopulationFocus == $arcologies[0].FSRepopulationFocusDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSRepopulationFocusSMR == 1>> <<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>> <</if>> @@ -791,6 +794,7 @@ <<if $arcologies[0].FSRestartDecoration < $FSLockinLevel>> <<if $arcologies[0].FSRestart == $arcologies[0].FSRestartDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSRestartSMR == 1>> <<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>> <</if>> @@ -820,6 +824,7 @@ <<if $arcologies[0].FSGenderRadicalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSGenderRadicalist == $arcologies[0].FSGenderRadicalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSGenderRadicalistSMR == 1>> <<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -849,6 +854,7 @@ <<if $arcologies[0].FSGenderFundamentalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSGenderFundamentalist == $arcologies[0].FSGenderFundamentalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSGenderFundamentalistSMR == 1>> <<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -878,6 +884,7 @@ <<if $arcologies[0].FSPaternalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSPaternalist == $arcologies[0].FSPaternalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSPaternalistSMR == 1>> <<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -907,6 +914,7 @@ <<if $arcologies[0].FSDegradationistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSDegradationist == $arcologies[0].FSDegradationistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSDegradationistSMR == 1>> <<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -936,6 +944,7 @@ <<if $arcologies[0].FSBodyPuristDecoration < $FSLockinLevel>> <<if $arcologies[0].FSBodyPurist == $arcologies[0].FSBodyPuristDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSBodyPuristSMR == 1>> <<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -963,6 +972,7 @@ <<if $arcologies[0].FSTransformationFetishistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSTransformationFetishist == $arcologies[0].FSTransformationFetishistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSTransformationFetishistSMR == 1>> <<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -990,6 +1000,7 @@ <<if $arcologies[0].FSMaturityPreferentialistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSMaturityPreferentialist == $arcologies[0].FSMaturityPreferentialistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSMaturityPreferentialistSMR == 1>> <<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1017,6 +1028,7 @@ <<if $arcologies[0].FSYouthPreferentialistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSYouthPreferentialist == $arcologies[0].FSYouthPreferentialistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSYouthPreferentialistSMR == 1>> <<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1044,6 +1056,7 @@ <<if $arcologies[0].FSSlimnessEnthusiastDecoration < $FSLockinLevel>> <<if $arcologies[0].FSSlimnessEnthusiast == $arcologies[0].FSSlimnessEnthusiastDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSSlimnessEnthusiastSMR == 1>> <<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1073,6 +1086,7 @@ <<if $arcologies[0].FSAssetExpansionistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSAssetExpansionist == $arcologies[0].FSAssetExpansionistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSAssetExpansionistSMR == 1>> <<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1102,6 +1116,7 @@ <<if $arcologies[0].FSPastoralistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSPastoralist == $arcologies[0].FSPastoralistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSPastoralistSMR == 1>> <<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1131,6 +1146,7 @@ <<if $arcologies[0].FSPhysicalIdealistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSPhysicalIdealist == $arcologies[0].FSPhysicalIdealistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSPhysicalIdealistSMR == 1>> <<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1160,6 +1176,7 @@ <<if $arcologies[0].FSHedonisticDecadenceDecoration < $FSLockinLevel>> <<if $arcologies[0].FSHedonisticDecadence == $arcologies[0].FSHedonisticDecadenceDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>> <<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1189,6 +1206,7 @@ <<if $arcologies[0].FSChattelReligionistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSChattelReligionist == $arcologies[0].FSChattelReligionistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSChattelReligionistSMR == 1>> <<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1218,6 +1236,7 @@ <<if $arcologies[0].FSRomanRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSRomanRevivalist == $arcologies[0].FSRomanRevivalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSRomanRevivalistSMR == 1>> <<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1247,6 +1266,7 @@ <<if $arcologies[0].FSAztecRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSAztecRevivalist == $arcologies[0].FSAztecRevivalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSAztecRevivalistSMR == 1>> <<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1276,6 +1296,7 @@ <<if $arcologies[0].FSEgyptianRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSEgyptianRevivalist == $arcologies[0].FSEgyptianRevivalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSEgyptianRevivalistSMR == 1>> <<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1305,6 +1326,7 @@ <<if $arcologies[0].FSEdoRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSEdoRevivalist == $arcologies[0].FSEdoRevivalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSEdoRevivalistSMR == 1>> <<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1334,6 +1356,7 @@ <<if $arcologies[0].FSArabianRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSArabianRevivalist == $arcologies[0].FSArabianRevivalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSArabianRevivalistSMR == 1>> <<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> @@ -1363,6 +1386,7 @@ <<if $arcologies[0].FSChineseRevivalistDecoration < $FSLockinLevel>> <<if $arcologies[0].FSChineseRevivalist == $arcologies[0].FSChineseRevivalistDecoration>> @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@ + <<set $FSReminder = 1>> <<elseif $arcologies[0].FSChineseRevivalistSMR == 1>> <<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>> <</if>> diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw index b907c60515595e7aae45ade0a4eb1097ff30c7bb..18f24582369670826ec5e76062371c9e0f11dede 100644 --- a/src/uncategorized/futureSociety.tw +++ b/src/uncategorized/futureSociety.tw @@ -1,7 +1,7 @@ :: Future Society [nobr] -<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Future Societies">> +<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Future Societies", $FSReminder = "">> <<if ndef $arcologies[0].FSSubjugationist>> <<set $arcologies[0].FSSubjugationist = "unset">> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 36370fc42fa0997514d973214bb7468075c12a7d..0880b62046e5e2b2d08ee850ccdb3e6b560c9d31 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -555,7 +555,7 @@ <br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@ <</if>> <<if $FSAnnounced>> - <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if $FSCredits > 0>>@@.yellow;[!]@@<</if>> + <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>> <</if>> <br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@