Merge branch 'pregmod-dev' into 'pregmod-master'

removed conflicting prints

See merge request pregmodfan/fc-pregmod!3393

src/pregmod/ovaTransplantWorkaround.tw

@@ -14,7 +14,7 @@ __Select a slave to serve as the host__
 <<capture _otw>>
 	<<if ($donatrix.ID != $slaves[_otw].ID && $slaves[_otw].ovaries > 0 || $slaves[_otw].mpreg > 0) && isSlaveAvailable($slaves[_otw]) && $slaves[_otw].preg >= 0 && $slaves[_otw].preg < $slaves[_otw].pregData.normalBirth/10 && $slaves[_otw].pregWeek >= 0 && $slaves[_otw].pubertyXX == 1 && $slaves[_otw].pregType < 12 && $slaves[_otw].bellyImplant == -1 && $slaves[_otw].broodmother == 0 && $slaves[_otw].inflation <= 2 && $slaves[_otw].physicalAge < 70>>
 		<<set _name = SlaveFullName($slaves[_otw])>>
-		<br><<print "[[_name|Surrogacy][$receptrix = $slaves[" + _otw + "], cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = 'transplant']]">> <<if $slaves[_otw].pregType >= 4>>//Using a slave carrying multiples is unadvisable//<</if>>
+		<br>[[_name|Surrogacy][$receptrix = $slaves[_otw], cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = "transplant"]] <<if $slaves[_otw].pregType >= 4>>//Using a slave carrying multiples is unadvisable//<</if>>
 		<<set _eligibility = 1>>
 	<</if>>
 <</capture>>

src/pregmod/slaveSlaveSwapWorkaround.tw

@@ -10,12 +10,14 @@ The surgeon awaits the pair of slaves to be strapped into the surgery. So far on
 <br><br>
 __Select an eligible slave:__
 <<for _i = 0; _i < $slaves.length; _i++>>
+<<capture _i>>
 	<<if isSlaveAvailable($slaves[_i])>>
 	<<if $slaves[_i].fuckdoll == 0>>
 	<<if ($slaves[_i].ID != $activeSlave.ID)>>
 		<<set _name = SlaveFullName($slaves[_i])>>
-		<br><<print "[[_name|Slave Slave Swap][$swappingSlave = $slaves[" + _i + "], cashX(-10000, "slaveSurgery", $slaves[_i])]]">>
+		<br>[[_name|Slave Slave Swap][$swappingSlave = $slaves[_i], cashX(-10000, "slaveSurgery", $slaves[_i])]]
 	<</if>>
 	<</if>>
 	<</if>>
+<</capture>>
 <</for>>
\ No newline at end of file