Removed CampaignData.java/GlobalData.java

This commit is contained in:
Anuken
2020-06-20 12:28:24 -04:00
parent ec4a5880b7
commit 25338ff1cf
13 changed files with 66 additions and 80 deletions

View File

@@ -22,6 +22,7 @@ public class Items implements ContentList{
type = ItemType.material;
hardness = 1;
cost = 0.7f;
alwaysUnlocked = true;
}};
metaglass = new Item("metaglass", Color.valueOf("ebeef5")){{

View File

@@ -133,9 +133,20 @@ public class Weathers implements ContentList{
if(Tmp.r3.setCentered(x, y, life * 4f).overlaps(Tmp.r2)){
Tile tile = world.tileWorld(x, y);
if(tile != null && tile.floor().liquidDrop == Liquids.water){
Draw.tint(Tmp.c1.set(tile.floor().mapColor).mul(1.5f));
Draw.color(Tmp.c1.set(tile.floor().mapColor).mul(1.5f).a(state.opacity()));
Draw.rect(splashes[(int)(life * (splashes.length - 1))], x, y);
}else{
Draw.color(Color.royal, Color.white, 0.3f);
Draw.alpha(Mathf.slope(life) * state.opacity());
Lines.stroke(1f);
float space = 45f;
for(int j : new int[]{-1, 1}){
Tmp.v1.trns(90f + j*space, 1f + 5f * life);
Lines.lineAngle(x + Tmp.v1.x, y + Tmp.v1.y, 90f + j*space, 3f * (1f - life));
}
}
}
}