From 694d86bbf13ed443a3a42817aa3e8ba59859b444 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 7 Feb 2019 01:07:31 -0500 Subject: [PATCH] Fixes --- src/SecExp/attackGenerator.tw | 50 ++++++++++++++++---------------- src/SecExp/rebellionGenerator.tw | 10 +++---- src/events/intro/introSummary.tw | 3 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw index 84a1b9eed1d..ce924cd7c20 100644 --- a/src/SecExp/attackGenerator.tw +++ b/src/SecExp/attackGenerator.tw @@ -131,15 +131,15 @@ <<if $attackType == "raiders">> <<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))>> @@ -148,42 +148,42 @@ <<elseif $week < 120>> <<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)>> <<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))) ))>> <<elseif $week < 90>> <<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)>> <<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))) ))>> @@ -192,27 +192,27 @@ <<elseif $week < 120>> <<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)>> <<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))) ))>> <<elseif $week < 90>> <<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))) ))>> <</if>> diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw index 11374f05a7e..66255ca0f8c 100644 --- a/src/SecExp/rebellionGenerator.tw +++ b/src/SecExp/rebellionGenerator.tw @@ -235,15 +235,15 @@ <<set _weekMod = 0.50>> <<if $week <= 30>> - <<set _weekMod = 0.75 * math.round(1+$week/10)>> + <<set _weekMod = 0.75 * Math.round(1+$week/10)>> <<elseif $week <= 60>> - <<set _weekMod = 1 * math.round(1+$week/10)>> + <<set _weekMod = 1 * Math.round(1+$week/10)>> <<elseif $week <= 90>> - <<set _weekMod = 1.25 * math.round(1+$week/10)>> + <<set _weekMod = 1.25 * Math.round(1+$week/10)>> <<elseif $week <= 120>> - <<set _weekMod = 1.50 * math.round(1+$week/10)>> + <<set _weekMod = 1.50 * Math.round(1+$week/10)>> <<else>> - <<set _weekMod = 1.75 * math.round(1+$week/10)>> + <<set _weekMod = 1.75 * Math.round(1+$week/10)>> <</if>> /* resetting ID list */ diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 37951dd4f7e..64b78c2e436 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -1050,7 +1050,8 @@ Currently @@.cyan;ENABLED.@@ [[Disable|Intro Summary][$seeVectorArtHighlights = 0]] <<else>> @@.red;DISABLED.@@ [[Enable|Intro Summary][$seeVectorArtHighlights = 1]] - <</if>><br> + <</if>> + <br> Height scaling <<if $seeHeight == 1>> @@.yellow;ENABLED@@ on small images. [[Disable|Intro Summary][$seeHeight = 0]] | [[Enable for all images|Intro Summary][$seeHeight = 2]] -- GitLab