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

Bugfixes, balancing

Browse Source
This commit is contained in:
Anuken
2020-07-24 12:42:59 -04:00
parent a48efd971c
commit 0372ec7c9f
10 changed files with 86 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -663,8 +663,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
public void updatePowerGraph(){
for(Building other : getPowerConnections(tempTileEnts)){
if(other.power() != null){
other.power().graph.addGraph(power.graph);
if(other.power != null){
other.power.graph.addGraph(power.graph);
}
}
}
@@ -688,7 +688,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
if(power == null) return out;
for(Building other : proximity){
if(other != null && other.power() != null
if(other != null && other.power != null
&& !(block.consumesPower && other.block.consumesPower && !block.outputsPower && !other.block.outputsPower)
&& !power.links.contains(other.pos())){
out.add(other);
@@ -800,7 +800,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
Building other = world.build(x, y);
if(other != null && other.block instanceof PowerNode && ((PowerNode)other.block).linkValid(other, base()) && !PowerNode.insulated(other, base())
&& !other.proximity().contains(this.<Building>base()) &&
!(block.outputsPower && proximity.contains(p -> p.power() != null && p.power().graph == other.power().graph))){
!(block.outputsPower && proximity.contains(p -> p.power != null && p.power.graph == other.power.graph))){
tempTiles.add(other.tile());
}
});

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

@@ -50,7 +50,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
void moveAt(Vec2 vector, float acceleration){
Vec2 t = tmp1.set(vector).scl(floorSpeedMultiplier()); //target vector
tmp2.set(t).sub(vel).limit(acceleration * vector.len()); //delta vector
tmp2.set(t).sub(vel).limit(acceleration * vector.len() * Time.delta); //delta vector
vel.add(tmp2);
}