From 66c9fd8431272334d194185168124262230d905a Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 28 Jun 2018 12:00:30 -0400 Subject: [PATCH] Added descriptions for some transportation blocks, fixed wrapping --- core/assets/bundles/bundle.properties | 8 +++++++- .../io/anuke/mindustry/ui/fragments/BlocksFragment.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0d4445c092..0808e1ffb4 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -386,11 +386,17 @@ block.conveyor.name=Conveyor block.titanium-conveyor.name=Titanium Conveyor block.junction.name=Junction block.splitter.name=Splitter +block.splitter.description=Outputs items into two opposite directions immediately after they are recieved. block.router.name=Router +block.router.description=Splits items into all 4 directions. Can store items as a buffer. block.multiplexer.name=Multiplexer +block.multiplexer.description=A router that can split items into 8 directions. block.sorter.name=Sorter -block.overflowgate.name=Overflowgate +block.sorter.description=Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right. +block.overflowgate.name=Overflow Gate +block.overflowgate.description=A combination splitter and router that only outputs to the left and right if the front path is blocked. block.bridgeconveyor.name=Bridge Conveyor +block.bridgeconveyor.description=A conveyor that can go over other blocks, for up to two total blocks. block.smelter.name=Smelter block.arc-smelter.name=Arc Smelter block.silicon-smelter.name=Silicon Smelter diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index baef0eae86..784da397f7 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -382,7 +382,7 @@ public class BlocksFragment implements Fragment{ table.row(); if(block.fullDescription != null){ - table.add(block.fullDescription); + table.add(block.fullDescription).padLeft(5).padRight(5).width(400f).wrap().fillX(); table.row(); table.addImage("white").height(3).color(Color.LIGHT_GRAY).pad(15).padLeft(0).padRight(0).fillX();