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

Tweaked sector dialog / Item icons fixed / Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-02-09 23:20:20 -05:00
parent 533ddb874e
commit 29821003fe
56 changed files with 1907 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -445,11 +445,10 @@ public class Blocks implements ContentList{
results = new ItemStack[]{
new ItemStack(Items.copper, 5),
new ItemStack(Items.lead, 3),
new ItemStack(Items.titanium, 2),
new ItemStack(Items.thorium, 1)
new ItemStack(Items.titanium, 2)
};
hasPower = true;
filterTime = 15f;
filterTime = 30f;
health = 50 * 4;
spinnerLength = 1.5f;
spinnerRadius = 3.5f;
@@ -457,6 +456,7 @@ public class Blocks implements ContentList{
spinnerSpeed = 3f;
size = 2;
consumes.power(1f);
consumes.liquid(Liquids.slag, 0.1f);
}};

3
core/src/io/anuke/mindustry/content/Fx.java
View File

@@ -15,6 +15,7 @@ import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.graphics.Shapes;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Item.Icon;
import static io.anuke.mindustry.Vars.tilesize;
@@ -541,7 +542,7 @@ public class Fx implements ContentList{
float length = 20f * e.finpow();
float size = 7f * e.fout();
Draw.rect(((Item) e.data).region, e.x + Angles.trnsx(e.rotation, length), e.y + Angles.trnsy(e.rotation, length), size, size);
Draw.rect(((Item) e.data).icon(Icon.large), e.x + Angles.trnsx(e.rotation, length), e.y + Angles.trnsy(e.rotation, length), size, size);
});

2
core/src/io/anuke/mindustry/content/Items.java
View File

@@ -26,7 +26,7 @@ public class Items implements ContentList{
genOre = true;
}};
metaglass = new Item("metaglass", Color.valueOf("648b55")){{
metaglass = new Item("metaglass", Color.valueOf("ebeef5")){{
type = ItemType.material;
cost = 2f;
}};

9
core/src/io/anuke/mindustry/content/Zones.java
View File

@@ -6,6 +6,7 @@ import io.anuke.mindustry.game.Rules;
import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.maps.generators.MapGenerator;
import io.anuke.mindustry.maps.generators.MapGenerator.Decoration;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.Zone;
import io.anuke.mindustry.world.Block;
@@ -23,6 +24,7 @@ public class Zones implements ContentList{
alwaysUnlocked = true;
conditionWave = 10;
launchPeriod = 5;
resources = new Item[]{Items.copper, Items.scrap};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
@@ -67,6 +69,7 @@ public class Zones implements ContentList{
itemRequirements = ItemStack.with(Items.copper, 2000);
zoneRequirements = new Zone[]{groundZero};
blockRequirements = new Block[]{Blocks.router};
resources = new Item[]{Items.copper, Items.lead};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
@@ -116,6 +119,7 @@ public class Zones implements ContentList{
conditionWave = 10;
zoneRequirements = new Zone[]{craters};
itemRequirements = ItemStack.with(Items.copper, 4000, Items.lead, 2000);
resources = new Item[]{Items.copper, Items.lead, Items.coal};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
@@ -178,6 +182,7 @@ public class Zones implements ContentList{
zoneRequirements = new Zone[]{frozenForest};
itemRequirements = ItemStack.with(Items.lead, 6000, Items.graphite, 2000);
blockRequirements = new Block[]{Blocks.graphitePress, Blocks.combustionGenerator};
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.sand};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
@@ -253,6 +258,7 @@ public class Zones implements ContentList{
zoneRequirements = new Zone[]{frozenForest};
blockRequirements = new Block[]{Blocks.pneumaticDrill};
itemRequirements = ItemStack.with(Items.copper, 8000, Items.silicon, 2000);
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
@@ -326,6 +332,7 @@ public class Zones implements ContentList{
conditionWave = 20;
zoneRequirements = new Zone[]{stainedMountains};
blockRequirements = new Block[]{Blocks.launchPad, Blocks.unloader, Blocks.coreFoundation};
resources = new Item[]{Items.scrap};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
@@ -398,6 +405,7 @@ public class Zones implements ContentList{
launchPeriod = 20;
zoneRequirements = new Zone[]{ruinousShores};
blockRequirements = new Block[]{Blocks.thermalGenerator};
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
@@ -492,6 +500,7 @@ public class Zones implements ContentList{
launchPeriod = 15;
zoneRequirements = new Zone[]{impact};
blockRequirements = new Block[]{Blocks.blastDrill, Blocks.thermalGenerator};
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;