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

Fixed power being set to NaN / Set splitter sprite to router

Browse Source
This commit is contained in:
Anuken
2018-07-15 11:50:06 -04:00
parent 37b9df3202
commit 92a968217c
8 changed files with 254 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/distribution/router.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 226 B

BIN
core/assets-raw/sprites/blocks/distribution/splitter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 234 B

After

Width:  |  Height:  |  Size: 226 B

514
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 133 KiB

1
core/src/io/anuke/mindustry/game/Saves.java
View File

@@ -48,6 +48,7 @@ public class Saves{
} }
public void update(){ public void update(){
SaveSlot current = this.current;
if(!state.is(State.menu) && !state.gameOver && current != null && current.isAutosave()){ if(!state.is(State.menu) && !state.gameOver && current != null && current.isAutosave()){
time += Timers.delta(); time += Timers.delta();

1
core/src/io/anuke/mindustry/maps/Sectors.java
View File

@@ -3,6 +3,7 @@ package io.anuke.mindustry.maps;
import io.anuke.ucore.util.GridMap; import io.anuke.ucore.util.GridMap;
public class Sectors{ public class Sectors{
private static final int sectorSize = 256;
private GridMap<Sector> grid = new GridMap<>(); private GridMap<Sector> grid = new GridMap<>();
public Sectors(){ public Sectors(){

2
core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java
View File

@@ -11,7 +11,7 @@ import io.anuke.mindustry.world.meta.BlockGroup;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
public class Splitter extends Block{ public class Splitter extends Block{
protected float speed = 9f; protected float speed = 8f;
public Splitter(String name){ public Splitter(String name){
super(name); super(name);

2
core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
View File

@@ -259,7 +259,7 @@ public class PowerNode extends PowerBlock{
for(int i = 0; i < entity.links.size; i++){ for(int i = 0; i < entity.links.size; i++){
Tile target = world.tile(entity.links.get(i)); Tile target = world.tile(entity.links.get(i));
if(shouldDistribute(tile, target)){ if(targets > 0 && shouldDistribute(tile, target)){
float transmit = Math.min(result, entity.power.amount); float transmit = Math.min(result, entity.power.amount);
if(target.block().acceptPower(target, tile, transmit)){ if(target.block().acceptPower(target, tile, transmit)){