Merge branch 'main' of github.com:ahyangyi/openttd-newgrfs

ahyangyi · Nov 1, 2023 · 01e1fc4 · 01e1fc4
2 parents 044f5df + bae086e
commit 01e1fc4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/industry/lang/chinese.lng b/industry/lang/chinese.lng
@@ -51,9 +51,10 @@ STR_PARAM_WORKFORCE_YETI_TIRED              :专属(Tired Worker)
 
 
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH                   :第一产业 - 增长
-STR_PARAM_PRIMARY_INDUSTRY_GROWTH_DESC              :选择第一产业的产量受何因素影响。{}{}无 - 不会发生变化{}通用供给 - 产量会在提供农用供给和工程供给时上升{}专用供给 - 产量会在提供特定的供给时上升{}工人 - 产量在有工人时上升{}离散 - 产量依据该产业产出是否被运走而随机变化{}连续 - 同上，但是变化的级别更多。
+STR_PARAM_PRIMARY_INDUSTRY_GROWTH_DESC              :选择第一产业的产量受何因素影响。{}{}无 - 不会发生变化{}普适供给 - 产量会在提供某种万能的供给物资时上升{}通用供给 - 产量会在提供农用供给和工程供给时上升{}专用供给 - 产量会在提供特定的供给时上升{}工人 - 产量在有工人时上升{}离散 - 产量依据该产业产出是否被运走而随机变化{}连续 - 同上，但是变化的级别更多。
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_PRESET            :使用预设玩法
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_NONE              :无
+STR_PARAM_PRIMARY_INDUSTRY_GROWTH_UNIVERSAL_SUPPLIES:万用供给
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_GENERIC_SUPPLIES  :通用供给
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_SPECIFIC_SUPPLIES :专用供给
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_WORKERS           :工人

diff --git a/industry/lang/english-uk.lng b/industry/lang/english-uk.lng
@@ -52,9 +52,10 @@ STR_PARAM_WORKFORCE_YETI_MAIL               :Exclusive (Mail)
 STR_PARAM_WORKFORCE_YETI_TIRED              :Exclusive (Tired Worker)
 
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH                   :Primary Industry - Growth
-STR_PARAM_PRIMARY_INDUSTRY_GROWTH_DESC              :Choose how does primary industries change their production.{}{}None - No change{}Generic Supplies - productions are boosted when supplied with Farming/Engineering Supplies{}Specific Supplies - productions are boosted when supplied with specific cargos{}Workers - productions are boosted when supplied with workers{}Discrete - productions change randomly, depending on whether its output is used{}Continuous - production change randomly, with many levels possible.
+STR_PARAM_PRIMARY_INDUSTRY_GROWTH_DESC              :Choose how does primary industries change their production.{}{}None - No change{}Universal Supplies - productions are boosted when supplied with a universal type of supplies{}Generic Supplies - productions are boosted when supplied with Farming/Engineering Supplies{}Specific Supplies - productions are boosted when supplied with specific cargos{}Workers - productions are boosted when supplied with workers{}Discrete - productions change randomly, depending on whether its output is used{}Continuous - production change randomly, with many levels possible.
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_PRESET            :Preset
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_NONE              :None
+STR_PARAM_PRIMARY_INDUSTRY_GROWTH_UNIVERSAL_SUPPLIES:Universal Supplies
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_GENERIC_SUPPLIES  :Generic Supplies
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_SPECIFIC_SUPPLIES :Specific Supplies
 STR_PARAM_PRIMARY_INDUSTRY_GROWTH_WORKERS           :Workers

diff --git a/industry/lib/parameters.py b/industry/lib/parameters.py
@@ -71,12 +71,13 @@
             {
                 0: "PRESET",
                 1: "NONE",
-                2: "GENERIC_SUPPLIES",
-                3: "SPECIFIC_SUPPLIES",
-                4: "TOWN_POPULATION",
-                5: "WORKERS",
-                6: "DISCRETE",
-                7: "CONTINUOUS",
+                2: "UNIVERSAL_SUPPLIES",
+                3: "GENERIC_SUPPLIES",
+                4: "SPECIFIC_SUPPLIES",
+                5: "TOWN_POPULATION",
+                6: "WORKERS",
+                7: "DISCRETE",
+                8: "CONTINUOUS",
             },
         ),
         Parameter(