From 578d056bda2b59c4e9663264d43bb43efeee1664 Mon Sep 17 00:00:00 2001 From: Hermios Date: Mon, 27 May 2024 16:41:17 +0300 Subject: [PATCH] add translations. Fix bugs from issue 33 --- graphics/icons/electric-fuel.png | Bin 0 -> 5706 bytes locale/de/locale.cfg | 7 ++++++- locale/en/locale.cfg | 7 ++++++- locale/fr/locale.cfg | 7 ++++++- locale/ru/locale.cfg | 7 ++++++- locale/uk/locale.cfg | 27 +++++++++++++++++++++++++++ prototypes/entities.lua | 11 +++++++++-- prototypes/items.lua | 4 +++- prototypes/locomotive.lua | 10 ++++------ 9 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 graphics/icons/electric-fuel.png create mode 100644 locale/uk/locale.cfg diff --git a/graphics/icons/electric-fuel.png b/graphics/icons/electric-fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..e8c27676aad774dbd002efb6c5d3b89300c60038 GIT binary patch literal 5706 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 literal 0 HcmV?d00001 diff --git a/locale/de/locale.cfg b/locale/de/locale.cfg index 3735a9b..d1bfe48 100644 --- a/locale/de/locale.cfg +++ b/locale/de/locale.cfg @@ -2,6 +2,7 @@ electric-rail=Strömungsschiene railpole-prototype=Strommast für Strömungsschiene electric-locomotive=elektrische Lokomotive +electric-fuel=Strom [item-description] straight-rail-power=Schiene, die mit Strommast angeschlossen werden kannn, dann wird mit Strom - und Schalt - netzwerk, verbunden. Strom kann auch vo elektrische Loko benutzt werden. @@ -14,9 +15,13 @@ curved-rail-power=Gebogen Strömungsschiene rail-pole=Strommast für Strömungsschiene railpole-prototype=Strommast für Strömungsschiene electric-locomotive=elektrische Lokomotive +rail-accu=Rail Power System [technology-name] rail-power-system=Strömungsschiene System [technology-description] -rail-power-system=Lass, elektrische Züge zu benutzen \ No newline at end of file +rail-power-system=Lass, elektrische Züge zu benutzen + +[fuel-category-name] +electrical=Strom \ No newline at end of file diff --git a/locale/en/locale.cfg b/locale/en/locale.cfg index 2bd3a7b..62a4569 100644 --- a/locale/en/locale.cfg +++ b/locale/en/locale.cfg @@ -2,6 +2,7 @@ electric-rail=Rail with power railpole-prototype=rail electric pole electric-locomotive=electric locomotive +electric-fuel=electricity [item-description] straight-rail-power=rail that can be connected to a rail electric pole supplier, and transmit electricity and signals along its course, and to hybrid trains @@ -14,9 +15,13 @@ curved-rail-power=Curved rail with power rail-pole=rail electric pole railpole-prototype=rail electric pole electric-locomotive=electric locomotive +rail-accu=Rail Power System [technology-name] rail-power-system=Rail Power System [technology-description] -rail-power-system=Allow to use electric trains \ No newline at end of file +rail-power-system=Allow to use electric trains + +[fuel-category-name] +electrical=electricity \ No newline at end of file diff --git a/locale/fr/locale.cfg b/locale/fr/locale.cfg index 2238e00..d9ce960 100644 --- a/locale/fr/locale.cfg +++ b/locale/fr/locale.cfg @@ -2,6 +2,7 @@ powered-rail=Rail électric railpole-prototype=pylone pour rail electric-locomotive=locomotive électrique +electric-fuel=électricité [item-description] straight-rail-power=rail qui peut être connecté à une pylone pour rail et transmettre l'électricité et les signaux de circuit à tous les rails connectés, ainsi qu'aux trains électriques @@ -14,9 +15,13 @@ curved-rail-power=Rail électric courbé rail-pole=pylone pour rail railpole-prototype=pylone pour rail electric-locomotive=locomotive électrique +rail-accu=Rail Power System [technology-name] rail-power-system=Système de trains électriques [technology-description] -rail-power-system=Permet l'utilisation des trains électriques \ No newline at end of file +rail-power-system=Permet l'utilisation des trains électriques + +[fuel-category-name] +electrical=électricité \ No newline at end of file diff --git a/locale/ru/locale.cfg b/locale/ru/locale.cfg index 3a59559..5d7a1fb 100644 --- a/locale/ru/locale.cfg +++ b/locale/ru/locale.cfg @@ -2,6 +2,7 @@ electric-rail=Электрифицированные рельсы railpole-prototype=Силовой контактор electric-locomotive=электрический локомотив +electric-fuel=электричество [item-description] straight-rail-power=Подключается к электрической сети через силовой контактор. Они передают сигналы и электроэнергию (и на электровозы) по всей своей длине. @@ -14,9 +15,13 @@ curved-rail-power=Электрифицированные рельсы rail-pole=Силовой контактор railpole-prototype=Силовой контактор electric-locomotive=электрический локомотив +rail-accu=Rail Power System [technology-name] rail-power-system=Электрификация железных дорог [technology-description] -rail-power-system=Позволяет использовать поезда на электротяге \ No newline at end of file +rail-power-system=Позволяет использовать поезда на электротяге + +[fuel-category-name] +electrical=электричество \ No newline at end of file diff --git a/locale/uk/locale.cfg b/locale/uk/locale.cfg new file mode 100644 index 0000000..a000534 --- /dev/null +++ b/locale/uk/locale.cfg @@ -0,0 +1,27 @@ +[item-name] +electric-rail=Електричні шківі +railpole-prototype=Силовий контактор +electric-locomotive=електричний локомотив +electric-fuel=електрика + +[item-description] +straight-rail-power=Підключається до електричної мережі через силовий контактор. Вони передають сигнали та електроенергію (і на електровози) по всій своїй довжині. +electric-locomotive=Працює як на стандартному паливі, так і на електротязі (вимагає електрифіковані рейки) +railpole-prototype=Забезпечує підключення електрифікованих рейок до електромережі + +[entity-name] +straight-rail-power=Електрифіковані рейки +curved-rail-power=Електрифіковані рейки +rail-pole=Силовий контактор +railpole-prototype=Силовий контактор +electric-locomotive=електричний локомотив +rail-accu=Rail Power System + +[technology-name] +rail-power-system=Електрифікація залізниць + +[technology-description] +rail-power-system=Дозволяє використовувати поїзди на електротязі + +[fuel-category-name] +electrical=електрика \ No newline at end of file diff --git a/prototypes/entities.lua b/prototypes/entities.lua index dae4d24..37fa0ef 100644 --- a/prototypes/entities.lua +++ b/prototypes/entities.lua @@ -90,7 +90,7 @@ createdata("electric-pole","small-electric-pole",railpole,{ connection_points = connection_points }) createdata("electric-pole",railpole,electricnode,{ - minable= nil, + minable= nil, draw_copper_wires=false, draw_circuit_wires=false, selectable_in_game=false, @@ -132,16 +132,23 @@ createdata("electric-energy-interface","electric-energy-interface",rail_electric } },true) +data.raw["electric-energy-interface"][rail_electric_accu].icon="__"..modname.."__/graphics/icons/"..electric_rail..".png" + --rail createdata("straight-rail","straight-rail",straight_rail_power,{ minable = {mining_time = 0.6, result = electric_rail}, + fast_replaceable_group = "straight-rail" }) update_rail_pictures("straight-rail",straight_rail_power) +data.raw["straight-rail"]["straight-rail"].fast_replaceable_group = "straight-rail" createdata("curved-rail","curved-rail",curved_rail_power,{ icon = "__base__/graphics/icons/curved-rail.png", minable = {mining_time = 0.6, result = electric_rail, count=4}, placeable_by = { item=electric_rail, count = 4}, + fast_replaceable_group = "curved-rail" }) -update_rail_pictures("curved-rail",curved_rail_power) \ No newline at end of file +update_rail_pictures("curved-rail",curved_rail_power) + +data.raw["curved-rail"]["curved-rail"].fast_replaceable_group = "curved-rail" \ No newline at end of file diff --git a/prototypes/items.lua b/prototypes/items.lua index 863783f..f20b456 100644 --- a/prototypes/items.lua +++ b/prototypes/items.lua @@ -1,7 +1,9 @@ --electrical fuel createdata("item","solid-fuel",electricfuel,{ fuel_category="electrical", - fuel_value="20KJ" + fuel_value="20KJ", + stack_size=1, + icon="__"..modname.."__/graphics/icons/"..electricfuel..".png" },true) --train diff --git a/prototypes/locomotive.lua b/prototypes/locomotive.lua index b1af1e4..414b7be 100644 --- a/prototypes/locomotive.lua +++ b/prototypes/locomotive.lua @@ -15,15 +15,13 @@ function locomotive:update() if not self.entity.valid then return end - local required_fuel=self.stack_size-self.entity.get_item_count() - if required_fuel>0 then + if self.burner.heat =self.ratio_fuel then - local required_energy=required_fuel*self.ratio_fuel + local required_energy=self.burner.heat_capacity*0.99-self.burner.heat local power_transfer = math.min(rail.accu.energy,required_energy) - local power_fuel=math.floor(power_transfer/self.ratio_fuel) - self.entity.get_fuel_inventory().insert({name=electricfuel, count=power_fuel}) - rail.accu.energy=rail.accu.energy-power_fuel*self.ratio_fuel + self.burner.heat=self.burner.heat+power_transfer + rail.accu.energy=rail.accu.energy-power_transfer end end end \ No newline at end of file