From 956e35b6774a5365412d7b75ef17a8dfb6e18275 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 7 Dec 2017 14:45:04 -0500 Subject: [PATCH] UI fixes; fixed conveyor infinite item pileup --- core/assets/ui/uiskin.json | 3 ++- .../src/io/anuke/mindustry/core/Renderer.java | 2 +- .../ui/fragments/BlocksFragment.java | 22 +++++++++++------- .../blocks/types/distribution/Conveyor.java | 2 +- desktop/mindustry-saves/0.mins | Bin 11415 -> 3824 bytes .../mindustry/desktop/DesktopLauncher.java | 2 +- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json index 62128c4be4..fb3350a1b2 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -48,7 +48,8 @@ io.anuke.ucore.scene.ui.ImageTextButton$ImageTextButtonStyle: { toggle: {checked: button-down, down: button-down, up: button, font: default-font, fontColor: white, over: button-over, disabled: button, disabledFontColor: grey } }, io.anuke.ucore.scene.ui.ScrollPane$ScrollPaneStyle: { - default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical} + default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical}, + clear: {vScroll: scroll, vScrollKnob: scroll-knob-vertical} }, io.anuke.ucore.scene.ui.Window$WindowStyle: { default: {titleFont: default-font, background: window, titleFontColor: orange }, diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index cccd55a5a3..1f972e6c46 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -38,7 +38,7 @@ import io.anuke.ucore.util.*; public class Renderer extends RendererModule{ String[] surfaces = { "shadow", "shield", "pixel", "indicators" }; int targetscale = baseCameraScale; - int chunksize = 32; + int chunksize = 16; int[][][] cache; FloatArray shieldHits = new FloatArray(); float shieldHitDuration = 18f; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index d27b15fe24..f8db0692d7 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -171,23 +171,29 @@ public class BlocksFragment implements Fragment{ GameState.set(State.paused); FloatingDialog d = new FloatingDialog("Block Info"); + Table table = new Table(); + table.defaults().pad(1f).units(Unit.dp); + ScrollPane pane = new ScrollPane(table, "clear"); + pane.setFadeScrollBars(false); Table top = new Table(); top.left(); top.add(new Image(Draw.region(recipe.result.name))).size(8*5 * recipe.result.width).units(Unit.dp); top.add("[orange]"+recipe.result.formalName).padLeft(6f).units(Unit.dp); - d.content().add(top).fill().left(); - d.content().row(); - d.content().add(desclabel).width(600).units(Unit.dp); - d.content().row(); + table.add(top).fill().left(); + table.row(); + table.add(desclabel).width(600).units(Unit.dp); + table.row(); + + d.content().add(pane).grow(); if(statlist.size > 0){ - d.content().add("[coral][[extra block info]:").padTop(6).padBottom(5).left(); - d.content().row(); + table.add("[coral][[extra block info]:").padTop(6).padBottom(5).left(); + table.row(); } for(String s : statlist){ - d.content().add(s).left(); - d.content().row(); + table.add(s).left(); + table.row(); } d.buttons().addButton("OK", ()->{ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java index ade4802b12..80b5e4e3b8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java @@ -120,7 +120,7 @@ public class Conveyor extends Block{ int direction = source == null ? 0 : Math.abs(source.relativeTo(dest.x, dest.y) - dest.getRotation()); float minitem = dest.entity().minitem; return ((direction == 0) && minitem > 0.05f) || - ((direction %2 == 1) && minitem > 0.5f); + ((direction %2 == 1) && minitem > 0.52f); } @Override diff --git a/desktop/mindustry-saves/0.mins b/desktop/mindustry-saves/0.mins index 68c51dbf51e144a8b023f3eb748e2602c587d1de..0a4475541e9d05d5042df983403c454447301758 100644 GIT binary patch literal 3824 zcmZQzVBle3U`#M-xc8HRje&uI(Xs6CT$hDsb)CEQk{K8nQW)47801>EF*C@uG_Wwp zH8-+>SWF;-l|iog8Y76s00NBGy&(Mz3|Z13E`t;UL#`~0RRL$EDZs?a;jBVMm{^W7 zjFqPXXQ{$i`RXuMs}_t^p$%h|7{FM^tzoRQ4lvddCm8FhGmJIC6~^*+gR#!RS+?#l zF;`C*>mZzECz+@M|S$E;Ara+kN zDL89R5KJsT7{=;_vou3sV!CivADpEb29q_1vy$Mf{czU4aG1L5a8_CbOl%gMbp+0` zh=j>{z*(>0EU74%tSg-L0M1g6hRJ5ZS=n$_E}Yc~XB~sH)MH?Jd*H0hIGETWIO`^y zbs!!t3ui?qz{JkMS-0V=@cZiy3viY~3rtqK1IF3{XN7da#MHZBEDbm-1kO_LhRLpjvyQ`AZ{RHT9+)~UIBOl8 zwHMCX-wRW>sSn254QDCz!^A4#tkwxIvDI*v>qMAXGn};p&UyuBNlk*O(}%M>;H(BX z%XczNT{E2Z49?P+0+ZE+v+UulZE)68I4f@|OvhR{>lmDsI1MJd2F_X!XKjG9q^HBw zDNSc!WME(b*Bu%R3=GO>d=)gl5nQJOoTW4aY=$1lAdnd#vz4)ksX)a*@-TI(5HUAq z1_lO@m>PtSVwO4j(;=#D7#J9sKy{7AEO1U?WMJ@~1yTYkL{(-(Y-5532S{9P zHaMg~?wbwv63BhC!CqoyV2GLxQUlVv7tT_e12F~eW>Cap5mSMRA={=35p#p-RfF(R zBLs_>21E=kLQXI+*vx@BP<}3qr8F1pKt!rTwHVI23}-1W0lUr{76eLYd}TDg3Njz031s-$B_I+MFN#aS#vwwG zkwMQclYv1AT^tlk=wgfv47=kP7*x>3nHd-yo-!~<+-8Vj;9_7; zU9%V-F6m?VGT}IbVnYQ3!?I-{6F{N9Z8?l}0nXB20TbJ@62_8W1!Hx=S*fdGVlC@n ztjP5+mfA)bOC8R#-2@XmyBWsH+5%%`Y=g1XcEVUra8@jwWw#3^o4OCivfmG5ErGMr z4#30~9)z)y4#QZ};H))p)`}xA*&Rn=ERAC@Rwtab5YE~KXW1Wzsna|GW7)u2u5i|J zIBPSUHSHu!$AMEYmepw(s{+oN1!u*cfypj_vzEbGCTC%?R&Z7yoHZHFaySQ5Hyh5H z3un!TvlhTvJr`g)>Mz1r^Wm(ymtbPvmticID=^mFt1y<=4H(M@&RTFACYF5%###(# UEx8L53w;D*R&-v0R1|%V*mgE literal 11415 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