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

Origin override and bugfixes.

parent 380c7765
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/init/storyInit.tw
+ 1
− 0
View file @ 96d4c443
...@@ -734,6 +734,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) ...@@ -734,6 +734,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $retainCareer = 1>> <<set $retainCareer = 1>>
<<set $freshPC = 0>> <<set $freshPC = 0>>
<<set $inbreeding = 1>> <<set $inbreeding = 1>>
<<set $originOveride = 0>>
<<set $fakeBellies to ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"]>> /* lets fake bellies be separated from other .bellyAccessory */ <<set $fakeBellies to ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"]>> /* lets fake bellies be separated from other .bellyAccessory */
......
src/npc/startingGirls/commitStartingGirl.tw
+ 1
− 0
View file @ 96d4c443
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<<set $activeSlave.boobs = Math.trunc($activeSlave.boobs/50)*50>> <<set $activeSlave.boobs = Math.trunc($activeSlave.boobs/50)*50>>
<<set $careerBonusApplied = 0>> <<set $careerBonusApplied = 0>>
<<set $originOveride = 0>>
<<if $cash < $minimumSlaveCost>><<goto "Acquisition">><</if>> <<if $cash < $minimumSlaveCost>><<goto "Acquisition">><</if>>
......
src/npc/startingGirls/moreCustomOptions.tw
+ 5
− 0
View file @ 96d4c443
...@@ -21,6 +21,11 @@ Custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "More c ...@@ -21,6 +21,11 @@ Custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "More c
&nbsp;&nbsp;&nbsp;&nbsp;//Use complete, capitalized and punctuated sentences// &nbsp;&nbsp;&nbsp;&nbsp;//Use complete, capitalized and punctuated sentences//
Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">> Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">>
&nbsp;&nbsp;&nbsp;&nbsp;//For best results, use complete, capitalized and punctuated sentences.// &nbsp;&nbsp;&nbsp;&nbsp;//For best results, use complete, capitalized and punctuated sentences.//
<<if $originOveride == 0>>
[[Origin Override|More customization options][$originOveride to 1]] //Will keep your custom origin from being overwritten.//
<<else>>
[[Disable Override|More customization options][$originOveride to 0]] //Will unlock origin and allow slavegen to overwrite it.//
<</if>>
Custom description: <<textbox "$activeSlave.customDesc" $activeSlave.customDesc "More customization options">> Custom description: <<textbox "$activeSlave.customDesc" $activeSlave.customDesc "More customization options">>
&nbsp;&nbsp;&nbsp;&nbsp;//Use complete, capitalized and punctuated sentences.// &nbsp;&nbsp;&nbsp;&nbsp;//Use complete, capitalized and punctuated sentences.//
Custom label: <<textbox "$activeSlave.customLabel" $activeSlave.customLabel "More customization options">> Custom label: <<textbox "$activeSlave.customLabel" $activeSlave.customLabel "More customization options">>
......
src/npc/startingGirls/startingGirls.tw
+ 2
− 0
View file @ 96d4c443
...@@ -139,6 +139,7 @@ __You are customizing this slave:__ ...@@ -139,6 +139,7 @@ __You are customizing this slave:__
<</if>> <</if>>
<</if>> <</if>>
/* this block makes starting girls actually apply the slave origins, mostly since it just hates you and everything you do */ /* this block makes starting girls actually apply the slave origins, mostly since it just hates you and everything you do */
<<if $originOveride = 0>>
<<if $PC.career is "capitalist">> <<if $PC.career is "capitalist">>
<<if $activeSlave.mother == -1 && $activeSlave.father == -1>> <<if $activeSlave.mother == -1 && $activeSlave.father == -1>>
<<set $activeSlave.origin to "To solidify an investment in hermaphrodite self-fertility, you took part in a test successful test trial. Nine months later your daughter was born.">> <<set $activeSlave.origin to "To solidify an investment in hermaphrodite self-fertility, you took part in a test successful test trial. Nine months later your daughter was born.">>
...@@ -286,6 +287,7 @@ __You are customizing this slave:__ ...@@ -286,6 +287,7 @@ __You are customizing this slave:__
<<set $activeSlave.origin to "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.">> <<set $activeSlave.origin to "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.">>
<<set $activeSlave.customTat to "She has the silhouette of an arcology tattooed on the nape of her neck.">> <<set $activeSlave.customTat to "She has the silhouette of an arcology tattooed on the nape of her neck.">>
<</if>> <</if>>
<</if>>
<<if $activeSlave.vagina < 1>> <<if $activeSlave.vagina < 1>>
<<set $activeSlave.vaginalSkill = 0>> <<set $activeSlave.vaginalSkill = 0>>
<</if>> <</if>>
......
src/pregmod/generateChild.tw
+ 8
− 8
View file @ 96d4c443
...@@ -253,16 +253,16 @@ ...@@ -253,16 +253,16 @@
<</if>> <</if>>
<</if>> <</if>>
<<set $activeSlave.mother = $mergeMom.ID>> <<set $activeSlave.mother = $mergeMom.ID>>
<<if $Mom.pregSource > 0>> <<if $mom.pregSource > 0>>
<<set $activeSlave.father = $mergeDad.ID>> <<set $activeSlave.father = $mergeDad.ID>>
<<set $activeSlave.slaveName = String($Mom.slaveName + " and " + $mergeDad.slaveName + "'s child")>> <<set $activeSlave.slaveName = String($mom.slaveName + " and " + $mergeDad.slaveName + "'s child")>>
<<elseif $Mom.pregSource == -1>> <<elseif $mom.pregSource == -1>>
<<set $activeSlave.father = -1>> <<set $activeSlave.father = -1>>
<<set $activeSlave.slaveName = String($Mom.slaveName + " and my child")>> <<set $activeSlave.slaveName = String($mom.slaveName + " and my child")>>
<<else>> <<else>>
<<set $activeSlave.father = $missingParentID>> <<set $activeSlave.father = $missingParentID>>
<<set $missingParentID-->> <<set $missingParentID-->>
<<set $activeSlave.slaveName = String($Mom.slaveName + "'s slut child")>> <<set $activeSlave.slaveName = String($mom.slaveName + "'s slut child")>>
<</if>> <</if>>
<<if $mergeMom.nationality == $mergeDad.nationality>> <<if $mergeMom.nationality == $mergeDad.nationality>>
<<set $activeSlave.nationality = $mergeDad.nationality>> <<set $activeSlave.nationality = $mergeDad.nationality>>
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
<<else>> <<else>>
<<set $activeSlave.race = "mixed race">> <<set $activeSlave.race = "mixed race">>
<</if>> <</if>>
<<if $Mom.pregSource == -2 && $arcologies[0].FSSupremacist != "unset">> <<if $mom.pregSource == -2 && $arcologies[0].FSSupremacist != "unset">>
<<set $activeSlave.race = either($mergeMom.race, $arcologies[0].FSSubjugationistRace, $arcologies[0].FSSubjugationistRace)>> <<set $activeSlave.race = either($mergeMom.race, $arcologies[0].FSSubjugationistRace, $arcologies[0].FSSubjugationistRace)>>
<<if $mergeMom.race != $arcologies[0].FSSubjugationistRace>> <<if $mergeMom.race != $arcologies[0].FSSubjugationistRace>>
<<if random(1,100) > 50>> <<if random(1,100) > 50>>
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
<<else>> <<else>>
<<set $activeSlave.eyeColor = either($mergeMom.eyeColor, $mergeDad.eyeColor)>> <<set $activeSlave.eyeColor = either($mergeMom.eyeColor, $mergeDad.eyeColor)>>
<</if>> <</if>>
<<if $mergeMom.pregSource == -2 || $mergeMom.pregSource == 0>> <<if $mom.pregSource == -2 || $mom.pregSource == 0>>
<<set $activeSlave.eyeColor = either($mergeMom.eyeColor, "brown", "blue", "brown", "green", "hazel", "green")>> <<set $activeSlave.eyeColor = either($mergeMom.eyeColor, "brown", "blue", "brown", "green", "hazel", "green")>>
<</if>> <</if>>
<<if $mergeMom.hColor == $mergeDad.hColor>> <<if $mergeMom.hColor == $mergeDad.hColor>>
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<<else>> <<else>>
<<set $activeSlave.hColor = either($mergeMom.hColor, $mergeDad.hColor)>> <<set $activeSlave.hColor = either($mergeMom.hColor, $mergeDad.hColor)>>
<</if>> <</if>>
<<if $Mom.pregSource == -2 || $Mom.pregSource == 0>> <<if $mom.pregSource == -2 || $mom.pregSource == 0>>
<<set $activeSlave.hColor = either($mergeMom.hColor, "brown", "blonde", "black", "brown", "black", "brown", "black")>> <<set $activeSlave.hColor = either($mergeMom.hColor, "brown", "blonde", "black", "brown", "black", "brown", "black")>>
<</if>> <</if>>
<<set $activeSlave.pubicHColor = $activeSlave.hColor>> <<set $activeSlave.pubicHColor = $activeSlave.hColor>>
......
src/uncategorized/reRelativeRecruiter.tw
+ 38
− 18
View file @ 96d4c443
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<<set $newRelativeRecruitID = 1100000>> <<set $newRelativeRecruitID = 1100000>>
<</if>> <</if>>
<<for $i to 0; $i < $slaves.length; $i++>> <<for $i to 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].fuckdoll == 0>> <<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].canRecruit == 1>> <<if $slaves[$i].canRecruit == 1>>
...@@ -29,38 +30,54 @@ ...@@ -29,38 +30,54 @@
<</for>> <</for>>
<<set $recruitedType = []>> <<set $recruitedType = []>>
<<if $eventSlave.mother == 0 && $activeSlave.actualAge < 24>> <<if $eventSlave.mother == 0 && $activeSlave.actualAge < 24 && $seeDicks != 100>>>>
<<set $recruitedType.push("mother")>> <<set $recruitedType.push("mother")>>
<<set $recruitedType.push("mother")>> <<set $recruitedType.push("mother")>>
<<set $recruitedType.push("mother")>> <<set $recruitedType.push("mother")>>
<</if>> <</if>>
<<if $eventSlave.father == 0 && $activeSlave.actualAge < 24>> <<if $eventSlave.father == 0 && $activeSlave.actualAge < 24 && $seeDicks != 0>>
<<set $recruitedType.push("father")>> <<set $recruitedType.push("father")>>
<</if>> <</if>>
<<if $eventSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$fertilityAge) && isFertile($activeSlave)>> <<if $eventSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$fertilityAge) && isFertile($activeSlave)>>
<<set $recruitedType.push("daughter")>> <<if $seeDicks != 100>>
<<set $recruitedType.push("daughter")>> <<set $recruitedType.push("daughter")>>
<<set $recruitedType.push("son")>> <<set $recruitedType.push("daughter")>>
<</if>>
<<if $seeDicks != 0>>
<<set $recruitedType.push("son")>>
<</if>>
<<set $tempMF = "mother">> <<set $tempMF = "mother">>
<</if>> <</if>>
<<if $eventSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$potencyAge) && $activeSlave.balls > 0>> <<if $eventSlave.daughters < 3 && $activeSlave.actualAge > ($minimumSlaveAge+$potencyAge) && $activeSlave.balls > 0>>
<<set $recruitedType.push("daughter")>> <<if $seeDicks != 100>>
<<set $recruitedType.push("daughter")>> <<set $recruitedType.push("daughter")>>
<<set $recruitedType.push("son")>> <<set $recruitedType.push("daughter")>>
<</if>>
<<if $seeDicks != 0>>
<<set $recruitedType.push("son")>>
<</if>>
<<set $tempMF = "father">> <<set $tempMF = "father">>
<</if>> <</if>>
<<if $eventSlave.sisters < 3>> <<if $eventSlave.sisters < 3>>
<<if $activeSlave.actualAge <= ($retirementAge-5)>> <<if $activeSlave.actualAge <= ($retirementAge-5)>>
<<set $recruitedType.push("older sister")>> <<if $seeDicks != 100>>
<<set $recruitedType.push("older sister")>> <<set $recruitedType.push("older sister")>>
<<set $recruitedType.push("older brother")>> <<set $recruitedType.push("older sister")>>
<<set $recruitedType.push("older brother")>> <</if>>
<<if $seeDicks != 0>>
<<set $recruitedType.push("older brother")>>
<<set $recruitedType.push("older brother")>>
<</if>>
<</if>> <</if>>
<<if $activeSlave.actualAge >= ($minimumSlaveAge+5)>> <<if $activeSlave.actualAge >= ($minimumSlaveAge+5)>>
<<set $recruitedType.push("younger sister")>> <<if $seeDicks != 100>>
<<set $recruitedType.push("younger sister")>> <<set $recruitedType.push("younger sister")>>
<<set $recruitedType.push("younger brother")>> <<set $recruitedType.push("younger sister")>>
<<set $recruitedType.push("younger brother")>> <</if>>
<<if $seeDicks != 0>>
<<set $recruitedType.push("younger brother")>>
<<set $recruitedType.push("younger brother")>>
<</if>>
<</if>> <</if>>
<<set $recruitedType.push("twin")>> <<set $recruitedType.push("twin")>>
<</if>> <</if>>
...@@ -240,6 +257,7 @@ She waits anxiously for your decision. ...@@ -240,6 +257,7 @@ She waits anxiously for your decision.
<<set $activeSlave.voice = 1>> <<set $activeSlave.voice = 1>>
<<set $activeSlave.energy = 0>> <<set $activeSlave.energy = 0>>
<<set $activeSlave.penis = 2>> <<set $activeSlave.penis = 2>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.boobs = (random(5,6)*100)>> <<set $activeSlave.boobs = (random(5,6)*100)>>
<<set $activeSlave.butt = random(4,6)>> <<set $activeSlave.butt = random(4,6)>>
<<set $activeSlave.actualAge = ($eventSlave.actualAge+random(15,20))>> <<set $activeSlave.actualAge = ($eventSlave.actualAge+random(15,20))>>
...@@ -338,6 +356,7 @@ She waits anxiously for your decision. ...@@ -338,6 +356,7 @@ She waits anxiously for your decision.
<<set $activeSlave.entertainSkill += random(0,20)>> <<set $activeSlave.entertainSkill += random(0,20)>>
<<set $activeSlave.whoreSkill += random(0,20)>> <<set $activeSlave.whoreSkill += random(0,20)>>
<<set $activeSlave.anus = 0>> <<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.energy = 70>> <<set $activeSlave.energy = 70>>
<<set $activeSlave.dickPiercing = 1>> <<set $activeSlave.dickPiercing = 1>>
<<set $activeSlave.tounguePiercing = 1>> <<set $activeSlave.tounguePiercing = 1>>
...@@ -359,6 +378,7 @@ She waits anxiously for your decision. ...@@ -359,6 +378,7 @@ She waits anxiously for your decision.
<<set $activeSlave.balls = 1>> <<set $activeSlave.balls = 1>>
<<set $activeSlave.foreskin = 10>> <<set $activeSlave.foreskin = 10>>
<<set $activeSlave.scrotum = 10>> <<set $activeSlave.scrotum = 10>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.anus = 3>> <<set $activeSlave.anus = 3>>
<<set $activeSlave.makeup = 3>> <<set $activeSlave.makeup = 3>>
<<set $activeSlave.nails = 5>> <<set $activeSlave.nails = 5>>
...@@ -490,7 +510,7 @@ She waits anxiously for your decision. ...@@ -490,7 +510,7 @@ She waits anxiously for your decision.
<<set $newRelativeRecruitID++>> <<set $newRelativeRecruitID++>>
<br><br> <br><br>
You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but you won't be able to inspect her beyond her likely resemblance to her You look up the $relationType. She costs ¤$slaveCost, a bargain, but you won't be able to inspect her beyond her likely resemblance to her
<<switch $relationType>> <<switch $relationType>>
<<case "daughter">> <<case "daughter">>
mother. Her listing states that she was used as a prostitute by her previous owner. mother. Her listing states that she was used as a prostitute by her previous owner.
...@@ -692,7 +712,7 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo ...@@ -692,7 +712,7 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo
<<AddSlave $activeSlave>> <<AddSlave $activeSlave>>
<<SlaveTitle $eventSlave>> <<SlaveTitle $eventSlave>>
<<replace "#result">> <<replace "#result">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly - they parted a long time ago - but they embrace. The devoted $desc explains the situation and encourages her $activeSlave.relation to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that she's lucky to be here. You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly - they parted a long time ago - but they embrace. The devoted $desc explains the situation and encourages her $relationType to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that she's lucky to be here.
<<set $nextLink to "AS Dump">> <<set $nextLink to "AS Dump">>
<<set $recruitedType = 0>> <<set $recruitedType = 0>>
<<set $relationType = 0>> <<set $relationType = 0>>
......
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