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

Unit naming / Fixed #2209

Browse Source
This commit is contained in:
Anuken
2020-07-04 23:53:22 -04:00
parent 685275237a
commit add0d0cd86
29 changed files with 840 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -102,8 +102,7 @@ public abstract class Turret extends Block{
stats.add(BlockStat.shootRange, range / tilesize, StatUnit.blocks);
stats.add(BlockStat.inaccuracy, (int)inaccuracy, StatUnit.degrees);
stats.add(BlockStat.reload, 60f / reloadTime, StatUnit.none);
stats.add(BlockStat.shots, shots, StatUnit.none);
stats.add(BlockStat.reload, 60f / reloadTime * shots, StatUnit.none);
stats.add(BlockStat.targetsAir, targetAir);
stats.add(BlockStat.targetsGround, targetGround);

2
core/src/mindustry/world/blocks/distribution/Sorter.java
View File

@@ -87,7 +87,7 @@ public class Sorter extends Block{
}
boolean isSame(Building other){
//uncomment comment below to prevent sorter/gate chaining (hacky)
//uncomment code below to prevent sorter/gate chaining
return other != null && (other.block() instanceof Sorter/* || other.block() instanceof OverflowGate */);
}