<!DOCTYPE>
<HTML>
<HEAD>
<META http-equiv="content-type" content="text/html; charset=utf-8">
<META name="GENERATOR" content="ConEmu 191012[64]">
</HEAD>
<BODY style="background-color: #161616;">
<DIV class="191012" style="font-family: 'Consolas'; font-size: 13px; text-align: start; text-indent: 0px; margin: 0;">
<span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #8DD006; background-color: #161616; ">C:\Users\k-Knight\Git\firs </span><span style="color: #CCCC81; background-color: #161616; ">(rfirs) </span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">λ </span><span style="color: #CACACA; background-color: #161616; ">git show </span><br>
<span style="color: #B6B649; background-color: #161616; ">commit 834354a03e6354819a31ef99d39a1123f1c61c03 (</span><span style="color: #58C2E5; background-color: #161616; ">HEAD -> </span><span style="color: #8DD006; background-color: #161616; ">rfirs</span><span style="color: #B6B649; background-color: #161616; ">)</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style=
"color: #CACACA; background-color: #161616; ">Author: k-Knight
<[email protected]> </span><br> <span style="color: #CACACA; background-color: #161616; ">Date: Wed Sep 23 00:36:57 2020 +0300 </span><br>
<span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> Start of RFIRS </span><br>
<span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">diff --git a/src/industry.py b/src/industry.py</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">index 7ceaf832..db5785ec 100644</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">--- a/src/industry.py</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">+++ b/src/industry.py</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #1A83A6; background-color: #161616; ">@@ -1051,16 +1051,16 @@</span><span style="color: #CACACA; background-color: #161616; "> class IndustryPrimary(Industry): </span><br>
<span style="color: #CACACA; background-color: #161616; "> self.perm_storage = IndustryPermStorage(['var_num_supplies_delivered', # amount of supplies delivered this month </span><br>
<span style="color: #CACACA; background-color: #161616; "> 'var_num_supplies_delivered_last', </span><br>
<span style="color: #CACACA; background-color: #161616; "> 'var_num_supplies_delivered_bef_last', </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'var_current_supplies_prod_factor',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 'unused',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_current_supplies_prod_factor_1',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_current_supplies_prod_factor_2',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_last_month_transported_1',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_last_month_transported_2',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_transported_p_month_1',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_transported_pp_month_1',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_transported_ppp_month_1',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_transported_p_month_2',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_transported_pp_month_2',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 'var_transported_ppp_month_2',</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> 'unused', </span><br>
<span style="color: #CACACA; background-color: #161616; "> 'unused', </span><br>
<span style="color: #CACACA; background-color: #161616; "> 'unused']) </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">diff --git a/src/templates/check_primary_supplies_delivered.pynml b/src/templates/check_primary_supplies_delivered.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">index ca3ea39e..c116c341 100644</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">--- a/src/templates/check_primary_supplies_delivered.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">+++ b/src/templates/check_primary_supplies_delivered.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #1A83A6; background-color: #161616; ">@@ -4,7 +4,152 @@</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> /* Production change evaluated monthly */ </span><br>
<span style="color: #CACACA; background-color: #161616; "> /* =================================== */ </span><br>
<span style="color: #CACACA; background-color: #161616; "> <tal:block define="perm_storage industry.perm_storage"> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ switch(FEAT_INDUSTRIES, SELF, ${industry.id}_init_perm_storage, [</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_transported_ppp_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_transported_pp_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_transported_p_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_transported_ppp_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_transported_pp_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_transported_p_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_num_supplies_delivered_bef_last}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_num_supplies_delivered_last}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(0, ${perm_storage.var_num_supplies_delivered}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(100, ${perm_storage.var_current_supplies_prod_factor_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(100, ${perm_storage.var_current_supplies_prod_factor_2})</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ]) {</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ return randomise_primary_production_on_build;</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ }</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> switch(FEAT_INDUSTRIES, SELF, ${industry.id}_monthly_update, [ </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(LOAD_PERM(${perm_storage.var_transported_pp_month_1}), ${perm_storage.var_transported_ppp_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(LOAD_PERM(${perm_storage.var_transported_p_month_1}), ${perm_storage.var_transported_pp_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(transported_last_month_pct_1, ${perm_storage.var_transported_p_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(LOAD_PERM(${perm_storage.var_transported_pp_month_2}), ${perm_storage.var_transported_ppp_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(LOAD_PERM(${perm_storage.var_transported_p_month_2}), ${perm_storage.var_transported_pp_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(transported_last_month_pct_2, ${perm_storage.var_transported_p_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_num_supplies_delivered}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_num_supplies_delivered_last}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_num_supplies_delivered_bef_last}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 8</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (LOAD_TEMP(8) >= (${industry.supply_requirements[2]} * primary_level2_requirement)) ? 150 :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (LOAD_TEMP(8) >= (${industry.supply_requirements[2]} * primary_level1_requirement)) ? 100 : 25,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 9</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (random_bits % 2),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 8</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_p_month_1}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_pp_month_1}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_ppp_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_p_month_2}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_pp_month_2}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_ppp_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 11</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) / 3 >= LOAD_PERM(${perm_storage.var_transported_p_month_1}) ?</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_p_month_1}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) / 3 >= LOAD_PERM(${perm_storage.var_transported_p_month_2}) ?</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_transported_p_month_2}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 11</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) >= 80 ? (LOAD_TEMP(8) == 1 ? 10 : 2) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) >= 70 ? (LOAD_TEMP(8) == 1 ? 8 : 2) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) >= 60 ? (LOAD_TEMP(8) == 1 ? 10 : 5) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) >= 50 ? (LOAD_TEMP(8) == 1 ? 5 : 5) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) >= 40 ? (LOAD_TEMP(8) == 1 ? 6 : 9) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (LOAD_TEMP(8) == 1 ? 5 : 10),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) >= 80 ? (LOAD_TEMP(8) == 1 ? 10 : 2) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) >= 70 ? (LOAD_TEMP(8) == 1 ? 8 : 2) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) >= 60 ? (LOAD_TEMP(8) == 1 ? 10 : 5) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) >= 50 ? (LOAD_TEMP(8) == 1 ? 5 : 5) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) >= 40 ? (LOAD_TEMP(8) == 1 ? 6 : 9) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (LOAD_TEMP(8) == 1 ? 5 : 10),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 11</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(8) == 1 ? (LOAD_TEMP(10) * LOAD_TEMP(9)) / 100 : LOAD_TEMP(10),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(8) == 1 ? (LOAD_TEMP(11) * LOAD_TEMP(9)) / 100 : LOAD_TEMP(11),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 11</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (random_bits % 100) >= 49 ? LOAD_TEMP(10) : LOAD_TEMP(10) / 2,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (random_bits % 100) >= 49 ? LOAD_TEMP(11) : LOAD_TEMP(11) / 2,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_1}) * LOAD_TEMP(10)) / 100,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ (LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_2}) * LOAD_TEMP(11)) / 100,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 11</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(8) == 1 ? LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_1}) + LOAD_TEMP(10) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_1}) - LOAD_TEMP(10),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 10</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(8) == 1 ? LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_2}) + LOAD_TEMP(11) :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_2}) - LOAD_TEMP(11),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ 11</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(10) <= 85 ? 85 : (LOAD_TEMP(10) >= 10000 ? 10000 : LOAD_TEMP(10)),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ${perm_storage.var_current_supplies_prod_factor_1}</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_PERM(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ LOAD_TEMP(11) <= 85 ? 85 : (LOAD_TEMP(11) >= 10000 ? 10000 : LOAD_TEMP(11)),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ${perm_storage.var_current_supplies_prod_factor_2}</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> STORE_PERM(LOAD_PERM(${perm_storage.var_num_supplies_delivered_last}), ${perm_storage.var_num_supplies_delivered_bef_last}), </span><br>
<span style="color: #CACACA; background-color: #161616; "> STORE_PERM(LOAD_PERM(${perm_storage.var_num_supplies_delivered}), ${perm_storage.var_num_supplies_delivered_last}), </span><br>
<span style="color: #CACACA; background-color: #161616; "> STORE_PERM(0, ${perm_storage.var_num_supplies_delivered}) </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">diff --git a/src/templates/extra_text_primary.pynml b/src/templates/extra_text_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">index 28ff222e..56bd5ec1 100644</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">--- a/src/templates/extra_text_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">+++ b/src/templates/extra_text_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #1A83A6; background-color: #161616; ">@@ -3,7 +3,7 @@</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> switch(FEAT_INDUSTRIES, SELF, ${industry.id}_extra_text, [ </span><br>
<span style="color: #CACACA; background-color: #161616; "> STORE_TEMP((primary_level1_requirement * ${industry.supply_requirements[2]}) | </span><br>
<span style="color: #CACACA; background-color: #161616; "> (primary_level2_requirement * ${industry.supply_requirements[2]}) << 16, 0x100), </span><br>
<span style="color: #A70334; background-color: #161616; ">- LOAD_PERM(${industry.perm_storage.var_current_supplies_prod_factor})</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+</span><span style="color: #CACACA; background-color: #161616; "> </span><span style="color: #74AA04; background-color: #161616; ">LOAD_PERM(${industry.perm_storage.var_current_supplies_prod_factor_1})</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> ]) { </span><br>
<span style="color: #CACACA; background-color: #161616; "> primary_level2_bonus: return string(STR_${industry.supply_requirements[1]}_PRODUCTION_4X); </span><br>
<span style="color: #CACACA; background-color: #161616; "> primary_level1_bonus: return string(STR_${industry.supply_requirements[1]}_PRODUCTION_2X); </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">diff --git a/src/templates/industry_primary.pynml b/src/templates/industry_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">index 4045b705..60392655 100644</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">--- a/src/templates/industry_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">+++ b/src/templates/industry_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #1A83A6; background-color: #161616; ">@@ -43,7 +43,6 @@</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> item(FEAT_INDUSTRIES, ${industry.id}, ${industry.numeric_id}) { </span><br>
<span style="color: #CACACA; background-color: #161616; "> graphics { </span><br>
<span style="color: #CACACA; background-color: #161616; "> construction_probability: ${industry.id}_check_availability; </span><br>
<span style="color: #A70334; background-color: #161616; ">- build_prod_change: randomise_primary_production_on_build;</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> produce_cargo_arrival: ${industry.id}_produce; </span><br>
<span style="color: #CACACA; background-color: #161616; "> produce_256_ticks: ${industry.id}_produce_256_ticks; </span><br>
<span style="color: #CACACA; background-color: #161616; "> monthly_prod_change: ${industry.id}_monthly_update; </span><br>
<span style="color: #1A83A6; background-color: #161616; ">@@ -53,6 +52,7 @@</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> extra_text_industry: ${industry.id}_extra_text; </span><br>
<span style="color: #CACACA; background-color: #161616; "> cargo_subtype_display: ${industry.id}_cargo_subtype_display; </span><br>
<span style="color: #CACACA; background-color: #161616; "> colour: switch_colour; </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ build_prod_change: ${industry.id}_init_perm_storage;</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> } </span><br>
<span style="color: #CACACA; background-color: #161616; "> } </span><br>
<span style="color: #CACACA; background-color: #161616; "> } </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">diff --git a/src/templates/produce_primary.pynml b/src/templates/produce_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">index edf15698..671497b1 100644</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">--- a/src/templates/produce_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">+++ b/src/templates/produce_primary.pynml</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #1A83A6; background-color: #161616; ">@@ -7,18 +7,16 @@</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> ${industry.id}_production; </span><br>
<span style="color: #CACACA; background-color: #161616; "> } </span><br>
<span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- produce(${industry.id}_production_256, 0, 0, 0, LOAD_TEMP(9) * production_rate_1 / 100, LOAD_TEMP(9) * production_rate_2 / 100, 0);</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ produce(${industry.id}_production_256, 0, 0, 0, (LOAD_TEMP(8) * production_rate_1) / 100, (LOAD_TEMP(9) * production_rate_2) / 100, 0);</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- switch(FEAT_INDUSTRIES, SELF, ${industry.id}_produce_256_ticks,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- [STORE_TEMP(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- LOAD_PERM(${perm_storage.var_num_supplies_delivered}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- LOAD_PERM(${perm_storage.var_num_supplies_delivered_last}) +</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- LOAD_PERM(${perm_storage.var_num_supplies_delivered_bef_last}),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- 8),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- STORE_TEMP((LOAD_TEMP(8) >= (${industry.supply_requirements[2]} * primary_level2_requirement)) ? primary_level2_bonus :</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- (LOAD_TEMP(8) >= (${industry.supply_requirements[2]} * primary_level1_requirement)) ? primary_level1_bonus : 0, 9),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- STORE_PERM(LOAD_TEMP(9), ${perm_storage.var_current_supplies_prod_factor})</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #A70334; background-color: #161616; ">- ]) {</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ switch(</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ FEAT_INDUSTRIES,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ SELF,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ${industry.id}_produce_256_ticks,</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ [</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_1}), 8),</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ STORE_TEMP(LOAD_PERM(${perm_storage.var_current_supplies_prod_factor_2}), 9)</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #74AA04; background-color: #161616; ">+ ]) {</span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #CACACA; background-color: #161616; "> ${industry.id}_production_256; </span><br>
<span style="color: #CACACA; background-color: #161616; "> } </span><br>
<span style="color: #CACACA; background-color: #161616; "> </tal:block> </span><br>
<span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #8DD006; background-color: #161616; ">C:\Users\k-Knight\Git\firs </span><span style="color: #CCCC81; background-color: #161616; ">(rfirs) </span><span style="color: #CACACA; background-color: #161616; "> </span><br>
<span style="color: #FFFFFF; background-color: #161616; ">λ </span><span style="color: #CACACA; background-color: #161616; "> </span><br>
</DIV>
</BODY>
</HTML>