Skip to content
Snippets Groups Projects
Commit c6f52879 authored by Blank's avatar Blank Committed by Pregmodder
Browse files

Sa conflict resolution

parent 1aa4b814
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/uncategorized/saChoosesOwnJob.tw
+ 9
− 0
View file @ c6f52879
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">> <<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<</if>> <</if>>
<<elseif ($slaves[$i].relationship == -2)>> <<elseif ($slaves[$i].relationship == -2)>>
...@@ -100,6 +101,7 @@ ...@@ -100,6 +101,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">> <<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].energy > 60)>> <<elseif ($slaves[$i].energy > 60)>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $he thinks of little but sex with you,">> <<set $slaves[$i].choosesOwnAssignmentText += " and $he thinks of little but sex with you,">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
...@@ -225,6 +227,7 @@ ...@@ -225,6 +227,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " is self-confident, so $he decides to work as a public servant.">> <<set $slaves[$i].choosesOwnAssignmentText += " is self-confident, so $he decides to work as a public servant.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].fetish == "masochist")>> <<elseif ($slaves[$i].fetish == "masochist")>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " enjoys abuse, so $he hurries down to $brothelName.">> <<set $slaves[$i].choosesOwnAssignmentText += " enjoys abuse, so $he hurries down to $brothelName.">>
...@@ -310,6 +313,7 @@ ...@@ -310,6 +313,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " heads to the streets to contribute to the number of visibly pregnant women around.">> <<set $slaves[$i].choosesOwnAssignmentText += " heads to the streets to contribute to the number of visibly pregnant women around.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<</if>> <</if>>
<<elseif $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>> <<elseif $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads straight to $masterSuiteName to share the intimacy of $his pregnant body with you.">> <<set $slaves[$i].choosesOwnAssignmentText += " heads straight to $masterSuiteName to share the intimacy of $his pregnant body with you.">>
...@@ -352,6 +356,7 @@ ...@@ -352,6 +356,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $he can show off $his bare breasts.">> <<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $he can show off $his bare breasts.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<</if>> <</if>>
<<elseif ($slaves[$i].attrXX > 85)>> <<elseif ($slaves[$i].attrXX > 85)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
...@@ -361,6 +366,7 @@ ...@@ -361,6 +366,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $he can hit on hot girls.">> <<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $he can hit on hot girls.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].attrXY > 85)>> <<elseif ($slaves[$i].attrXY > 85)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $he can hit on cute boys.">> <<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $he can hit on cute boys.">>
...@@ -369,6 +375,7 @@ ...@@ -369,6 +375,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $he can hit on cute boys.">> <<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $he can hit on cute boys.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].energy > 95)>> <<elseif ($slaves[$i].energy > 95)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to help those of your slaves who mind taking dick all day by working in $brothelName.">> <<set $slaves[$i].choosesOwnAssignmentText += " decides to help those of your slaves who mind taking dick all day by working in $brothelName.">>
...@@ -409,6 +416,7 @@ ...@@ -409,6 +416,7 @@
<<else>> <<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $he decides $he can best serve the empire by offering $himself to the public.">> <<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $he decides $he can best serve the empire by offering $himself to the public.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<<set $slaves[$i].sexAmount = 10>>
<</if>> <</if>>
<<elseif ($arcologies[0].FSPaternalist > 0)>> <<elseif ($arcologies[0].FSPaternalist > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
...@@ -461,6 +469,7 @@ ...@@ -461,6 +469,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " decides to serve the public, since $he thinks $himself a better public slut than a whore.">> <<set $slaves[$i].choosesOwnAssignmentText += " decides to serve the public, since $he thinks $himself a better public slut than a whore.">>
<<= assignJob($slaves[$i], "serve the public")>> <<= assignJob($slaves[$i], "serve the public")>>
<</if>> <</if>>
<<set $slaves[$i].sexAmount = 10>>
<<else>> <<else>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to join $his sisters and work in $brothelName.">> <<set $slaves[$i].choosesOwnAssignmentText += " decides to join $his sisters and work in $brothelName.">>
......
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