diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 04528982f38151595ce1f3ad95ba56b080b2d8a5..024be731e6b0e6d0c5745306e65b77117194a0a9 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ 8/10/2018 + 28 + -bulk ordering from the prison sales now works + -fixed, hopefully, an issue where executed traitors were not properly being removed from the unit pool (secEx) + 27 -critical fix to missing parents in childgen (now only done once instead for each child) diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw index 73db0a7026db2b8f0a25859824d033573a0c59db..cc7d21844c8f93de765793122b0a2f56ed3a6d33 100644 --- a/src/SecExp/rebellionReport.tw +++ b/src/SecExp/rebellionReport.tw @@ -813,6 +813,8 @@ <<include "unitsRebellionReport">> /* resets variables and flags */ +<<recalcManpower>> +<<recalcUnits>> <<set $attackTroops = 0>> <<set $attackEquip = 0>> <<set $enemyLosses = 0>> diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw index 87c780b581287eba1865dd211ca2526ee029f3ae..3463cd1777f4956fdc88da7ecffeff6758510d64 100644 --- a/src/uncategorized/bulkSlaveGenerate.tw +++ b/src/uncategorized/bulkSlaveGenerate.tw @@ -78,7 +78,7 @@ /* Determine if Law Compliance effects must be applied to this transaction */ <<switch $slaveMarket>> -<<case "indentures" "neighbor" "heap" "TSS" "GRI" "SCP" "LDE" "TGA" "HA" "TCR" "TFS" "wetware">> /* these markets are exempt from law compliance */ +<<case "indentures" "neighbor" "heap" "TSS" "GRI" "SCP" "LDE" "TGA" "HA" "TCR" "TFS" "wetware" "low tier criminals" "gangs and smugglers" "white collar" "military prison">> /* these markets are exempt from law compliance */ <<set $applyLaw = 0>> <<default>> /* all other markets are not exempt: corporate, hunters, kidnappers, raiders, trainers */ <<set $applyLaw = 1>> diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw index 16e958fff8ad5c192d76290c35823fbca10395c8..26f2f9d00b01241edb613b98891be407765ffd35 100644 --- a/src/uncategorized/buySlaves.tw +++ b/src/uncategorized/buySlaves.tw @@ -137,10 +137,10 @@ __Sex Slave Purchase Options__ <<set $weeklyMarket = $prisonCircuit[$prisonCircuitIndex]>> <br>[[Prisoner Sale|Criminal Market][$slavesSeen += 1]] | <<if $cash > _minimumFive>> - [[(x5)|Bulk Slave Generate][$introType = "bulk", $numSlaves = 5]] | + [[(x5)|Bulk Slave Generate][$slaveMarket = $weeklyMarket, $introType = "bulk", $numSlaves = 5]] | <</if>> <<if $cash > _minimumTen>> - [[(x10)|Bulk Slave Generate][$introType = "bulk", $numSlaves = 10]] | + [[(x10)|Bulk Slave Generate][$slaveMarket = $weeklyMarket, $introType = "bulk", $numSlaves = 10]] | <</if>> This week <<switch $weeklyMarket>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 90d1781da25d705d93a1e2162261cc2d92218a93..50aa918695fca08e4d698d22ac4efc456d5035f4 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -4478,7 +4478,9 @@ <<case "TFS">> The Futanari Sisters <<case HA>> - The Hippolyta Academy. + The Hippolyta Academy +<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">> + the prisoner sale <<default>> Someone messed up. _market is not known. @@ -4538,6 +4540,8 @@ The Futanari Sisters. <<case HA>> The Hippolyta Academy. +<<case "low tier criminals" "gangs and smugglers" "white collar" "military prison">> + the prisoner sale. <<default>> Someone messed up. _market is not known.