'Added' attack mode / Core inventory sharing
This commit is contained in:
@@ -13,7 +13,6 @@ public enum GameMode{
|
|||||||
}},
|
}},
|
||||||
attack{{
|
attack{{
|
||||||
disableWaves = true;
|
disableWaves = true;
|
||||||
hidden = true;
|
|
||||||
enemyCheat = true;
|
enemyCheat = true;
|
||||||
}},
|
}},
|
||||||
victory{{
|
victory{{
|
||||||
|
|||||||
@@ -221,11 +221,6 @@ public class MobileInput extends InputHandler implements GestureListener{
|
|||||||
}
|
}
|
||||||
}).update(l -> l.setChecked(mode == breaking));
|
}).update(l -> l.setChecked(mode == breaking));
|
||||||
|
|
||||||
//rotate button
|
|
||||||
table.addImageButton("icon-arrow", "clear-partial", 16 * 2f, () -> rotation = Mathf.mod(rotation + 1, 4))
|
|
||||||
.update(i -> i.getImage().setRotationOrigin(rotation * 90, Align.center))
|
|
||||||
.visible(() -> recipe != null && recipe.result.rotate);
|
|
||||||
|
|
||||||
//cancel button
|
//cancel button
|
||||||
table.addImageButton("icon-cancel", "clear-partial", 16 * 2f, () -> {
|
table.addImageButton("icon-cancel", "clear-partial", 16 * 2f, () -> {
|
||||||
player.clearBuilding();
|
player.clearBuilding();
|
||||||
@@ -233,6 +228,11 @@ public class MobileInput extends InputHandler implements GestureListener{
|
|||||||
recipe = null;
|
recipe = null;
|
||||||
}).visible(() -> player.isBuilding() || recipe != null || mode == breaking);
|
}).visible(() -> player.isBuilding() || recipe != null || mode == breaking);
|
||||||
|
|
||||||
|
//rotate button
|
||||||
|
table.addImageButton("icon-arrow", "clear-partial", 16 * 2f, () -> rotation = Mathf.mod(rotation + 1, 4))
|
||||||
|
.update(i -> i.getImage().setRotationOrigin(rotation * 90, Align.center))
|
||||||
|
.visible(() -> recipe != null && recipe.result.rotate);
|
||||||
|
|
||||||
//confirm button
|
//confirm button
|
||||||
table.addImageButton("icon-check", "clear-partial", 16 * 2f, () -> {
|
table.addImageButton("icon-check", "clear-partial", 16 * 2f, () -> {
|
||||||
for(PlaceRequest request : selection){
|
for(PlaceRequest request : selection){
|
||||||
|
|||||||
@@ -82,6 +82,11 @@ public class CoreBlock extends StorageBlock{
|
|||||||
if(entity != null) entity.solid = solid;
|
if(entity != null) entity.solid = solid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaximumAccepted(Tile tile, Item item){
|
||||||
|
return itemCapacity * state.teams.get(tile.getTeam()).cores.size;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onProximityUpdate(Tile tile) {
|
public void onProximityUpdate(Tile tile) {
|
||||||
for(Tile other : state.teams.get(tile.getTeam()).cores){
|
for(Tile other : state.teams.get(tile.getTeam()).cores){
|
||||||
@@ -100,6 +105,11 @@ public class CoreBlock extends StorageBlock{
|
|||||||
@Override
|
@Override
|
||||||
public void removed(Tile tile){
|
public void removed(Tile tile){
|
||||||
state.teams.get(tile.getTeam()).cores.remove(tile);
|
state.teams.get(tile.getTeam()).cores.remove(tile);
|
||||||
|
|
||||||
|
int max = itemCapacity * state.teams.get(tile.getTeam()).cores.size;
|
||||||
|
for(Item item : content.items()){
|
||||||
|
tile.entity.items.set(item, Math.min(tile.entity.items.get(item), max));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public abstract class StorageBlock extends Block{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean acceptItem(Item item, Tile tile, Tile source){
|
public boolean acceptItem(Item item, Tile tile, Tile source){
|
||||||
return tile.entity.items.get(item) < itemCapacity;
|
return tile.entity.items.get(item) < getMaximumAccepted(tile, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user