diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8b4ec3bf55..64bd54bd56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,9 +15,6 @@ If you are submitting a new block, make sure it has a name and description, and If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*). For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it. -### Do not include packed sprites in your pull request. -When making a pull request that changes or adds new sprites, do not add the modified atlas & `spritesX.png` files to your final pull request. These are a frequent source of conflicts. - ## Style Guidelines diff --git a/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png b/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png index ac04aef1c4..ac77dbe43c 100644 Binary files a/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png and b/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 60d7909818..d071e7dab9 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2055,6 +2055,7 @@ public class Blocks implements ContentList{ //TODO remove launchPadLarge = new LaunchPad("launch-pad-large"){{ + requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75)); size = 4; itemCapacity = 300; launchTime = 60f * 35; diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java index fcac9ae455..172ea8e5b7 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java +++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java @@ -1,5 +1,6 @@ package mindustry.world.blocks.experimental; +import arc.*; import arc.graphics.g2d.*; import arc.util.*; import mindustry.entities.units.*; @@ -46,12 +47,13 @@ public class BlockLoader extends PayloadAcceptor{ public void setBars(){ super.setBars(); - bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, ((BlockLoaderBuild)entity)::fraction)); + bars.add("progress", (BlockLoaderBuild entity) -> new Bar(() -> Core.bundle.format("bar.items", entity.payload == null ? 0 : entity.payload.build.items.total()), () -> Pal.items, entity::fraction)); } @Override public void drawRequestRegion(BuildPlan req, Eachable list){ Draw.rect(region, req.drawx(), req.drawy()); + Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90); Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90); Draw.rect(topRegion, req.drawx(), req.drawy()); } @@ -76,11 +78,14 @@ public class BlockLoader extends PayloadAcceptor{ Draw.rect(region, x, y); //draw input + boolean fallback = true; for(int i = 0; i < 4; i++){ if(blends(i) && i != rotation){ Draw.rect(inRegion, x, y, (i * 90) - 180); + fallback = false; } } + if(fallback) Draw.rect(inRegion, x, y, rotation * 90); Draw.rect(outRegion, x, y, rotdeg()); diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java index 12b5e856dd..cdb3681ae9 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java +++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java @@ -54,11 +54,6 @@ public class BlockUnloader extends BlockLoader{ return items.total() >= itemCapacity; } - @Override - public float fraction(){ - return payload == null ? 0f : 1f - payload.build.items.total() / (float)payload.build.block.itemCapacity; - } - @Override public boolean shouldExport(){ return payload != null && (payload.block().hasItems && payload.build.items.empty()); diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index 634ea5b911..3f65908068 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -33,6 +33,7 @@ public class Reconstructor extends UnitBlock{ @Override public void drawRequestRegion(BuildPlan req, Eachable list){ Draw.rect(region, req.drawx(), req.drawy()); + Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90); Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90); Draw.rect(topRegion, req.drawx(), req.drawy()); } @@ -127,11 +128,14 @@ public class Reconstructor extends UnitBlock{ Draw.rect(region, x, y); //draw input + boolean fallback = true; for(int i = 0; i < 4; i++){ if(blends(i) && i != rotation){ Draw.rect(inRegion, x, y, (i * 90) - 180); + fallback = false; } } + if(fallback) Draw.rect(inRegion, x, y, rotation * 90); Draw.rect(outRegion, x, y, rotdeg()); diff --git a/servers_v6.json b/servers_v6.json index 895cc5913d..ff486ea497 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -53,7 +53,7 @@ }, { "name": "ALEX", - "address": ["alexmindustryhub.ddns.net:6568", "alexmindustry.ddns.net:6568", "alexmindustry.ddns.net:6569", "alexmindustryattac.ddns.net:2293"] + "address": ["alexmindustryhub.ddns.net:6568", "alexmindustry.ddns.net:6568", "alexmindustry.ddns.net:6569", "alexmindustryattac.ddns.net:25800"] }, { "name": "Minty [subzero]",