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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-03-30 19:10:06 -04:00
parent 0c3b39ffdc
commit 801eadd8a8
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -342,7 +342,7 @@ no = No
info.title = Info info.title = Info
error.title = [crimson]An error has occured error.title = [crimson]An error has occured
error.crashtitle = An error has occured error.crashtitle = An error has occured
blocks.outputspeed = Drill Speed: {0}/ blocks.outputspeed = Drill Speed: {0}/s
blocks.efficiency = Efficiency: {0}% blocks.efficiency = Efficiency: {0}%
blocks.unknown = [LIGHT_GRAY]??? blocks.unknown = [LIGHT_GRAY]???
blocks.blockinfo = Block Info blocks.blockinfo = Block Info

2
core/src/io/anuke/mindustry/game/SpawnGroup.java
View File

@@ -53,7 +53,7 @@ public class SpawnGroup implements Serializable{
} }
float scaling = this.unitScaling; float scaling = this.unitScaling;
return Math.min(unitAmount - 1 + Math.max((int) (((wave - begin) / spacing) / scaling), 1), max); return Math.min(unitAmount - 1 + Math.max((int) (((wave - begin + 1) / spacing) / scaling), 1), max);
} }
/** /**

3
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -9,6 +9,7 @@ import io.anuke.arc.math.geom.Rectangle;
import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.math.geom.Vector2;
import io.anuke.arc.util.Time; import io.anuke.arc.util.Time;
import io.anuke.arc.util.Tmp; import io.anuke.arc.util.Tmp;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.Player;
@@ -36,7 +37,7 @@ public class OverlayRenderer{
if(Core.settings.getBool("indicators")){ if(Core.settings.getBool("indicators")){
for(Player player : playerGroup.all()){ for(Player player : playerGroup.all()){
if(player != player && player.getTeam() == player.getTeam()){ if(Vars.player != player && Vars.player.getTeam() == player.getTeam()){
if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f) if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
.setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){ .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){

4
core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
View File

@@ -1,13 +1,13 @@
package io.anuke.mindustry.world.blocks.distribution; package io.anuke.mindustry.world.blocks.distribution;
import io.anuke.arc.collection.Array; import io.anuke.arc.collection.Array;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Edges;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockGroup; import io.anuke.mindustry.world.meta.BlockGroup;
import io.anuke.arc.util.Time;
public class Router extends Block{ public class Router extends Block{
protected float speed = 8f; protected float speed = 8f;
@@ -46,7 +46,7 @@ public class Router extends Block{
public boolean acceptItem(Item item, Tile tile, Tile source){ public boolean acceptItem(Item item, Tile tile, Tile source){
SplitterEntity entity = tile.entity(); SplitterEntity entity = tile.entity();
return tile.getTeamID() == source.getTeamID() && entity.lastItem == null && entity.items.total() == 0; return tile.getTeam() == source.getTeam() && entity.lastItem == null && entity.items.total() == 0;
} }
@Override @Override

4
core/src/io/anuke/mindustry/world/blocks/production/Drill.java
View File

@@ -200,8 +200,8 @@ public class Drill extends Block{
float totalHardness = entity.dominantItems * entity.dominantItem.hardness; float totalHardness = entity.dominantItems * entity.dominantItem.hardness;
if(entity.timer.get(timerDump, 15)){ if(entity.timer.get(timerDump, 5)){
tryDump(tile); tryDump(tile, entity.dominantItem);
} }
entity.drillTime += entity.warmup * entity.delta(); entity.drillTime += entity.warmup * entity.delta();