diff --git a/src/Mods/SecExp/buildings/weaponsManufacturing.tw b/src/Mods/SecExp/buildings/weaponsManufacturing.tw index ec51be61070f9c6fcecae145eb716fecf5051bc8..5fb27aa14e3273718693d3990687e4eb049acf83 100644 --- a/src/Mods/SecExp/buildings/weaponsManufacturing.tw +++ b/src/Mods/SecExp/buildings/weaponsManufacturing.tw @@ -95,11 +95,13 @@ You own <<print num($menials)>> free menial slaves. This manufacturing complex c <br> <<link "Invest in automating the complex" "weaponsManufacturing">> <<run cashX(forceNeg(10000 * $SecExp.buildings.weapManu.productivity), "capEx")>> <<set $SecExp.buildings.weapManu.productivity++>> - <<if $SecExp.buildings.weapManu.upgrades.current.time > 0>> - <<set _percentComplete = $SecExp.buildings.weapManu.upgrades.current.time / (_baseUpgradeTime / ($SecExp.buildings.weapManu.productivity - 1))>> - <<set _newTime = Math.ceil(_percentComplete * _baseUpgradeTime / $SecExp.buildings.weapManu.productivity)>> - <<set $SecExp.buildings.weapManu.upgrades.current.time = _newTime>> - <</if>> + <<for _i = 0; _i < $SecExp.buildings.weapManu.upgrades.queue.length; _i++>> + <<if $SecExp.buildings.weapManu.upgrades.queue[_i].time > 0>> + <<set _percentComplete = $SecExp.buildings.weapManu.upgrades.queue[_i].time / (_baseUpgradeTime / ($SecExp.buildings.weapManu.productivity - 1))>> + <<set _newTime = Math.ceil(_percentComplete * _baseUpgradeTime / $SecExp.buildings.weapManu.productivity)>> + <<set $SecExp.buildings.weapManu.upgrades.queue[_i].time = _newTime>> + <</if>> + <</for>> <</link>> //Will cost <<print cashFormat(10000 * $SecExp.buildings.weapManu.productivity)>> and will increase the facility income in addition to speeding up upgrade production.// <<elseif $SecExp.buildings.weapManu.lab < 3>> diff --git a/src/Mods/SecExp/rebellionOptions.tw b/src/Mods/SecExp/rebellionOptions.tw index 5a8abc3ef54522703c2963b8e49f55f4d78398bc..e98b7b96bcfb59ab2f515980b24c707d36d094ed 100644 --- a/src/Mods/SecExp/rebellionOptions.tw +++ b/src/Mods/SecExp/rebellionOptions.tw @@ -276,6 +276,6 @@ In order to preserve the structural integrity of the building and the lives of o <<set $battleResult = 4, $foughtThisWeek = 1>> /* sets $battleResult value outside accepted range (-3, 3) to avoid evaluation problems */ <</link>> <br> -<<link "Surrender" "rebellionHandler">> +<<link "Surrender" "rebellionReport">> <<set $battleResult = -1, $foughtThisWeek = 1>> <</link>> \ No newline at end of file