diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index a32a53db833a8393ee5fa299e5b2cc39c3892005..bcc793442334276ac6ff0c85e0fd88e449628241 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,9 +1,9 @@
-:: pregmod widgets [nobr widget]
+:: pregmod widgets [nobr widget]
<<widget "initPC">>
<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>>
<</widget>>
-
+
<<widget "PMODinit">>
<<if ndef $args[0].actualAge>>
<<set $args[0].actualAge = $args[0].age>>
@@ -726,7 +726,7 @@ $activeSlave.slaveName is up for review:
<<case "French">>
and, in keeping with her heritage, a MAS AAT-F1 GPMG
<<case "Korean">>
- and, in keeping with her heritage, a S&T K12 GPMG
+ and, in keeping with her heritage, a S&T K12 GPMG
<<case "South African">>
and, in keeping with her heritage, a Vektor SS-77 GPMG
<<case "Finnish">>
@@ -979,7 +979,7 @@ $activeSlave.slaveName is up for review:
<</switch>>
at her side.
<</if>>
-
+
<</widget>>
/*
@@ -1322,7 +1322,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<</if>>
<<set $slaves[$i].devotion += 4, $citizenOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(100)>> weekly//
| <<link 'Have them raised privately'>>
<<replace `"#" + _dispositionId`>>
@@ -1339,7 +1339,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
The remaining child<<if $slaves[$i].pregType > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
<<set $slaves[$i].devotion += 6, $privateOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(500)>> weekly//
<</capture>>
<</if>>
@@ -1759,7 +1759,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<</if>>
<<set $slaves[$i].devotion += 4, $citizenOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(100)>> weekly//
| <<link 'Have them raised privately'>>
<<replace `"#" + _dispositionId`>>
@@ -1776,7 +1776,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
The remaining child<<if $slaves[$i].pregType > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
<<set $slaves[$i].devotion += 6, $privateOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(500)>> weekly//
<</capture>>
<</if>>
@@ -1838,7 +1838,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
/* <<case 7>> */
<<set $AgeTrainingLowerBoundPC = 14, $AgeTrainingUpperBoundPC = 16, $AgeEffectOnTrainerPricingPC = .75, $AgeEffectOnTrainerEffectivenessPC = .75>>
/* <<case 8>> */
- <<set $AgeTrainingLowerBoundPC = 13, $AgeTrainingUpperBoundPC = 15, $AgeEffectOnTrainerPricingPC = .85, $AgeEffectOnTrainerEffectivenessPC = .85>>
+ <<set $AgeTrainingLowerBoundPC = 13, $AgeTrainingUpperBoundPC = 15, $AgeEffectOnTrainerPricingPC = .85, $AgeEffectOnTrainerEffectivenessPC = .85>>
<<case 3>>
<<set $AgeTrainingLowerBounds = 18, $AgeTrainingUpperBounds = 20, $AgePricing = .1, $AgeTrainingEffect = .1>>
<<case 4>>
@@ -1850,7 +1850,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<<case 7>>
<<set $AgeTrainingLowerBounds = 14, $AgeTrainingUpperBounds = 16, $AgePricing = .75, $AgeTrainingEffect = .75>>
<<case 8>>
- <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>>
+ <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>>
<<case 9>>
<<set $AgeTrainingLowerBoundPC = 12, $AgeTrainingUpperBoundPC = 14, $AgeEffectOnTrainerPricingPC = 1.00, $AgeEffectOnTrainerEffectivenessPC = 1.00>>
<<case 10>>
@@ -1870,7 +1870,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<<case 17>>
<<set $AgeTrainingLowerBoundPC = 4, $AgeTrainingUpperBoundPC = 6, $AgeEffectOnTrainerPricingPC = 1.07, $AgeEffectOnTrainerEffectivenessPC = 1.07>>
<<case 18>>
- <<set $AgeTrainingLowerBoundPC = 3, $AgeTrainingUpperBoundPC = 5, $AgeEffectOnTrainerPricingPC = 1.08, $AgeEffectOnTrainerEffectivenessPC = 1.08>>
+ <<set $AgeTrainingLowerBoundPC = 3, $AgeTrainingUpperBoundPC = 5, $AgeEffectOnTrainerPricingPC = 1.08, $AgeEffectOnTrainerEffectivenessPC = 1.08>>
/* <<case 19>> */
/* <<set $AgeTrainingLowerBoundPC = 2, $AgeTrainingUpperBoundPC = 4, $AgeEffectOnTrainerPricingPC = 1.09, $AgeEffectOnTrainerEffectivenessPC = 1.09>> */
/* <<case 20>> */
@@ -1910,7 +1910,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
Call as <<HSM>>
%/
<<widget "HSM">>
- <<if $PC.hacking == -100>>
+ <<if $PC.hacking <= -100>>
<<set $HackingSkillMultiplier = 1.5>>
<<elseif $PC.hacking <= -75>>
<<set $HackingSkillMultiplier = 1.35>>
@@ -1928,5 +1928,5 @@ Call as <<HSM>>
<<set $HackingSkillMultiplier = .65>>
<<elseif $PC.hacking >= 100>>
<<set $HackingSkillMultiplier = .5>>
- <</if>>
+ <</if>>
<</widget>>
\ No newline at end of file
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index e872f9dfb464608a8811e7d25386d034d61308ad..5b4e47960bfab7aed660cc4e1f2f67f17b4438db 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -153,8 +153,8 @@ The fabricator is producing
<<elseif $injectionUpgrade == 1>>
prototype growth hormones.
<<if $rep > 10000>>
- [[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $injectionUpgrade = 2]]
- //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
+ [[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $injectionUpgrade = 2]]
+ //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>//
<br> //Should improve the reliability of growth injections of all kinds.//
<<else>>
//You lack the reputation to obtain prototype fabricator upgrades//
@@ -162,8 +162,8 @@ The fabricator is producing
<<elseif $injectionUpgrade == 2>>
prototype growth hormones.
<<if $rep > 14000>>
- [[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][$cash -= 100000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $injectionUpgrade = 3]]
- //Costs <<print cashFormat(100000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>//
+ [[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][$cash -= 100000*$upgradeMultiplierMedicine, $injectionUpgrade = 3]]
+ //Costs <<print cashFormat(100000*$upgradeMultiplierMedicine)>>//
<br> //Should improve the reliability of growth injections of all kinds.//
<br>
<<else>>
@@ -249,7 +249,7 @@ Dietary Upgrades
//You lack the reputation to fund research into hermaphrodite hormones//
<br>
<<elseif ($dietXXY == 0) && ($rep > 3500*$upgradeMultiplierMedicine)>>
- [[Fund research into developing hermaphrodite hormone therapies|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine*$HackingSkillMultiplier, $dietXXY = 1]]
+ [[Fund research into developing hermaphrodite hormone therapies|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $dietXXY = 1]]
//Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>//
<br> //Will allow for specially balanced meals to be served in the cafeteria designed to promote both halves of a herm's sexuality. //
<br>
@@ -432,7 +432,7 @@ Implant Production
<</if>>
<<if $ImplantProductionUpgrade == 1>>
- <<if ($bellyImplants == 0) && ($rep <= 2000*$upgradeMultiplierMedicine*)>>
+ <<if ($bellyImplants == 0) && ($rep <= 2000*$upgradeMultiplierMedicine)>>
//You lack the reputation to access experimental fillable abdominal implants//
<br>
<</if>>
@@ -500,7 +500,7 @@ Future Societies Research
<<if $arcologies[0].FSGenderRadicalistDecoration == 100 && $organFarmUpgrade > 0>>
<<if ($arcologies[0].FSGenderRadicalistResearch == 0)>>
<<if ($rep >= 10000*$upgradeMultiplierMedicine)>>
- [[Fund research into developing male pregnancy methods|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier,$arcologies[0].FSGenderRadicalistResearch = 1]] //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine*$HackingSkillMultiplier)>>. Will allow cloning and production of anal uteri and ovaries.//
+ [[Fund research into developing male pregnancy methods|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine,$arcologies[0].FSGenderRadicalistResearch = 1]] //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>. Will allow cloning and production of anal uteri and ovaries.//
<br>
<<else>>
// You lack the reputation to access the research necessary to develop anal uteri and ovaries. //
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 15c5ac5a56d65c2f20f89bbd6080a4a433f47956..c989417de1ae3efb1676741b036939ab480a0d75 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -50,7 +50,7 @@ __Construction__
<<elseif $arcologyUpgrade.apron != 1>>
//The next major upgrade needed is the installation of a broader apron at the bottom of the arcology to increase its surface area and gather more solar energy. Right now, tenants that use a lot of power have to import it from outside. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>.// [[Install solar apron|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $arcologyUpgrade.apron = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.grid != 1>>
- //The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Upgrade transmission lines|Manage Arcology][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $arcologyUpgrade.grid = 1, $PC.engineering += 1, $PC.hacking += 1]]
+ //The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Upgrade transmission lines|Manage Arcology][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $arcologyUpgrade.grid = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.spire != 1>>
//The next major upgrade needed is the addition of a spire at the top of the arcology to increase the space available for the wealthiest citizens to own whole floors. This huge project will cost <<print cashFormat(Math.trunc(250000*$upgradeMultiplierArcology))>>.// [[Add spire|Manage Arcology][$cash -= Math.trunc(250000*$upgradeMultiplierArcology), $arcologyUpgrade.spire = 1, $sectors[1].type = "Apartments", $sectors[2].type = "Apartments", $sectors[3].type = "Apartments", $sectors[4].type = "Apartments", $sectors[1].ownership = 1, $sectors[2].ownership = 1, $sectors[3].ownership = 1, $sectors[4].ownership = 1, $PC.engineering += 1]]
<<else>>
@@ -73,8 +73,8 @@ __Construction__
<br>
<<if ($receiverAvailable == 1) && ($FCTVenable != 0) && ($FCTVreceiver == 0)>>
- You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.
- [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.hacking += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.hacking += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.hacking += 1]]
+ You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology))>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.
+ [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1]]
<<elseif ($FCTVreceiver == 3)>>
You have installed the FCTV receiver and have access to the full range of FCTV's programs. High viewership rates amongst your citizens makes it easier to pursue your societal goals.
<<elseif ($FCTVreceiver == 2)>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index cd6a209d46fd95077aa5ee3539e0414f9e45ed7e..a1f93014090d286dbc44fb1cc0450bdd0db08e5a 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -820,11 +820,13 @@ It has no impact on public opinion.
<br><br>
__Downloadable Appearances:__
<br>
+ /*
<<if $assistantExtra1 == 0>>
- <<if $PC.hacking < 75>> [[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc(6000*$upgradeMultiplier), $assistantExtra1 = 1]] //Costs <<print cashFormat(Math.trunc(6000*$upgradeMultiplier))>>// <<else>> [[Acquire a set of monstergirl appearances|Assistant Events][$event = "", $assistantExtra1 = 1]] //Unencrypted files, ripe for the taking// <</if>>
- <<else>>
- You have downloaded a set of monstergirl appearances for your avatar.
+ [[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc(10000*$upgradeMultiplier), $assistantExtra1 = 1]]
+ //Costs <<print cashFormat(Math.trunc(6000*$upgradeMultiplier))>>//
+ <<else>>You have downloaded a set of monstergirl appearances for your avatar.
<</if>>
+ */
<<if $assistantExtra2 == 0>>
<<if $PC.hacking < 75>>
<<link "Purchase a set of heaven and hell themed appearances">>
@@ -836,6 +838,7 @@ __Downloadable Appearances:__
<<set $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
<<goto "Assistant Appearance Pack Two">>
<</link>> //Yet more unencrypted files, ripe for the taking//
+ <</if>>
<<else>>
You have downloaded a set of heavenly and hellish appearances for your avatar.
<</if>>
@@ -1005,4 +1008,3 @@ The arcology's upgraded computers support advanced business analysis.
<</if>>
<</if>>
-<</if>>
\ No newline at end of file