diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw index d450bbb06e749dc972f1beed738f25d3b4ffdb6c..f13f704f4a0ff7abc356868d2021f6badfbc38a0 100644 --- a/src/SecExp/attackGenerator.tw +++ b/src/SecExp/attackGenerator.tw @@ -129,103 +129,103 @@ <</if>> <<if $attackType == "raiders">> - <<set $attackTroops = random(40,80)>>> + <<set $attackTroops = random(40,80)>> <<if $week < 30>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>> <<elseif $week < 60>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>> <<elseif $week < 90>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30))) ))>> <<elseif $week < 120>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>> <<else>> - <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>> <</if>> <<if $week < 60>> - <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/25))>>> + <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/25))>> <<elseif $week < 90>> - <<set $attackEquip = Math.ceil(random( (0, (2*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (2*(4+($week/30))) ))>> <<elseif $week < 120>> - <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>> <<else>> - <<set $attackEquip = Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>> <</if>> <<elseif $attackType == "free city">> - <<set $attackTroops = random(20,40)>>> + <<set $attackTroops = random(20,40)>> <<if $week < 30>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>> <<elseif $week < 60>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>> <<elseif $week < 90>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30)))) )>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30)))) )>> <<elseif $week < 120>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30)))) )>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30)))) )>> <<else>> - <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>> <</if>> <<if $week < 60>> - <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/30))) ))>> <<elseif $week < 90>> - <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>> <<elseif $week < 120>> - <<set $attackEquip = Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>> <<else>> - <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>> <</if>> <<elseif $attackType == "old world">> - <<set $attackTroops = random(25,50)>>> + <<set $attackTroops = random(25,50)>> <<if $week < 30>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>> <<elseif $week < 60>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>> <<elseif $week < 90>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30))) ))>> <<elseif $week < 120>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>> <<else>> - <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>> <</if>> <<if $week < 60>> - <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/30))) ))>> <<elseif $week < 90>> - <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>> <<elseif $week < 120>> - <<set $attackEquip = Math.ceil(random( (1,3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (1,3*(4+($week/30))) ))>> <<else>> - <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>> <</if>> <<elseif $attackType == "freedom fighters">> - <<set $attackTroops = random(30,60)>>> + <<set $attackTroops = random(30,60)>> <<if $week < 30>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (2*(4+($week/30))) ))>> <<elseif $week < 60>> - <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>> <<elseif $week < 90>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (3*(4+($week/30))) ))>> <<elseif $week < 120>> - <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>>> + <<set $attackTroops *= Math.ceil(random( (2*(2+($week/40))) , (4*(4+($week/30))) ))>> <<else>> - <<set $attackTroops *= random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>>> + <<set $attackTroops *= random( (3*(2+($week/40))) , (5*(4+($week/30))) ))>> <</if>> <<if $week < 60>> - <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/30))) ))>> <<elseif $week < 90>> - <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>> <<elseif $week < 120>> - <<set $attackEquip = Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (1*(2+($week/40))) , (3*(4+($week/30))) ))>> <<else>> - <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))), (4*(4+($week/30))) ))>>> + <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))), (4*(4+($week/30))) ))>> <</if>> <</if>> - <<set $estimatedMen = Math.round($attackTroops * (1 + either(-1,1) * (random(3,4) - $recon) * 0.1))>>> + <<set $estimatedMen = Math.round($attackTroops * (1 + either(-1,1) * (random(3,4) - $recon) * 0.1))>> <<if $recon == 3>> - <<set $expectedEquip = $attackEquip + random(-1,1)>>> + <<set $expectedEquip = $attackEquip + random(-1,1)>> <<elseif $recon == 2>> - <<set $expectedEquip = $attackEquip + random(-1,2)>>> + <<set $expectedEquip = $attackEquip + random(-1,2)>> <<elseif $recon == 1>> - <<set $expectedEquip = $attackEquip + random(-2,2)>>> + <<set $expectedEquip = $attackEquip + random(-2,2)>> <<else>> - <<set $expectedEquip = $attackEquip + random(-2,3)>>> + <<set $expectedEquip = $attackEquip + random(-2,3)>> <</if>> <</if>> diff --git a/src/SecExp/seeUnit.tw b/src/SecExp/seeUnit.tw index 729209d0bdd4e69d22ce22d2e1ad8db01caab065..0e9cc0a0d7b72ef47ec5552013ee246cf58d9909 100644 --- a/src/SecExp/seeUnit.tw +++ b/src/SecExp/seeUnit.tw @@ -19,7 +19,7 @@ <<if $secBots.maxTroops > $secBots.troops>> <br> <<link "Replenish the unit" "seeUnit">> - <<run cashX(forceNeg($secBots.maxTroops - $secBots.troops) * $secBotsCost), "securityExpansion")>> + <<run cashX(forceNeg(($secBots.maxTroops - $secBots.troops) * $secBotsCost), "securityExpansion")>> <<set $secBots.troops = $secBots.maxTroops>> <</link>> <</if>>