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

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

Pregmod v1028-33

See merge request pregmodfan/fc-pregmod!2595
parents 59c89ef7 35637522
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
devNotes/twine JS.txt
+ 1
− 0
View file @ e6276f1e
......@@ -13614,6 +13614,7 @@ window.DefaultRules = (function() {
slave.milkSource = 0;
slave.cumSource = 0;
SetBellySize(slave);
} else if ((rule.inflationType === "curative" && slave.health > 90) || (rule.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
} else {
r += `<br>${slave.slaveName}'s current enema regimen has been set to ${slave.inflationType}.`;
slave.inflation = 1;
src/init/storyInit.tw
+ 95
− 94
View file @ e6276f1e
......@@ -23,56 +23,57 @@ You should have received a copy of the GNU General Public License along with thi
<<if def $slaves>>
<<set _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
<<if $slaves[_i].assignment == "be imported">>
<<set $slaves[_i].ID += 1200000>>
<<set $slaves[_i].assignment = "rest">>
<<set $slaves[_i].assignmentVisible = 1>>
<<set $slaves[_i].weekAcquired = 0>>
<<set $slaves[_i].newGamePlus = 1>>
<<PMODinit $slaves[_i]>>
<<if $slaves[_i].mother > 0>>
<<set $slaves[_i].mother += 1200000>>
<<elseif $freshPC == 1 && $slaves[_i].mother == -1>>
<<set $slaves[_i].mother = -12000000>>
<<elseif $slaves[_i].mother < -1>>
<<set $slaves[_i].mother -= 1200000>>
<</if>>
<<if $slaves[_i].father > 0>>
<<set $slaves[_i].father += 1200000>>
<<elseif $freshPC == 1 && $slaves[_i].father == -1>>
<<set $slaves[_i].father = -12000000>>
<<elseif $slaves[_i].father < -1>>
<<set $slaves[_i].father -= 1200000>>
<</if>>
<<set $slaves[_i].daughters = 0>>
<<set $slaves[_i].sisters = 0>>
<<set $slaves[_i].canRecruit = 0>>
<<set $slaves[_i].breedingMark = 0>>
<<set $slaves[_i].reservedChildren = 0>>
<<if $arcologies[0].FSRomanRevivalist > 90>>
<<set $slaves[_i].nationality = "Roman Revivalist">>
<<elseif $arcologies[0].FSAztecRevivalist > 90>>
<<set $slaves[_i].nationality = "Aztec Revivalist">>
<<elseif $arcologies[0].FSEgyptianRevivalist > 90>>
<<set $slaves[_i].nationality = "Ancient Egyptian Revivalist">>
<<elseif $arcologies[0].FSEdoRevivalist > 90>>
<<set $slaves[_i].nationality = "Edo Revivalist">>
<<elseif $arcologies[0].FSArabianRevivalist > 90>>
<<set $slaves[_i].nationality = "Arabian Revivalist">>
<<elseif $arcologies[0].FSChineseRevivalist > 90>>
<<set $slaves[_i].nationality = "Ancient Chinese Revivalist">>
<</if>>
<<if $slaves[_i].relationTarget != 0>>
<<set $slaves[_i].relationTarget += 1200000>>
<</if>>
<<if $slaves[_i].relationshipTarget != 0>>
<<set $slaves[_i].relationshipTarget += 1200000>>
<<if $slaves[_i].assignment == "be imported">>
<<set $slaves[_i].ID += 1200000>>
<<set $slaves[_i].assignment = "rest">>
<<set $slaves[_i].assignmentVisible = 1>>
<<set $slaves[_i].weekAcquired = 0>>
<<set $slaves[_i].newGamePlus = 1>>
<<PMODinit $slaves[_i]>>
<<if $slaves[_i].mother > 0>>
<<set $slaves[_i].mother += 1200000>>
<<elseif $freshPC == 1 && $slaves[_i].mother == -1>>
<<set $slaves[_i].mother = -12000000>>
<<elseif $slaves[_i].mother < -1>>
<<set $slaves[_i].mother -= 1200000>>
<</if>>
<<if $slaves[_i].father > 0>>
<<set $slaves[_i].father += 1200000>>
<<elseif $freshPC == 1 && $slaves[_i].father == -1>>
<<set $slaves[_i].father = -12000000>>
<<elseif $slaves[_i].father < -1>>
<<set $slaves[_i].father -= 1200000>>
<</if>>
<<set $slaves[_i].daughters = 0>>
<<set $slaves[_i].sisters = 0>>
<<set $slaves[_i].canRecruit = 0>>
<<set $slaves[_i].breedingMark = 0>>
<<set $slaves[_i].reservedChildren = 0>>
<<if $arcologies[0].FSRomanRevivalist > 90>>
<<set $slaves[_i].nationality = "Roman Revivalist">>
<<elseif $arcologies[0].FSAztecRevivalist > 90>>
<<set $slaves[_i].nationality = "Aztec Revivalist">>
<<elseif $arcologies[0].FSEgyptianRevivalist > 90>>
<<set $slaves[_i].nationality = "Ancient Egyptian Revivalist">>
<<elseif $arcologies[0].FSEdoRevivalist > 90>>
<<set $slaves[_i].nationality = "Edo Revivalist">>
<<elseif $arcologies[0].FSArabianRevivalist > 90>>
<<set $slaves[_i].nationality = "Arabian Revivalist">>
<<elseif $arcologies[0].FSChineseRevivalist > 90>>
<<set $slaves[_i].nationality = "Ancient Chinese Revivalist">>
<</if>>
<<if $slaves[_i].relationTarget != 0>>
<<set $slaves[_i].relationTarget += 1200000>>
<</if>>
<<if $slaves[_i].relationshipTarget != 0>>
<<set $slaves[_i].relationshipTarget += 1200000>>
<</if>>
<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>>
<<else>>
<<set _dump = removeSlave(_i), _i--, _SL-->>
<</if>>
<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>>
<<else>>
<<set _dump = removeSlave(_i), _i--, _SL-->>
<</if>>
<</for>>
<<set $slaveIndices = slaves2indices()>>
<<for _k = 0; _k < _SL; _k++>>
<<for _i = 0; _i < _SL; _i++>>
<<if $slaves[_k].mother == $slaves[_i].ID || $slaves[_k].father == $slaves[_i].ID>>
......@@ -110,57 +111,57 @@ You should have received a copy of the GNU General Public License along with thi
<</for>>
*/
<<for _i = 0; _i < _SL; _i++>>
<<if $slaves[_i].relation != 0>>
<<set _seed = 0, _rt = $slaves[_i].relationTarget, _ID = $slaves[_i].ID>>
<<set _j = $slaveIndices[_rt]>>
<<if def _j && $slaves[_j].relationTarget == _ID>>
<<set _seed = 1>>
<</if>>
<<if _seed == 0>>
<<set $slaves[_i].relation = 0, $slaves[_i].relationTarget = 0>>
<</if>>
<</if>>
<<if $slaves[_i].relationship > 0>>
<<set _seed = 0, _rt = $slaves[_i].relationshipTarget, _ID = $slaves[_i].ID>>
<<set _j = $slaveIndices[_rt]>>
<<if def _j && $slaves[_j].relationshipTarget == _ID>>
<<set _seed = 1>>
<<if $slaves[_i].relation != 0>>
<<set _seed = 0, _rt = $slaves[_i].relationTarget, _ID = $slaves[_i].ID>>
<<set _j = $slaveIndices[_rt]>>
<<if def _j && $slaves[_j].relationTarget == _ID>>
<<set _seed = 1>>
<</if>>
<<if _seed == 0>>
<<set $slaves[_i].relation = 0, $slaves[_i].relationTarget = 0>>
<</if>>
<</if>>
<<if _seed == 0>>
<<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>>
<<if $slaves[_i].relationship > 0>>
<<set _seed = 0, _rt = $slaves[_i].relationshipTarget, _ID = $slaves[_i].ID>>
<<set _j = $slaveIndices[_rt]>>
<<if def _j && $slaves[_j].relationshipTarget == _ID>>
<<set _seed = 1>>
<</if>>
<<if _seed == 0>>
<<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>>
<</if>>
<</if>>
<</if>>
<</for>>
<<for _i = 0; _i < _SL; _i++>>
<<if $familyTesting == 1>>
<<if $slaves[_i].canRecruit == 1>>
/*<<set $recruiters.push($slaves[_i])>>*/
<</if>>
<<else>>
<<if $slaves[_i].relation == 0>>
<<if random(1,100) <= 5>>
<<set $slaves[_i].recruiter = "twin">>
<<elseif ($slaves[_i].actualAge > 32) && (random(1,100) <= 41)>>
<<set $slaves[_i].recruiter = "mother">>
<<elseif ($slaves[_i].actualAge < 24) && (random(1,100) <= 40)>>
<<set $slaves[_i].recruiter = "daughter">>
<<elseif ($slaves[_i].actualAge < 43) && (random(1,100) <= 20)>>
<<set $slaves[_i].recruiter = "older sister">>
<<elseif ($slaves[_i].actualAge < 25) && ($slaves[_i].actualAge > 18) && (random(1,100) <= 20)>>
<<set $slaves[_i].recruiter = "young sister">>
<<if $familyTesting == 1>>
<<if $slaves[_i].canRecruit == 1>>
/*<<set $recruiters.push($slaves[_i])>>*/
<</if>>
<<else>>
<<set $slaves[_i].recruiter = 0>>
<</if>>
<</if>> /*closes family mode */
<<set $slaves[_i].milk = 0>>
<<set $slaves[_i].cum = 0>>
<<set $slaves[_i].births = 0>>
<<set $slaves[_i].mammaryCount = 0>>
<<set $slaves[_i].penetrativeCount = 0>>
<<set $slaves[_i].oralCount = 0>>
<<set $slaves[_i].analCount = 0>>
<<set $slaves[_i].vaginalCount = 0>>
<<if $slaves[_i].relation == 0>>
<<if random(1,100) <= 5>>
<<set $slaves[_i].recruiter = "twin">>
<<elseif ($slaves[_i].actualAge > 32) && (random(1,100) <= 41)>>
<<set $slaves[_i].recruiter = "mother">>
<<elseif ($slaves[_i].actualAge < 24) && (random(1,100) <= 40)>>
<<set $slaves[_i].recruiter = "daughter">>
<<elseif ($slaves[_i].actualAge < 43) && (random(1,100) <= 20)>>
<<set $slaves[_i].recruiter = "older sister">>
<<elseif ($slaves[_i].actualAge < 25) && ($slaves[_i].actualAge > 18) && (random(1,100) <= 20)>>
<<set $slaves[_i].recruiter = "young sister">>
<</if>>
<<else>>
<<set $slaves[_i].recruiter = 0>>
<</if>>
<</if>> /*closes family mode */
<<set $slaves[_i].milk = 0>>
<<set $slaves[_i].cum = 0>>
<<set $slaves[_i].births = 0>>
<<set $slaves[_i].mammaryCount = 0>>
<<set $slaves[_i].penetrativeCount = 0>>
<<set $slaves[_i].oralCount = 0>>
<<set $slaves[_i].analCount = 0>>
<<set $slaves[_i].vaginalCount = 0>>
<</for>>
<<set $slavesOriginal = []>> /* not used by pregmod */
<<if ndef $PC.intelligence>>
......@@ -242,9 +243,9 @@ You should have received a copy of the GNU General Public License along with thi
<<set $slaves = []>>
<<set $slavesOriginal = []>> /* not used by pregmod */
<<set $genePool = []>>
<<set $slaveIndices = slaves2indices()>>
<</if>>
<<set $slaveIndices = slaves2indices()>>
<<set $organs = []>>
<<set $ArcadeiIDs = [], $BrothiIDs = [], $CellBiIDs = [], $CliniciIDs = [], $ClubiIDs = [], $DairyiIDs = [], $HGSuiteiIDs = [], $MastSiIDs = [], $SchlRiIDs = [], $ServQiIDs = [], $SpaiIDs = []>>
......
src/js/DefaultRules.tw
+ 1
− 0
View file @ e6276f1e
......@@ -1331,6 +1331,7 @@ window.DefaultRules = (function() {
slave.milkSource = 0;
slave.cumSource = 0;
SetBellySize(slave);
} else if ((rule.inflationType === "curative" && slave.health > 90) || (rule.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
} else {
r += `<br>${slave.slaveName}'s current enema regimen has been set to ${slave.inflationType}.`;
slave.inflation = 1;
......
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