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

Constructor tech tree move

Browse Source
This commit is contained in:
Anuken
2022-02-08 13:49:04 -05:00
parent ec8952ed46
commit 4a419d52cc
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3575,6 +3575,7 @@ public class Blocks{
deconstructSpeed = 1f; deconstructSpeed = 1f;
}}; }};
//TODO consider usefulness and applicability to serpulo
deconstructor = new PayloadDeconstructor("deconstructor"){{ deconstructor = new PayloadDeconstructor("deconstructor"){{
requirements(Category.units, with(Items.thorium, 250, Items.silicon, 200, Items.graphite, 250)); requirements(Category.units, with(Items.thorium, 250, Items.silicon, 200, Items.graphite, 250));
itemCapacity = 250; itemCapacity = 250;
@@ -3583,8 +3584,9 @@ public class Blocks{
deconstructSpeed = 2f; deconstructSpeed = 2f;
}}; }};
//TODO move completely to erekir tech tree?
constructor = new Constructor("constructor"){{ constructor = new Constructor("constructor"){{
requirements(Category.units, with(Items.silicon, 50, Items.thorium, 70, Items.graphite, 50)); requirements(Category.units, with(Items.silicon, 80, Items.graphite, 120));
hasPower = true; hasPower = true;
consumes.power(2f); consumes.power(2f);
size = 3; size = 3;
@@ -3592,7 +3594,7 @@ public class Blocks{
//yes this block is pretty much useless //yes this block is pretty much useless
largeConstructor = new Constructor("large-constructor"){{ largeConstructor = new Constructor("large-constructor"){{
requirements(Category.units, with(Items.silicon, 100, Items.thorium, 150, Items.graphite, 50, Items.phaseFabric, 40)); requirements(Category.units, with(Items.silicon, 150, Items.graphite, 150, Items.phaseFabric, 40));
hasPower = true; hasPower = true;
consumes.power(2f); consumes.power(2f);
maxBlockSize = 4; maxBlockSize = 4;

6
core/src/mindustry/logic/LExecutor.java
View File

@@ -1157,11 +1157,11 @@ public class LExecutor{
} }
} }
public static class SpawnUniI implements LInstruction{ public static class SpawnUnitI implements LInstruction{
public int type, x, y, rotation, team, result; public int type, x, y, rotation, team, result;
public boolean effect; public boolean effect;
public SpawnUniI(int type, int x, int y, int rotation, int team, boolean effect, int result){ public SpawnUnitI(int type, int x, int y, int rotation, int team, boolean effect, int result){
this.type = type; this.type = type;
this.x = x; this.x = x;
this.y = y; this.y = y;
@@ -1171,7 +1171,7 @@ public class LExecutor{
this.result = result; this.result = result;
} }
public SpawnUniI(){ public SpawnUnitI(){
} }
@Override @Override

2
core/src/mindustry/logic/LStatements.java
View File

@@ -1202,7 +1202,7 @@ public class LStatements{
@Override @Override
public LInstruction build(LAssembler builder){ public LInstruction build(LAssembler builder){
return new SpawnUniI(builder.var(type), builder.var(x), builder.var(y), builder.var(rotation), builder.var(team), effect, builder.var(result)); return new SpawnUnitI(builder.var(type), builder.var(x), builder.var(y), builder.var(rotation), builder.var(team), effect, builder.var(result));
} }
} }
} }

11
core/src/mindustry/world/blocks/units/DroneCenter.java
View File

@@ -141,8 +141,7 @@ public class DroneCenter extends Block{
} }
} }
public static class EffectDroneAI extends AIController{ public class EffectDroneAI extends AIController{
//TODO non static?
@Override @Override
public void updateUnit(){ public void updateUnit(){
@@ -150,18 +149,16 @@ public class DroneCenter extends Block{
if(!(tether.building() instanceof DroneCenterBuild build)) return; if(!(tether.building() instanceof DroneCenterBuild build)) return;
if(build.target == null) return; if(build.target == null) return;
DroneCenter block = (DroneCenter)build.block;
target = build.target; target = build.target;
//TODO what angle? //TODO what angle?
moveTo(target, build.target.hitSize / 1.8f + block.droneRange - 10f); moveTo(target, build.target.hitSize / 1.8f + droneRange - 10f);
unit.lookAt(target); unit.lookAt(target);
//TODO low power? status effects may not be the best way to do this... //TODO low power? status effects may not be the best way to do this...
if(unit.within(target, block.droneRange + build.target.hitSize)){ if(unit.within(target, droneRange + build.target.hitSize)){
build.target.apply(block.status, block.statusDuration); build.target.apply(status, statusDuration);
} }
} }
} }

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=15cbd2710c archash=5babd5fc94