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

Implemented unlocks for placement

Browse Source
This commit is contained in:
Anuken
2018-11-18 20:04:15 -05:00
parent d862498516
commit ab79ccb02b
7 changed files with 64 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -111,15 +111,6 @@ public class Control extends Module{
}
state.set(State.playing);
if(world.getSector() == null && !Settings.getBool("custom-warning-for-real-1", false)){
threads.runGraphics(() -> ui.showInfo("$mode.custom.warning", () ->
ui.showInfo("$mode.custom.warning.read", () -> {
Settings.putBool("custom-warning-for-real-1", true);
Settings.save();
})));
}
});
Events.on(WorldLoadGraphicsEvent.class, event -> {

69
core/src/io/anuke/mindustry/game/Unlocks.java
View File

@@ -4,16 +4,12 @@ import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.ObjectMap.Entry;
import com.badlogic.gdx.utils.ObjectSet;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.ContentType;
import io.anuke.ucore.core.Settings;
import static io.anuke.mindustry.Vars.*;
/**Stores player unlocks. Clientside only.*/
public class Unlocks{
private ObjectMap<String, ContentUnlockSet> sets = new ObjectMap<>();
ContentUnlockSet set = new ContentUnlockSet();
static{
Settings.setSerializer(ContentType.class, (stream, t) -> stream.writeInt(t.ordinal()), stream -> ContentType.values()[stream.readInt()]);
@@ -21,7 +17,7 @@ public class Unlocks{
/** Returns whether or not this piece of content is unlocked yet.*/
public boolean isUnlocked(UnlockableContent content){
return rootSet().isUnlocked(content) || currentSet().isUnlocked(content);
return set.isUnlocked(content);
}
/**
@@ -32,77 +28,42 @@ public class Unlocks{
* @return whether or not this content was newly unlocked.
*/
public boolean unlockContent(UnlockableContent content){
return !rootSet().isUnlocked(content) && currentSet().unlockContent(content);
return !set.isUnlocked(content) && currentSet().unlockContent(content);
}
private ContentUnlockSet currentSet(){
//client connected to server: always return the IP-specific set
if(Net.client()){
return getSet(Net.getLastIP());
}else if((world.getSector() != null || state.mode.infiniteResources) || state.is(State.menu)){ //sector-sandbox have shared set
return rootSet();
}else{ //per-mode set
return getSet(state.mode.name());
}
}
private ContentUnlockSet rootSet(){
return getSet("root");
}
private ContentUnlockSet getSet(String name){
if(!sets.containsKey(name)){
sets.put(name, new ContentUnlockSet());
}
return sets.get(name);
return set;
}
/** Returns whether unlockables have changed since the last save.*/
public boolean isDirty(){
for(ContentUnlockSet set : sets.values()){
if(set.isDirty()){
return true;
}
}
return false;
return set.isDirty();
}
/** Clears all unlocked content. Automatically saves.*/
public void reset(){
sets.clear();
save();
}
public void load(){
sets.clear();
ObjectMap<ContentType, Array<String>> outer = Settings.getObject("unlocks", ObjectMap.class, ObjectMap::new);
ContentUnlockSet cset = new ContentUnlockSet();
ObjectMap<String, ObjectMap<ContentType, Array<String>>> result = Settings.getObject("content-sets", ObjectMap.class, ObjectMap::new);
for(Entry<String, ObjectMap<ContentType, Array<String>>> outer : result.entries()){
ContentUnlockSet cset = new ContentUnlockSet();
for (Entry<ContentType, Array<String>> entry : outer.value.entries()){
ObjectSet<String> set = new ObjectSet<>();
set.addAll(entry.value);
cset.getUnlocked().put(entry.key, set);
}
sets.put(outer.key, cset);
for (Entry<ContentType, Array<String>> entry : outer.entries()){
ObjectSet<String> set = new ObjectSet<>();
set.addAll(entry.value);
cset.getUnlocked().put(entry.key, set);
}
}
public void save(){
ObjectMap<String, ObjectMap<ContentType, Array<String>>> output = new ObjectMap<>();
ObjectMap<ContentType, Array<String>> write = new ObjectMap<>();
for(Entry<String, ContentUnlockSet> centry : sets.entries()){
ObjectMap<ContentType, Array<String>> write = new ObjectMap<>();
for(Entry<ContentType, ObjectSet<String>> entry : centry.value.getUnlocked().entries()){
write.put(entry.key, entry.value.iterator().toArray());
}
output.put(centry.key, write);
for(Entry<ContentType, ObjectSet<String>> entry : set.getUnlocked().entries()){
write.put(entry.key, entry.value.iterator().toArray());
}
Settings.putObject("content-sets", output);
Settings.putObject("unlocks", write);
Settings.save();
}

1
core/src/io/anuke/mindustry/graphics/Palette.java
View File

@@ -29,6 +29,7 @@ public class Palette{
lightishGray = Color.valueOf("a2a2a2"),
darkishGray = new Color(0.3f, 0.3f, 0.3f, 1f),
darkerGray = new Color(0.2f, 0.2f, 0.2f, 1f),
boostTo = Color.valueOf("ffad4d"),
boostFrom = Color.valueOf("ff7f57"),

1
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -224,7 +224,6 @@ public class HudFragment extends Fragment{
/**Show unlock notification for a new recipe.*/
public void showUnlock(Recipe recipe){
blockfrag.rebuild();
//if there's currently no unlock notification...
if(lastUnlockTable == null){

62
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -2,6 +2,7 @@ package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.graphics.Palette;
@@ -17,14 +18,17 @@ import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.scene.Group;
import io.anuke.ucore.scene.event.Touchable;
import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Bundles;
import static io.anuke.mindustry.Vars.*;
public class PlacementFragment extends Fragment{
final int rowWidth = 4;
Array<Recipe> returned = new Array<>();
Category currentCategory = Category.turret;
Block hovered;
Block lastDisplay;
@@ -33,34 +37,50 @@ public class PlacementFragment extends Fragment{
@Override
public void build(Group parent){
InputHandler input = control.input(0);
parent.fill(frame -> {
frame.clear();
InputHandler input = control.input(0);
//rebuilds the category table with the correct recipes
Runnable rebuildCategory = () -> {
blockTable.clear();
blockTable.top().margin(5);
//blockTable.add(currentCategory.name()).colspan(rowWidth).growX(); //TODO localize
int index = 0;
ButtonGroup<ImageButton> group = new ButtonGroup<>();
group.setMinCheckCount(0);
for(Recipe recipe : content.recipes()){
if(recipe.category != currentCategory) continue;
for(Recipe recipe : recipes(currentCategory)){
if(index++ % rowWidth == 0){
blockTable.row();
}
ImageButton button = blockTable.addImageButton("blank", "select", 8*4,
() -> input.recipe = input.recipe == recipe ? null : recipe)
.size(50f).group(group).update(b -> b.setChecked(input.recipe == recipe)).get();
boolean[] unlocked = {false};
button.replaceImage(new ImageStack(recipe.result.getCompactIcon()));
ImageButton button = blockTable.addImageButton("icon-locked", "select", 8*4, () -> {
if(control.unlocks.isUnlocked(recipe)){
input.recipe = input.recipe == recipe ? null : recipe;
}
}).size(50f).group(group).get();
button.update(() -> { //color unplacable things gray
boolean ulock = control.unlocks.isUnlocked(recipe);
TileEntity core = players[0].getClosestCore();
Color color = core != null && core.items.has(recipe.requirements) ? Color.WHITE : ulock ? Color.GRAY : Color.WHITE;
button.forEach(elem -> elem.setColor(color));
button.setChecked(input.recipe == recipe);
if(ulock == unlocked[0]) return;
unlocked[0] = ulock;
if(!ulock){
button.replaceImage(new Image("icon-locked"));
}else{
button.replaceImage(new ImageStack(recipe.result.getCompactIcon()));
}
});
if(!mobile){
button.hovered(() -> hovered = recipe.result);
@@ -71,6 +91,8 @@ public class PlacementFragment extends Fragment{
});
}
}
blockTable.act(0f);
};
frame.bottom().left().visible(() -> !state.is(State.menu));
@@ -78,7 +100,7 @@ public class PlacementFragment extends Fragment{
frame.table("clear", top -> {
top.add(new Table()).growX().update(topTable -> {
if((tileDisplayBlock() == null && lastDisplay == getSelected()) ||
(tileDisplayBlock() != null && lastDisplay == tileDisplayBlock())) return;
(tileDisplayBlock() != null && lastDisplay == tileDisplayBlock())) return;
topTable.clear();
topTable.top().left().margin(5);
@@ -89,7 +111,9 @@ public class PlacementFragment extends Fragment{
topTable.table(header -> {
header.left();
header.add(new ImageStack(lastDisplay.getCompactIcon())).size(8*4);
header.labelWrap(lastDisplay.formalName).left().width(200f).padLeft(5);
header.labelWrap(() ->
!control.unlocks.isUnlocked(Recipe.getByResult(lastDisplay)) ? Bundles.get("text.blocks.unknown") : lastDisplay.formalName)
.left().width(200f).padLeft(5);
}).growX().left();
topTable.row();
//add requirement table
@@ -118,7 +142,7 @@ public class PlacementFragment extends Fragment{
}else if(tileDisplayBlock() != null){ //show selected tile
lastDisplay = tileDisplayBlock();
topTable.add(new ImageStack(lastDisplay.getDisplayIcon(hoverTile))).size(8*4);
topTable.labelWrap(lastDisplay.getDisplayName(hoverTile)).left().width(150f).padLeft(5);
topTable.labelWrap(lastDisplay.getDisplayName(hoverTile)).left().width(200f).padLeft(5);
}
});
top.row();
@@ -131,6 +155,8 @@ public class PlacementFragment extends Fragment{
ButtonGroup<ImageButton> group = new ButtonGroup<>();
for(Category cat : Category.values()){
if(recipes(cat).isEmpty()) continue;
categories.addImageButton("icon-" + cat.name(), "clear-toggle", 16*2, () -> {
currentCategory = cat;
rebuildCategory.run();
@@ -181,9 +207,13 @@ public class PlacementFragment extends Fragment{
return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.floor() instanceof OreBlock ? hoverTile.floor() : null;
}
/**Rebuilds the whole placement menu, attempting to preserve previous state.*/
void rebuild(){
Array<Recipe> recipes(Category cat){
returned.clear();
for(Recipe recipe : content.recipes()){
if(recipe.category != cat || recipe.isHidden()) continue;
returned.add(recipe);
}
return returned;
}
void toggle(float t, Interpolation ip){

2
core/src/io/anuke/mindustry/world/meta/StatValue.java
View File

@@ -8,7 +8,7 @@ import io.anuke.ucore.scene.ui.layout.Table;
public interface StatValue{
/**
* This method should provide all elements necessary to display this stat to the specified table.
* For example, a stat that is just text would add label to the table.
* For example, a stat that is just text would add a label to the table.
*/
void display(Table table);
}