Skip to content
Snippets Groups Projects
Commit 437de1c3 authored by Pregmodder's avatar Pregmodder
Browse files

Bug fixes, oversight corrections and short/tall basic SMRs.

parent ebd4ee07
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 21 deletions
src/init/storyInit.tw
+ 2
− 0
View file @ 437de1c3
...@@ -899,6 +899,8 @@ DairyRestraintsSetting($dairyRestraintsSetting) ...@@ -899,6 +899,8 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $BasicWeightSMR = 0>> <<set $BasicWeightSMR = 0>>
<<set $BasicIntelligenceSMR = 0>> <<set $BasicIntelligenceSMR = 0>>
<<set $QualityIntelligenceSMR = 0>> <<set $QualityIntelligenceSMR = 0>>
<<set $BasicTallSMR = 0>>
<<set $BasicShortSMR = 0>>
<<set $IntelligenceEugenicsSMR = 0>> <<set $IntelligenceEugenicsSMR = 0>>
<<set $HeightEugenicsSMR = 0>> <<set $HeightEugenicsSMR = 0>>
<<set $FaceEugenicsSMR = 0>> <<set $FaceEugenicsSMR = 0>>
......
src/js/raSelectorJS.tw
+ 8
− 8
View file @ 437de1c3
...@@ -28,20 +28,20 @@ window.growAdvSelector = function(slave, rule) { ...@@ -28,20 +28,20 @@ window.growAdvSelector = function(slave, rule) {
return ret; return ret;
} }
if ((rule.ballSize == "small" && slave.balls < 2) || if ((rule.ballSize == "small" && slave.balls < 2 && slave.balls > 0) ||
(rule.ballSize == "big" && slave.balls < 4) || (rule.ballSize == "big" && slave.balls < 4 && slave.balls > 0) ||
(rule.ballSize == "huge" && slave.balls < 6) || (rule.ballSize == "huge" && slave.balls < 6 && slave.balls > 0) ||
(rule.ballSize == "unlimited" && slave.balls < 9)) (rule.ballSize == "unlimited" && slave.balls < 9 && slave.balls > 0))
{ {
slave.drugs = "testicle enhancement"; slave.drugs = "testicle enhancement";
ret = slave.slaveName + "'s balls aren't large enough, so she's been put on testicle enhancement."; ret = slave.slaveName + "'s balls aren't large enough, so she's been put on testicle enhancement.";
return ret; return ret;
} }
if ((rule.penisSize == "small" && slave.dick < 2) || if ((rule.penisSize == "small" && slave.dick < 2 && slave.dick > 0) ||
(rule.penisSize == "big" && slave.dick < 4) || (rule.penisSize == "big" && slave.dick < 4 && slave.dick > 0) ||
(rule.penisSize == "huge" && slave.dick < 6) || (rule.penisSize == "huge" && slave.dick < 6 && slave.dick > 0) ||
(rule.penisSize == "unlimited" && slave.dick < 12)) (rule.penisSize == "unlimited" && slave.dick < 12 && slave.dick > 0))
{ {
slave.drugs = "penis enhancement"; slave.drugs = "penis enhancement";
ret = slave.slaveName + "'s dick isn't large enough, so she's been put on penis enhancement."; ret = slave.slaveName + "'s dick isn't large enough, so she's been put on penis enhancement.";
......
src/pregmod/pcSurgeryDegredation.tw
+ 1
− 1
View file @ 437de1c3
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<<switch $surgeryType>> <<switch $surgeryType>>
<<case "skinTone">> <<case "skinTone">>
After a few hours, you awaken in the recovery wing to find every inch of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["tanned", "lightened", "pale", "fair", "white", "dark", "olive", "black", "brown", "light brown", "light", "extremely pale"].includes($PC.skin)>>The surgeon's assistant immediatly covers her mouth to hide her giggle a thte sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every inch of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster. After a few hours, you awaken in the recovery wing to find every inch of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["tanned", "lightened", "pale", "fair", "white", "dark", "olive", "black", "brown", "light brown", "light", "extremely pale"].includes($PC.skin)>>The surgeon's assistant immediatly covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every inch of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
<<case "restoreFace">> <<case "restoreFace">>
After a few hours, you awaken in the recovery wing with a face both sore and somewhat numb. <<if $PC.preg > 30 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you catch sight of yourself in the mirror-covered wall across from your bed. Your face is back to the way it was before you had it altered (not counting any additional years added to it) and looking just as good as you remember. You attempt to smile at yourself, only to find your face doesn't want to comply; guess the drugs haven't completely worn off yet. You lie back down to sleep off the rest of the anesthesia before returning to your arcology. After a few hours, you awaken in the recovery wing with a face both sore and somewhat numb. <<if $PC.preg > 30 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you catch sight of yourself in the mirror-covered wall across from your bed. Your face is back to the way it was before you had it altered (not counting any additional years added to it) and looking just as good as you remember. You attempt to smile at yourself, only to find your face doesn't want to comply; guess the drugs haven't completely worn off yet. You lie back down to sleep off the rest of the anesthesia before returning to your arcology.
......
src/uncategorized/BackwardsCompatibility.tw
+ 6
− 0
View file @ 437de1c3
...@@ -163,6 +163,12 @@ ...@@ -163,6 +163,12 @@
<<if ndef $BasicWeightSMR>> <<if ndef $BasicWeightSMR>>
<<set $BasicWeightSMR = 0>> <<set $BasicWeightSMR = 0>>
<</if>> <</if>>
<<if ndef $BasicTallSMR>>
<<set $BasicTallSMR = 0>>
<</if>>
<<if ndef $BasicShortSMR>>
<<set $BasicShortSMR = 0>>
<</if>>
<<if ndef $toysBoughtButtPlugTails>> <<if ndef $toysBoughtButtPlugTails>>
<<set $toysBoughtButtPlugTails = 0>> <<set $toysBoughtButtPlugTails = 0>>
<</if>> <</if>>
......
src/uncategorized/lawCompliance.tw
+ 30
− 0
View file @ 437de1c3
...@@ -347,6 +347,36 @@ ...@@ -347,6 +347,36 @@
<<set $activeSlave.trust -= 5>> <<set $activeSlave.trust -= 5>>
<</if>> <</if>>
<<if $BasicTallSMR == 1>>
<<if $activeSlave.height < 170>>
<<if $activeSlave.height >= 160>>
Before she was put up for sale, she underwent height increasing surgery to fulfill your arcology's height SMR. She was @@.gold;horrified@@ by how drastically her body was altered just for a chance at sale.
<<set $activeSlave.trust -= 10>>
<<set $activeSlave.height += 10, $activeSlave.heightImplant = 1, $activeSlave.health -= -40>>
<<else>>
While she was in the slave pens, she was treated as nothing more than an unsalvagable slab of meat suitable only for the lowliest of jobs. She's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should she fail, she'll be discarded like so many other shorties.
<<set $activeSlave.devotion += 10, $activeSlave.trust -= 10>>
<</if>>
<<else>>
While she was in the slave pens, she saw that short and even average sized slaves were commonly designated as menials and fuckdolls. Her tall stature gives her a promising future compared to her shorter peers, leaving her @@.mediumOrchid;inappropriately proud@@ of height.
<<set $activeSlave.devotion -= 10>>
<</if>>
<<elseif $BasicShortSMR == 1>>
<<if $activeSlave.height >= 160>>
<<if $activeSlave.height <= 169>>
Before she was put up for sale, she underwent height reduction surgery to fulfill your arcology's height SMR. She was @@.gold;horrified@@ by how drastically her body was altered just for a chance at sale.
<<set $activeSlave.trust -= 10>>
<<set $activeSlave.height -= 10, $activeSlave.heightImplant = -1, $activeSlave.health -= -40>>
<<else>>
While she was in the slave pens, she was treated as nothing more than an unsalvagable slab of meat suitable only for the lowliest of jobs. She's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should she fail, she'll be discarded like all the other tall girls.
<<set $activeSlave.devotion += 10, $activeSlave.trust -= 10>>
<</if>>
<<else>>
While she was in the slave pens, she saw that tall and even average sized slaves were commonly designated as menials and fuckdolls. Her short stature gives her a promising future compared to her towering peers, leaving her @@.mediumOrchid;inappropriately proud@@ of height.
<<set $activeSlave.devotion -= 10>>
<</if>>
<</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
+ 40
− 10
View file @ 437de1c3
...@@ -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 + $BasicWeightSMR + $BasicIntelligenceSMR + $QualityIntelligenceSMR > 0>> <<if $BasicSMR + $HealthInspectionSMR + $EducationSMR + $IntelligenceEugenicsSMR + $HeightEugenicsSMR + $FaceEugenicsSMR + $HonestySMR + $FrigiditySMR + $BasicBeautySMR + $QualityBeautySMR + $BasicWeightSMR + $BasicIntelligenceSMR + $QualityIntelligenceSMR + $basicTallSMR + $BasicShortSMR > 0>>
<br>__Slave Market Regulations__ <br>__Slave Market Regulations__
<<if $BasicSMR == 1>> <<if $BasicSMR == 1>>
...@@ -73,6 +73,14 @@ ...@@ -73,6 +73,14 @@
[[Repeal|Policies][$BasicWeightSMR = 0, $minimumSlaveCost -= 3000]] [[Repeal|Policies][$BasicWeightSMR = 0, $minimumSlaveCost -= 3000]]
<</if>> <</if>>
<<if $BasicTallSMR == 1>>
<br>''Basic Height Standards:'' talls slaves are favored in the slave market, short slaves capable of meeting height standards via surgery must undergo it.
[[Repeal|Policies][$BasicTallSMR = 0, $minimumSlaveCost -= 5000]]
<<elseif $BasicShortSMR == 1>>
<br>''Basic Height Standards:'' short slaves are favored in the slave market, tall slaves capable of meeting height standards via surgery must undergo it.
[[Repeal|Policies][$BasicShortSMR = 0, $minimumSlaveCost -= 5000]]
<</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]]
...@@ -666,6 +674,22 @@ ...@@ -666,6 +674,22 @@
<</if>> <</if>>
<</if>> <</if>>
<<if $BasicTallSMR == 0>>
<<if $BasicShortSMR == 0>>
<br>''Basic Height Standards:'' tall slaves will be favored in the slave markets and those not quite tall enough will undergo height increasing surgery. This will not preclude the sale of short slaves, just the care of them.
[[Implement|Policies][$BasicTallSMR = 1, $cash -=5000, $rep -= 1000, $minimumSlaveCost += 5000]]
<br>&nbsp;&nbsp;&nbsp;&nbsp;//This will raise the price of slaves.
<</if>>
<</if>>
<<if $BasicTallSMR == 0>>
<<if $BasicShortSMR == 0>>
<br>''Basic Height Standards:'' short slaves will be favored in the slave markets and those just above the cut off will undergo height increasing surgery. This will not preclude the sale of tall slaves, just the care of them.
[[Implement|Policies][$BasicShortSMR = 1, $cash -=5000, $rep -= 1000, $minimumSlaveCost += 5000]]
<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.
...@@ -728,15 +752,21 @@ ...@@ -728,15 +752,21 @@
<br>__Sexual Trendsetting__ <br>__Sexual Trendsetting__
<<if $OralEncouragement+$VaginalEncouragement+$AnalEncouragement == 0>> <<if $OralEncouragement+$VaginalEncouragement+$AnalEncouragement == 0>>
<br>''Oral Sex Encouragement:'' you will use your personal influence to make blowjobs the most fashionable sex act in the arcology. <<if $OralDiscouragement == 0>>
[[Implement|Policies][$OralEncouragement = 1, $cash -=5000, $rep -= 1000]] <br>''Oral Sex Encouragement:'' you will use your personal influence to make blowjobs the most fashionable sex act in the arcology.
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the weight on slaves' oral skills// [[Implement|Policies][$OralEncouragement = 1, $cash -=5000, $rep -= 1000]]
<br>''Vaginal Sex Encouragement:'' you will use your personal influence to keep pussies the most fashionable holes in the arcology. <br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the weight on slaves' oral skills//
[[Implement|Policies][$VaginalEncouragement = 1, $cash -=5000, $rep -= 1000]] <</if>>
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the weight on slaves' vaginal skills// <<if $VaginalDiscouragement == 0>>
<br>''Anal Sex Encouragement:'' you will use your personal influence to make anuses the most fashionable holes in the arcology. <br>''Vaginal Sex Encouragement:'' you will use your personal influence to keep pussies the most fashionable holes in the arcology.
[[Implement|Policies][$AnalEncouragement = 1, $cash -=5000, $rep -= 1000]] [[Implement|Policies][$VaginalEncouragement = 1, $cash -=5000, $rep -= 1000]]
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the weight on slaves' anal skills// <br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the weight on slaves' vaginal skills//
<</if>>
<<if $AnalDiscouragement == 0>>
<br>''Anal Sex Encouragement:'' you will use your personal influence to make anuses the most fashionable holes in the arcology.
[[Implement|Policies][$AnalEncouragement = 1, $cash -=5000, $rep -= 1000]]
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will increase the weight on slaves' anal skills//
<</if>>
<</if>> <</if>>
<<if $OralDiscouragement == 0>> <<if $OralDiscouragement == 0>>
......
src/uncategorized/saServeThePublic.tw
+ 1
− 1
View file @ 437de1c3
...@@ -203,7 +203,7 @@ the public. ...@@ -203,7 +203,7 @@ the public.
The DJ is such a gorgeous diva that she's swept along by her charisma, and does her best to be a worthy part of her entourage. The DJ is such a gorgeous diva that she's swept along by her charisma, and does her best to be a worthy part of her entourage.
<</if>> <</if>>
<</if>> <</if>>
<<if ($slaves[$i].sexualFlaw != "none") && (random(1,100) > 90)>> <<if !["none", "neglectful", "cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "breeder"].includes($slaves[$i].sexualFlaw) && (random(1,100) > 90)>>
<<SlaveFullName $DJ>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws. <<SlaveFullName $DJ>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws.
<<set $slaves[$i].sexualFlaw = "none">> <<set $slaves[$i].sexualFlaw = "none">>
<<elseif ($slaves[$i].behavioralFlaw != "none") && (random(1,100) > 90)>> <<elseif ($slaves[$i].behavioralFlaw != "none") && (random(1,100) > 90)>>
......
src/uncategorized/saWhore.tw
+ 1
− 1
View file @ 437de1c3
...@@ -199,7 +199,7 @@ her body. ...@@ -199,7 +199,7 @@ her body.
The Madam uses her dick to reward her when she does well and needs some loving. The Madam uses her dick to reward her when she does well and needs some loving.
<</if>> <</if>>
<</if>> <</if>>
<<if ($slaves[$i].sexualFlaw != "none") && (random(1,100) > 90)>> <<if !["none", "neglectful", "cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "breeder"].includes($slaves[$i].sexualFlaw) && (random(1,100) > 90)>>
<<SlaveFullName $Madam>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws. <<SlaveFullName $Madam>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws.
<<set $slaves[$i].sexualFlaw = "none">> <<set $slaves[$i].sexualFlaw = "none">>
<<elseif ($slaves[$i].behavioralFlaw != "none") && (random(1,100) > 90)>> <<elseif ($slaves[$i].behavioralFlaw != "none") && (random(1,100) > 90)>>
......
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