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-09-14 20:57:10 -04:00
parent 6d61515e28
commit cd456f80a4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,8 @@ public class Router extends Block{
int counter = tile.rotation(); int counter = tile.rotation();
for(int i = 0; i < proximity.size; i++){ for(int i = 0; i < proximity.size; i++){
Tile other = proximity.get((i + counter) % proximity.size); Tile other = proximity.get((i + counter) % proximity.size);
if(other == from) continue;
if(set) tile.rotation((byte)((tile.rotation() + 1) % proximity.size)); if(set) tile.rotation((byte)((tile.rotation() + 1) % proximity.size));
if(other == from) continue;
if(other.block().acceptItem(item, other, Edges.getFacingEdge(tile, other))){ if(other.block().acceptItem(item, other, Edges.getFacingEdge(tile, other))){
return other; return other;
} }

8
desktop/src/io/anuke/mindustry/desktop/steam/SStats.java
View File

@@ -170,8 +170,6 @@ public class SStats implements SteamUserStatsCallback{
Events.on(Trigger.thoriumReactorOverheat, SStat.reactorsOverheated::add); Events.on(Trigger.thoriumReactorOverheat, SStat.reactorsOverheated::add);
Events.on(Trigger.tutorialComplete, completeTutorial::complete);
Events.on(Trigger.shock, shockWetEnemy::complete); Events.on(Trigger.shock, shockWetEnemy::complete);
Events.on(Trigger.phaseDeflectHit, killEnemyPhaseWall::complete); Events.on(Trigger.phaseDeflectHit, killEnemyPhaseWall::complete);
@@ -198,6 +196,10 @@ public class SStats implements SteamUserStatsCallback{
total += Vars.state.stats.itemsDelivered.get(item, 0); total += Vars.state.stats.itemsDelivered.get(item, 0);
} }
if(state.rules.tutorial){
completeTutorial.complete();
}
SStat.timesLaunched.add(); SStat.timesLaunched.add();
SStat.itemsLaunched.add(total); SStat.itemsLaunched.add(total);
}); });
@@ -228,7 +230,7 @@ public class SStats implements SteamUserStatsCallback{
Events.on(WinEvent.class, e -> { Events.on(WinEvent.class, e -> {
if(campaign()){ if(campaign()){
if(Vars.state.wave <= 5){ if(Vars.state.wave <= 5 && state.rules.attackMode){
defeatAttack5Waves.complete(); defeatAttack5Waves.complete();
} }