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

Laid groundwork for tutorial, changed map storage

Browse Source
This commit is contained in:
Anuken
2017-10-13 20:28:25 -04:00
parent c167e117c0
commit ba345b4421
17 changed files with 161 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/input/AndroidInput.java
+3 -3
View File
@@ -7,7 +7,7 @@ import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.InputAdapter;
import com.badlogic.gdx.math.Vector2;
import io.anuke.mindustry.Inventory;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.World;
@@ -62,7 +62,7 @@ public class AndroidInput extends InputAdapter{
if(player.breaktime >= tile.block().breaktime){
brokeBlock = true;
if(tile.block().drops != null){
Inventory.addItem(tile.block().drops.item, tile.block().drops.amount);
Vars.control.addItem(tile.block().drops.item, tile.block().drops.amount);
}
Effects.effect("break", tile.worldx(), tile.worldy());
@@ -95,7 +95,7 @@ public class AndroidInput extends InputAdapter{
Sounds.play("place");
for(ItemStack stack : player.recipe.requirements){
Inventory.removeItem(stack);
Vars.control.removeItem(stack);
}
}
}
core/src/io/anuke/mindustry/input/GestureHandler.java
+2 -3
View File
@@ -6,7 +6,6 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.input.GestureDetector.GestureAdapter;
import com.badlogic.gdx.math.Vector2;
import io.anuke.mindustry.Inventory;
import io.anuke.mindustry.Vars;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.scene.ui.layout.Unit;
@@ -35,7 +34,7 @@ public class GestureHandler extends GestureAdapter{
@Override
public boolean tap (float x, float y, int count, int button) {
if(AndroidInput.mode == PlaceMode.touch && !ui.hasMouse() && player.recipe != null &&
Inventory.hasItems(player.recipe.requirements) && !Vars.ui.hasMouse() && !AndroidInput.brokeBlock){
Vars.control.hasItems(player.recipe.requirements) && !Vars.ui.hasMouse() && !AndroidInput.brokeBlock){
AndroidInput.mousex = x;
AndroidInput.mousey = y;
AndroidInput.place();
@@ -46,7 +45,7 @@ public class GestureHandler extends GestureAdapter{
@Override
public boolean pan(float x, float y, float deltaX, float deltaY){
if(player.recipe == null || !Inventory.hasItems(player.recipe.requirements) || AndroidInput.mode == PlaceMode.touch){
if(player.recipe == null || !Vars.control.hasItems(player.recipe.requirements) || AndroidInput.mode == PlaceMode.touch){
player.x -= deltaX*Core.camera.zoom/Core.cameraScale;
player.y += deltaY*Core.camera.zoom/Core.cameraScale;
}else if(AndroidInput.mode == PlaceMode.cursor){
core/src/io/anuke/mindustry/input/Input.java
+4 -5
View File
@@ -5,7 +5,6 @@ import static io.anuke.mindustry.Vars.*;
import com.badlogic.gdx.Input.Buttons;
import com.badlogic.gdx.Input.Keys;
import io.anuke.mindustry.Inventory;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.resource.Weapon;
@@ -51,7 +50,7 @@ public class Input{
if(Inputs.buttonUp(Buttons.LEFT) && player.recipe != null &&
World.validPlace(World.tilex(), World.tiley(), player.recipe.result) && !ui.hasMouse() &&
Inventory.hasItems(player.recipe.requirements)){
Vars.control.hasItems(player.recipe.requirements)){
Tile tile = World.tile(World.tilex(), World.tiley());
if(tile == null)
@@ -65,10 +64,10 @@ public class Input{
Sounds.play("place");
for(ItemStack stack : player.recipe.requirements){
Inventory.removeItem(stack);
Vars.control.removeItem(stack);
}
if(!Inventory.hasItems(player.recipe.requirements)){
if(!Vars.control.hasItems(player.recipe.requirements)){
Cursors.restoreCursor();
}
}
@@ -87,7 +86,7 @@ public class Input{
player.breaktime += Timers.delta();
if(player.breaktime >= tile.block().breaktime){
if(tile.block().drops != null){
Inventory.addItem(tile.block().drops.item, tile.block().drops.amount);
Vars.control.addItem(tile.block().drops.item, tile.block().drops.amount);
}
Effects.effect("break", tile.worldx(), tile.worldy());