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

fixes, vanilla, credits and SFAnon stuff

parent 4188bab9
No related branches found
No related tags found
4 merge requests!1155Pregmod master,!851Nevermind.,!843Delete Please.,!804Pregmod v1021-12
Expand all Hide whitespace changes
Inline Side-by-side
src/gui/Encyclopedia/encyclopedia.tw
+ 1
− 0
View file @ 63893a2e
......@@ -2582,6 +2582,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''anonNeo'' for spellchecking.
<br>''Utopia'' for dirty dealings gang leader focus and updates to it.
<br>''hexall90'' for height growth drugs.
<br>''laziestman'' for sexy spats.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
<br>''Qotsafan'' submitted bugfixes.
......
src/uncategorized/SFMBarracks.tw
+ 60
− 52
View file @ 63893a2e
......@@ -541,63 +541,71 @@ Increase crew comfort and life support systems to increase operational time.
//The Colonel is working to improve the $securityForceName this week.//<br>
<</if>><</nobr>>
<span id="result3">
<<if $securityForceColonelToken == 0>>
<<link "Spend some one on one time up on the surface with The Colonel, along with an escort of cource.">>
<<if $securityForceColonelToken == 0>><</if>>
<<link "Spend some one on one time up on the surface with The Colonel, along with an escort of course.">>
<<replace "#result3">>
<<set $securityForceColonelToken = 1>>
You ask The Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
/* <<if $PC.warfare < 10>> */
/* Your complete lack of skill at warfare ensures that in addition to $Bodyguard, you need; two full sqauds of $securityForceName and on foot,a squadron of fighters, a large convy of $securityForceName ground verchiles. */
/* <</if>> */
/* <<if $PC.warfare > 10>> */
/* Your F.N.G tier skills at warfare ensures that in addition to $Bodyguard, you need; two full sqauds of $securityForceName on foot,a squadron of fighters, a large convy of $securityForceName ground verchiles. */
/* <</if>> */
/* <<if $PC.warfare > 30>> */
/* As you have some skill at warfare, you only need in addition to $Bodyguard; two full sqauds of $securityForceName on foot,a squadron of fighters, a small convy of $securityForceName ground verchiles. */
/* <</if>> */
/* <<if $PC.warfare > 60>> */
/* Your experness at warfare means that in addition to $Bodyguard you only require;a sqaud of $securityForceName on foot,a two fighters, a tiny convy of $securityForceName ground verchiles. */
/* <</if>> */
<<if $PC.warfare > 100>>
Your mastery of wet work, satcatifies the Colonel that you only need; two soliders and a single verchile plus your $Bodyguard.
<</if>>
Being able to see and interact with the arcology owner directly if they so wish boosts the mood of your citizen's while also giving them the opportunity to try gaining favour with you.
<<set $rep += 500>>
<<set $arcologies[0].prosperity += 5>>
<<set $cash += 25000>>
<<set $securityForceColonelToken = 1>>
You ask The Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
<<if $PC.warfare is < 10>>Your complete lack of skill at warfare ensures that in addition to $Bodyguard, you need; two full sqauds of $securityForceName on foot,a squadron of fighters, a large convy of $securityForceName ground vehicles.<<elseif $PC.warfare is 10>>Your F.N.G tier skills at warfare ensures that in addition to $Bodyguard, you need; two full sqauds of $securityForceName on foot,a squadron of fighters, a large convy of $securityForceName ground vehicles.<<elseif $PC.warfare is 30>>As you have some skill at warfare, you only need in addition to $Bodyguard; two full sqauds of $securityForceName on foot,a squadron of fighters, a small convy of $securityForceName ground vehicles.<<elseif $PC.warfare > 60>>Your expertness at warfare means that in addition to $Bodyguard you only require;a sqaud of $securityForceName on foot,a two fighters, a tiny convy of $securityForceName ground vehicles.<<elseif $PC.warfare is 100>>Your mastery of wet work, satcatifies the Colonel that you only need; two soliders and a single verchile plus $Bodyguard.Being able to see and interact with the arcology owner directly if they so wis h boosts the mood of your citizen's while also giving them the opportunity to try gaining favour with you.<<set ($rep += 500) && ($arcologies[0].prosperity += 5) && ($cash += 25000)>>.<<elseif ($PC.warfare is 100) && ($career is "mercenary")>>Your mastery of wet work and prior work as a PMC s, satcatifies the Colonel that you only need; one solider and a single verchile plus $Bodyguard.Being able to see and interact with the arcology owner even more directly if they so wis h boosts the mood of your citizen's while also giving them an increased opportunity to try gaining favour with you.<<set ($rep += 1000) && ($arcologies[0].prosperity += 10) && ($cash += 50000)>><</if>>
Stopping at a <<if $arcologies[0].FSPaternalist != "unset">><</if>> Paternalist shop, you help The Colonel select some luxurious and relaxing treatments for her main slave.
/* <<if ($PC.slaving < 10) || ($PC.career == "arcology owner")>> */
/* Your total lack of slavery skill (which is most suprising and very concerning for an archology owner), means that you are of little to no help or even a hinderance. */
/* <</if>> */
/* <<if $PC.slaving > 10>> */
/* Your basic skill at slavery, allows you to neither be a hinderance or helpful.
/* <</if>> */
/* <<if $PC.slaving > 30>> */
/* Possing some skill you are slightly helpful. */
/* <</if>> */
/* <<if $PC.slaving > 60>> */
/* Your expertness of slavery alllows you to be more useful. */
/* <</if>> */
<<if $PC.slaving > 100>>
>Your mastery of slaving allows you assist the Colonel greatly. However the shop owner is so impressed by your undestanding of slavery that she is more than happy for an endorsement from you. As you are exiting the shop you hear your pre-recorded message which bears the slogan "This is ($PC.customTitle) and this is my favourate Paternalist shop in $arcologies[0].name."
<</if>>
<<set $arcologies[0].prosperity += 5>>
Soon the onterage heads back to $securityForceName 's HQ.
Stopping at a <<if $arcologies[0].FSPaternalist != "unset">>Paternalist shop, you help The Colonel select some luxurious and relaxing treatments for her main slave.
<<if ($PC.slaving is < 10) || ($PC.career is "arcology owner")>>Your total lack of slavery skill (which is very unusal and very concerning for an archology owner), means that you are of little to no help or even a hinderance.<<elseif $PC.slaving is 10>>Your basic skill at slavery, allows you to neither be a hinderance or helpful.<<elseif $PC.slaving is 30>>Possing some skill you are slightly helpful.<<elseif $PC.slaving is 60>>Your expertness of slavery alllows you to be more useful.<<elseif $PC.slaving is 100>>Your mastery of slaving allows you assis t the Colonel greatly. However the shop owner is so impressed by your undestanding of slavery that she is more than happy for an endorsement from you. As you are exiting the shop you hear your pre-recorded message which bears the slogan "This is ($PC.customTitle) and this is my favourate Paternalis t shop in $arcologies[0].name."<<set $arcologies[0].prosperity += 5>><</if>>
Soon the onterage heads back to $securityForceName 's HQ. Along the route you see a homeless citizen in great pain.<<if $PC.medicine is less than 10>>Your total lack of medical skill causes the death of the citizen.<<set ($rep -= 500) && ($arcologies[0].prosperity -= 2).<<elseif $PC.medicine is 10>>Your basic level of medicine esnure that the citizen's condition remains the same.<<elseif $PC.medicine is 30>>Your slightly higher level of medicine esnure that the citizen's condition ever so slightly improves.<<elseif $PC.medicine is 60>>Your mastery of medicine ensures that the citizen's condition is noticably better.<<elseif ($PC.medicine is 100) && ($career is "medicine")>>Your expertness of medicine ensures that the citizen is probably the best they have ever been. Word quickly spreads of the kindly archology owner who took the time to heal a citizen ($rep += 500).<<elseif $PC.medicine is 100>>Your expertness of medicine ensures that the citizen is probably the best they have ever been. They are so greatful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained archology owner who took the time to heal a citizen, providing confidence to the rest of the citizens. ($rep += 1000) && ($arcologies[0].prosperity += 2) && ($cash += 1500)>><</if>>
<</replace>>
<</link>>
<br><<link "Spend some one on one time down in $securityForceName 's HQ">>
<<replace "#result3">>
<<set $securityForceColonelToken = 1>>
"Sure, boss." she says, nodding. "I can use a break from all of this." She laughs.
<</replace>>
<</link>>
<<else>>
//The Colonel has already spent time with you this week.//
<</if>>
<br>
<<link "Spend some one on one time down in $securityForceName 's HQ">>
<<replace "#result3">>
<<set $securityForceColonelToken = 1>>
"Sure, boss." she says, nodding. "I can use a break from all of this." She laughs.
<span id="result4">
<<link "learn some field medicine.">>
<<replace "#result4">>
<<set $PC.medicine + 3>>
<<if $PC.medicine>>//Hopefully now, you are less likely to cut yourself on the sharp things.
<</replace>>
<</link>>
<<link "listen to some war stories.">>
<<replace "#result4">>
<<set $PC.warfare + 5>>
<<if $PC.warfare is < 10>>//There, now you hopefully can hit the broad side of a barn. What am I kidding you still suck.<<elseif $PC.warfare is is 10>>Slightly better but you still have a long way to go.
<</replace>>
<</link>>
<<link "learn some trading.">>
<<replace "#result4">>
<<set $PC.trading + 2>>
<<if $PC.trading is < 10>>//Congragulations you have just passed economics 101, "black and red should balance".
<</replace>>
<</link>>
<<link "learn about slaving.">>
<<replace "#result4">>
<<set $PC.slaving + 2>>
<<if $PC.slaving is < 10>>//Yes, the rope normally goes around the wrist first and no where near the mouth.
<</replace>>
<</link>>
<<link "learn about the exciting life of a combat engineer.">>
<<replace "#result4">>
<<set $PC.engineering + 2>>
<<if $PC.engineering is < 10>>//Good job you know what a hammer now looks like.
<</replace>>
<</link>>
</span>
<</replace>>
<</link>>
<<elseif $securityForceColonelToken == 1>>
//The Colonel has already spent time with you this week or is unable able to find time in her busy week to relax with you.//
<</if>>
</span>
/*
......
src/utility/assayWidgets.tw
+ 170
− 432
View file @ 63893a2e
This diff is collapsed.
src/utility/extendedFamilyWidgets.tw
+ 12
− 12
View file @ 63893a2e
......@@ -670,7 +670,7 @@
/*Player parents, lists both your parents, or just one.*/
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].ID == $PC.father || $slaves[$i].ID == $PC.mother>>
<<set $children.push($slaves[$i])>>
<<set $children.push($slaves[$i])>>
<</if>>
<</for>>
<<if $children.length > 1>>
......@@ -683,7 +683,7 @@
/*Twins Test with aresisters*/
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].ID != $PC.ID>>
<<if areSisters($activeSlave, $PC) == 1 && areSisters($slaves[$i], $activeSlave) == 1>>
<<if areSisters($slaves[$i], $PC) == 1 && areSisters($slaves[$i], $slaves[$i]) == 1>>
<<set $children.push($slaves[$i])>>
<</if>>
<</if>>
......@@ -776,9 +776,9 @@
<</if>>
<</for>>
<<elseif $children.length > 1>>
<br>You are half-sisters with @@.lightgreen;$children[0].slaveName and $children[1].slaveName@@.
<br>You are half-sisters with @@.lightgreen;$children[0].slaveName and $children[1].slaveName.@@
<<elseif $children.length > 0>>
<br>You have one half-sister, @@.lightgreen;$children[0].slaveName@@.
<br>You have one half-sister, @@.lightgreen;$children[0].slaveName.@@
<</if>>
<<set $children = []>>
......@@ -798,13 +798,13 @@
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
and $children[$j].slaveName@@.
and $children[$j].slaveName.@@
<</if>>
<</for>>
<<elseif $children.length > 1>>
<br>You are half-brothers with @@.lightgreen;$children[0].slaveName and $children[1].slaveName@@.
<br>You are half-brothers with @@.lightgreen;$children[0].slaveName and $children[1].slaveName.@@
<<elseif $children.length > 0>>
<br>You have one half-brother, @@.lightgreen;$children[0].slaveName@@.
<br>You have one half-brother, @@.lightgreen;$children[0].slaveName.@@
<</if>>
<<set $children = []>>
......@@ -820,13 +820,13 @@
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
and $children[$j].slaveName@@.
and $children[$j].slaveName.@@
<</if>>
<</for>>
<<elseif $children.length > 1>>
<br>You are the father of two of your slaves, @@.lightgreen;$children[0].slaveName, and $children[1].slaveName@@.
<br>You are the father of two of your slaves, @@.lightgreen;$children[0].slaveName, and $children[1].slaveName.@@
<<elseif $children.length > 0>>
<br>You are the father of one of your slaves, @@.lightgreen;$children[0].slaveName@@.
<br>You are the father of one of your slaves, @@.lightgreen;$children[0].slaveName.@@
<</if>>
<<set $children = []>>
......@@ -846,9 +846,9 @@
<</if>>
<</for>>
<<elseif $children.length > 1>>
<br>You are the mother of two of your slaves, @@.lightgreen;$children[0].slaveName, and $children[1].slaveName@@.
<br>You are the mother of two of your slaves, @@.lightgreen;$children[0].slaveName, and $children[1].slaveName.@@
<<elseif $children.length > 0>>
<br>You are the mother of one of your slaves, @@.lightgreen;$children[0].slaveName@@.
<br>You are the mother of one of your slaves, @@.lightgreen;$children[0].slaveName.@@
<</if>>
<<set $children = []>>
......
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