From fe32edba9e5660dde428c0140b5a73c1b2473f8c Mon Sep 17 00:00:00 2001 From: mitaa Date: Tue, 17 Sep 2024 08:08:41 +0200 Subject: [PATCH] Saner power generation display --- data/production_planner-readme.png | Bin 27826 -> 24802 bytes src/production_planner/cells/power.py | 2 +- src/production_planner/cells/producer.py | 2 +- src/production_planner/core.py | 5 ++ src/production_planner/gamedata/__init__.py | 3 +- src/production_planner/gamedata/parse.py | 6 +- .../production_buildings_v1.0.0.1_366202.json | 72 +++++++++--------- tests | 2 +- 8 files changed, 48 insertions(+), 44 deletions(-) diff --git a/data/production_planner-readme.png b/data/production_planner-readme.png index 951f6bd6607018dbc48ad05a932693353bf2e054..4a44714ef0ee397a4ec73664c830d80fbcf01e6e 100644 GIT binary patch literal 24802 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%0ALzq|GOW5LTXbRZ9bYKVSnFD7 zh|h5jb)uW*S(loAn8%?@mQ9-um>|;$)BXMS6y!w6R)GV zN}aZ|@X5OukDD?cU%eehorvktkSnMYQ1)PB0KOFlM@Xqj?p4%kiSgY*qX?P5YNl74 zXs9>J*EPTYp)gFD1tLv0p!BRBiKR-yYb}pV0|B ziA!?YMBYU3Up$CRn6zv5tm{pP5z*An&oxf~(nTQ1CJ#laGn^PgO3cjYw_2+vWJ~SD zpA4jA?v|A&6MIYv)!Jp3k$JpZPTsMkSLPS|`uE7nH2csg_S0=BmSX8pxy z4vl(ls<}`Y27vDM7lLhLDVG)P9LW%T8cM}r|KqQYjHNG+<@h3<<_rD(dUeH4VLF)B zo=aM-SoE60@+P`{3~AYB;k?Ww0;K!<;J*R?6$2_t-GnGVfIXxoyT5k{cg5SDqHS` zhWwA5<~E=B6r9n15MdRjSZ+L3@~}3Ze)_)d5XfrP^Jp`5;e&}O2tA7Hexa&4iQ5hx z@?1kn4YL#Da)!IUxid(|m5+?>^qFrgD0|p^uYWKG_&1~DOd6=Rnd%|F`e@Y(NqJV+HAWfJ26oF#@|U;pzP3Kn?I5Dn<2%ZE_Ecwm zNc3RS>k7~^q0+_Wi*GR8Snd2Gx6xzYUjf0I?es%PuY;2qWEiq|N%u_&swMlId7wNj zo>)-<>Y$rhZo=grn?YP=UsF4}C3WDc{$51>ArKUaP8;wdted!rWJV(k#71vb;jeif zk)~~vKWLyOn?l;1N!B!EHKaKa$lmG2XPvh(b}Wn13Wxvz60UpWACH3##f&3A*GE)& zRu{??o?$5*^v%;^HtqwIO#QNrmz≀b`Xmq}419l3vpK6h5 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 Path: def main(): + import parse from production_planner.core import ProducerEncoder arguments = docopt(__doc__) diff --git a/src/production_planner/gamedata/parse.py b/src/production_planner/gamedata/parse.py index 9ae0ef8..fdaafa5 100644 --- a/src/production_planner/gamedata/parse.py +++ b/src/production_planner/gamedata/parse.py @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -from .. import core +from production_planner import core import re from typing import Optional, Self @@ -225,11 +225,11 @@ def generate_recipes(self, ctx: ParseContext): fuel_energy = float(fuel_class.energy_value) burn_time = fuel_energy / self.power_production items_per_minute = 60 / burn_time - items_per_minute = _convert_units(fuel_class, items_per_minute) + outputs += [[fuel_energy * items_per_minute, "Energy"]] + items_per_minute = _convert_units(fuel_class, items_per_minute) inputs += [[items_per_minute, fuel_class.display_name]] # FIXME ? - outputs += [[fuel_energy * items_per_minute, "Energy"]] if self.requires_supplemental_resource: supplemental_resource = fuel["mSupplementalResourceClass"] diff --git a/src/production_planner/gamedata/production_buildings_v1.0.0.1_366202.json b/src/production_planner/gamedata/production_buildings_v1.0.0.1_366202.json index 2b93545..552ec29 100644 --- a/src/production_planner/gamedata/production_buildings_v1.0.0.1_366202.json +++ b/src/production_planner/gamedata/production_buildings_v1.0.0.1_366202.json @@ -6327,8 +6327,8 @@ ], [ [ - 1800.0, - "Energy" + 30.0, + "+Power" ] ], false @@ -6343,8 +6343,8 @@ ], [ [ - 1800.0, - "Energy" + 30.0, + "+Power" ] ], false @@ -6359,8 +6359,8 @@ ], [ [ - 1800.0, - "Energy" + 30.0, + "+Power" ] ], false @@ -6375,8 +6375,8 @@ ], [ [ - 1800.0, - "Energy" + 30.0, + "+Power" ] ], false @@ -6391,8 +6391,8 @@ ], [ [ - 1800.0, - "Energy" + 30.0, + "+Power" ] ], false @@ -6407,8 +6407,8 @@ ], [ [ - 1800.0, - "Energy" + 30.0, + "+Power" ] ], false @@ -6436,8 +6436,8 @@ ], [ [ - 4500.0, - "Energy" + 75.0, + "+Power" ] ], false @@ -6456,8 +6456,8 @@ ], [ [ - 4500.0, - "Energy" + 75.0, + "+Power" ] ], false @@ -6476,8 +6476,8 @@ ], [ [ - 4500.0, - "Energy" + 75.0, + "+Power" ] ], false @@ -6501,8 +6501,8 @@ ], [ [ - 15.0, - "Energy" + 250.0, + "+Power" ] ], false @@ -6517,8 +6517,8 @@ ], [ [ - 15.0, - "Energy" + 250.0, + "+Power" ] ], false @@ -6533,8 +6533,8 @@ ], [ [ - 15.0, - "Energy" + 250.0, + "+Power" ] ], false @@ -6549,8 +6549,8 @@ ], [ [ - 15.000000000000002, - "Energy" + 250.00000000000003, + "+Power" ] ], false @@ -6565,8 +6565,8 @@ ], [ [ - 15.0, - "Energy" + 250.0, + "+Power" ] ], false @@ -6585,8 +6585,8 @@ [], [ [ - 18000, - "Energy" + 300.0, + "+Power" ] ], false @@ -6614,8 +6614,8 @@ ], [ [ - 150000.0, - "Energy" + 2500.0, + "+Power" ], [ 50.0, @@ -6638,8 +6638,8 @@ ], [ [ - 150000.0, - "Energy" + 2500.0, + "+Power" ], [ 10.0, @@ -6662,8 +6662,8 @@ ], [ [ - 150000.0, - "Energy" + 2500.0, + "+Power" ] ], false diff --git a/tests b/tests index 5b8a001..cd1a97b 160000 --- a/tests +++ b/tests @@ -1 +1 @@ -Subproject commit 5b8a0019ab22dad828a3b17be080079a75102bc6 +Subproject commit cd1a97b20dde1932c4d1c437efd3a7e7551bbd91