diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 5dee2dfb2f0e9298ab592190409ed4a594c5f022..87084c88346e9f36e17ea05eb5f712a1a976cd63 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -191,6 +191,27 @@ You should have received a copy of the GNU General Public License along with thi <<if ndef $PC.slavesFathered>> <<set $PC.slavesFathered = 0>> <</if>> + <<if ndef $PC.pregKnown>> + <<if $PC.preg > 0>> + <<set $PC.pregKnown = 1>> + <<else>> + <<set $PC.pregKnown = 0>> + <</if>> + <</if>> + <<if ndef $PC.pregType>> + <<if $PC.preg > 0>> + <<set $PC.pregType = 1>> + <<else>> + <<set $PC.pregType = 0>> + <</if>> + <</if>> + <<if ndef $PC.belly>> + <<if $PC.preg > 0>> + <<set $PC.belly = getPregBellySize($PC)>> + <<else>> + <<set $PC.belly = 0>> + <</if>> + <</if>> <<else>> <<set $slaves = []>> <<set $slavesOriginal = []>> /* not used by pregmod */ @@ -207,7 +228,7 @@ You should have received a copy of the GNU General Public License along with thi <<if $saveImported == 0>> <<set $cheater = 0>> -<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>> +<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>> <<set $cash = 10000>> <<set $normalizedEvents = 0>> <<set $autosave = 1>> @@ -319,7 +340,7 @@ You should have received a copy of the GNU General Public License along with thi <<else>> <<set $cheater = 0>> <<set $cash = 10000>> - <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>> + <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0}>> <</if>> <</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index dc5663a1df20cc111b43c2dbf6f74f8b730b9292..d219105cd8e81f4e5ca53784823cb2884bf3aac7 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -165,6 +165,27 @@ <<if ndef $PC.slavesFathered>> <<set $PC.slavesFathered = 0>> <</if>> +<<if ndef $PC.pregKnown>> + <<if $PC.preg > 0>> + <<set $PC.pregKnown = 1>> + <<else>> + <<set $PC.pregKnown = 0>> + <</if>> +<</if>> +<<if ndef $PC.pregType>> + <<if $PC.preg > 0>> + <<set $PC.pregType = 1>> + <<else>> + <<set $PC.pregType = 0>> + <</if>> +<</if>> +<<if ndef $PC.belly>> + <<if $PC.preg > 0>> + <<set $PC.belly = getPregBellySize($PC)>> + <<else>> + <<set $PC.belly = 0>> + <</if>> +<</if>> <<if ndef $universalRulesImmobileSlavesMaintainMuscles>> <<set $universalRulesImmobileSlavesMaintainMuscles = 0>> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index 9338a4f7c80a456ef6b2f0accd75e793baf9c4ba..338895f9dd6a268af34f531de46e029fa18adf2d 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -413,7 +413,7 @@ serves you this week. reluctantly trying to avoid having to take all of your pregnancy weight while not pissing you off whenever you ride $possessive dick in a futile attempt to cool your raging hormones. <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "submissive")>> doing $possessive best to be a good belly support as $pronoun submissively gives you what you want. - <<elseif ($slaves[$i].devotion <= 50>> + <<elseif ($slaves[$i].devotion <= 50)>> obediently bearing your weight as you aggressively ride $possessive dick in a futile attempt to cool your raging hormones. <<else>> happily pampering and supporting your gravid bulk as you ride $possessive dick in a futile attempt to cool your raging hormones. diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 9487ca414b15976431ea5b43297489b96a8fddaa..c1af703cc284568ab12aec4240b3b6c7cf2ed0e2 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -2409,7 +2409,7 @@ $pronounCap's got a <<SlavePronouns $activeSlave>> -<<if ($showClothing == 1) && ($saleDescription == 0)>> + <<if $activeSlave.dick > 0>> @@ -3153,7 +3153,7 @@ $pronounCap's got a <<dickTatDescription>> <</if>> <</if>> -<</if>> + <</widget>> @@ -3161,7 +3161,7 @@ $pronounCap's got a <<SlavePronouns $activeSlave>> -<<if ($showClothing == 1) && ($saleDescription == 0)>> + <<if $activeSlave.dick > 0>> <<if $activeSlave.vagina > -1>> @@ -3648,7 +3648,7 @@ $pronounCap's got a <</if>> <</if>> -<</if>> + <</widget>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 3728a8376d6227f2d78c9b82d17735e5e245265c..cc58aa664959bd9252cd86547a124305be39e6a5 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -4051,7 +4051,7 @@ check if a rule attribute, any one, is defined and otherwise skip everything. /* Other Drugs */ <<if $args[0].drugs == "none" && ((_combinedRule.drugs != "psychosuppressants") || (_combinedRule.drugs != "steroids") || (_combinedRule.drugs != "hormone enhancers"))>> <<set $args[0].drugs = _combinedRule.drugs >> - <br> $$args[0].slaveName has been put on $args[0].drugs. + <br> $args[0].slaveName has been put on $args[0].drugs. <</if>> /* Diet Setting */