Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed assembly modules yeeting into obstruction

Browse Source
This commit is contained in:
Anuken
2021-12-20 15:31:50 -05:00
parent 6f67ea1742
commit f8b360bca6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/content/Blocks.java
View File

@@ -1530,12 +1530,13 @@ public class Blocks{
requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 40)); requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 40));
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
consumes.power(3f); consumes.power(3f);
range = 120f; range = 150f;
size = 3; size = 3;
buildSpeed = 1.5f; buildSpeed = 1.5f;
}}; }};
//TODO green looks bad switch to orange //TODO green looks bad switch to orange
//TODO orange also looks bad hhhh
regenProjector = new RegenProjector("regen-projector"){{ regenProjector = new RegenProjector("regen-projector"){{
requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 40)); requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 40));
size = 3; size = 3;

2
core/src/mindustry/world/blocks/units/UnitAssemblerModule.java
View File

@@ -128,7 +128,7 @@ public class UnitAssemblerModule extends PayloadBlock{
findLink(); findLink();
} }
if(moveInPayload() && link != null && link.moduleFits(block, x, y, rotation) && link.acceptPayload(this, payload) && consValid()){ if(moveInPayload() && link != null && link.moduleFits(block, x, y, rotation) && !link.wasOccupied && link.acceptPayload(this, payload) && consValid()){
link.yeetPayload(payload); link.yeetPayload(payload);
payload = null; payload = null;
} }

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=82157de87b archash=0370ef92e5