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

Waveskip / Stat fixes / 3x3 thermalpump / Removed liquid tiers

Browse Source
This commit is contained in:
Anuken
2019-03-01 23:01:12 -05:00
parent 1e111d29d9
commit d82d0ae923
18 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -727,7 +727,6 @@ public class Blocks implements ContentList{
mechanicalPump = new Pump("mechanical-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 30, Items.lead, 20));
pumpAmount = 0.1f;
tier = 0;
}};
rotaryPump = new Pump("rotary-pump"){{
@@ -737,17 +736,15 @@ public class Blocks implements ContentList{
liquidCapacity = 30f;
hasPower = true;
size = 2;
tier = 1;
}};
thermalPump = new Pump("thermal-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 160, Items.lead, 130, Items.silicon, 60, Items.titanium, 80, Items.thorium, 70));
pumpAmount = 0.275f;
pumpAmount = 0.22f;
consumes.power(0.30f);
liquidCapacity = 40f;
hasPower = true;
size = 2;
tier = 2;
size = 3;
}};
conduit = new Conduit("conduit"){{
@@ -949,7 +946,7 @@ public class Blocks implements ContentList{
waterExtractor = new SolidPump("water-extractor"){{
requirements(Category.production, ItemStack.with(Items.copper, 50, Items.graphite, 50, Items.lead, 40));
result = Liquids.water;
pumpAmount = 0.065f;
pumpAmount = 0.13f;
size = 2;
liquidCapacity = 30f;
rotateSpeed = 1.4f;
@@ -963,7 +960,7 @@ public class Blocks implements ContentList{
updateEffect = Fx.pulverize;
liquidCapacity = 50f;
updateEffectChance = 0.05f;
pumpAmount = 0.09f;
pumpAmount = 0.25f;
size = 3;
liquidCapacity = 30f;

4
core/src/io/anuke/mindustry/content/Liquids.java
View File

@@ -12,14 +12,12 @@ public class Liquids implements ContentList{
water = new Liquid("water", Color.valueOf("596ab8")){{
heatCapacity = 0.4f;
tier = 0;
effect = StatusEffects.wet;
}};
slag = new Liquid("slag", Color.valueOf("ffa166")){{
temperature = 1f;
viscosity = 0.8f;
tier = 2;
effect = StatusEffects.melting;
}};
@@ -28,14 +26,12 @@ public class Liquids implements ContentList{
flammability = 1.2f;
explosiveness = 1.2f;
heatCapacity = 0.7f;
tier = 1;
effect = StatusEffects.tarred;
}};
cryofluid = new Liquid("cryofluid", Color.valueOf("6ecdec")){{
heatCapacity = 0.9f;
temperature = 0.25f;
tier = 1;
effect = StatusEffects.freezing;
}};
}