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

autolink 2

Browse Source
This commit is contained in:
Anuken
2019-08-02 23:40:08 -04:00
parent 878901d05d
commit 86a78b206a
4 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,7 +411,7 @@ public class Blocks implements ContentList{
//region crafting
graphitePress = new GenericCrafter("graphite-press"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 75, Items.lead, 30));
requirements(Category.crafting, ItemStack.with(Items.copper, 112, Items.lead, 45));
craftEffect = Fx.pulverizeMedium;
outputItem = new ItemStack(Items.graphite, 1);
@@ -423,7 +423,7 @@ public class Blocks implements ContentList{
}};
multiPress = new GenericCrafter("multi-press"){{
requirements(Category.crafting, ItemStack.with(Items.titanium, 100, Items.silicon, 25, Items.lead, 100, Items.graphite, 50));
requirements(Category.crafting, ItemStack.with(Items.titanium, 150, Items.silicon, 37, Items.lead, 150, Items.graphite, 75));
craftEffect = Fx.pulverizeMedium;
outputItem = new ItemStack(Items.graphite, 2);
@@ -439,7 +439,7 @@ public class Blocks implements ContentList{
}};
siliconSmelter = new GenericSmelter("silicon-smelter"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.lead, 25));
requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.lead, 37));
craftEffect = Fx.smeltsmoke;
outputItem = new ItemStack(Items.silicon, 1);
craftTime = 40f;
@@ -453,7 +453,7 @@ public class Blocks implements ContentList{
}};
kiln = new GenericSmelter("kiln"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.graphite, 30, Items.lead, 30));
requirements(Category.crafting, ItemStack.with(Items.copper, 90, Items.graphite, 45, Items.lead, 45));
craftEffect = Fx.smeltsmoke;
outputItem = new ItemStack(Items.metaglass, 1);
craftTime = 30f;
@@ -466,7 +466,7 @@ public class Blocks implements ContentList{
}};
plastaniumCompressor = new GenericCrafter("plastanium-compressor"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 80, Items.lead, 115, Items.graphite, 60, Items.titanium, 80));
requirements(Category.crafting, ItemStack.with(Items.silicon, 120, Items.lead, 172, Items.graphite, 90, Items.titanium, 120));
hasItems = true;
liquidCapacity = 60f;
craftTime = 60f;
@@ -495,7 +495,7 @@ public class Blocks implements ContentList{
}};
phaseWeaver = new GenericCrafter("phase-weaver"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 130, Items.lead, 120, Items.thorium, 75));
requirements(Category.crafting, ItemStack.with(Items.silicon, 195, Items.lead, 180, Items.thorium, 112));
craftEffect = Fx.smeltsmoke;
outputItem = new ItemStack(Items.phasefabric, 1);
craftTime = 120f;
@@ -531,7 +531,7 @@ public class Blocks implements ContentList{
}};
surgeSmelter = new GenericSmelter("alloy-smelter"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 80, Items.lead, 80, Items.thorium, 70));
requirements(Category.crafting, ItemStack.with(Items.silicon, 120, Items.lead, 120, Items.thorium, 105));
craftEffect = Fx.smeltsmoke;
outputItem = new ItemStack(Items.surgealloy, 1);
craftTime = 75f;
@@ -543,7 +543,7 @@ public class Blocks implements ContentList{
}};
cryofluidMixer = new LiquidConverter("cryofluidmixer"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 65, Items.silicon, 40, Items.titanium, 60));
requirements(Category.crafting, ItemStack.with(Items.lead, 97, Items.silicon, 60, Items.titanium, 90));
outputLiquid = new LiquidStack(Liquids.cryofluid, 0.2f);
craftTime = 120f;
size = 2;
@@ -581,7 +581,7 @@ public class Blocks implements ContentList{
}};
blastMixer = new GenericCrafter("blast-mixer"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 30, Items.titanium, 20));
requirements(Category.crafting, ItemStack.with(Items.lead, 45, Items.titanium, 30));
hasItems = true;
hasPower = true;
outputItem = new ItemStack(Items.blastCompound, 1);
@@ -592,7 +592,7 @@ public class Blocks implements ContentList{
}};
pyratiteMixer = new GenericSmelter("pyratite-mixer"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 50, Items.lead, 25));
requirements(Category.crafting, ItemStack.with(Items.copper, 75, Items.lead, 37));
flameColor = Color.CLEAR;
hasItems = true;
hasPower = true;
@@ -605,7 +605,7 @@ public class Blocks implements ContentList{
}};
melter = new GenericCrafter("melter"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.lead, 35, Items.graphite, 45));
requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.lead, 52, Items.graphite, 67));
health = 200;
outputLiquid = new LiquidStack(Liquids.slag, 2f);
craftTime = 10f;
@@ -616,7 +616,7 @@ public class Blocks implements ContentList{
}};
separator = new Separator("separator"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.titanium, 25));
requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.titanium, 37));
results = ItemStack.with(
Items.copper, 5,
Items.lead, 3,
@@ -636,7 +636,7 @@ public class Blocks implements ContentList{
}};
sporePress = new GenericCrafter("spore-press"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 35, Items.silicon, 30));
requirements(Category.crafting, ItemStack.with(Items.lead, 52, Items.silicon, 45));
liquidCapacity = 60f;
craftTime = 20f;
outputLiquid = new LiquidStack(Liquids.oil, 6f);
@@ -672,7 +672,7 @@ public class Blocks implements ContentList{
}};
pulverizer = new GenericCrafter("pulverizer"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.lead, 25));
requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.lead, 37));
outputItem = new ItemStack(Items.sand, 1);
craftEffect = Fx.pulverize;
craftTime = 40f;
@@ -695,7 +695,7 @@ public class Blocks implements ContentList{
}};
coalCentrifuge = new GenericCrafter("coal-centrifuge"){{
requirements(Category.crafting, ItemStack.with(Items.titanium, 20, Items.graphite, 40, Items.lead, 30));
requirements(Category.crafting, ItemStack.with(Items.titanium, 30, Items.graphite, 60, Items.lead, 45));
craftEffect = Fx.smeltsmoke;
outputItem = new ItemStack(Items.coal, 1);
craftTime = 30f;
@@ -707,7 +707,7 @@ public class Blocks implements ContentList{
}};
incinerator = new Incinerator("incinerator"){{
requirements(Category.crafting, ItemStack.with(Items.graphite, 5, Items.lead, 15));
requirements(Category.crafting, ItemStack.with(Items.graphite, 7, Items.lead, 22));
health = 90;
consumes.power(0.50f);
}};
@@ -773,7 +773,7 @@ public class Blocks implements ContentList{
}};
copperWall = new Wall("copper-wall"){{
requirements(Category.defense, ItemStack.with(Items.copper, 6));
requirements(Category.defense, ItemStack.with(Items.copper, 9));
health = 80 * wallHealthMultiplier;
}};
@@ -784,7 +784,7 @@ public class Blocks implements ContentList{
}};
titaniumWall = new Wall("titanium-wall"){{
requirements(Category.defense, ItemStack.with(Items.titanium, 6));
requirements(Category.defense, ItemStack.with(Items.titanium, 9));
health = 110 * wallHealthMultiplier;
}};
@@ -795,7 +795,7 @@ public class Blocks implements ContentList{
}};
thoriumWall = new Wall("thorium-wall"){{
requirements(Category.defense, ItemStack.with(Items.thorium, 6));
requirements(Category.defense, ItemStack.with(Items.thorium, 9));
health = 200 * wallHealthMultiplier;
}};
@@ -806,7 +806,7 @@ public class Blocks implements ContentList{
}};
phaseWall = new DeflectorWall("phase-wall"){{
requirements(Category.defense, ItemStack.with(Items.phasefabric, 6));
requirements(Category.defense, ItemStack.with(Items.phasefabric, 9));
health = 150 * wallHealthMultiplier;
}};
@@ -817,7 +817,7 @@ public class Blocks implements ContentList{
}};
surgeWall = new SurgeWall("surge-wall"){{
requirements(Category.defense, ItemStack.with(Items.surgealloy, 6));
requirements(Category.defense, ItemStack.with(Items.surgealloy, 9));
health = 230 * wallHealthMultiplier;
}};
@@ -828,7 +828,7 @@ public class Blocks implements ContentList{
}};
door = new Door("door"){{
requirements(Category.defense, ItemStack.with(Items.titanium, 6, Items.silicon, 4));
requirements(Category.defense, ItemStack.with(Items.titanium, 9, Items.silicon, 6));
health = 100 * wallHealthMultiplier;
}};
@@ -841,7 +841,7 @@ public class Blocks implements ContentList{
}};
mender = new MendProjector("mender"){{
requirements(Category.effect, ItemStack.with(Items.lead, 30, Items.copper, 25));
requirements(Category.effect, ItemStack.with(Items.lead, 45, Items.copper, 37));
consumes.power(0.3f);
size = 1;
reload = 200f;
@@ -854,7 +854,7 @@ public class Blocks implements ContentList{
}};
mendProjector = new MendProjector("mend-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 100, Items.titanium, 25, Items.silicon, 40));
requirements(Category.effect, ItemStack.with(Items.lead, 150, Items.titanium, 37, Items.silicon, 60));
consumes.power(1.5f);
size = 2;
reload = 250f;
@@ -865,21 +865,21 @@ public class Blocks implements ContentList{
}};
overdriveProjector = new OverdriveProjector("overdrive-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 100, Items.titanium, 75, Items.silicon, 75, Items.plastanium, 30));
requirements(Category.effect, ItemStack.with(Items.lead, 150, Items.titanium, 112, Items.silicon, 112, Items.plastanium, 45));
consumes.power(3.50f);
size = 2;
consumes.item(Items.phasefabric).boost();
}};
forceProjector = new ForceProjector("force-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 100, Items.titanium, 75, Items.silicon, 125));
requirements(Category.effect, ItemStack.with(Items.lead, 150, Items.titanium, 112, Items.silicon, 187));
size = 3;
consumes.item(Items.phasefabric).boost();
consumes.power(3f);
}};
shockMine = new ShockMine("shock-mine"){{
requirements(Category.effect, ItemStack.with(Items.lead, 25, Items.silicon, 12));
requirements(Category.effect, ItemStack.with(Items.lead, 37, Items.silicon, 18));
hasShadow = false;
health = 40;
damage = 11;
@@ -911,40 +911,40 @@ public class Blocks implements ContentList{
}};
itemBridge = new BufferedItemBridge("bridge-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4));
requirements(Category.distribution, ItemStack.with(Items.lead, 6, Items.copper, 6));
range = 4;
speed = 70f;
bufferCapacity = 15;
}};
phaseConveyor = new ItemBridge("phase-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.phasefabric, 5, Items.silicon, 7, Items.lead, 10, Items.graphite, 10));
requirements(Category.distribution, ItemStack.with(Items.phasefabric, 7, Items.silicon, 10, Items.lead, 15, Items.graphite, 15));
range = 12;
hasPower = true;
consumes.power(0.30f);
}};
sorter = new Sorter("sorter"){{
requirements(Category.distribution, ItemStack.with(Items.lead, 2, Items.copper, 2));
requirements(Category.distribution, ItemStack.with(Items.lead, 3, Items.copper, 3));
}};
router = new Router("router"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 3));
requirements(Category.distribution, ItemStack.with(Items.copper, 4));
}};
distributor = new Router("distributor"){{
requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4));
requirements(Category.distribution, ItemStack.with(Items.lead, 6, Items.copper, 6));
size = 2;
}};
overflowGate = new OverflowGate("overflow-gate"){{
requirements(Category.distribution, ItemStack.with(Items.lead, 2, Items.copper, 4));
requirements(Category.distribution, ItemStack.with(Items.lead, 3, Items.copper, 6));
}};
massDriver = new MassDriver("mass-driver"){{
requirements(Category.distribution, ItemStack.with(Items.titanium, 125, Items.silicon, 75, Items.lead, 125, Items.thorium, 50));
requirements(Category.distribution, ItemStack.with(Items.titanium, 187, Items.silicon, 112, Items.lead, 187, Items.thorium, 75));
size = 3;
itemCapacity = 120;
reloadTime = 200f;
@@ -956,12 +956,12 @@ public class Blocks implements ContentList{
//region liquid
mechanicalPump = new Pump("mechanical-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 15, Items.lead, 10));
requirements(Category.liquid, ItemStack.with(Items.copper, 22, Items.lead, 15));
pumpAmount = 0.1f;
}};
rotaryPump = new Pump("rotary-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 70, Items.lead, 50, Items.silicon, 20, Items.titanium, 35));
requirements(Category.liquid, ItemStack.with(Items.copper, 105, Items.lead, 75, Items.silicon, 30, Items.titanium, 52));
pumpAmount = 0.8f;
consumes.power(0.15f);
liquidCapacity = 30f;
@@ -970,7 +970,7 @@ public class Blocks implements ContentList{
}};
thermalPump = new Pump("thermal-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 80, Items.lead, 65, Items.silicon, 30, Items.titanium, 40, Items.thorium, 35));
requirements(Category.liquid, ItemStack.with(Items.copper, 120, Items.lead, 97, Items.silicon, 45, Items.titanium, 60, Items.thorium, 52));
pumpAmount = 1.5f;
consumes.power(0.30f);
liquidCapacity = 40f;
@@ -991,29 +991,29 @@ public class Blocks implements ContentList{
}};
liquidRouter = new LiquidRouter("liquid-router"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 2, Items.metaglass, 2));
requirements(Category.liquid, ItemStack.with(Items.titanium, 3, Items.metaglass, 3));
liquidCapacity = 20f;
}};
liquidTank = new LiquidTank("liquid-tank"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 25, Items.metaglass, 25));
requirements(Category.liquid, ItemStack.with(Items.titanium, 37, Items.metaglass, 37));
size = 3;
liquidCapacity = 1500f;
health = 500;
}};
liquidJunction = new LiquidJunction("liquid-junction"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 2, Items.metaglass, 2));
requirements(Category.liquid, ItemStack.with(Items.titanium, 3, Items.metaglass, 3));
}};
bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4));
requirements(Category.liquid, ItemStack.with(Items.titanium, 6, Items.metaglass, 6));
range = 4;
hasPower = false;
}};
phaseConduit = new LiquidBridge("phase-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.phasefabric, 5, Items.silicon, 7, Items.metaglass, 20, Items.titanium, 10));
requirements(Category.liquid, ItemStack.with(Items.phasefabric, 7, Items.silicon, 10, Items.metaglass, 30, Items.titanium, 15));
range = 12;
hasPower = true;
consumes.power(0.30f);
@@ -1023,51 +1023,51 @@ public class Blocks implements ContentList{
//region power
powerNode = new PowerNode("power-node"){{
requirements(Category.power, ItemStack.with(Items.copper, 1, Items.lead, 3));
requirements(Category.power, ItemStack.with(Items.copper, 1, Items.lead, 4));
maxNodes = 20;
laserRange = 6;
}};
powerNodeLarge = new PowerNode("power-node-large"){{
requirements(Category.power, ItemStack.with(Items.titanium, 5, Items.lead, 10, Items.silicon, 3));
requirements(Category.power, ItemStack.with(Items.titanium, 7, Items.lead, 15, Items.silicon, 4));
size = 2;
maxNodes = 30;
laserRange = 9.5f;
}};
surgeTower = new PowerNode("surge-tower"){{
requirements(Category.power, ItemStack.with(Items.titanium, 7, Items.lead, 10, Items.silicon, 15, Items.surgealloy, 15));
requirements(Category.power, ItemStack.with(Items.titanium, 10, Items.lead, 15, Items.silicon, 22, Items.surgealloy, 22));
size = 2;
maxNodes = 2;
laserRange = 30f;
}};
battery = new Battery("battery"){{
requirements(Category.power, ItemStack.with(Items.copper, 4, Items.lead, 20));
requirements(Category.power, ItemStack.with(Items.copper, 6, Items.lead, 30));
consumes.powerBuffered(4000f);
}};
batteryLarge = new Battery("battery-large"){{
requirements(Category.power, ItemStack.with(Items.titanium, 20, Items.lead, 40, Items.silicon, 20));
requirements(Category.power, ItemStack.with(Items.titanium, 30, Items.lead, 60, Items.silicon, 30));
size = 3;
consumes.powerBuffered(50000f);
}};
combustionGenerator = new BurnerGenerator("combustion-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 25, Items.lead, 15));
requirements(Category.power, ItemStack.with(Items.copper, 37, Items.lead, 22));
powerProduction = 1f;
itemDuration = 120f;
}};
thermalGenerator = new ThermalGenerator("thermal-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 40, Items.graphite, 35, Items.lead, 50, Items.silicon, 35, Items.metaglass, 40));
requirements(Category.power, ItemStack.with(Items.copper, 60, Items.graphite, 52, Items.lead, 75, Items.silicon, 52, Items.metaglass, 60));
powerProduction = 1.8f;
generateEffect = Fx.redgeneratespark;
size = 2;
}};
turbineGenerator = new BurnerGenerator("turbine-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 35, Items.graphite, 25, Items.lead, 40, Items.silicon, 30));
requirements(Category.power, ItemStack.with(Items.copper, 52, Items.graphite, 37, Items.lead, 60, Items.silicon, 45));
powerProduction = 6f;
itemDuration = 90f;
consumes.liquid(Liquids.water, 0.05f);
@@ -1076,7 +1076,7 @@ public class Blocks implements ContentList{
}};
differentialGenerator = new SingleTypeGenerator(true, false, "differential-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 70, Items.titanium, 50, Items.lead, 100, Items.silicon, 65, Items.metaglass, 50));
requirements(Category.power, ItemStack.with(Items.copper, 105, Items.titanium, 75, Items.lead, 150, Items.silicon, 97, Items.metaglass, 75));
powerProduction = 16f;
itemDuration = 120f;
hasLiquids = true;
@@ -1087,25 +1087,25 @@ public class Blocks implements ContentList{
}};
rtgGenerator = new DecayGenerator("rtg-generator"){{
requirements(Category.power, ItemStack.with(Items.lead, 100, Items.silicon, 75, Items.phasefabric, 25, Items.plastanium, 75, Items.thorium, 50));
requirements(Category.power, ItemStack.with(Items.lead, 150, Items.silicon, 112, Items.phasefabric, 37, Items.plastanium, 112, Items.thorium, 75));
size = 2;
powerProduction = 3f;
itemDuration = 440f;
}};
solarPanel = new SolarGenerator("solar-panel"){{
requirements(Category.power, ItemStack.with(Items.lead, 10, Items.silicon, 15));
requirements(Category.power, ItemStack.with(Items.lead, 15, Items.silicon, 22));
powerProduction = 0.06f;
}};
largeSolarPanel = new SolarGenerator("solar-panel-large"){{
requirements(Category.power, ItemStack.with(Items.lead, 100, Items.silicon, 145, Items.phasefabric, 15));
requirements(Category.power, ItemStack.with(Items.lead, 150, Items.silicon, 217, Items.phasefabric, 22));
size = 3;
powerProduction = 0.9f;
}};
thoriumReactor = new NuclearReactor("thorium-reactor"){{
requirements(Category.power, ItemStack.with(Items.lead, 300, Items.silicon, 200, Items.graphite, 150, Items.thorium, 150, Items.metaglass, 50));
requirements(Category.power, ItemStack.with(Items.lead, 450, Items.silicon, 300, Items.graphite, 225, Items.thorium, 225, Items.metaglass, 75));
size = 3;
health = 700;
itemDuration = 360f;
@@ -1116,7 +1116,7 @@ public class Blocks implements ContentList{
}};
impactReactor = new ImpactReactor("impact-reactor"){{
requirements(Category.power, ItemStack.with(Items.lead, 500, Items.silicon, 300, Items.graphite, 400, Items.thorium, 100, Items.surgealloy, 250, Items.metaglass, 250));
requirements(Category.power, ItemStack.with(Items.lead, 750, Items.silicon, 450, Items.graphite, 600, Items.thorium, 150, Items.surgealloy, 375, Items.metaglass, 375));
size = 4;
health = 900;
powerProduction = 130f;
@@ -1130,7 +1130,7 @@ public class Blocks implements ContentList{
//region production
mechanicalDrill = new Drill("mechanical-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 12), true);
requirements(Category.production, ItemStack.with(Items.copper, 18), true);
tier = 2;
drillTime = 600;
size = 2;
@@ -1139,7 +1139,7 @@ public class Blocks implements ContentList{
}};
pneumaticDrill = new Drill("pneumatic-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 17, Items.graphite, 7));
requirements(Category.production, ItemStack.with(Items.copper, 25, Items.graphite, 10));
tier = 3;
drillTime = 400;
size = 2;
@@ -1148,7 +1148,7 @@ public class Blocks implements ContentList{
}};
laserDrill = new Drill("laser-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 35, Items.graphite, 30, Items.silicon, 30, Items.titanium, 20));
requirements(Category.production, ItemStack.with(Items.copper, 52, Items.graphite, 45, Items.silicon, 45, Items.titanium, 30));
drillTime = 280;
size = 3;
hasPower = true;
@@ -1161,7 +1161,7 @@ public class Blocks implements ContentList{
}};
blastDrill = new Drill("blast-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 65, Items.silicon, 60, Items.titanium, 50, Items.thorium, 75));
requirements(Category.production, ItemStack.with(Items.copper, 97, Items.silicon, 90, Items.titanium, 75, Items.thorium, 112));
drillTime = 280;
size = 4;
drawRim = true;
@@ -1178,7 +1178,7 @@ public class Blocks implements ContentList{
}};
waterExtractor = new SolidPump("water-extractor"){{
requirements(Category.production, ItemStack.with(Items.copper, 25, Items.graphite, 25, Items.lead, 20));
requirements(Category.production, ItemStack.with(Items.copper, 37, Items.graphite, 37, Items.lead, 30));
result = Liquids.water;
pumpAmount = 0.13f;
size = 2;
@@ -1190,7 +1190,7 @@ public class Blocks implements ContentList{
}};
cultivator = new Cultivator("cultivator"){{
requirements(Category.production, ItemStack.with(Items.copper, 10, Items.lead, 25, Items.silicon, 10));
requirements(Category.production, ItemStack.with(Items.copper, 15, Items.lead, 37, Items.silicon, 15));
outputItem = new ItemStack(Items.sporePod, 1);
craftTime = 140;
size = 2;
@@ -1203,7 +1203,7 @@ public class Blocks implements ContentList{
}};
oilExtractor = new Fracker("oil-extractor"){{
requirements(Category.production, ItemStack.with(Items.copper, 150, Items.graphite, 175, Items.lead, 115, Items.thorium, 115, Items.silicon, 75));
requirements(Category.production, ItemStack.with(Items.copper, 225, Items.graphite, 262, Items.lead, 172, Items.thorium, 172, Items.silicon, 112));
result = Liquids.oil;
updateEffect = Fx.pulverize;
liquidCapacity = 50f;
@@ -1222,7 +1222,7 @@ public class Blocks implements ContentList{
//region storage
coreShard = new CoreBlock("core-shard"){{
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 1000));
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 1500));
alwaysUnlocked = true;
health = 1100;
@@ -1231,7 +1231,7 @@ public class Blocks implements ContentList{
}};
coreFoundation = new CoreBlock("core-foundation"){{
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 1500, Items.silicon, 1000));
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 2250, Items.silicon, 1500));
health = 2000;
itemCapacity = 9000;
@@ -1239,7 +1239,7 @@ public class Blocks implements ContentList{
}};
coreNucleus = new CoreBlock("core-nucleus"){{
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000, Items.surgealloy, 1000));
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 6000, Items.silicon, 3000, Items.surgealloy, 1500));
health = 4000;
itemCapacity = 13000;
@@ -1247,24 +1247,24 @@ public class Blocks implements ContentList{
}};
vault = new Vault("vault"){{
requirements(Category.effect, ItemStack.with(Items.titanium, 250, Items.thorium, 125));
requirements(Category.effect, ItemStack.with(Items.titanium, 375, Items.thorium, 187));
size = 3;
itemCapacity = 1000;
}};
container = new Vault("container"){{
requirements(Category.effect, ItemStack.with(Items.titanium, 100));
requirements(Category.effect, ItemStack.with(Items.titanium, 150));
size = 2;
itemCapacity = 300;
}};
unloader = new Unloader("unloader"){{
requirements(Category.effect, ItemStack.with(Items.titanium, 25, Items.silicon, 30));
requirements(Category.effect, ItemStack.with(Items.titanium, 37, Items.silicon, 45));
speed = 7f;
}};
launchPad = new LaunchPad("launch-pad"){{
requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.copper, 250, Items.silicon, 75, Items.lead, 100));
requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.copper, 375, Items.silicon, 112, Items.lead, 150));
size = 3;
itemCapacity = 100;
launchTime = 60f * 16;
@@ -1273,7 +1273,7 @@ public class Blocks implements ContentList{
}};
launchPadLarge = new LaunchPad("launch-pad-large"){{
requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75));
requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.titanium, 300, Items.silicon, 225, Items.lead, 375, Items.plastanium, 112));
size = 4;
itemCapacity = 250;
launchTime = 60f * 14;
@@ -1286,7 +1286,7 @@ public class Blocks implements ContentList{
//region turrets
duo = new DoubleTurret("duo"){{
requirements(Category.turret, ItemStack.with(Items.copper, 35), true);
requirements(Category.turret, ItemStack.with(Items.copper, 52), true);
ammo(
Items.copper, Bullets.standardCopper,
Items.graphite, Bullets.standardDense,
@@ -1304,7 +1304,7 @@ public class Blocks implements ContentList{
}};
scatter = new BurstTurret("scatter"){{
requirements(Category.turret, ItemStack.with(Items.copper, 85, Items.lead, 45));
requirements(Category.turret, ItemStack.with(Items.copper, 127, Items.lead, 67));
ammo(
Items.scrap, Bullets.flakScrap,
Items.lead, Bullets.flakLead
@@ -1325,7 +1325,7 @@ public class Blocks implements ContentList{
}};
scorch = new ItemTurret("scorch"){{
requirements(Category.turret, ItemStack.with(Items.copper, 25, Items.graphite, 22));
requirements(Category.turret, ItemStack.with(Items.copper, 37, Items.graphite, 33));
ammo(
Items.coal, Bullets.basicFlame,
Items.pyratite, Bullets.pyraFlame
@@ -1340,7 +1340,7 @@ public class Blocks implements ContentList{
}};
hail = new ArtilleryTurret("hail"){{
requirements(Category.turret, ItemStack.with(Items.copper, 40, Items.graphite, 17));
requirements(Category.turret, ItemStack.with(Items.copper, 60, Items.graphite, 25));
ammo(
Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming,
@@ -1355,7 +1355,7 @@ public class Blocks implements ContentList{
}};
wave = new LiquidTurret("wave"){{
requirements(Category.turret, ItemStack.with(Items.metaglass, 45, Items.lead, 75));
requirements(Category.turret, ItemStack.with(Items.metaglass, 67, Items.lead, 112));
ammo(
Liquids.water, Bullets.waterShot,
Liquids.slag, Bullets.slagShot,
@@ -1382,7 +1382,7 @@ public class Blocks implements ContentList{
}};
lancer = new ChargeTurret("lancer"){{
requirements(Category.turret, ItemStack.with(Items.copper, 25, Items.lead, 50, Items.silicon, 45));
requirements(Category.turret, ItemStack.with(Items.copper, 37, Items.lead, 75, Items.silicon, 67));
range = 155f;
chargeTime = 50f;
chargeMaxDelay = 30f;
@@ -1404,7 +1404,7 @@ public class Blocks implements ContentList{
}};
arc = new PowerTurret("arc"){{
requirements(Category.turret, ItemStack.with(Items.copper, 35, Items.lead, 35));
requirements(Category.turret, ItemStack.with(Items.copper, 52, Items.lead, 52));
shootType = Bullets.arc;
reload = 24f;
shootCone = 40f;
@@ -1420,7 +1420,7 @@ public class Blocks implements ContentList{
}};
swarmer = new BurstTurret("swarmer"){{
requirements(Category.turret, ItemStack.with(Items.graphite, 35, Items.titanium, 35, Items.plastanium, 45, Items.silicon, 30));
requirements(Category.turret, ItemStack.with(Items.graphite, 52, Items.titanium, 52, Items.plastanium, 67, Items.silicon, 45));
ammo(
Items.blastCompound, Bullets.missileExplosive,
Items.pyratite, Bullets.missileIncendiary,
@@ -1437,7 +1437,7 @@ public class Blocks implements ContentList{
}};
salvo = new BurstTurret("salvo"){{
requirements(Category.turret, ItemStack.with(Items.copper, 105, Items.graphite, 95, Items.titanium, 60));
requirements(Category.turret, ItemStack.with(Items.copper, 157, Items.graphite, 142, Items.titanium, 90));
ammo(
Items.copper, Bullets.standardCopper,
Items.graphite, Bullets.standardDense,
@@ -1461,7 +1461,7 @@ public class Blocks implements ContentList{
}};
fuse = new ItemTurret("fuse"){{
requirements(Category.turret, ItemStack.with(Items.copper, 225, Items.graphite, 225, Items.thorium, 100));
requirements(Category.turret, ItemStack.with(Items.copper, 337, Items.graphite, 337, Items.thorium, 150));
reload = 35f;
shootShake = 4f;
@@ -1513,7 +1513,7 @@ public class Blocks implements ContentList{
}};
ripple = new ArtilleryTurret("ripple"){{
requirements(Category.turret, ItemStack.with(Items.copper, 150, Items.graphite, 135, Items.titanium, 60));
requirements(Category.turret, ItemStack.with(Items.copper, 225, Items.graphite, 202, Items.titanium, 90));
ammo(
Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming,
@@ -1538,7 +1538,7 @@ public class Blocks implements ContentList{
}};
cyclone = new ItemTurret("cyclone"){{
requirements(Category.turret, ItemStack.with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80));
requirements(Category.turret, ItemStack.with(Items.copper, 300, Items.titanium, 187, Items.plastanium, 120));
ammo(
Items.blastCompound, Bullets.flakExplosive,
Items.plastanium, Bullets.flakPlastic,
@@ -1557,7 +1557,7 @@ public class Blocks implements ContentList{
}};
spectre = new DoubleTurret("spectre"){{
requirements(Category.turret, ItemStack.with(Items.copper, 350, Items.graphite, 300, Items.surgealloy, 250, Items.plastanium, 175, Items.thorium, 250));
requirements(Category.turret, ItemStack.with(Items.copper, 525, Items.graphite, 450, Items.surgealloy, 375, Items.plastanium, 262, Items.thorium, 375));
ammo(
Items.graphite, Bullets.standardDenseBig,
Items.pyratite, Bullets.standardIncendiaryBig,
@@ -1582,7 +1582,7 @@ public class Blocks implements ContentList{
}};
meltdown = new LaserTurret("meltdown"){{
requirements(Category.turret, ItemStack.with(Items.copper, 250, Items.lead, 350, Items.graphite, 300, Items.surgealloy, 325, Items.silicon, 325));
requirements(Category.turret, ItemStack.with(Items.copper, 375, Items.lead, 525, Items.graphite, 450, Items.surgealloy, 487, Items.silicon, 487));
shootType = Bullets.meltdownLaser;
shootEffect = Fx.shootBigSmoke2;
shootCone = 40f;
@@ -1603,7 +1603,7 @@ public class Blocks implements ContentList{
//region units
draugFactory = new UnitFactory("draug-factory"){{
requirements(Category.units, ItemStack.with(Items.copper, 30, Items.lead, 70));
requirements(Category.units, ItemStack.with(Items.copper, 45, Items.lead, 105));
type = UnitTypes.draug;
produceTime = 2500;
size = 2;
@@ -1613,7 +1613,7 @@ public class Blocks implements ContentList{
}};
spiritFactory = new UnitFactory("spirit-factory"){{
requirements(Category.units, ItemStack.with(Items.metaglass, 35, Items.lead, 55, Items.silicon, 45));
requirements(Category.units, ItemStack.with(Items.metaglass, 52, Items.lead, 82, Items.silicon, 67));
type = UnitTypes.spirit;
produceTime = 2850;
size = 2;
@@ -1623,7 +1623,7 @@ public class Blocks implements ContentList{
}};
phantomFactory = new UnitFactory("phantom-factory"){{
requirements(Category.units, ItemStack.with(Items.titanium, 45, Items.thorium, 40, Items.lead, 55, Items.silicon, 105));
requirements(Category.units, ItemStack.with(Items.titanium, 67, Items.thorium, 60, Items.lead, 82, Items.silicon, 157));
type = UnitTypes.phantom;
produceTime = 3650;
size = 2;
@@ -1633,7 +1633,7 @@ public class Blocks implements ContentList{
}};
wraithFactory = new UnitFactory("wraith-factory"){{
requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 30, Items.lead, 40, Items.silicon, 45));
requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 45, Items.lead, 60, Items.silicon, 67));
type = UnitTypes.wraith;
produceTime = 750;
size = 2;
@@ -1642,7 +1642,7 @@ public class Blocks implements ContentList{
}};
ghoulFactory = new UnitFactory("ghoul-factory"){{
requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 75, Items.lead, 65, Items.silicon, 110));
requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 112, Items.lead, 97, Items.silicon, 165));
type = UnitTypes.ghoul;
produceTime = 1150;
size = 3;
@@ -1651,7 +1651,7 @@ public class Blocks implements ContentList{
}};
revenantFactory = new UnitFactory("revenant-factory"){{
requirements(Category.units, padVisible, ItemStack.with(Items.plastanium, 50, Items.titanium, 150, Items.lead, 150, Items.silicon, 200));
requirements(Category.units, padVisible, ItemStack.with(Items.plastanium, 75, Items.titanium, 225, Items.lead, 225, Items.silicon, 300));
type = UnitTypes.revenant;
produceTime = 2000;
size = 4;
@@ -1660,7 +1660,7 @@ public class Blocks implements ContentList{
}};
daggerFactory = new UnitFactory("dagger-factory"){{
requirements(Category.units, padVisible, ItemStack.with(Items.lead, 55, Items.silicon, 35));
requirements(Category.units, padVisible, ItemStack.with(Items.lead, 82, Items.silicon, 52));
type = UnitTypes.dagger;
produceTime = 850;
size = 2;
@@ -1669,7 +1669,7 @@ public class Blocks implements ContentList{
}};
crawlerFactory = new UnitFactory("crawler-factory"){{
requirements(Category.units, padVisible, ItemStack.with(Items.lead, 25, Items.silicon, 40));
requirements(Category.units, padVisible, ItemStack.with(Items.lead, 37, Items.silicon, 60));
type = UnitTypes.crawler;
produceTime = 250;
size = 2;
@@ -1679,7 +1679,7 @@ public class Blocks implements ContentList{
}};
titanFactory = new UnitFactory("titan-factory"){{
requirements(Category.units, padVisible, ItemStack.with(Items.graphite, 50, Items.lead, 50, Items.silicon, 45));
requirements(Category.units, padVisible, ItemStack.with(Items.graphite, 75, Items.lead, 75, Items.silicon, 67));
type = UnitTypes.titan;
produceTime = 1050;
size = 3;
@@ -1688,7 +1688,7 @@ public class Blocks implements ContentList{
}};
fortressFactory = new UnitFactory("fortress-factory"){{
requirements(Category.units, padVisible, ItemStack.with(Items.thorium, 40, Items.lead, 110, Items.silicon, 75));
requirements(Category.units, padVisible, ItemStack.with(Items.thorium, 60, Items.lead, 165, Items.silicon, 112));
type = UnitTypes.fortress;
produceTime = 2000;
size = 3;
@@ -1698,7 +1698,7 @@ public class Blocks implements ContentList{
}};
repairPoint = new RepairPoint("repair-point"){{
requirements(Category.units, ItemStack.with(Items.lead, 15, Items.copper, 15, Items.silicon, 15));
requirements(Category.units, ItemStack.with(Items.lead, 22, Items.copper, 22, Items.silicon, 22));
repairSpeed = 0.3f;
powerUse = 1f;
}};
@@ -1707,49 +1707,49 @@ public class Blocks implements ContentList{
//region upgrades
dartPad = new MechPad("dart-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75));
requirements(Category.upgrade, ItemStack.with(Items.lead, 150, Items.graphite, 75, Items.copper, 112));
mech = Mechs.alpha;
size = 2;
consumes.power(0.5f);
}};
deltaPad = new MechPad("delta-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 175, Items.titanium, 175, Items.copper, 200, Items.silicon, 225, Items.thorium, 150));
requirements(Category.upgrade, ItemStack.with(Items.lead, 262, Items.titanium, 262, Items.copper, 300, Items.silicon, 337, Items.thorium, 225));
mech = Mechs.delta;
size = 2;
consumes.power(0.7f);
}};
tauPad = new MechPad("tau-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 125, Items.titanium, 125, Items.copper, 125, Items.silicon, 125));
requirements(Category.upgrade, ItemStack.with(Items.lead, 187, Items.titanium, 187, Items.copper, 187, Items.silicon, 187));
mech = Mechs.tau;
size = 2;
consumes.power(1f);
}};
omegaPad = new MechPad("omega-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 225, Items.graphite, 275, Items.silicon, 325, Items.thorium, 300, Items.surgealloy, 120));
requirements(Category.upgrade, ItemStack.with(Items.lead, 337, Items.graphite, 412, Items.silicon, 487, Items.thorium, 450, Items.surgealloy, 180));
mech = Mechs.omega;
size = 3;
consumes.power(1.2f);
}};
javelinPad = new MechPad("javelin-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 175, Items.silicon, 225, Items.titanium, 250, Items.plastanium, 200, Items.phasefabric, 100));
requirements(Category.upgrade, ItemStack.with(Items.lead, 262, Items.silicon, 337, Items.titanium, 375, Items.plastanium, 300, Items.phasefabric, 150));
mech = Mechs.javelin;
size = 2;
consumes.power(0.8f);
}};
tridentPad = new MechPad("trident-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 125, Items.copper, 125, Items.silicon, 125, Items.titanium, 150, Items.plastanium, 100));
requirements(Category.upgrade, ItemStack.with(Items.lead, 187, Items.copper, 187, Items.silicon, 187, Items.titanium, 225, Items.plastanium, 150));
mech = Mechs.trident;
size = 2;
consumes.power(1f);
}};
glaivePad = new MechPad("glaive-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 225, Items.silicon, 325, Items.titanium, 350, Items.plastanium, 300, Items.surgealloy, 100));
requirements(Category.upgrade, ItemStack.with(Items.lead, 337, Items.silicon, 487, Items.titanium, 525, Items.plastanium, 450, Items.surgealloy, 150));
mech = Mechs.glaive;
size = 3;
consumes.power(1.2f);

2
core/src/io/anuke/mindustry/game/Rules.java
View File

@@ -66,7 +66,7 @@ public class Rules{
/** Whether this is the editor gamemode. */
public boolean editor = false;
/** Starting items put in cores */
public Array<ItemStack> loadout = Array.with(ItemStack.with(Items.copper, 200));
public Array<ItemStack> loadout = Array.with(ItemStack.with(Items.copper, 150));
/** Copies this ruleset exactly. Not very efficient at all, do not use often. */
public Rules copy(){

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

@@ -223,7 +223,7 @@ public class Maps implements Disposable{
for(Block block : new Block[]{Blocks.oreCopper, Blocks.oreLead, Blocks.oreCoal, Blocks.oreTitanium, Blocks.oreThorium}){
OreFilter filter = new OreFilter();
filter.threshold += index ++ * 0.019f;
filter.scl += index;
filter.scl += index/2f;
filter.ore = block;
filters.add(filter);
}

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

@@ -8,7 +8,7 @@ import static io.anuke.mindustry.maps.filters.FilterOption.BlockOption;
import static io.anuke.mindustry.maps.filters.FilterOption.oresOnly;
public class OreFilter extends GenerateFilter{
public float scl = 23, threshold = 0.8f, octaves = 2f, falloff = 0.3f;
public float scl = 24, threshold = 0.812f, octaves = 2f, falloff = 0.3f;
public Block ore = Blocks.oreCopper;
{