fixes and bulk slave prison purchases

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)
 

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>>

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>>

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>>

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.