This commit is contained in:
Anuken
2020-05-28 21:13:25 -04:00
parent c5c8d646f7
commit a7f86b2ba6
12 changed files with 19 additions and 19 deletions

View File

@@ -2,6 +2,7 @@ package mindustry.content;
import arc.math.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import mindustry.ctype.*;
import mindustry.game.Objectives.*;
import mindustry.type.*;
@@ -314,15 +315,17 @@ public class TechTree implements ContentList{
public static class TechNode{
private static TechNode context;
/** Depth in tech tree. */
public int depth;
/** Requirement node. */
public TechNode parent;
public @Nullable TechNode parent;
/** Content to be researched. */
public UnlockableContent content;
/** Item requirements for this content. */
public ItemStack[] requirements;
/** Extra objectives needed to research this. TODO implement */
public Objective[] objectives = {};
/** Turns required to research this content. */
/** Research turns required to research this content. */
public int turns = 3; //TODO keep track of turns that have been used so far
/** Nodes that depend on this node. */
public final Array<TechNode> children = new Array<>();
@@ -335,6 +338,7 @@ public class TechTree implements ContentList{
this.parent = ccontext;
this.content = content;
this.requirements = requirements;
this.depth = parent == null ? 0 : parent.depth + 1;
context = this;
children.run();

View File

@@ -62,7 +62,7 @@ public class Weathers implements ContentList{
};
rain = new Weather("rain"){
float yspeed = 7f, xspeed = 2f, padding = 16f, size = 40f, density = 1200f;
float yspeed = 5f, xspeed = 1.5f, padding = 16f, size = 40f, density = 1200f;
TextureRegion[] splashes = new TextureRegion[12];
@Override