diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index b9afaf879b88afd4d04e31cd755c6a2d2e544d73..bde73c1d564b1e4a0360f9f067af068e223eb453 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -6,7 +6,7 @@ 24 -various fixes including issues pertaining to incubator reservations not clearing after birth - -also fixed horrid age weighting effects involving the age FSs + -tweaked maturity pref age effects to hopefully be less overwhelming 23 -lots more new nicknames diff --git a/devNotes/twine JS b/devNotes/twine JS index f6809f4a75fe3c3c68eec941defeda745f0dd98a..92c1e8b0d273e39f416be134e4515da6f3517905 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -1392,6 +1392,15 @@ window.setPregType = function(actor) { } } +window.getIncubatorReserved = function(slaves) { + var count = 0; + slaves.forEach(function(s){ + if (s.reservedChildren > 0) + count += s.reservedChildren; + }); + return count; +} + /*:: RA Selector JS [script]*/ window.growAdvSelector = function(slave, rule) { diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw index 241b8156ed81de7d5e97a585f7ae73a9c1b40589..26268ff5124bcc4b1304ac0b2d620d6cf00e845f 100644 --- a/src/pregmod/theBlackMarket.tw +++ b/src/pregmod/theBlackMarket.tw @@ -32,10 +32,10 @@ Of all the wonders present, the thing that catches your eye the most is a shady <<if $thisWeeksFSWares[_bm] == "GenderRadicalistResearch">> <<if $seePreg != 0 && $arcologies[0].FSGenderRadicalistResearch == 0>> <<if $organFarmUpgrade > 0>> - <<if $cash < 100000>> - [[Purchase schematics for anal pregnancy|The Black Market][$cash -= 100000, $arcologies[0].FSGenderRadicalistResearch = 1, _dump = $merchantFSWares.delete("GenderRadicalistResearch")]] //<<print cashFormat(100000)>>.// + <<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(100000)>> for anal pregnancy schematics. "No discounts. No haggling. No price naming. Take it or leave it." + 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." <</if>> <<else>> You lack the facilities needed to grow organs, so anal pregnancy schematics are currently out of your reach. @@ -76,6 +76,32 @@ Of all the wonders present, the thing that catches your eye the most is a shady <<set _dump = $merchantFSWares.delete("AssetExpansionistResearch")>> <</if>> <</if>> + <<if $thisWeeksFSWares[_bm] == "SlimnessEnthusiastResearch">> + <<if $arcologies[0].FSSlimnessEnthusiastResearch == 0>> + <<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>>." + <</if>> + <</if>> + <<else>> + You already possess formulas for growth reversing drugs. + <<set _dump = $merchantFSWares.delete("SlimnessEnthusiastResearch")>> + <</if>> + <</if>> + <<if $thisWeeksFSWares[_bm] == "YouthPreferentialistResearch">> + <<if $arcologies[0].FSYouthPreferentialistResearch == 0>> + <<if $cash < 45000>> + [[Purchase formulas for growth reversing drugs|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 growth reversing drug formulas. "<<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>>." + <</if>> + <</if>> + <<else>> + You already possess formulas for growth reversing drugs. + <<set _dump = $merchantFSWares.delete("YouthPreferentialistResearch")>> + <</if>> + <</if>> <</for>> <<else>> You appear to already possess all the societal based schematics he has to offer.