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

Removed autogenerated liquid sprites

Browse Source
This commit is contained in:
Anuken
2019-01-08 09:56:42 -05:00
parent a6f7bd9099
commit 521174f911
17 changed files with 4442 additions and 4597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ public class Blocks implements ContentList{
grass, shrub, rock, icerock, blackrock,
//crafting
smelter, siliconSmelter, plastaniumCompressor, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidmixer,
siliconSmelter, plastaniumCompressor, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
melter, separator, centrifuge, biomatterCompressor, pulverizer, incinerator,
//sandbox
@@ -44,10 +44,10 @@ public class Blocks implements ContentList{
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine,
//transport
conveyor, titaniumconveyor, distributor, junction, itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver,
conveyor, titaniumConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver,
//liquids
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, liquidRouter, liquidtank, liquidJunction, bridgeConduit, phaseConduit,
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
//power
combustionGenerator, thermalGenerator, turbineGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
@@ -264,7 +264,7 @@ public class Blocks implements ContentList{
consumes.items(new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 4), new ItemStack(Items.silicon, 3), new ItemStack(Items.copper, 3));
}};
cryofluidmixer = new LiquidMixer("cryofluidmixer"){{
cryofluidMixer = new LiquidMixer("cryofluidmixer"){{
outputLiquid = Liquids.cryofluid;
liquidPerItem = 50f;
size = 2;
@@ -460,7 +460,7 @@ public class Blocks implements ContentList{
speed = 0.03f;
}};
titaniumconveyor = new Conveyor("titanium-conveyor"){{
titaniumConveyor = new Conveyor("titanium-conveyor"){{
health = 65;
speed = 0.07f;
}};
@@ -538,7 +538,7 @@ public class Blocks implements ContentList{
liquidCapacity = 20f;
}};
liquidtank = new LiquidTank("liquid-tank"){{
liquidTank = new LiquidTank("liquid-tank"){{
size = 3;
liquidCapacity = 1500f;
health = 500;
@@ -1113,7 +1113,6 @@ public class Blocks implements ContentList{
}};
//endregion
//region ores
//create ores for every floor and item combination necessary

1
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -513,7 +513,6 @@ public class Bullets implements ContentList{
fuseShot = new BulletType(0.01f, 70){
int rays = 3;
float raySpace = 2f;
float rayLength = 80f;
{
hitEffect = Fx.hitFuse;

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

@@ -7,7 +7,7 @@ import io.anuke.mindustry.type.ItemType;
public class Items implements ContentList{
public static Item scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, phasefabric, surgealloy,
biomatter, sand, blastCompound, pyratite;
biomatter, sand, blastCompound, pyratite, bioglass;
@Override
public void load(){
@@ -99,5 +99,10 @@ public class Items implements ContentList{
flammability = 0.7f;
explosiveness = 0.2f;
}};
bioglass = new Item("bioglass", Color.valueOf("648b55")){{
type = ItemType.material;
cost = 2f;
}};
}
}

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

@@ -10,18 +10,11 @@ public class Liquids implements ContentList{
@Override
public void load(){
water = new Liquid("water", Color.valueOf("486acd")){
{
heatCapacity = 0.4f;
tier = 0;
effect = StatusEffects.wet;
}
@Override
public boolean alwaysUnlocked() {
return true;
}
};
water = new Liquid("water", Color.valueOf("486acd")){{
heatCapacity = 0.4f;
tier = 0;
effect = StatusEffects.wet;
}};
slag = new Liquid("slag", Color.valueOf("e37341")){{
temperature = 1f;

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

@@ -72,7 +72,7 @@ public class Recipes implements ContentList{
//DISTRIBUTION
new Recipe(distribution, Blocks.conveyor, new ItemStack(Items.copper, 1)).setAlwaysUnlocked(true);
new Recipe(distribution, Blocks.titaniumconveyor, new ItemStack(Items.copper, 2), new ItemStack(Items.titanium, 1));
new Recipe(distribution, Blocks.titaniumConveyor, new ItemStack(Items.copper, 2), new ItemStack(Items.titanium, 1));
new Recipe(distribution, Blocks.phaseConveyor, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.graphite, 20));
//starter transport
@@ -101,7 +101,7 @@ public class Recipes implements ContentList{
new Recipe(crafting, Blocks.pulverizer, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50));
new Recipe(crafting, Blocks.pyratiteMixer, new ItemStack(Items.copper, 100), new ItemStack(Items.lead, 50));
new Recipe(crafting, Blocks.blastMixer, new ItemStack(Items.lead, 60), new ItemStack(Items.titanium, 40));
new Recipe(crafting, Blocks.cryofluidmixer, new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 80), new ItemStack(Items.thorium, 90));
new Recipe(crafting, Blocks.cryofluidMixer, new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 80), new ItemStack(Items.thorium, 90));
new Recipe(crafting, Blocks.melter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 70), new ItemStack(Items.graphite, 90));
new Recipe(crafting, Blocks.incinerator, new ItemStack(Items.graphite, 10), new ItemStack(Items.lead, 30));
@@ -175,7 +175,7 @@ public class Recipes implements ContentList{
new Recipe(liquid, Blocks.phaseConduit, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20));
new Recipe(liquid, Blocks.liquidRouter, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4));
new Recipe(liquid, Blocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50));
new Recipe(liquid, Blocks.liquidTank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50));
new Recipe(liquid, Blocks.liquidJunction, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4));
new Recipe(liquid, Blocks.bridgeConduit, new ItemStack(Items.titanium, 8), new ItemStack(Items.lead, 8));

2
core/src/io/anuke/mindustry/maps/SectorPresets.java
View File

@@ -25,7 +25,7 @@ public class SectorPresets{
Array.ofRecursive(
Missions.blockRecipe(Blocks.daggerFactory),
new UnitMission(UnitTypes.dagger),
Missions.blockRecipe(Blocks.commandCenter),
//Missions.blockRecipe(Blocks.commandCenter),
new CommandMission(UnitCommand.retreat),
new CommandMission(UnitCommand.attack),
new BattleMission()

2
core/src/io/anuke/mindustry/maps/TutorialSector.java
View File

@@ -95,7 +95,7 @@ public class TutorialSector{
new ItemMission(Items.lead, 50),
// new BlockMission(CraftingBlocks.smelter),
new BlockMission(Blocks.smelter),
//new BlockMission(Blocks.smelter),
new WaveMission(5)
);
}

14
core/src/io/anuke/mindustry/type/ItemType.java
View File

@@ -1,16 +1,8 @@
package io.anuke.mindustry.type;
public enum ItemType{
/**
* Not used for anything besides crafting inside blocks.
*/
/**Not used for anything besides crafting inside blocks.*/
resource,
/**
* Can be used for constructing blocks. Only materials are accepted into the core.
*/
material,
/**
* Only used as ammo for turrets.
*/
ammo
/**Can be used for constructing blocks. Only materials are accepted into the core.*/
material
}

4
core/src/io/anuke/mindustry/type/Liquid.java
View File

@@ -29,7 +29,7 @@ public class Liquid extends UnlockableContent{
public StatusEffect effect = StatusEffects.none;
/**Pump tier. Controls which pumps can use this liquid.*/
public int tier;
/**Displayed icon.*/
/**Displayed icon. TODO fix it by removing autogen, draw icons manually*/
public TextureRegion iconRegion;
public Liquid(String name, Color color){
@@ -44,7 +44,7 @@ public class Liquid extends UnlockableContent{
@Override
public void load(){
iconRegion = Core.atlas.find("liquid-icon-" + name);
iconRegion = Core.atlas.find("liquid-" + name);
}
@Override