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

secExp attack numbers reverted

See merge request pregmodfan/fc-pregmod!3614

src/SecExp/attackGenerator.tw

@@ -135,13 +135,13 @@
 	<<elseif $attackType == "freedom fighters">> <<set $attackTroops = random(30,60)>>
 	<</if>>
 	<<if $week < 30>>
-		<<set $attackTroops *= Math.trunc(random( (1*(1.01+($week/100))), (2*(1.01+($week/100))) ))>> /*<<set $attackTroops *= random(1,2)>>*/
+		/*<<set $attackTroops *= Math.trunc(random( (1*(1.01+($week/100))), (2*(1.01+($week/100))) ))>>*/ <<set $attackTroops *= random(1,2)>>
 	<<elseif $week < 60>>
-		<<set $attackTroops *= Math.trunc(random( (1*(1.01+($week/200))), (3*(1.01+($week/200))) ))>> /*<<set $attackTroops *= random(1,3)>>*/
+		/*<<set $attackTroops *= Math.trunc(random( (1*(1.01+($week/200))), (3*(1.01+($week/200))) ))>>*/ <<set $attackTroops *= random(1,3)>>
 	<<elseif $week < 90>>
-		<<set $attackTroops *= Math.trunc(random( (2*(1.01+($week/300))), (3*(1.01+($week/300))) ))>> /*<<set $attackTroops *= random(2,3)>>*/
+		/*<<set $attackTroops *= Math.trunc(random( (2*(1.01+($week/300))), (3*(1.01+($week/300))) ))>>*/ <<set $attackTroops *= random(2,3)>>
 	<<elseif $week < 120>>
-		<<set $attackTroops *= Math.trunc(random( (2*(1.01+($week/400))), (4*(1.01+($week/400))) ))>> /*<<set $attackTroops *= random(2,4)>>*/
+		/*<<set $attackTroops *= Math.trunc(random( (2*(1.01+($week/400))), (4*(1.01+($week/400))) ))>>*/ <<set $attackTroops *= random(2,4)>>
 	<<else>>
 		<<set $attackTroops *= random(3,5)>>
 	<</if>>