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

SecExp: units get battle credit even if they take no losses

Closes #1936

See merge request pregmodfan/fc-pregmod!7164

src/Mods/SecExp/unitsBattleReport.tw

@@ -14,6 +14,7 @@
 			<<if $militiaUnits[_j].isDeployed == 1>>
 				<br>
 				$militiaUnits[_j].platoonName: no casualties.
+				<<set $militiaUnits[_j].battlesFought++>>
 				<<if $militiaUnits[_j].training < 100>>
 					<<if random(1,100) > 60>>
 						Experience has increased.
@@ -28,6 +29,7 @@
 			<<if $slaveUnits[_j].isDeployed == 1>>
 				<br>
 				$slaveUnits[_j].platoonName: no casualties.
+				<<set $slaveUnits[_j].battlesFought++>>
 				<<if $slaveUnits[_j].training < 100>>
 					<<if random(1,100) > 60>>
 						Experience has increased.
@@ -42,6 +44,7 @@
 			<<if $mercUnits[_j].isDeployed == 1>>
 				<br>
 				$mercUnits[_j].platoonName: no casualties.
+				<<set $mercUnits[_j].battlesFought++>>
 				<<if $mercUnits[_j].training < 100>>
 					<<if random(1,100) > 60>>
 						Experience has increased.

src/Mods/SecExp/unitsRebellionReport.tw

@@ -16,6 +16,7 @@
 		<br>
 		<<for _i = 0; _i < $militiaUnits.length; _i++>>
 			<<if $militiaUnits[_i].active == 1 && ($loyalID.includes($militiaUnits[_i].ID))>>
+				<<set $militiaUnits[_i].battlesFought++>>
 				<<set _count++>>
 				<<if _count < $loyalID.length>>
 					$militiaUnits[_i].platoonName,
@@ -26,6 +27,7 @@
 		<</for>>
 		<<for _i = 0; _i < $slaveUnits.length; _i++>>
 			<<if $slaveUnits[_i].active == 1 && ($loyalID.includes($slaveUnits[_i].ID))>>
+				<<set $slaveUnits[_i].battlesFought++>>
 				<<set _count++>>
 				<<if _count < $loyalID.length>>
 					$slaveUnits[_i].platoonName,
@@ -36,6 +38,7 @@
 		<</for>>
 		<<for _i = 0; _i < $mercUnits.length; _i++>>
 			<<if $mercUnits[_i].active == 1 && ($loyalID.includes($mercUnits[_i].ID))>>
+				<<set $mercUnits[_i].battlesFought++>>
 				<<set _count++>>
 				<<if _count < $loyalID.length>>
 					$mercUnits[_i].platoonName,