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

Fixed #7752

Browse Source
This commit is contained in:
Anuken
2022-10-23 08:43:12 -04:00
parent a003e0b31e
commit 514f50a411
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5488,10 +5488,9 @@ public class Blocks{
researchCostMultiplier = 0.4f; researchCostMultiplier = 0.4f;
consumePower(3f); consumePower(3f);
consumeLiquid(Liquids.cyanogen, 24f / 60f); consumeLiquid(Liquids.cyanogen, 9f / 60f);
}}; }};
//TODO requirements
shipAssembler = new UnitAssembler("ship-assembler"){{ shipAssembler = new UnitAssembler("ship-assembler"){{
requirements(Category.units, with(Items.carbide, 100, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 800, Items.thorium, 400)); requirements(Category.units, with(Items.carbide, 100, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 800, Items.thorium, 400));
regionSuffix = "-dark"; regionSuffix = "-dark";
@@ -5503,23 +5502,22 @@ public class Blocks{
areaSize = 13; areaSize = 13;
consumePower(3f); consumePower(3f);
consumeLiquid(Liquids.cyanogen, 6f / 60f); consumeLiquid(Liquids.cyanogen, 12f / 60f);
}}; }};
//TODO requirements
mechAssembler = new UnitAssembler("mech-assembler"){{ mechAssembler = new UnitAssembler("mech-assembler"){{
requirements(Category.units, with(Items.carbide, 200, Items.thorium, 600, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 900)); requirements(Category.units, with(Items.carbide, 200, Items.thorium, 600, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 900));
regionSuffix = "-dark"; regionSuffix = "-dark";
size = 5; size = 5;
//TODO different reqs //TODO different reqs
plans.add( plans.add(
new AssemblerUnitPlan(UnitTypes.tecta, 60f * 60f, PayloadStack.list(UnitTypes.merui, 4, Blocks.tungstenWallLarge, 10)), new AssemblerUnitPlan(UnitTypes.tecta, 60f * 70f, PayloadStack.list(UnitTypes.merui, 6, Blocks.tungstenWallLarge, 12)),
new AssemblerUnitPlan(UnitTypes.collaris, 60f * 60f * 3f, PayloadStack.list(UnitTypes.cleroi, 6, Blocks.carbideWallLarge, 20)) new AssemblerUnitPlan(UnitTypes.collaris, 60f * 60f * 3f, PayloadStack.list(UnitTypes.cleroi, 6, Blocks.carbideWallLarge, 20))
); );
areaSize = 13; areaSize = 13;
consumePower(3f); consumePower(3.5f);
consumeLiquid(Liquids.cyanogen, 9f / 60f); consumeLiquid(Liquids.cyanogen, 12f / 60f);
}}; }};
//TODO requirements / only accept inputs //TODO requirements / only accept inputs

1
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -272,6 +272,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
//region utility methods //region utility methods
public boolean isDiscovered(Team viewer){ public boolean isDiscovered(Team viewer){
if(viewer == null) return true;
if(block.size <= 2){ if(block.size <= 2){
return fogControl.isDiscovered(viewer, tile.x, tile.y); return fogControl.isDiscovered(viewer, tile.x, tile.y);
}else{ }else{

2
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -77,6 +77,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
rotateMove(movement); rotateMove(movement);
} }
} }
public void moveAt(Vec2 vector){ public void moveAt(Vec2 vector){
moveAt(vector, type.accel); moveAt(vector, type.accel);
} }
@@ -84,6 +85,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
public void approach(Vec2 vector){ public void approach(Vec2 vector){
vel.approachDelta(vector, type.accel * speed()); vel.approachDelta(vector, type.accel * speed());
} }
public void rotateMove(Vec2 vec){ public void rotateMove(Vec2 vec){
moveAt(Tmp.v2.trns(rotation, vec.len())); moveAt(Tmp.v2.trns(rotation, vec.len()));

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=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=8793e01874 archash=5a1cbb8b59