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

Tutorial fixes

Browse Source
This commit is contained in:
Anuken
2019-08-13 16:26:02 -04:00
parent 974ab59fd2
commit 58b4f64125
9 changed files with 40 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/io/anuke/mindustry/game/GlobalData.java
View File

@@ -1,15 +1,13 @@
package io.anuke.mindustry.game;
import io.anuke.arc.Core;
import io.anuke.arc.Events;
import io.anuke.arc.*;
import io.anuke.arc.collection.*;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.game.EventType.UnlockEvent;
import io.anuke.mindustry.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.type.*;
import static io.anuke.mindustry.Vars.content;
import static io.anuke.mindustry.Vars.state;
import static io.anuke.mindustry.Vars.*;
/** Stores player unlocks. Clientside only. */
public class GlobalData{
@@ -40,7 +38,9 @@ public class GlobalData{
}
public void addItem(Item item, int amount){
unlockContent(item);
if(amount > 0){
unlockContent(item);
}
modified = true;
items.getAndIncrement(item, 0, amount);
state.stats.itemsDelivered.getAndIncrement(item, 0, amount);

6
core/src/io/anuke/mindustry/game/Tutorial.java
View File

@@ -20,7 +20,7 @@ import static io.anuke.mindustry.Vars.*;
/** Handles tutorial state. */
public class Tutorial{
private static final int mineCopper = 18;
private static final int blocksToBreak = 3, blockOffset = 5;
private static final int blocksToBreak = 3, blockOffset = -6;
private ObjectSet<String> events = new ObjectSet<>();
private ObjectIntMap<Block> blocksPlaced = new ObjectIntMap<>();
@@ -179,7 +179,7 @@ public class Tutorial{
state.wave = 5;
//end tutorial, never show it again
Core.settings.put("tutorial", true);
Core.settings.put("playedtutorial", true);
Core.settings.save();
}
@@ -230,7 +230,7 @@ public class Tutorial{
Tile core = state.teams.get(defaultTeam).cores.first();
for(int i = 0; i < blocksToBreak; i++){
world.removeBlock(world.ltile(core.x + blockOffset, core.y + i));
world.tile(core.x + blockOffset, core.y + i).setBlock(Blocks.scrapWall);
world.tile(core.x + blockOffset, core.y + i).setBlock(Blocks.scrapWall, defaultTeam);
}
}