diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index bde73c1d564b1e4a0360f9f067af068e223eb453..9764b9c276f2faccc75cda742ac013d02d5e31fd 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.1.x
+4/04/2018
+
+ 25
+ -added the black market pt 1 (FS research buying)
+ -various fixes and typo corrections
+ -most, if not all, of the old sugarcube operators
+
4/03/2018
24
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 1a0ad015dff05c6b4ab6a95ae3964a8224c1d5d5..ab2b249fafe6ea96786c7bb624a0bd07e2c35c69 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2819,6 +2819,9 @@ When it comes to slave breeding, the natural chance of conception is just too lo
<br>
**Our guarantee does not cover slave owners who underestimate their slaves' potency and wind up pregnant.
+<<case "The Black Market">>
+ //Place holder//
+
<<case "Security Expansion">>
<<include "encyclopediaSecExpMain">>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index ef41134f7a0384db77bcea664e2094d6ea9309e4..4a646eb947fd9c587b116bc4e3718c24583fbbb9 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -524,6 +524,15 @@ __Drugs__
You are not on any stamina enhancers. [[More stamina means more sex|Manage Personal Affairs][$PC.staminaPills = 1]]
<</if>>
+<br><br>
+__Other Personal Business__
+<<if $rep >= 10000>>
+<br> [[Visit the Black Market|The Black Market]]
+<<elseif $rep > 7500>>
+<br> You lack the reputation to be invited to the underground Black Market.
+<</if>>
+
+
<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<br><br>
__Elite Breeder Qualifications__
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 99c07a6077761e9ea757fc9ba3e51719a8d694e9..c0902166cd5ed6b9bc839f4cb40b827583849393 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -1,6 +1,6 @@
:: The Black Market [nobr]
-<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "The Black Market">>
+<<set $nextButton = "Back", $nextLink = "Main", $returnTo = "Main", $showEncyclopedia = 1, $encyclopedia = "The Black Market">>
You board your VTOL bird for the trip to the current location of the particularly exclusive, and quite lucrative, Black Market knowing full well that the trip may take far longer than anticipated; the market frequently relocates to shake the unwanted attention it inevitably gains. It's far easier than paying off authorities, especially with how outrageous their demands have become with the decline of the Old World. You're greeting by a gruff bouncer, already fully aware of just who you are and your permission to be there. "Check your weapons - No firearms allowed inside.<<if $Bodyguard != 0>> She may keep her blade," he gestures to $Bodyguard.slaveName, "but keep in mind. If you cause us trouble, you will not be going home in one piece.<<if $Bodyguard.amp <= -4>>" He taps his clearly bionic arm. "Disable her weapons systems. I know what she is capable of.<</if>><</if>>"
@@ -16,8 +16,9 @@ The main draw, however, is the prominent stage to the rear of the building where
<br><br>
Of all the wonders present, the thing that catches your eye the most is a shady looking stall with a somehow even shadier looking merchant; a merchant who is beckoning you to come over. "A prominent arcology owner like yourself wandering around in here can only be looking for one thing: New and exciting ways to spice up <<if $PC.title == 1>>his<<else>>her<</if>> slaves! I've got the hottest research and tech straight from the labs waiting for you to peruse and some of the 'hottest' tech straight out of the research labs if you catch my drift." He shuffles around behind the counter, pulling out a stack of papers.
+<br>
<<if $dispensary == 0>>
- Even if you wanted to buy something, you lack the pharmaceutical fabricator to make use of it.
+ <br>Even if you wanted to buy something, you lack the pharmaceutical fabricator to make use of it.
<<else>>
<<if ndef $thisWeeksFSWares>>
<<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
@@ -25,13 +26,14 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<br>
"Now when it comes to the legal, relatively boring stuff, I've got the following available:"
- <br>
+
<<if $thisWeeksFSWares.length > 0>>
<<for _bm = 0; _bm < $thisWeeksFSWares.length; _bm++>>
+ <br>
<<if $thisWeeksFSWares[_bm] == "GenderRadicalistResearch">>
<<if $seePreg != 0 && $arcologies[0].FSGenderRadicalistResearch == 0>>
<<if $organFarmUpgrade > 0>>
- <<if $cash < 75000>>
+ <<if $cash >= 75000>>
[[Purchase schematics for anal pregnancy|The Black Market][$cash -= 75000, $arcologies[0].FSGenderRadicalistResearch = 1, _dump = $merchantFSWares.delete("GenderRadicalistResearch")]] //<<print cashFormat(75000)>>.//
<<else>>
You can not afford the asking price of <<print cashFormat(75000)>> for anal pregnancy schematics. "No discounts. No haggling. No price naming. Take it or leave it."
@@ -39,17 +41,17 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<else>>
You lack the facilities needed to grow organs, so anal pregnancy schematics are currently out of your reach.
<</if>>
- <<elseif $seePreg == 1>>
+ <<elseif $seePreg == 0>>
You have no interest in this pregnancy based research.
<<else>>
- You already possess designs for anal pregnancy.
+ You already possess designs to facilitate anal pregnancy.
<<set _dump = $merchantFSWares.delete("GenderRadicalistResearch")>>
<</if>>
<</if>>
<<if $thisWeeksFSWares[_bm] == "TransformationFetishistResearch">>
<<if $arcologies[0].FSTransformationFetishistResearch == 0>>
<<if $ImplantProductionUpgrade == 1>>
- <<if $cash < 50000>>
+ <<if $cash >= 50000>>
[[Purchase designs for immense implants|The Black Market][$cash -= 50000, $arcologies[0].FSTransformationFetishistResearch = 1, _dump = $merchantFSWares.delete("TransformationFetishistResearch")]] //<<print cashFormat(50000)>>.//
<<else>>
You can not afford the asking price of <<print cashFormat(50000)>> for absurdly huge implant designs. "No big fake boobs for you. How sad it must be to be flat and enslaved by such a poor <<if $PC.title == 1>>Master<<else>>Mistress<</if>>"
@@ -64,7 +66,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksFSWares[_bm] == "AssetExpansionistResearch">>
<<if $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if $cash < 50000>>
+ <<if $cash >= 50000>>
[[Purchase formulas for extremely powerful growth drugs|The Black Market][$cash -= 50000, $arcologies[0].FSAssetExpansionistResearch = 1, _dump = $merchantFSWares.delete("AssetExpansionistResearch")]] //<<print cashFormat(50000)>>.//
<<else>>
You can not afford the asking price of <<print cashFormat(50000)>> for extremely powerful growth drug formulas. "Why'd you even come here if you didn't have the credits to buy anything?"
@@ -76,10 +78,10 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksFSWares[_bm] == "SlimnessEnthusiastResearch">>
<<if $arcologies[0].FSSlimnessEnthusiastResearch == 0>>
- <<if $cash < 75000>>
+ <<if $cash >= 75000>>
[[Purchase formulas for growth reversing drugs|The Black Market][$cash -= 75000, $arcologies[0].FSSlimnessEnthusiastResearch = 1, _dump = $merchantFSWares.delete("SlimnessEnthusiastResearch")]] //<<print cashFormat(75000)>>.//
<<else>>
- You can not afford the asking price of <<print cashFormat(75000)>> for growth reversing drug formulas. "<<if $PC.boobsBonus > 0>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>little miss top heavy<<else>>mr busty<<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
+ You can not afford the asking price of <<print cashFormat(75000)>> for growth reversing drug formulas. "<<if $PC.boobsBonus > 0>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>little miss top heavy<<else>>mr busty<</if>><<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
<</if>>
<<else>>
You already possess formulas for growth reversing drugs.
@@ -88,7 +90,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksFSWares[_bm] == "YouthPreferentialistResearch">>
<<if $arcologies[0].FSYouthPreferentialistResearch == 0>>
- <<if $cash < 45000>>
+ <<if $cash >= 45000>>
[[Purchase formulas for extremely effective anti-aging beauty creams|The Black Market][$cash -= 45000, $arcologies[0].FSYouthPreferentialistResearch = 1, _dump = $merchantFSWares.delete("YouthPreferentialistResearch")]] //<<print cashFormat(45000)>>.//
<<else>>
You can not afford the asking price of <<print cashFormat(45000)>> for extremely effective anti-aging beauty creams. "<<if $PC.visualAge > 40>>Those wrinkles don't look that bad on you, so don't worry about not being able to afford this<<else>>Just tell them they look young, and well, don't give them any mirrors. Probably should keep your money troubles from them too<</if>>."
@@ -100,7 +102,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksFSWares[_bm] == "HedonisticDecadenceResearch">>
<<if $arcologies[0].FSHedonisticDecadenceResearch == 0>>
- <<if $cash < 65000>>
+ <<if $cash >= 65000>>
[[Purchase recipes for highly addictive solid slave food|The Black Market][$cash -= 65000, $arcologies[0].FSHedonisticDecadenceResearch = 1, _dump = $merchantFSWares.delete("HedonisticDecadenceResearch")]] //<<print cashFormat(65000)>>.//
<<else>>
You can not afford the asking price of <<print cashFormat(65000)>> for highly addictive solid slave food recipes. "I promise you'll not be able to recreate this at home, so if you want to give your begging slave the treat she deserves, buy now! Or, you know, come back with money."
@@ -112,14 +114,14 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<</for>>
<<else>>
- You appear to already possess all the societal based schematics he has to offer.
+ <br>You appear to already possess all the societal based schematics he has to offer.
<</if>>
- <br>
+ <br><br>
He gestures to a door in the back of the stall. "The good shit's back there, here's a list:"
<<if $merchantIllegalWares.length > 1>>
<<elseif $merchantIllegalWares.length == 1>>
<<else>>
- You appear to already possess all the black market schematics he has to offer.
+ <br>You appear to already possess all the black market schematics he has to offer.
<</if>>
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index efd4f7b0a7994ca17cd6550b7f0ebade4c063af2..ebaa3984eac40520baddb54fcbf88b9370f77dfb 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -588,6 +588,7 @@
<br>
<br><<link [[Wardrobe]]>><</link>>
<br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
+ <br><<if $rep >= 10000>>[[Black Market|The Black Market]]<</if>>
<br><br><br><br><br>
<<elseif _Pass == "Manage Personal Affairs">>
<br>
@@ -596,7 +597,9 @@
<br>
<br><<link [[Wardrobe]]>><</link>>
<br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
+ <br><<if $rep >= 10000>>[[Black Market|The Black Market]]<</if>>
<br><br><br><br><br>
+
<<elseif _Pass == "Options">>
<br>
<br>[[Summary Options]]