From a3270dd9088d9bab24069030596e8f346f59a714 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Aug 2021 16:29:58 -0400 Subject: [PATCH 01/21] this turned out to be pretty difficult --- core/src/mindustry/ui/dialogs/JoinDialog.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 8a6ddf9543..a859620f61 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -24,6 +24,8 @@ import mindustry.ui.*; import static mindustry.Vars.*; public class JoinDialog extends BaseDialog{ + //TODO unused + Seq commmunityHosts = new Seq<>(); Seq servers = new Seq<>(); Dialog add; Server renaming; @@ -358,6 +360,7 @@ public class JoinDialog extends BaseDialog{ } void refreshCommunity(){ + commmunityHosts.clear(); int cur = refreshes; global.clear(); @@ -378,6 +381,8 @@ public class JoinDialog extends BaseDialog{ if(refreshes != cur) return; res.port = resport; + commmunityHosts.add(res); + //add header if(groupTable[0] == null){ global.table(t -> groupTable[0] = t).row(); From e30d7e998dbb357fe66364fb39d728b3492dbdb7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Aug 2021 20:49:39 -0400 Subject: [PATCH 02/21] Allow unit icons for sectors --- core/src/mindustry/Vars.java | 2 +- core/src/mindustry/world/blocks/power/PowerGraph.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 4d5042ad68..e7804deea8 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -45,7 +45,7 @@ public class Vars implements Loadable{ /** Name of current Steam player. */ public static String steamPlayerName = ""; /** Default accessible content types used for player-selectable icons. */ - public static final ContentType[] defaultContentIcons = {ContentType.item, ContentType.liquid, ContentType.block}; + public static final ContentType[] defaultContentIcons = {ContentType.item, ContentType.liquid, ContentType.block, ContentType.unit}; /** Wall darkness radius. */ public static final int darkRadius = 4; /** Maximum extra padding around deployment schematics. */ diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 5e5ff19022..80567af1ad 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -176,7 +176,7 @@ public class PowerGraph{ public void distributePower(float needed, float produced, boolean charged){ //distribute even if not needed. this is because some might be requiring power but not using it; it updates consumers - float coverage = Mathf.zero(needed) && Mathf.zero(produced) && !charged ? 0f : Mathf.zero(needed) ? 1f : Math.min(1, produced / needed); + float coverage = Mathf.zero(needed) && Mathf.zero(produced) && !charged && Mathf.zero(lastPowerStored) ? 0f : Mathf.zero(needed) ? 1f : Math.min(1, produced / needed); for(Building consumer : consumers){ Consumers consumes = consumer.block.consumes; if(consumes.hasPower()){ From 71f064bda10915f96fc39a619360c63d7a89818f Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Sun, 29 Aug 2021 05:28:38 -0700 Subject: [PATCH 03/21] Shouldn't `shorten()` also reset the counter? (#5890) --- core/src/mindustry/graphics/Trail.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java index 5fc194c51d..ebcef4a3ca 100644 --- a/core/src/mindustry/graphics/Trail.java +++ b/core/src/mindustry/graphics/Trail.java @@ -77,6 +77,8 @@ public class Trail{ if(points.size >= 3){ points.removeRange(0, 2); } + + counter = 0f; } } From bb9d7fedf78e9ac4f30728a210e4061da3294062 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Aug 2021 09:12:03 -0400 Subject: [PATCH 04/21] Fixed #5894 --- core/src/mindustry/type/UnitType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 1ee3c7a345..7f5b77f967 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -607,7 +607,7 @@ public class UnitType extends UnlockableContent{ } public void drawControl(Unit unit){ - Draw.z(Layer.groundUnit - 2); + Draw.z(unit.isFlying() ? Layer.flyingUnitLow : Layer.groundUnit - 2); Draw.color(Pal.accent, Color.white, Mathf.absin(4f, 0.3f)); Lines.poly(unit.x, unit.y, 4, unit.hitSize + 1.5f); From cc689fd1148a82b909ba63e0d56bb81ad7b16914 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Aug 2021 10:26:39 -0400 Subject: [PATCH 05/21] Fixed #5895 --- core/assets-raw/sprites/units/weapons/flakgun.png | Bin 462 -> 0 bytes .../assets-raw/sprites/units/weapons/missiles.png | Bin 524 -> 0 bytes .../world/blocks/defense/turrets/LaserTurret.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 core/assets-raw/sprites/units/weapons/flakgun.png delete mode 100644 core/assets-raw/sprites/units/weapons/missiles.png diff --git a/core/assets-raw/sprites/units/weapons/flakgun.png b/core/assets-raw/sprites/units/weapons/flakgun.png deleted file mode 100644 index 12ee89862fcc25425d9e07046032472aad62d1de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtoGP)Px$h)G02RA_rH z#=*%L!%~(KLs;JCV(J7D;XQcmy|0?wZ!3MdJtw`VIRJtn2to;Jl*4ZCC%NnX`^(e% zd2t+*JhM(Rr9y%kc)Xji%nf3IOFR(30H=6>*#NhAKtk-M*Y9$U2N2*5aGMCSLYyXo zWuVvZ;=FS~KKF=xqMLmF@kv@=NDW*rZ#J&4p3in2%R$(|yjDnS?KM1!GTSX@>GQ!m z16pe@BMuWJ6kZ{%HI!1DKYl&zJex$BZJkOJEW}BaVcZz3uSY|gxl$#n#%qO|t+xBX zvW%2s_-3Hg=Z~XaldjOukcNUh12z*}pHY?&|2DxT9`MY-Vm7TcTkV5#Fm4R~=3mOi zYPx$#z{m$RA_6 zm(p3#x;QvEI7M6p5gG@3F&CS7m-{ZMa6brb?vBg%-QEB0p8y_@=U>xdb#xIA0U(w4 z$EO3OelnUW&%L@FQl8tT^zu#mcavIeD`6VQD2{$v83Ve3Dxoe+Y_U2D!#)7u<>?s! zu)VvZ)XQ?&j)jvY)Fj?O+t6ZQv3LYf9;h-V3g>|}^ckoU$QBP67!X202%*(>olqCz zff_SlVx$b_R$4m-gb)aVAiJN Date: Sun, 29 Aug 2021 16:25:26 -0400 Subject: [PATCH 06/21] #5897 with proper formatting --- core/src/mindustry/ui/dialogs/PlanetDialog.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 5db4f285b3..dcf61ea4d9 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -518,7 +518,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ pt.button(planet.localizedName, Styles.clearTogglet, () -> { selected = null; launchSector = null; - renderer.planets.planet = planet; + if(renderer.planets.planet != planet){ + renderer.planets.planet = planet; + rebuildList(); + } settings.put("lastplanet", planet.name); }).width(200).height(40).growX().update(bb -> bb.setChecked(renderer.planets.planet == planet)); pt.row(); From 2f47f13ef7c8cf95586a45dbd610a6fdc58db39c Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Sun, 29 Aug 2021 19:55:52 -0700 Subject: [PATCH 07/21] Adjustable `generateEffect` randomness (#5901) --- .../mindustry/world/blocks/power/ItemLiquidGenerator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index 1ef6010f2b..a8462502ea 100644 --- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -29,6 +29,7 @@ public class ItemLiquidGenerator extends PowerGenerator{ public float maxLiquidGenerate = 0.4f; public Effect generateEffect = Fx.generatespark; + public float generateEffectRnd = 3f; public Effect explodeEffect = Fx.generatespark; public Color heatColor = Color.valueOf("ff9b59"); public @Load("@-top") TextureRegion topRegion; @@ -128,12 +129,12 @@ public class ItemLiquidGenerator extends PowerGenerator{ productionEfficiency = baseLiquidEfficiency * used / maximumPossible; if(used > 0.001f && Mathf.chance(0.05 * delta())){ - generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f)); + generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd)); } }else if(hasItems){ // No liquids accepted or none supplied, try using items if accepted if(generateTime <= 0f && items.total() > 0){ - generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f)); + generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd)); Item item = items.take(); productionEfficiency = getItemEfficiency(item); explosiveness = item.explosiveness; From 9b28eaa3b3e24a78ecea05ec8995ea0a20342844 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 30 Aug 2021 05:23:58 -0700 Subject: [PATCH 08/21] Allow for `SingleTypeGenerators` to use only liquid. (#5900) --- .../mindustry/world/blocks/power/SingleTypeGenerator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java index ff5da52aaa..95919f105b 100644 --- a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java +++ b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java @@ -3,6 +3,7 @@ package mindustry.world.blocks.power; import mindustry.type.*; public class SingleTypeGenerator extends ItemLiquidGenerator{ + public boolean useItems = true; public SingleTypeGenerator(String name){ super(name); @@ -11,11 +12,11 @@ public class SingleTypeGenerator extends ItemLiquidGenerator{ @Override protected float getItemEfficiency(Item item){ - return 1f; + return useItems ? 1f : 0f; } @Override protected float getLiquidEfficiency(Liquid liquid){ - return 0f; + return useItems ? 0f : 1f; } } From 48f359ca9ba5b7d7b185731ca00800653df8c336 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 09:55:23 -0400 Subject: [PATCH 09/21] Fixed #5907 --- core/src/mindustry/game/SectorInfo.java | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index 80859f48bc..ac7352a3ad 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -288,7 +288,7 @@ public class SectorInfo{ public void eachImport(Planet planet, Cons cons){ for(Sector sector : planet.sectors){ Sector dest = sector.info.getRealDestination(); - if(sector.hasBase() && sector.info != this && dest != null && dest.info == this){ + if(sector.hasBase() && sector.info != this && dest != null && dest.info == this && sector.info.anyExports()){ cons.get(sector); } } diff --git a/gradle.properties b/gradle.properties index 09cc4bfc63..ac1a9b5737 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=dd43cacc5c5a68bd7160234a97b4fd48d9a816d7 +archash=d7fa044477f0d6683a72ede87a35daf9fee851a2 From 3714077fbe21ae7d52fea1f9352536d3d4431a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=90=D0=BB=D0=B4?= =?UTF-8?q?=D0=B0=D1=88=D0=BA=D0=B8=D0=BD?= Date: Sat, 4 Sep 2021 21:58:38 +0800 Subject: [PATCH 10/21] Fixed the display of the oil extractor efficiency (#5915) --- core/src/mindustry/world/blocks/production/SolidPump.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java index 277621162f..f430ef7679 100644 --- a/core/src/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/mindustry/world/blocks/production/SolidPump.java @@ -38,7 +38,7 @@ public class SolidPump extends Pump{ drawPotentialLinks(x, y); if(attribute != null){ - drawPlaceText(Core.bundle.formatFloat("bar.efficiency", Math.max(sumAttribute(attribute, x, y) / size / size + baseEfficiency, 0f) * 100 * percentSolid(x, y), 1), x, y, valid); + drawPlaceText(Core.bundle.format("bar.efficiency", Math.round(Math.max(sumAttribute(attribute, x, y) / size / size + baseEfficiency, 0f) * 100 * percentSolid(x, y))), x, y, valid); } } From f8048be429e0f3e09c4023ba502e36ccf355f5e0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 09:59:28 -0400 Subject: [PATCH 11/21] Fixed #5918 --- core/src/mindustry/ui/dialogs/SchematicsDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 3dce3ebf0a..a23dfd9881 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -155,7 +155,7 @@ public class SchematicsDialog extends BaseDialog{ }); buttons.button(Icon.pencil, style, () -> { - new Dialog("@schematic.rename"){{ + new BaseDialog("@schematic.rename"){{ setFillParent(true); cont.margin(30); From 8224cc3fceb8bd23791b0beb40bbed7ccfdb9f20 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 10:03:40 -0400 Subject: [PATCH 12/21] Fixed #5922 --- core/src/mindustry/logic/LExecutor.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 94b4e6fa5d..1fcf1b37d1 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -715,6 +715,7 @@ public class LExecutor{ if((base instanceof Building && timer.get(30f)) || (ai != null && ai.checkTargetTimer(this))){ //if any of the targets involve enemies boolean enemies = target1 == RadarTarget.enemy || target2 == RadarTarget.enemy || target3 == RadarTarget.enemy; + boolean allies = target1 == RadarTarget.ally || target2 == RadarTarget.ally || target3 == RadarTarget.ally; best = null; bestValue = 0; @@ -726,6 +727,11 @@ public class LExecutor{ find(r, range, sortDir, data.items[i].team); } } + }else if(!allies){ + Seq data = state.teams.present; + for(int i = 0; i < data.size; i++){ + find(r, range, sortDir, data.items[i].team); + } }else{ find(r, range, sortDir, r.team()); } From ee8683c7347a4518f58d5a2f7ea7a315e6c21243 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 10:07:13 -0400 Subject: [PATCH 13/21] Do not display overdrive visual for router/conduit --- core/src/mindustry/world/blocks/liquid/Conduit.java | 1 + core/src/mindustry/world/blocks/liquid/LiquidRouter.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 1218ef9030..0b4295f7dd 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -40,6 +40,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ floating = true; conveyorPlacement = true; noUpdateDisabled = true; + canOverdrive = false; } @Override diff --git a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java index d3befe8233..478ccef7d8 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java @@ -9,6 +9,7 @@ public class LiquidRouter extends LiquidBlock{ super(name); noUpdateDisabled = true; + canOverdrive = false; } public class LiquidRouterBuild extends LiquidBuild{ From d31389efca0ef11b43da7689b193ddc583940808 Mon Sep 17 00:00:00 2001 From: QmelZ <59574967+QmelZ@users.noreply.github.com> Date: Sat, 4 Sep 2021 17:12:13 +0300 Subject: [PATCH 14/21] remove space (#5929) --- .../src/main/java/mindustry/annotations/BaseProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java index 310f8e2906..e933eafdbf 100644 --- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java @@ -91,7 +91,7 @@ public abstract class BaseProcessor extends AbstractProcessor{ } public static TypeName tname(String pack, String simple){ - return ClassName.get(pack, simple ); + return ClassName.get(pack, simple); } public static TypeName tname(String name){ From 2dffd525a393944b0f3ec55b369b2d52b2fdfd6c Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Sat, 4 Sep 2021 10:14:04 -0400 Subject: [PATCH 15/21] remove useless method call (#5912) sector.hasBase() already checks that save != null --- core/src/mindustry/ui/dialogs/ResearchDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index dbe7caa19f..bd343988fa 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -60,7 +60,7 @@ public class ResearchDialog extends BaseDialog{ //add global counts of each sector for(Planet planet : content.planets()){ for(Sector sector : planet.sectors){ - if(sector.hasSave() && sector.hasBase()){ + if(sector.hasBase()){ ItemSeq cached = sector.items(); cache.put(sector, cached); cached.each((item, amount) -> { From bcf798c2471f95dbb9bab075e7b6f44e4f1551bc Mon Sep 17 00:00:00 2001 From: RebornTrack970 <62565267+RebornTrack970@users.noreply.github.com> Date: Sat, 4 Sep 2021 17:14:16 +0300 Subject: [PATCH 16/21] Moved All OmegaHub servers from all Nodes to N5 (#5917) * Moved All OmegaHub servers from all Nodes to N5 * Update servers_v7.json * v6 life matters! * Update servers_v6.json * Update servers_v7.json Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com> --- servers_v6.json | 2 +- servers_v7.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 59224c074f..f9bb12257a 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -57,7 +57,7 @@ }, { "name": "Omega", - "address": ["178.170.47.34:20204", "157.90.213.2:30308", "157.90.180.53:25738", "185.86.230.61:25578", "mindustry.me:7172"] + "address": ["yeeth.mindustry.me:2004"] }, { "name": "md.obvilionnetwork.ru", diff --git a/servers_v7.json b/servers_v7.json index eccd6ced6d..b7dbd2b066 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -13,7 +13,7 @@ }, { "name": "Omega", - "address": ["yeet.mindustry.me", "yeet.mindustry.me:2345", "n3.mindustry.me:4444","n2.mindustry.me:4040", "n2.mindustry.me:4002", "n2.mindustry.me:4001", "n3.mindustry.me", "n2.mindustry.me:4004"] + "address": ["yeet.mindustry.me", "yeeth.mindustry.me:2006", "yeeth.mindustry.me:2003","yeeth.mindustry.me:2002", "yeeth.mindustry.me:2001", "yeeth.mindustry.me:2007", "yeeth.mindustry.me:2005"] }, { "name": "MeowLand", From 3901ae1720dc2594ec19ee23f07bc0bc6a177146 Mon Sep 17 00:00:00 2001 From: CancerGuy <70016211+AzhurniyBaklan@users.noreply.github.com> Date: Sat, 4 Sep 2021 19:14:40 +0500 Subject: [PATCH 17/21] change (#5923) --- .../sprites/blocks/power/rtg-generator.png | Bin 1146 -> 1274 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator.png b/core/assets-raw/sprites/blocks/power/rtg-generator.png index 0a6766ab696d8fb866b5b630db895e764b2f3be9..6c958949594fa3037495b3fe17007b70ae6d5681 100644 GIT binary patch delta 1255 zcmVJ<-BYyw^b5ch_0Itp)=>Px(v`IukRCt`#Tfb|YF%W%mQ}7fB1hN@l~PY5Ld|`^5kb;miU<TaQm|MoRK|vzI+MBoU9z!qNJA1H~NDX-{j$3E!vMEa>DFEOEjt?aNL$=`SJ&t4IiWK>2~Lb&4=6=G_q!aPP!XUc zd8&-Go>qhf0aD0sbZ#mgvcDg<&d9afE=!Sj?c^3=E`LBOc>w5k+w%^&TPuVu;zvB|=R@9$4JFQ$$muPE^_4B1AVr1~Kx}NfW>W^xftJHssgP(XuOFM zVSRjmx$uCqBQvOP-B!H7wr5;2N8SOLiQo4IC*&Ar zmDAv8*h}&PU?u`}$}8as5>b8a2ZN%ih>7O&1b16ho6AL6T#L*>SVd zKstHA8Um$6pvZT-ZE{;1vSaGlB1p&so{N%|No%_kG!#pkQgDe&>jCt2ID6Fqs(%@# z$|RW66GHHnk=9GO!Rkw|c~^mwBIJChB@YlAq4E7Cdp8%_EJ?tvmxDYI*#~Gnp%ikF z2N)Zn5*L&;;I=XT^OJRBoV62tDk7xV=4Pd%|1V%8<%FlXVBtf`@!TG|?mvCFh@J*r z!(0)jlcrY$$z^FNdAq&j>@c?h3Se%>B_VSSdD|vCD5`0Qf;42#MXXOD5t4?0+aPB+ zNRyYQUSl)v0o)(NHyl(^;atJbW%j}K1a(+^l_E&nwnfO29$$qB+BS^{e*xL<3DALK RW*h(j002ovPDHLkV1hXRKPvzL delta 1126 zcmV-s1eyE#3Hk_-BYy-zNkl|+SdqYEGB`5}^D;Oy!!rRh5`TC^h2?cKBRs*d;9$^u!6H!!~GSbuL-39 zE8i8sS%Y819Dlwee6QwsN5<$2V=BPQcLZ=&l~83?=XehpeRsGM5X+AQaJEyTD#OoL zaL(Xem4HmbGXX5G1lTYSiii3_7Rbu*|WQD!ud}KxfXGvQCi?fiw z66X{Ce9BBz)aTekGxPWt%0eeMKshyx6)7LzP%2kx)#P+g2vKpf-%7pmoidDV^)+^cRF?I;Cg2d^AJ zJd<jq3xyu67LCj&Mf;&#^V@_mCKy?&zVqORCSlQL> z@LvE2W`=o8=P14<+;L(bb0W(EctrOg&&}Wt!hiRjouk|(0bJfWgk*EozMb8p%u;}d za)3)m2Pm?+Y$xGfb%TGL8BQu726BK4tHnEHdkObfcc?DLod5=MfS)%;zYMLA?RGBx zWoR_O&yRi`-XYt6{MTU?aH;`S{%Q#IEHr~q%7DbM#AEdeJbur#U4$9uZvj|w;;fn_VI@($mU zcry!=+qXe3h{UiR2`o8+^H~myv;0Va-Tw4*02et7T#>+XT~v!f!T Date: Sat, 4 Sep 2021 07:18:44 -0700 Subject: [PATCH 18/21] Input liquid drawing for `DrawLiquid` and `DrawMixer` (#5906) --- core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/world/draw/DrawLiquid.java | 21 ++++++++++++++++- core/src/mindustry/world/draw/DrawMixer.java | 23 +++++++++++++++++-- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b5566e463a..6746e14984 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -609,7 +609,7 @@ public class Blocks implements ContentList{ rotate = false; solid = true; outputsLiquid = true; - drawer = new DrawMixer(); + drawer = new DrawMixer(true); consumes.power(1f); consumes.item(Items.titanium); diff --git a/core/src/mindustry/world/draw/DrawLiquid.java b/core/src/mindustry/world/draw/DrawLiquid.java index 16cfd14934..ae246a5c67 100644 --- a/core/src/mindustry/world/draw/DrawLiquid.java +++ b/core/src/mindustry/world/draw/DrawLiquid.java @@ -3,18 +3,36 @@ package mindustry.world.draw; import arc.*; import arc.graphics.g2d.*; import mindustry.graphics.*; +import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.production.*; import mindustry.world.blocks.production.GenericCrafter.*; +import mindustry.world.consumers.*; public class DrawLiquid extends DrawBlock{ - public TextureRegion liquid, top; + public TextureRegion inLiquid, liquid, top; + public boolean useOutputSprite = false; + + public DrawLiquid(){ + } + + public DrawLiquid(boolean useOutputSprite){ + this.useOutputSprite = useOutputSprite; + } @Override public void draw(GenericCrafterBuild build){ Draw.rect(build.block.region, build.x, build.y); GenericCrafter type = (GenericCrafter)build.block; + if((inLiquid.found() || useOutputSprite) && type.consumes.has(ConsumeType.liquid)){ + Liquid input = type.consumes.get(ConsumeType.liquid).liquid; + Drawf.liquid(useOutputSprite ? liquid : inLiquid, build.x, build.y, + build.liquids.get(input) / type.liquidCapacity, + input.color + ); + } + if(type.outputLiquid != null && build.liquids.get(type.outputLiquid.liquid) > 0){ Drawf.liquid(liquid, build.x, build.y, build.liquids.get(type.outputLiquid.liquid) / type.liquidCapacity, @@ -29,6 +47,7 @@ public class DrawLiquid extends DrawBlock{ public void load(Block block){ top = Core.atlas.find(block.name + "-top"); liquid = Core.atlas.find(block.name + "-liquid"); + inLiquid = Core.atlas.find(block.name + "-input-liquid"); } @Override diff --git a/core/src/mindustry/world/draw/DrawMixer.java b/core/src/mindustry/world/draw/DrawMixer.java index 850ac5c6dd..a2ff14b7f8 100644 --- a/core/src/mindustry/world/draw/DrawMixer.java +++ b/core/src/mindustry/world/draw/DrawMixer.java @@ -2,19 +2,37 @@ package mindustry.world.draw; import arc.*; import arc.graphics.g2d.*; +import mindustry.graphics.*; +import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.production.*; import mindustry.world.blocks.production.GenericCrafter.*; +import mindustry.world.consumers.*; public class DrawMixer extends DrawBlock{ - public TextureRegion liquid, top, bottom; + public TextureRegion inLiquid, liquid, top, bottom; + public boolean useOutputSprite; + + public DrawMixer(){ + } + + public DrawMixer(boolean useOutputSprite){ + this.useOutputSprite = useOutputSprite; + } @Override public void draw(GenericCrafterBuild build){ float rotation = build.block.rotate ? build.rotdeg() : 0; - Draw.rect(bottom, build.x, build.y, rotation); + if((inLiquid.found() || useOutputSprite) && build.block.consumes.has(ConsumeType.liquid)){ + Liquid input = build.block.consumes.get(ConsumeType.liquid).liquid; + Drawf.liquid(useOutputSprite ? liquid : inLiquid, build.x, build.y, + build.liquids.get(input) / build.block.liquidCapacity, + input.color + ); + } + if(build.liquids.total() > 0.001f){ Draw.color(((GenericCrafter)build.block).outputLiquid.liquid.color); Draw.alpha(build.liquids.get(((GenericCrafter)build.block).outputLiquid.liquid) / build.block.liquidCapacity); @@ -27,6 +45,7 @@ public class DrawMixer extends DrawBlock{ @Override public void load(Block block){ + inLiquid = Core.atlas.find(block.name + "-input-liquid"); liquid = Core.atlas.find(block.name + "-liquid"); top = Core.atlas.find(block.name + "-top"); bottom = Core.atlas.find(block.name + "-bottom"); From 264052a95fe79b15838f1a8dcf7c5a196074274a Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 4 Sep 2021 07:26:42 -0700 Subject: [PATCH 19/21] Remove the slight delay in `wind3.ogg` (#5909) * Remove the slight delay in `wind3.ogg` * Don't need to export the quality that high --- core/assets/sounds/wind3.ogg | Bin 38775 -> 25692 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets/sounds/wind3.ogg b/core/assets/sounds/wind3.ogg index 35e732725bfe2186ed8b883ca59ea82406dfdb6e..315edc4146421a12862e87e4ce9a49928e29936b 100644 GIT binary patch literal 25692 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 literal 38775 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 z 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 Date: Sat, 4 Sep 2021 11:05:06 -0400 Subject: [PATCH 20/21] add statustable name to hudfragment (#5904) --- core/src/mindustry/ui/fragments/HudFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 5fc4654cd2..cf54cb6eae 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -207,7 +207,7 @@ public class HudFragment extends Fragment{ logic.skipWave(); } }).growY().fillX().right().width(40f).disabled(b -> !canSkipWave()).name("skip"); - }).width(dsize * 5 + 4f); + }).width(dsize * 5 + 4f).name("statustable"); wavesMain.row(); From 13ddca750a6ec6543e74f3a7a793f368536a91e9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 11:27:26 -0400 Subject: [PATCH 21/21] arc --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ac1a9b5737..b38510c7c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=d7fa044477f0d6683a72ede87a35daf9fee851a2 +archash=98c420de77661889ab0330a956d50721f27f33d9