Skip to content
Snippets Groups Projects
Commit da8ce2f7 authored by x's avatar x
Browse files

Bug fixes

parent b1cfb193
No related branches found
No related tags found
1 merge request!3520ITT SecExp suggestions and general tweaks (Finally ready to be merged)
Hide whitespace changes
Inline Side-by-side
src/SecExp/attackGenerator.tw
+ 45
− 45
View file @ da8ce2f7
...@@ -129,103 +129,103 @@ ...@@ -129,103 +129,103 @@
<</if>> <</if>>
<<if $attackType == "raiders">> <<if $attackType == "raiders">>
<<set $attackTroops = random(40,80)>>> <<set $attackTroops = random(40,80)>>
<<if $week < 30>> <<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>> <<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>> <<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>> <<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>> <<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>>
<<if $week < 60>> <<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>> <<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>> <<elseif $week < 120>>
<<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>>> <<set $attackEquip = Math.ceil(random( (0, (3*(4+($week/30))) ))>>
<<else>> <<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>> <</if>>
<<elseif $attackType == "free city">> <<elseif $attackType == "free city">>
<<set $attackTroops = random(20,40)>>> <<set $attackTroops = random(20,40)>>
<<if $week < 30>> <<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>> <<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>> <<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>> <<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>> <<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>>
<<if $week < 60>> <<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>> <<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>> <<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>> <<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>>
<<elseif $attackType == "old world">> <<elseif $attackType == "old world">>
<<set $attackTroops = random(25,50)>>> <<set $attackTroops = random(25,50)>>
<<if $week < 30>> <<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>> <<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>> <<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>> <<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>> <<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>>
<<if $week < 60>> <<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>> <<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>> <<elseif $week < 120>>
<<set $attackEquip = Math.ceil(random( (1,3*(4+($week/30))) ))>>> <<set $attackEquip = Math.ceil(random( (1,3*(4+($week/30))) ))>>
<<else>> <<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>>
<<elseif $attackType == "freedom fighters">> <<elseif $attackType == "freedom fighters">>
<<set $attackTroops = random(30,60)>>> <<set $attackTroops = random(30,60)>>
<<if $week < 30>> <<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>> <<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>> <<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>> <<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>> <<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>>
<<if $week < 60>> <<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>> <<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>> <<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>> <<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>>
<</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>> <<if $recon == 3>>
<<set $expectedEquip = $attackEquip + random(-1,1)>>> <<set $expectedEquip = $attackEquip + random(-1,1)>>
<<elseif $recon == 2>> <<elseif $recon == 2>>
<<set $expectedEquip = $attackEquip + random(-1,2)>>> <<set $expectedEquip = $attackEquip + random(-1,2)>>
<<elseif $recon == 1>> <<elseif $recon == 1>>
<<set $expectedEquip = $attackEquip + random(-2,2)>>> <<set $expectedEquip = $attackEquip + random(-2,2)>>
<<else>> <<else>>
<<set $expectedEquip = $attackEquip + random(-2,3)>>> <<set $expectedEquip = $attackEquip + random(-2,3)>>
<</if>> <</if>>
<</if>> <</if>>
......
src/SecExp/seeUnit.tw
+ 1
− 1
View file @ da8ce2f7
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<<if $secBots.maxTroops > $secBots.troops>> <<if $secBots.maxTroops > $secBots.troops>>
<br> <br>
<<link "Replenish the unit" "seeUnit">> <<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>> <<set $secBots.troops = $secBots.maxTroops>>
<</link>> <</link>>
<</if>> <</if>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment