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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-06-01 23:10:15 -04:00
parent 2e64f7663a ab73305df9
commit f924d0b533
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/Pathfinder.java
View File

@@ -540,7 +540,7 @@ public class Pathfinder implements Runnable{
if(!targets.isEmpty()){ if(!targets.isEmpty()){
boolean any = false; boolean any = false;
for(Building other : targets){ for(Building other : targets){
if((other.items != null && other.items.any()) || other.status() != BlockStatus.noInput){ if(((other.items != null && other.items.any()) || other.status() != BlockStatus.noInput) && other.block.targetable){
out.add(other.tile.array()); out.add(other.tile.array());
any = true; any = true;
} }

2
core/src/mindustry/ai/types/FlyingAI.java
View File

@@ -41,7 +41,7 @@ public class FlyingAI extends AIController{
Building closest = null; Building closest = null;
float cdist = 0f; float cdist = 0f;
for(Building t : list){ for(Building t : list){
if((t.items != null && t.items.any()) || t.status() != BlockStatus.noInput){ if(((t.items != null && t.items.any()) || t.status() != BlockStatus.noInput) && t.block.targetable){
float dst = t.dst2(x, y); float dst = t.dst2(x, y);
if(closest == null || dst < cdist){ if(closest == null || dst < cdist){
closest = t; closest = t;

4
core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
View File

@@ -55,13 +55,13 @@ public class ContinuousLaserBulletType extends ContinuousBulletType{
float ellipseLenScl = Mathf.lerp(1 - i / (float)(colors.length), 1f, pointyScaling); float ellipseLenScl = Mathf.lerp(1 - i / (float)(colors.length), 1f, pointyScaling);
Lines.stroke(stroke); Lines.stroke(stroke);
Lines.lineAngle(b.x, b.y, rot, realLength - frontLength, false); Lines.lineAngle(b.x, b.y, rot, Math.max(0, realLength - frontLength), false);
//back ellipse //back ellipse
Drawf.flameFront(b.x, b.y, divisions, rot + 180f, backLength, stroke / 2f); Drawf.flameFront(b.x, b.y, divisions, rot + 180f, backLength, stroke / 2f);
//front ellipse //front ellipse
Tmp.v1.trnsExact(rot, realLength - frontLength); Tmp.v1.trnsExact(rot, Math.max(0, realLength - frontLength));
Drawf.flameFront(b.x + Tmp.v1.x, b.y + Tmp.v1.y, divisions, rot, frontLength * ellipseLenScl, stroke / 2f); Drawf.flameFront(b.x + Tmp.v1.x, b.y + Tmp.v1.y, divisions, rot, frontLength * ellipseLenScl, stroke / 2f);
} }

2
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@@ -262,7 +262,7 @@ public class BeamDrill extends Block{
time %= drillTime; time %= drillTime;
} }
if(timer(timerDump, dumpTime)){ if(timer(timerDump, dumpTime / timeScale)){
dump(); dump();
} }
} }

2
core/src/mindustry/world/blocks/production/BurstDrill.java
View File

@@ -80,7 +80,7 @@ public class BurstDrill extends Drill{
if(invertTime > 0f) invertTime -= delta() / invertedTime; if(invertTime > 0f) invertTime -= delta() / invertedTime;
if(timer(timerDump, dumpTime)){ if(timer(timerDump, dumpTime / timeScale)){
dump(items.has(dominantItem) ? dominantItem : null); dump(items.has(dominantItem) ? dominantItem : null);
} }

2
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -286,7 +286,7 @@ public class Drill extends Block{
@Override @Override
public void updateTile(){ public void updateTile(){
if(timer(timerDump, dumpTime)){ if(timer(timerDump, dumpTime / timeScale)){
dump(dominantItem != null && items.has(dominantItem) ? dominantItem : null); dump(dominantItem != null && items.has(dominantItem) ? dominantItem : null);
} }

2
core/src/mindustry/world/blocks/production/Separator.java
View File

@@ -162,7 +162,7 @@ public class Separator extends Block{
} }
} }
if(timer(timerDump, dumpTime)){ if(timer(timerDump, dumpTime / timeScale)){
dump(); dump();
} }
} }

2
core/src/mindustry/world/blocks/production/WallCrafter.java
View File

@@ -216,7 +216,7 @@ public class WallCrafter extends Block{
totalTime += edelta() * warmup * (eff <= 0f ? 0f : 1f); totalTime += edelta() * warmup * (eff <= 0f ? 0f : 1f);
if(timer(timerDump, dumpTime)){ if(timer(timerDump, dumpTime / timeScale)){
dump(output); dump(output);
} }
} }