Skip to content
Snippets Groups Projects
Commit 97af5d6f authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master' 

Pregmod v1017-48

See merge request !491
parents e2c0a9c9 4820f8f2
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
src/init/storyInit.tw
+ 1
− 0
View file @ 97af5d6f
...@@ -886,6 +886,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) ...@@ -886,6 +886,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $FrigiditySMR = 0>> <<set $FrigiditySMR = 0>>
<<set $BasicBeautySMR = 0>> <<set $BasicBeautySMR = 0>>
<<set $QualityBeautySMR = 0>> <<set $QualityBeautySMR = 0>>
<<set $BasicWeightSMR = 0>>
<<set $BasicIntelligenceSMR = 0>> <<set $BasicIntelligenceSMR = 0>>
<<set $QualityIntelligenceSMR = 0>> <<set $QualityIntelligenceSMR = 0>>
<<set $IntelligenceEugenicsSMR = 0>> <<set $IntelligenceEugenicsSMR = 0>>
......
src/uncategorized/BackwardsCompatibility.tw
+ 3
− 0
View file @ 97af5d6f
...@@ -143,6 +143,9 @@ ...@@ -143,6 +143,9 @@
<<if ndef $meshImplants>> <<if ndef $meshImplants>>
<<set $meshImplants = 0>> <<set $meshImplants = 0>>
<</if>> <</if>>
<<if ndef $BasicWeightSMR>>
<<set $BasicWeightSMR = 0>>
<</if>>
<<if ndef $FCTVenable>> <<if ndef $FCTVenable>>
<<set $FCTVenable = 1>> <<set $FCTVenable = 1>>
......
src/uncategorized/lawCompliance.tw
+ 8
− 0
View file @ 97af5d6f
...@@ -339,6 +339,14 @@ ...@@ -339,6 +339,14 @@
<<set $activeSlave.trust -= 5>> <<set $activeSlave.trust -= 5>>
<</if>> <</if>>
<<if $BasicWeightSMR == 1>>
<<if $activeSlave.weight > 100>>
<<set $activeSlave.weight = random(-50,50)>>
<</if>>
While she was in the slave pens, she saw that obese slaves were immediately designated as menials and cows, and she is @@.gold;terrified@@ that should she get fat, she'll be considered worthless and be reassigned on the spot.
<<set $activeSlave.trust -= 5>>
<</if>>
<<if $BasicIntelligenceSMR == 1>> <<if $BasicIntelligenceSMR == 1>>
<<if $activeSlave.intelligence < 0>> <<if $activeSlave.intelligence < 0>>
<<set $activeSlave.intelligence = either(0,1,1,1,1,1,1,1,1,1,2,2,2,3)>> <<set $activeSlave.intelligence = either(0,1,1,1,1,1,1,1,1,1,2,2,2,3)>>
......
src/uncategorized/policies.tw
+ 16
− 1
View file @ 97af5d6f
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
''__Active policies__'' ''__Active policies__''
<br>//These policies are active within your arcology. Slave Market Regulations (SMRs) will affect slaves that come through the official slave markets in your arcology. The markets themselves will bear the cost of these regulations, but the minimum practicable slave prices may rise as a result.// <br>//These policies are active within your arcology. Slave Market Regulations (SMRs) will affect slaves that come through the official slave markets in your arcology. The markets themselves will bear the cost of these regulations, but the minimum practicable slave prices may rise as a result.//
<<if $BasicSMR + $HealthInspectionSMR + $EducationSMR + $IntelligenceEugenicsSMR + $HeightEugenicsSMR + $FaceEugenicsSMR + $HonestySMR + $FrigiditySMR + $BasicBeautySMR + $QualityBeautySMR + $BasicIntelligenceSMR + $QualityIntelligenceSMR > 0>> <<if $BasicSMR + $HealthInspectionSMR + $EducationSMR + $IntelligenceEugenicsSMR + $HeightEugenicsSMR + $FaceEugenicsSMR + $HonestySMR + $FrigiditySMR + $BasicBeautySMR + $QualityBeautySMR + $BasicWeightSMR + $BasicIntelligenceSMR + $QualityIntelligenceSMR > 0>>
<br>__Slave Market Regulations__ <br>__Slave Market Regulations__
<<if $BasicSMR == 1>> <<if $BasicSMR == 1>>
...@@ -68,6 +68,11 @@ ...@@ -68,6 +68,11 @@
[[Repeal|Policies][$QualityBeautySMR = 0, $minimumSlaveCost -= 10000]] [[Repeal|Policies][$QualityBeautySMR = 0, $minimumSlaveCost -= 10000]]
<</if>> <</if>>
<<if $BasicWeightSMR == 1>>
<br>''Basic Weight Standards:'' no obese slaves may be sold in the slave markets.
[[Repeal|Policies][$BasicWeightSMR = 0, $minimumSlaveCost -= 3000]]
<</if>>
<<if $BasicIntelligenceSMR == 1>> <<if $BasicIntelligenceSMR == 1>>
<br>''Basic Intelligence Standards:'' no stupid slaves may be sold in the slave markets. <br>''Basic Intelligence Standards:'' no stupid slaves may be sold in the slave markets.
[[Repeal|Policies][$BasicIntelligenceSMR = 0, $minimumSlaveCost -= 2000]] [[Repeal|Policies][$BasicIntelligenceSMR = 0, $minimumSlaveCost -= 2000]]
...@@ -648,6 +653,14 @@ ...@@ -648,6 +653,14 @@
<</if>> <</if>>
<</if>> <</if>>
<<if $BasicWeightSMR == 0>>
<<if $arcologies[0].FSHedonisticDecadenceSMR == 0>>
<br>''Basic Weight Standards:'' only attractive slaves may be sold in the slave markets.
[[Implement|Policies][$BasicWeightSMR = 1, $cash -=5000, $rep -= 1000, $minimumSlaveCost += 3000]]
<br>&nbsp;&nbsp;&nbsp;&nbsp;//This will raise the price of slaves.
<</if>>
<</if>>
<<if $BasicIntelligenceSMR == 0>> <<if $BasicIntelligenceSMR == 0>>
<<if $QualityIntelligenceSMR == 0>> <<if $QualityIntelligenceSMR == 0>>
<br>''Basic Intelligence Standards:'' no stupid slaves may be sold in the slave markets. <br>''Basic Intelligence Standards:'' no stupid slaves may be sold in the slave markets.
...@@ -1273,11 +1286,13 @@ ...@@ -1273,11 +1286,13 @@
<</if>> <</if>>
<<if $arcologies[0].FSHedonisticDecadence >= 40>> <<if $arcologies[0].FSHedonisticDecadence >= 40>>
<<if $BasicWeightSMR == 0>>
<<if $arcologies[0].FSHedonisticDecadenceSMR == 0 && $arcologies[0].FSMaturityPreferentialistSMR == 0>> <<if $arcologies[0].FSHedonisticDecadenceSMR == 0 && $arcologies[0].FSMaturityPreferentialistSMR == 0>>
<br>''@@.lime;Corpulence SMR:@@'' in order to be sold in the arcology, slaves must be plump. <br>''@@.lime;Corpulence SMR:@@'' in order to be sold in the arcology, slaves must be plump.
[[Implement|Policies][$arcologies[0].FSHedonisticDecadenceSMR = 1, $cash -=5000, $rep -= 1000, $minimumSlaveCost += 500]] [[Implement|Policies][$arcologies[0].FSHedonisticDecadenceSMR = 1, $cash -=5000, $rep -= 1000, $minimumSlaveCost += 500]]
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will help advance Hedonistic Decadence// <br>&nbsp;&nbsp;&nbsp;&nbsp;//Will help advance Hedonistic Decadence//
<</if>> <</if>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadence >= 60>> <<if $arcologies[0].FSHedonisticDecadence >= 60>>
<<if $arcologies[0].FSHedonisticDecadenceLaw2 == 0 && $arcologies[0].FSSlimnessEnthusiastLaw == 0 && $arcologies[0].FSGenderRadicalistLawBeauty == 0 && $arcologies[0].FSGenderFundamentalistLawBeauty == 0>> <<if $arcologies[0].FSHedonisticDecadenceLaw2 == 0 && $arcologies[0].FSSlimnessEnthusiastLaw == 0 && $arcologies[0].FSGenderRadicalistLawBeauty == 0 && $arcologies[0].FSGenderFundamentalistLawBeauty == 0>>
<br>''@@.lime;Rotund Feminine Ideal:@@'' you will do your best to start a fashion for thick girls with soft bellies, big butts and luscious tits. <br>''@@.lime;Rotund Feminine Ideal:@@'' you will do your best to start a fashion for thick girls with soft bellies, big butts and luscious tits.
......
src/uncategorized/seCoursing.tw
+ 9
− 2
View file @ 97af5d6f
...@@ -49,6 +49,7 @@ The rules have been explained to the hares: they're to be freed if they can reac ...@@ -49,6 +49,7 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.oralSkill = 0>> <<set $activeSlave.oralSkill = 0>>
<<set $activeSlave.analSkill = 0>> <<set $activeSlave.analSkill = 0>>
<<set $activeSlave.whoreSkill = 0>> <<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.weight = random(-50,50)>>
is an appealingly young $activeSlave.race girl, and has V symbols drawn over her cunt and on her lower back, in the interests of fairness. She's a @@.pink;double virgin.@@<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>> is an appealingly young $activeSlave.race girl, and has V symbols drawn over her cunt and on her lower back, in the interests of fairness. She's a @@.pink;double virgin.@@<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>>
<<elseif _origin == "heavily pregnant">> <<elseif _origin == "heavily pregnant">>
<<set $activeSlaveOneTimeMinAge = $fertilityAge>> <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
...@@ -65,6 +66,7 @@ The rules have been explained to the hares: they're to be freed if they can reac ...@@ -65,6 +66,7 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.oralSkill = 0>> <<set $activeSlave.oralSkill = 0>>
<<set $activeSlave.analSkill = 0>> <<set $activeSlave.analSkill = 0>>
<<set $activeSlave.whoreSkill = 0>> <<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.weight = random(-20,100)>>
<<set $activeSlave.career = setup.youngCareers.random()>> <<set $activeSlave.career = setup.youngCareers.random()>>
is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race girl, young and healthy but @@.pink;heavily pregnant.@@ She's probably been selected to be a hare as a joke, or because someone hates her. <<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is attached to her popped navel.<</if>> is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race girl, young and healthy but @@.pink;heavily pregnant.@@ She's probably been selected to be a hare as a joke, or because someone hates her. <<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is attached to her popped navel.<</if>>
<<elseif _origin == "housewife">> <<elseif _origin == "housewife">>
...@@ -88,6 +90,7 @@ The rules have been explained to the hares: they're to be freed if they can reac ...@@ -88,6 +90,7 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.analSkill = 15>> <<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 35>> <<set $activeSlave.whoreSkill = 35>>
<<set $activeSlave.career = either("a housewife", "a trophy wife")>> <<set $activeSlave.career = either("a housewife", "a trophy wife")>>
<<set $activeSlave.weight = random(-50,100)>>
is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race woman, no longer young, but attractive enough in a fake sort of way. She has obviously been crying, and has probably been recently enslaved from a comfortable life, like that of a @@.pink;housewife or a trophy wife.@@<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>> is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race woman, no longer young, but attractive enough in a fake sort of way. She has obviously been crying, and has probably been recently enslaved from a comfortable life, like that of a @@.pink;housewife or a trophy wife.@@<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>>
<<elseif _origin == "disobedient young">> <<elseif _origin == "disobedient young">>
<<set $activeSlaveOneTimeMaxAge = 25>> <<set $activeSlaveOneTimeMaxAge = 25>>
...@@ -106,7 +109,8 @@ The rules have been explained to the hares: they're to be freed if they can reac ...@@ -106,7 +109,8 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>> <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
<<set $activeSlave.energy = 10>> <<set $activeSlave.energy = 10>>
<<set $activeSlave.fetish = "none">> <<set $activeSlave.fetish = "none">>
<<set $activeSlave.muscles = either(20, 50)>> <<set $activeSlave.muscles = random(20,50)>>
<<set $activeSlave.weight = random(-20,20)>>
is a fit young $activeSlave.race girl, and is far more watchful and alert than her fellow hares. She may be a @@.pink;disobedient slave@@ here because she was difficult to train.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>> is a fit young $activeSlave.race girl, and is far more watchful and alert than her fellow hares. She may be a @@.pink;disobedient slave@@ here because she was difficult to train.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>>
<<elseif _origin == "disobedient young dickgirl">> <<elseif _origin == "disobedient young dickgirl">>
<<set $activeSlaveOneTimeMaxAge = 25>> <<set $activeSlaveOneTimeMaxAge = 25>>
...@@ -124,7 +128,8 @@ The rules have been explained to the hares: they're to be freed if they can reac ...@@ -124,7 +128,8 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.attrXY = 0>> <<set $activeSlave.attrXY = 0>>
<<set $activeSlave.attrXX = 70>> <<set $activeSlave.attrXX = 70>>
<<set $activeSlave.fetish = "none">> <<set $activeSlave.fetish = "none">>
<<set $activeSlave.muscles = either(20, 50)>> <<set $activeSlave.muscles = random(20,50)>>
<<set $activeSlave.weight = random(-20,50)>>
is a strong young $activeSlave.race girl with who retains her cock and balls, and looks determined. Perhaps she's a @@.pink;resistant dickgirl@@ who's been difficult to turn into a good girl.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her cock.<</if>> is a strong young $activeSlave.race girl with who retains her cock and balls, and looks determined. Perhaps she's a @@.pink;resistant dickgirl@@ who's been difficult to turn into a good girl.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her cock.<</if>>
<<elseif _origin == "huge balled">> <<elseif _origin == "huge balled">>
<<set $activeSlaveOneTimeMaxAge = 25>> <<set $activeSlaveOneTimeMaxAge = 25>>
...@@ -137,6 +142,7 @@ The rules have been explained to the hares: they're to be freed if they can reac ...@@ -137,6 +142,7 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.oralSkill = 0>> <<set $activeSlave.oralSkill = 0>>
<<set $activeSlave.analSkill = 0>> <<set $activeSlave.analSkill = 0>>
<<set $activeSlave.whoreSkill = 0>> <<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.weight = random(-50,100)>>
is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race slave whose distinguishing characteristic is a dangling scrotum and a pair of @@.pink;huge balls.@@ This impediment bumps against her thighs as she's made ready.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her hefty testicles.<</if>> is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race slave whose distinguishing characteristic is a dangling scrotum and a pair of @@.pink;huge balls.@@ This impediment bumps against her thighs as she's made ready.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her hefty testicles.<</if>>
<<elseif _origin == "feminized">> <<elseif _origin == "feminized">>
<<set $activeSlaveOneTimeMaxAge = 25>> <<set $activeSlaveOneTimeMaxAge = 25>>
...@@ -157,6 +163,7 @@ The rules have been explained to the hares: they're to be freed if they can reac ...@@ -157,6 +163,7 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.whoreSkill = 15>> <<set $activeSlave.whoreSkill = 15>>
<<set $activeSlave.attrXY = 100>> <<set $activeSlave.attrXY = 100>>
<<set $activeSlave.attrXX = 0>> <<set $activeSlave.attrXX = 0>>
<<set $activeSlave.weight = random(-100,200)>>
is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race bitch with a tiny dick who has been @@.pink;heavily feminized,@@ yet seems terrified and very new to slavery. Her fake tits and girly behavior must be from her life before she was a slave.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>> is <<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race bitch with a tiny dick who has been @@.pink;heavily feminized,@@ yet seems terrified and very new to slavery. Her fake tits and girly behavior must be from her life before she was a slave.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around her neck.<</if>>
<</if>> <</if>>
......
src/utility/descriptionWidgets.tw
+ 149
− 133
View file @ 97af5d6f
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment