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

Sprite reorganization, new power and tier-based pumps

Browse Source
This commit is contained in:
Anuken
2018-06-15 15:53:43 -04:00
parent 604f315a83
commit ffbb6bb40b
95 changed files with 862 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ public class Liquids implements ContentList {
water = new Liquid("water", Color.valueOf("486acd")) {
{
heatCapacity = 0.4f;
tier = 0;
effect = StatusEffects.wet;
}
};
@@ -25,6 +26,7 @@ public class Liquids implements ContentList {
{
temperature = 0.8f;
viscosity = 0.8f;
tier = 2;
effect = StatusEffects.melting;
}
};
@@ -34,6 +36,7 @@ public class Liquids implements ContentList {
viscosity = 0.7f;
flammability = 0.6f;
explosiveness = 0.6f;
tier = 1;
effect = StatusEffects.oiled;
}
};
@@ -42,6 +45,7 @@ public class Liquids implements ContentList {
{
heatCapacity = 0.75f;
temperature = 0.5f;
tier = 1;
effect = StatusEffects.freezing;
}
};

5
core/src/io/anuke/mindustry/content/Recipes.java
View File

@@ -108,8 +108,9 @@ public class Recipes implements ContentList{
new Recipe(liquid, LiquidBlocks.bridgeconduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.steel, 2));
new Recipe(liquid, LiquidBlocks.laserconduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.steel, 2));
new Recipe(liquid, LiquidBlocks.pump, new ItemStack(Items.steel, 10));
new Recipe(liquid, LiquidBlocks.fluxpump, new ItemStack(Items.steel, 10), new ItemStack(Items.surgealloy, 5));
new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.steel, 10));
new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.steel, 10), new ItemStack(Items.surgealloy, 5));
new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.steel, 10), new ItemStack(Items.surgealloy, 5));
new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.steel, 10));
new Recipe(units, UnitBlocks.dropPoint, new ItemStack(Items.steel, 10));

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

@@ -51,7 +51,7 @@ public class Blocks extends BlockList implements ContentList{
speedMultiplier = 0.2f;
variants = 0;
liquidDrop = Liquids.water;
liquid = true;
isLiquid = true;
status = StatusEffects.wet;
statusIntensity = 1f;
drownTime = 140f;
@@ -66,7 +66,7 @@ public class Blocks extends BlockList implements ContentList{
status = StatusEffects.wet;
statusIntensity = 0.9f;
liquidDrop = Liquids.water;
liquid = true;
isLiquid = true;
cacheLayer = CacheLayer.water;
}};
@@ -79,7 +79,7 @@ public class Blocks extends BlockList implements ContentList{
statusIntensity = 0.8f;
variants = 0;
liquidDrop = Liquids.lava;
liquid = true;
isLiquid = true;
cacheLayer = CacheLayer.lava;
}};
@@ -91,7 +91,7 @@ public class Blocks extends BlockList implements ContentList{
speedMultiplier = 0.2f;
variants = 0;
liquidDrop = Liquids.oil;
liquid = true;
isLiquid = true;
cacheLayer = CacheLayer.oil;
}};

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

@@ -194,7 +194,7 @@ public class CraftingBlocks extends BlockList implements ContentList {
hasLiquids = hasItems = true;
}};
weaponFactory = new WeaponFactory("weaponfactory") {{
weaponFactory = new MechFactory("weaponfactory") {{
size = 2;
health = 250;
}};

19
core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
View File

@@ -6,17 +6,30 @@ import io.anuke.mindustry.world.blocks.distribution.*;
import io.anuke.mindustry.world.blocks.production.Pump;
public class LiquidBlocks extends BlockList implements ContentList{
public static Block pump, fluxpump, conduit, pulseconduit, liquidrouter, liquidtank, liquidjunction, bridgeconduit, laserconduit;
public static Block mechanicalPump, rotaryPump, thermalPump, conduit, pulseconduit, liquidrouter, liquidtank, liquidjunction, bridgeconduit, laserconduit;
@Override
public void load() {
pump = new Pump("pump") {{
mechanicalPump = new Pump("mechanical-pump") {{
pumpAmount = 0.1f;
tier = 0;
}};
fluxpump = new Pump("fluxpump") {{
rotaryPump = new Pump("rotary-pump") {{
pumpAmount = 0.2f;
powerUse = 0.015f;
liquidCapacity = 30f;
size = 2;
tier = 1;
}};
thermalPump = new Pump("thermal-pump") {{
pumpAmount = 0.3f;
powerUse = 0.02f;
liquidCapacity = 40f;
size = 2;
tier = 2;
}};
conduit = new Conduit("conduit") {{