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

hhh

Browse Source
This commit is contained in:
Anuken
2019-06-07 11:18:06 -04:00
parent 1c3d7c1c73
commit 4458ae042e
8 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/io/anuke/mindustry/core/Logic.java
View File

@@ -63,9 +63,13 @@ public class Logic implements ApplicationListener{
//add starting items
if(!world.isZone()){
for(Tile core : state.teams.get(defaultTeam).cores){
for(ItemStack stack : state.rules.startingItems){
core.entity.items.add(stack.item, stack.amount);
for(Team team : Team.all){
if(state.teams.isActive(team)){
for(Tile core : state.teams.get(team).cores){
for(ItemStack stack : state.rules.startingItems){
core.entity.items.add(stack.item, stack.amount);
}
}
}
}
}

4
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -42,8 +42,6 @@ public class MobileInput extends InputHandler implements GestureListener{
//gesture data
private Vector2 vector = new Vector2();
private float lastDistance = -1f;
/** Set of completed guides. */
//private ObjectSet<String> guides = new ObjectSet<>();
/** Position where the player started dragging a line. */
private int lineStartX, lineStartY;
@@ -311,7 +309,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}).visible(() -> !selection.isEmpty());
Core.scene.table(t -> {
t.bottom().left().visible(() -> player.isBuilding() || block != null || mode == breaking);
t.bottom().left().visible(() -> (player.isBuilding() || block != null || mode == breaking) && !state.is(State.menu));
t.addImageTextButton("$cancel", "icon-cancel", 16*2, () -> {
player.clearBuilding();
mode = none;

8
core/src/io/anuke/mindustry/io/SaveVersion.java
View File

@@ -6,11 +6,15 @@ import io.anuke.arc.util.Time;
import io.anuke.arc.util.io.CounterInputStream;
import io.anuke.mindustry.entities.Entities;
import io.anuke.mindustry.entities.EntityGroup;
import io.anuke.mindustry.entities.traits.*;
import io.anuke.mindustry.entities.traits.Entity;
import io.anuke.mindustry.entities.traits.SaveTrait;
import io.anuke.mindustry.entities.traits.TypeTrait;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.WorldContext;
import java.io.*;

5
core/src/io/anuke/mindustry/type/ItemStack.java
View File

@@ -1,19 +1,22 @@
package io.anuke.mindustry.type;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.content.Items;
public class ItemStack implements Comparable<ItemStack>{
public Item item;
public int amount;
public ItemStack(Item item, int amount){
if(item == null) item = Items.copper;
this.item = item;
this.amount = amount;
}
//serialization only
public ItemStack(){
//prevent nulls.
item = Items.copper;
}
public boolean equals(ItemStack other){

14
core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java
View File

@@ -2,12 +2,17 @@ package io.anuke.mindustry.world.blocks.distribution;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.gen.BufferItem;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.DirectionalItemBuffer;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockGroup;
import java.io.*;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import static io.anuke.mindustry.Vars.content;
@@ -22,6 +27,11 @@ public class Junction extends Block{
group = BlockGroup.transportation;
}
@Override
public int acceptStack(Item item, int amount, Tile tile, Unit source){
return 0;
}
@Override
public boolean outputsItems(){
return true;

15
core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
View File

@@ -2,11 +2,17 @@ package io.anuke.mindustry.world.blocks.distribution;
import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.DirectionalItemBuffer;
import io.anuke.mindustry.world.Edges;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockGroup;
import java.io.*;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
public class OverflowGate extends Block{
protected int bufferCapacity = 10;
@@ -20,6 +26,11 @@ public class OverflowGate extends Block{
group = BlockGroup.transportation;
}
@Override
public int acceptStack(Item item, int amount, Tile tile, Unit source){
return 0;
}
@Override
public void update(Tile tile){
OverflowGateEntity entity = tile.entity();

6
core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
View File

@@ -7,6 +7,7 @@ import io.anuke.arc.math.Mathf;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.*;
@@ -31,6 +32,11 @@ public class Sorter extends Block{
configurable = true;
}
@Override
public int acceptStack(Item item, int amount, Tile tile, Unit source){
return 0;
}
@Override
public boolean outputsItems(){
return true;