From dabdd094f97b6b28a4610a7db31c68cca2e778ed Mon Sep 17 00:00:00 2001 From: matheod <339611+matheod@users.noreply.github.com> Date: Sun, 24 Nov 2019 07:35:16 +0100 Subject: [PATCH] Add storable indication in core database (#1124) * Add storable in core indication in core database * Add corestorable text * French translation of corestorable --- core/assets/bundles/bundle.properties | 1 + core/assets/bundles/bundle_fr.properties | 1 + core/src/io/anuke/mindustry/ui/ContentDisplay.java | 3 +++ 3 files changed, 5 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4602ecdb24..30e8622482 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -806,6 +806,7 @@ mech.trident-ship.name = Trident mech.trident-ship.weapon = Bomb Bay mech.glaive-ship.name = Glaive mech.glaive-ship.weapon = Flame Repeater +item.corestorable = [lightgray]Storable in Core: {0} item.explosiveness = [lightgray]Explosiveness: {0}% item.flammability = [lightgray]Flammability: {0}% item.radioactivity = [lightgray]Radioactivity: {0}% diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index d41d82c9d2..f4464dd977 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -804,6 +804,7 @@ mech.trident-ship.name = Trident mech.trident-ship.weapon = Bombes mech.glaive-ship.name = Glaive mech.glaive-ship.weapon = Mitraille incendiaire +item.corestorable = [lightgray]Stockable dans le Noyau: {0} item.explosiveness = [LIGHT_GRAY]Explosivité: {0} item.flammability = [LIGHT_GRAY]Inflammabilité: {0} item.radioactivity = [LIGHT_GRAY]Radioactivité: {0} diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java index a184e86aaf..e086e4e616 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java @@ -85,6 +85,9 @@ public class ContentDisplay{ table.left().defaults().fillX(); + table.add(Core.bundle.format("item.corestorable", item.type == ItemType.material ? Core.bundle.format("yes") : Core.bundle.format("no"))); + table.row(); + table.add(Core.bundle.format("item.explosiveness", (int)(item.explosiveness * 100))); table.row(); table.add(Core.bundle.format("item.flammability", (int)(item.flammability * 100)));