Re-added all recipes to blocks

This commit is contained in:
Anuken
2019-01-20 21:11:58 -05:00
parent bc77ebc10c
commit a9d7ed50b7
5 changed files with 169 additions and 62 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 447 B

View File

@@ -206,15 +206,16 @@ public class Blocks implements ContentList{
}}; }};
rocks = new Rock("rocks"){{ rocks = new Rock("rocks"){{
variants = 2; variants = 2;
breakable = alwaysReplace = false; breakable = alwaysReplace = false;
solid = true; solid = true;
}}; }};
//endregion //endregion
//region crafting //region crafting
siliconSmelter = new PowerSmelter("silicon-smelter"){{ siliconSmelter = new PowerSmelter("silicon-smelter"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.lead, 50));
health = 90; health = 90;
craftEffect = Fx.smeltsmoke; craftEffect = Fx.smeltsmoke;
result = Items.silicon; result = Items.silicon;
@@ -228,6 +229,7 @@ public class Blocks implements ContentList{
}}; }};
plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{ plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 160, Items.lead, 230, Items.graphite, 120, Items.titanium, 160));
hasItems = true; hasItems = true;
liquidCapacity = 60f; liquidCapacity = 60f;
craftTime = 60f; craftTime = 60f;
@@ -244,6 +246,7 @@ public class Blocks implements ContentList{
}}; }};
phaseWeaver = new PhaseWeaver("phase-weaver"){{ phaseWeaver = new PhaseWeaver("phase-weaver"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 260, Items.lead, 240, Items.thorium, 150));
craftEffect = Fx.smeltsmoke; craftEffect = Fx.smeltsmoke;
result = Items.phasefabric; result = Items.phasefabric;
craftTime = 120f; craftTime = 120f;
@@ -254,6 +257,7 @@ public class Blocks implements ContentList{
}}; }};
surgeSmelter = new PowerSmelter("alloy-smelter"){{ surgeSmelter = new PowerSmelter("alloy-smelter"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 160, Items.lead, 160, Items.thorium, 140));
craftEffect = Fx.smeltsmoke; craftEffect = Fx.smeltsmoke;
result = Items.surgealloy; result = Items.surgealloy;
craftTime = 75f; craftTime = 75f;
@@ -267,6 +271,7 @@ public class Blocks implements ContentList{
}}; }};
cryofluidMixer = new LiquidMixer("cryofluidmixer"){{ cryofluidMixer = new LiquidMixer("cryofluidmixer"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 130, Items.silicon, 80, Items.thorium, 90));
outputLiquid = Liquids.cryofluid; outputLiquid = Liquids.cryofluid;
liquidPerItem = 50f; liquidPerItem = 50f;
size = 2; size = 2;
@@ -278,6 +283,7 @@ public class Blocks implements ContentList{
}}; }};
blastMixer = new GenericCrafter("blast-mixer"){{ blastMixer = new GenericCrafter("blast-mixer"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 60, Items.titanium, 40));
hasItems = true; hasItems = true;
hasPower = true; hasPower = true;
hasLiquids = true; hasLiquids = true;
@@ -290,6 +296,7 @@ public class Blocks implements ContentList{
}}; }};
pyratiteMixer = new PowerSmelter("pyratite-mixer"){{ pyratiteMixer = new PowerSmelter("pyratite-mixer"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 100, Items.lead, 50));
flameColor = Color.CLEAR; flameColor = Color.CLEAR;
hasItems = true; hasItems = true;
hasPower = true; hasPower = true;
@@ -302,6 +309,7 @@ public class Blocks implements ContentList{
}}; }};
melter = new PowerCrafter("melter"){{ melter = new PowerCrafter("melter"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.lead, 70, Items.graphite, 90));
health = 200; health = 200;
outputLiquid = Liquids.slag; outputLiquid = Liquids.slag;
outputLiquidAmount = 1.5f; outputLiquidAmount = 1.5f;
@@ -313,11 +321,12 @@ public class Blocks implements ContentList{
}}; }};
separator = new Separator("separator"){{ separator = new Separator("separator"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.titanium, 50));
results = new ItemStack[]{ results = new ItemStack[]{
new ItemStack(Items.copper, 5), new ItemStack(Items.copper, 5),
new ItemStack(Items.lead, 3), new ItemStack(Items.lead, 3),
new ItemStack(Items.titanium, 2), new ItemStack(Items.titanium, 2),
new ItemStack(Items.thorium, 1) new ItemStack(Items.thorium, 1)
}; };
hasPower = true; hasPower = true;
filterTime = 15f; filterTime = 15f;
@@ -332,6 +341,7 @@ public class Blocks implements ContentList{
}}; }};
biomatterCompressor = new Compressor("biomattercompressor"){{ biomatterCompressor = new Compressor("biomattercompressor"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 70, Items.silicon, 60));
liquidCapacity = 60f; liquidCapacity = 60f;
craftTime = 20f; craftTime = 20f;
outputLiquid = Liquids.oil; outputLiquid = Liquids.oil;
@@ -345,6 +355,7 @@ public class Blocks implements ContentList{
}}; }};
pulverizer = new Pulverizer("pulverizer"){{ pulverizer = new Pulverizer("pulverizer"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.lead, 50));
output = Items.sand; output = Items.sand;
craftEffect = Fx.pulverize; craftEffect = Fx.pulverize;
craftTime = 40f; craftTime = 40f;
@@ -356,6 +367,7 @@ public class Blocks implements ContentList{
}}; }};
incinerator = new Incinerator("incinerator"){{ incinerator = new Incinerator("incinerator"){{
requirements(Category.crafting, ItemStack.with(Items.graphite, 10, Items.lead, 30));
health = 90; health = 90;
}}; }};
@@ -389,55 +401,73 @@ public class Blocks implements ContentList{
int wallHealthMultiplier = 3; int wallHealthMultiplier = 3;
copperWall = new Wall("copper-wall"){{ copperWall = new Wall("copper-wall"){{
requirements(Category.defense, ItemStack.with(Items.copper, 12));
health = 80 * wallHealthMultiplier; health = 80 * wallHealthMultiplier;
}}; }};
copperWallLarge = new Wall("copper-wall-large"){{ copperWallLarge = new Wall("copper-wall-large"){{
requirements(Category.defense, ItemStack.with(Items.copper, 12 * 4));
requirements(Category.defense, ItemStack.with(Items.copper, 12));
health = 80 * 4 * wallHealthMultiplier; health = 80 * 4 * wallHealthMultiplier;
size = 2; size = 2;
}}; }};
titaniumWall = new Wall("titanium-wall"){{ titaniumWall = new Wall("titanium-wall"){{
requirements(Category.defense, ItemStack.with(Items.titanium, 12));
health = 110 * wallHealthMultiplier; health = 110 * wallHealthMultiplier;
}}; }};
titaniumWallLarge = new Wall("titanium-wall-large"){{ titaniumWallLarge = new Wall("titanium-wall-large"){{
requirements(Category.defense, ItemStack.with(Items.titanium, 12 * 4));
requirements(Category.defense, ItemStack.with(Items.titanium, 12));
health = 110 * wallHealthMultiplier * 4; health = 110 * wallHealthMultiplier * 4;
size = 2; size = 2;
}}; }};
thoriumWall = new Wall("thorium-wall"){{ thoriumWall = new Wall("thorium-wall"){{
requirements(Category.defense, ItemStack.with(Items.thorium, 12));
health = 200 * wallHealthMultiplier; health = 200 * wallHealthMultiplier;
}}; }};
thoriumWallLarge = new Wall("thorium-wall-large"){{ thoriumWallLarge = new Wall("thorium-wall-large"){{
requirements(Category.defense, ItemStack.with(Items.thorium, 12 * 4));
requirements(Category.defense, ItemStack.with(Items.thorium, 12));
health = 200 * wallHealthMultiplier * 4; health = 200 * wallHealthMultiplier * 4;
size = 2; size = 2;
}}; }};
phaseWall = new DeflectorWall("phase-wall"){{ phaseWall = new DeflectorWall("phase-wall"){{
requirements(Category.defense, ItemStack.with(Items.phasefabric, 12));
health = 150 * wallHealthMultiplier; health = 150 * wallHealthMultiplier;
}}; }};
phaseWallLarge = new DeflectorWall("phase-wall-large"){{ phaseWallLarge = new DeflectorWall("phase-wall-large"){{
requirements(Category.defense, ItemStack.with(Items.phasefabric, 12 * 4));
requirements(Category.defense, ItemStack.with(Items.phasefabric, 12));
health = 150 * 4 * wallHealthMultiplier; health = 150 * 4 * wallHealthMultiplier;
size = 2; size = 2;
}}; }};
surgeWall = new SurgeWall("surge-wall"){{ surgeWall = new SurgeWall("surge-wall"){{
requirements(Category.defense, ItemStack.with(Items.surgealloy, 12));
health = 230 * wallHealthMultiplier; health = 230 * wallHealthMultiplier;
}}; }};
surgeWallLarge = new SurgeWall("surge-wall-large"){{ surgeWallLarge = new SurgeWall("surge-wall-large"){{
requirements(Category.defense, ItemStack.with(Items.surgealloy, 12 * 4));
requirements(Category.defense, ItemStack.with(Items.surgealloy, 12));
health = 230 * 4 * wallHealthMultiplier; health = 230 * 4 * wallHealthMultiplier;
size = 2; size = 2;
}}; }};
door = new Door("door"){{ door = new Door("door"){{
requirements(Category.defense, ItemStack.with(Items.titanium, 12, Items.silicon, 8));
health = 100 * wallHealthMultiplier; health = 100 * wallHealthMultiplier;
}}; }};
doorLarge = new Door("door-large"){{ doorLarge = new Door("door-large"){{
requirements(Category.defense, ItemStack.with(Items.titanium, 12 * 4, Items.silicon, 8 * 4));
requirements(Category.defense, ItemStack.with(Items.titanium, 12, Items.silicon, 8));
openfx = Fx.dooropenlarge; openfx = Fx.dooropenlarge;
closefx = Fx.doorcloselarge; closefx = Fx.doorcloselarge;
health = 100 * 4 * wallHealthMultiplier; health = 100 * 4 * wallHealthMultiplier;
@@ -445,23 +475,27 @@ public class Blocks implements ContentList{
}}; }};
mendProjector = new MendProjector("mend-projector"){{ mendProjector = new MendProjector("mend-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.titanium, 50, Items.silicon, 180));
consumes.power(0.2f, 1.0f); consumes.power(0.2f, 1.0f);
size = 2; size = 2;
consumes.item(Items.phasefabric).optional(true); consumes.item(Items.phasefabric).optional(true);
}}; }};
overdriveProjector = new OverdriveProjector("overdrive-projector"){{ overdriveProjector = new OverdriveProjector("overdrive-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.titanium, 150, Items.silicon, 250));
consumes.power(0.35f, 1.0f); consumes.power(0.35f, 1.0f);
size = 2; size = 2;
consumes.item(Items.phasefabric).optional(true); consumes.item(Items.phasefabric).optional(true);
}}; }};
forceProjector = new ForceProjector("force-projector"){{ forceProjector = new ForceProjector("force-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.titanium, 150, Items.silicon, 250));
size = 3; size = 3;
consumes.item(Items.phasefabric).optional(true); consumes.item(Items.phasefabric).optional(true);
}}; }};
shockMine = new ShockMine("shock-mine"){{ shockMine = new ShockMine("shock-mine"){{
requirements(Category.effect, ItemStack.with(Items.lead, 50, Items.silicon, 25));
health = 40; health = 40;
damage = 11; damage = 11;
tileDamage = 7f; tileDamage = 7f;
@@ -473,50 +507,59 @@ public class Blocks implements ContentList{
//region distribution //region distribution
conveyor = new Conveyor("conveyor"){{ conveyor = new Conveyor("conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 1), true);
health = 45; health = 45;
speed = 0.03f; speed = 0.03f;
requirements(Category.distribution, ItemStack.with(Items.copper, 1), true);
}}; }};
titaniumConveyor = new Conveyor("titanium-conveyor"){{ titaniumConveyor = new Conveyor("titanium-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 2, Items.titanium, 1));
health = 65; health = 65;
speed = 0.07f; speed = 0.07f;
requirements(Category.distribution, ItemStack.with(Items.copper, 2, Items.titanium, 1));
}}; }};
junction = new Junction("junction"){{ junction = new Junction("junction"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 2));
speed = 26; speed = 26;
capacity = 32; capacity = 32;
requirements(Category.distribution, ItemStack.with(Items.copper, 2));
}}; }};
itemBridge = new BufferedItemBridge("bridge-conveyor"){{ itemBridge = new BufferedItemBridge("bridge-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.titanium, 8, Items.copper, 8));
range = 4; range = 4;
speed = 60f; speed = 60f;
bufferCapacity = 15; bufferCapacity = 15;
}}; }};
phaseConveyor = new ItemBridge("phase-conveyor"){{ phaseConveyor = new ItemBridge("phase-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.lead, 20, Items.graphite, 20));
range = 12; range = 12;
hasPower = true; hasPower = true;
consumes.power(0.03f, 1.0f); consumes.power(0.03f, 1.0f);
}}; }};
sorter = new Sorter("sorter"){{ sorter = new Sorter("sorter"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 5, Items.titanium, 4)); requirements(Category.distribution, ItemStack.with(Items.titanium, 4, Items.copper, 4));
}}; }};
router = new Router("router"){{ router = new Router("router"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 6)); requirements(Category.distribution, ItemStack.with(Items.copper, 6));
}}; }};
distributor = new Router("distributor"){{ distributor = new Router("distributor"){{
requirements(Category.distribution, ItemStack.with(Items.titanium, 8, Items.copper, 8));
size = 2; size = 2;
}}; }};
overflowGate = new OverflowGate("overflow-gate"); overflowGate = new OverflowGate("overflow-gate"){{
requirements(Category.distribution, ItemStack.with(Items.titanium, 4, Items.copper, 8));
}};
massDriver = new MassDriver("mass-driver"){{ massDriver = new MassDriver("mass-driver"){{
requirements(Category.distribution, ItemStack.with(Items.titanium, 250, Items.silicon, 150, Items.lead, 250, Items.thorium, 100));
size = 3; size = 3;
itemCapacity = 60; itemCapacity = 60;
range = 440f; range = 440f;
@@ -526,11 +569,13 @@ public class Blocks implements ContentList{
//region liquid //region liquid
mechanicalPump = new Pump("mechanical-pump"){{ mechanicalPump = new Pump("mechanical-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 30, Items.lead, 20));
pumpAmount = 0.1f; pumpAmount = 0.1f;
tier = 0; tier = 0;
}}; }};
rotaryPump = new Pump("rotary-pump"){{ rotaryPump = new Pump("rotary-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 140, Items.lead, 100, Items.silicon, 40, Items.titanium, 70));
pumpAmount = 0.2f; pumpAmount = 0.2f;
consumes.power(0.015f); consumes.power(0.015f);
liquidCapacity = 30f; liquidCapacity = 30f;
@@ -540,6 +585,7 @@ public class Blocks implements ContentList{
}}; }};
thermalPump = new Pump("thermal-pump"){{ 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.275f;
consumes.power(0.03f); consumes.power(0.03f);
liquidCapacity = 40f; liquidCapacity = 40f;
@@ -549,33 +595,41 @@ public class Blocks implements ContentList{
}}; }};
conduit = new Conduit("conduit"){{ conduit = new Conduit("conduit"){{
requirements(Category.liquid, ItemStack.with(Items.lead, 1));
health = 45; health = 45;
}}; }};
pulseConduit = new Conduit("pulse-conduit"){{ pulseConduit = new Conduit("pulse-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.lead, 1));
liquidCapacity = 16f; liquidCapacity = 16f;
liquidFlowFactor = 4.9f; liquidFlowFactor = 4.9f;
health = 90; health = 90;
}}; }};
liquidRouter = new LiquidRouter("liquid-router"){{ liquidRouter = new LiquidRouter("liquid-router"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4));
liquidCapacity = 20f; liquidCapacity = 20f;
}}; }};
liquidTank = new LiquidTank("liquid-tank"){{ liquidTank = new LiquidTank("liquid-tank"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 50, Items.lead, 50));
size = 3; size = 3;
liquidCapacity = 1500f; liquidCapacity = 1500f;
health = 500; health = 500;
}}; }};
liquidJunction = new LiquidJunction("liquid-junction"); liquidJunction = new LiquidJunction("liquid-junction"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4));
}};
bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{ bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 8, Items.lead, 8));
range = 4; range = 4;
hasPower = false; hasPower = false;
}}; }};
phaseConduit = new LiquidBridge("phase-conduit"){{ phaseConduit = new LiquidBridge("phase-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.lead, 20, Items.titanium, 20));
range = 12; range = 12;
hasPower = true; hasPower = true;
consumes.power(0.03f, 1.0f); consumes.power(0.03f, 1.0f);
@@ -585,33 +639,39 @@ public class Blocks implements ContentList{
//region power //region power
powerNode = new PowerNode("power-node"){{ powerNode = new PowerNode("power-node"){{
requirements(Category.power, ItemStack.with(Items.copper, 2, Items.lead, 6));
maxNodes = 4; maxNodes = 4;
laserRange = 6; laserRange = 6;
requirements(Category.power, ItemStack.with(Items.copper, 2, Items.lead, 6));
}}; }};
powerNodeLarge = new PowerNode("power-node-large"){{ powerNodeLarge = new PowerNode("power-node-large"){{
requirements(Category.power, ItemStack.with(Items.titanium, 10, Items.lead, 20, Items.silicon, 6));
requirements(Category.power, ItemStack.with(Items.copper, 2, Items.lead, 6));
size = 2; size = 2;
maxNodes = 6; maxNodes = 6;
laserRange = 9.5f; laserRange = 9.5f;
requirements(Category.power, ItemStack.with(Items.silicon, 6, Items.lead, 20, Items.titanium, 6));
}}; }};
battery = new Battery("battery"){{ battery = new Battery("battery"){{
requirements(Category.power, ItemStack.with(Items.copper, 8, Items.lead, 30, Items.silicon, 4));
consumes.powerBuffered(320f, 1f); consumes.powerBuffered(320f, 1f);
}}; }};
batteryLarge = new Battery("battery-large"){{ batteryLarge = new Battery("battery-large"){{
requirements(Category.power, ItemStack.with(Items.titanium, 40, Items.lead, 80, Items.silicon, 30));
requirements(Category.power, ItemStack.with(Items.copper, 8, Items.lead, 30, Items.silicon, 4));
size = 3; size = 3;
consumes.powerBuffered(2000f, 1f); consumes.powerBuffered(2000f, 1f);
}}; }};
combustionGenerator = new BurnerGenerator("combustion-generator"){{ combustionGenerator = new BurnerGenerator("combustion-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 50, Items.lead, 30));
powerProduction = 0.09f; powerProduction = 0.09f;
itemDuration = 40f; itemDuration = 40f;
}}; }};
thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{ thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 80, Items.graphite, 70, Items.lead, 100, Items.silicon, 70, Items.thorium, 70));
maxLiquidGenerate = 2f; maxLiquidGenerate = 2f;
powerProduction = 2f; powerProduction = 2f;
generateEffect = Fx.redgeneratespark; generateEffect = Fx.redgeneratespark;
@@ -619,6 +679,7 @@ public class Blocks implements ContentList{
}}; }};
turbineGenerator = new TurbineGenerator("turbine-generator"){{ turbineGenerator = new TurbineGenerator("turbine-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 70, Items.graphite, 50, Items.lead, 80, Items.silicon, 60));
powerProduction = 0.28f; powerProduction = 0.28f;
itemDuration = 30f; itemDuration = 30f;
consumes.liquid(Liquids.water, 0.05f); consumes.liquid(Liquids.water, 0.05f);
@@ -626,21 +687,25 @@ public class Blocks implements ContentList{
}}; }};
rtgGenerator = new DecayGenerator("rtg-generator"){{ rtgGenerator = new DecayGenerator("rtg-generator"){{
requirements(Category.power, ItemStack.with(Items.lead, 200, Items.silicon, 150, Items.phasefabric, 50, Items.plastanium, 150, Items.thorium, 100));
size = 2; size = 2;
powerProduction = 0.3f; powerProduction = 0.3f;
itemDuration = 220f; itemDuration = 220f;
}}; }};
solarPanel = new SolarGenerator("solar-panel"){{ solarPanel = new SolarGenerator("solar-panel"){{
requirements(Category.power, ItemStack.with(Items.lead, 20, Items.silicon, 30));
powerProduction = 0.0045f; powerProduction = 0.0045f;
}}; }};
largeSolarPanel = new SolarGenerator("solar-panel-large"){{ largeSolarPanel = new SolarGenerator("solar-panel-large"){{
requirements(Category.power, ItemStack.with(Items.lead, 200, Items.silicon, 290, Items.phasefabric, 30));
size = 3; size = 3;
powerProduction = 0.055f; powerProduction = 0.055f;
}}; }};
thoriumReactor = new NuclearReactor("thorium-reactor"){{ thoriumReactor = new NuclearReactor("thorium-reactor"){{
requirements(Category.power, ItemStack.with(Items.lead, 600, Items.silicon, 400, Items.graphite, 300, Items.thorium, 300));
size = 3; size = 3;
health = 700; health = 700;
powerProduction = 1.1f; powerProduction = 1.1f;
@@ -655,6 +720,7 @@ public class Blocks implements ContentList{
//region production //region production
mechanicalDrill = new Drill("mechanical-drill"){{ mechanicalDrill = new Drill("mechanical-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 20), true);
tier = 2; tier = 2;
drillTime = 600; drillTime = 600;
size = 2; size = 2;
@@ -662,6 +728,7 @@ public class Blocks implements ContentList{
}}; }};
pneumaticDrill = new Drill("pneumatic-drill"){{ pneumaticDrill = new Drill("pneumatic-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 60, Items.graphite, 50));
tier = 3; tier = 3;
drillTime = 480; drillTime = 480;
size = 2; size = 2;
@@ -669,6 +736,7 @@ public class Blocks implements ContentList{
}}; }};
laserDrill = new Drill("laser-drill"){{ laserDrill = new Drill("laser-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 70, Items.graphite, 90, Items.silicon, 60, Items.titanium, 50));
drillTime = 280; drillTime = 280;
size = 2; size = 2;
hasPower = true; hasPower = true;
@@ -680,6 +748,7 @@ public class Blocks implements ContentList{
}}; }};
blastDrill = new Drill("blast-drill"){{ blastDrill = new Drill("blast-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 60));
drillTime = 120; drillTime = 120;
size = 3; size = 3;
drawRim = true; drawRim = true;
@@ -712,6 +781,7 @@ public class Blocks implements ContentList{
}}; }};
waterExtractor = new SolidPump("water-extractor"){{ waterExtractor = new SolidPump("water-extractor"){{
requirements(Category.production, ItemStack.with(Items.copper, 50, Items.graphite, 50, Items.lead, 40));
result = Liquids.water; result = Liquids.water;
pumpAmount = 0.065f; pumpAmount = 0.065f;
size = 2; size = 2;
@@ -722,6 +792,7 @@ public class Blocks implements ContentList{
}}; }};
oilExtractor = new Fracker("oil-extractor"){{ oilExtractor = new Fracker("oil-extractor"){{
requirements(Category.production, ItemStack.with(Items.copper, 300, Items.graphite, 350, Items.lead, 230, Items.thorium, 230, Items.silicon, 150));
result = Liquids.oil; result = Liquids.oil;
updateEffect = Fx.pulverize; updateEffect = Fx.pulverize;
liquidCapacity = 50f; liquidCapacity = 50f;
@@ -736,6 +807,7 @@ public class Blocks implements ContentList{
}}; }};
cultivator = new Cultivator("cultivator"){{ cultivator = new Cultivator("cultivator"){{
requirements(Category.production, ItemStack.with(Items.copper, 20, Items.lead, 50, Items.silicon, 20));
result = Items.biomatter; result = Items.biomatter;
drillTime = 200; drillTime = 200;
size = 2; size = 2;
@@ -750,6 +822,9 @@ public class Blocks implements ContentList{
//region storage //region storage
core = new CoreBlock("core"){{ core = new CoreBlock("core"){{
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 2000));
alwaysUnlocked = true;
health = 1100; health = 1100;
itemCapacity = 1000; itemCapacity = 1000;
launchThreshold = 500; launchThreshold = 500;
@@ -759,20 +834,24 @@ public class Blocks implements ContentList{
}}; }};
vault = new Vault("vault"){{ vault = new Vault("vault"){{
requirements(Category.effect, ItemStack.with(Items.titanium, 500, Items.thorium, 250));
size = 3; size = 3;
itemCapacity = 1000; itemCapacity = 1000;
}}; }};
container = new Vault("container"){{ container = new Vault("container"){{
requirements(Category.effect, ItemStack.with(Items.titanium, 200));
size = 2; size = 2;
itemCapacity = 300; itemCapacity = 300;
}}; }};
unloader = new SortedUnloader("unloader"){{ unloader = new SortedUnloader("unloader"){{
requirements(Category.distribution, ItemStack.with(Items.titanium, 50, Items.silicon, 60));
speed = 7f; speed = 7f;
}}; }};
launchPad = new LaunchPad("launch-pad"){{ launchPad = new LaunchPad("launch-pad"){{
requirements(Category.effect, ItemStack.with(Items.copper, 500));
size = 3; size = 3;
itemCapacity = 100; itemCapacity = 100;
launchTime = 60f * 6; launchTime = 60f * 6;
@@ -784,11 +863,12 @@ public class Blocks implements ContentList{
//region turrets //region turrets
duo = new DoubleTurret("duo"){{ duo = new DoubleTurret("duo"){{
requirements(Category.turret, ItemStack.with(Items.copper, 60), true);
ammo( ammo(
Items.copper, Bullets.standardCopper, Items.copper, Bullets.standardCopper,
Items.graphite, Bullets.standardDense, Items.graphite, Bullets.standardDense,
Items.pyratite, Bullets.standardIncendiary, Items.pyratite, Bullets.standardIncendiary,
Items.silicon, Bullets.standardHoming Items.silicon, Bullets.standardHoming
); );
reload = 20f; reload = 20f;
restitution = 0.03f; restitution = 0.03f;
@@ -798,14 +878,14 @@ public class Blocks implements ContentList{
health = 110; health = 110;
inaccuracy = 2f; inaccuracy = 2f;
rotatespeed = 10f; rotatespeed = 10f;
requirements(Category.turret, ItemStack.with(Items.copper, 60), true);
}}; }};
hail = new ArtilleryTurret("hail"){{ hail = new ArtilleryTurret("hail"){{
requirements(Category.turret, ItemStack.with(Items.copper, 60, Items.graphite, 35));
ammo( ammo(
Items.graphite, Bullets.artilleryDense, Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming, Items.silicon, Bullets.artilleryHoming,
Items.pyratite, Bullets.artlleryIncendiary Items.pyratite, Bullets.artlleryIncendiary
); );
reload = 60f; reload = 60f;
recoil = 2f; recoil = 2f;
@@ -816,11 +896,12 @@ public class Blocks implements ContentList{
}}; }};
wave = new LiquidTurret("wave"){{ wave = new LiquidTurret("wave"){{
requirements(Category.turret, ItemStack.with(Items.titanium, 70, Items.lead, 150));
ammo( ammo(
Liquids.water, Bullets.waterShot, Liquids.water, Bullets.waterShot,
Liquids.slag, Bullets.slagShot, Liquids.slag, Bullets.slagShot,
Liquids.cryofluid, Bullets.cryoShot, Liquids.cryofluid, Bullets.cryoShot,
Liquids.oil, Bullets.oilShot Liquids.oil, Bullets.oilShot
); );
size = 2; size = 2;
recoil = 0f; recoil = 0f;
@@ -842,6 +923,7 @@ public class Blocks implements ContentList{
}}; }};
lancer = new ChargeTurret("lancer"){{ lancer = new ChargeTurret("lancer"){{
requirements(Category.turret, ItemStack.with(Items.copper, 50, Items.lead, 100, Items.silicon, 90));
range = 90f; range = 90f;
chargeTime = 60f; chargeTime = 60f;
chargeMaxDelay = 30f; chargeMaxDelay = 30f;
@@ -864,6 +946,7 @@ public class Blocks implements ContentList{
}}; }};
arc = new PowerTurret("arc"){{ arc = new PowerTurret("arc"){{
requirements(Category.turret, ItemStack.with(Items.copper, 70, Items.lead, 60));
shootType = Bullets.arc; shootType = Bullets.arc;
reload = 85f; reload = 85f;
shootShake = 1f; shootShake = 1f;
@@ -879,10 +962,11 @@ public class Blocks implements ContentList{
}}; }};
swarmer = new BurstTurret("swarmer"){{ swarmer = new BurstTurret("swarmer"){{
requirements(Category.turret, ItemStack.with(Items.graphite, 70, Items.titanium, 70, Items.plastanium, 90, Items.silicon, 60));
ammo( ammo(
Items.blastCompound, Bullets.missileExplosive, Items.blastCompound, Bullets.missileExplosive,
Items.pyratite, Bullets.missileIncendiary, Items.pyratite, Bullets.missileIncendiary,
Items.surgealloy, Bullets.missileSurge Items.surgealloy, Bullets.missileSurge
); );
reload = 50f; reload = 50f;
shots = 4; shots = 4;
@@ -895,12 +979,13 @@ public class Blocks implements ContentList{
}}; }};
salvo = new BurstTurret("salvo"){{ salvo = new BurstTurret("salvo"){{
requirements(Category.turret, ItemStack.with(Items.copper, 210, Items.graphite, 190, Items.thorium, 130));
ammo( ammo(
Items.copper, Bullets.standardCopper, Items.copper, Bullets.standardCopper,
Items.graphite, Bullets.standardDense, Items.graphite, Bullets.standardDense,
Items.pyratite, Bullets.standardIncendiary, Items.pyratite, Bullets.standardIncendiary,
Items.silicon, Bullets.standardHoming, Items.silicon, Bullets.standardHoming,
Items.thorium, Bullets.standardThorium Items.thorium, Bullets.standardThorium
); );
size = 2; size = 2;
@@ -918,12 +1003,13 @@ public class Blocks implements ContentList{
}}; }};
ripple = new ArtilleryTurret("ripple"){{ ripple = new ArtilleryTurret("ripple"){{
requirements(Category.turret, ItemStack.with(Items.copper, 300, Items.graphite, 220, Items.thorium, 120));
ammo( ammo(
Items.graphite, Bullets.artilleryDense, Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming, Items.silicon, Bullets.artilleryHoming,
Items.pyratite, Bullets.artlleryIncendiary, Items.pyratite, Bullets.artlleryIncendiary,
Items.blastCompound, Bullets.artilleryExplosive, Items.blastCompound, Bullets.artilleryExplosive,
Items.plastanium, Bullets.arilleryPlastic Items.plastanium, Bullets.arilleryPlastic
); );
size = 3; size = 3;
shots = 4; shots = 4;
@@ -942,10 +1028,11 @@ public class Blocks implements ContentList{
}}; }};
cyclone = new ItemTurret("cyclone"){{ cyclone = new ItemTurret("cyclone"){{
requirements(Category.turret, ItemStack.with(Items.copper, 400, Items.surgealloy, 200, Items.plastanium, 150));
ammo( ammo(
Items.blastCompound, Bullets.flakExplosive, Items.blastCompound, Bullets.flakExplosive,
Items.plastanium, Bullets.flakPlastic, Items.plastanium, Bullets.flakPlastic,
Items.surgealloy, Bullets.flakSurge Items.surgealloy, Bullets.flakSurge
); );
xRand = 4f; xRand = 4f;
reload = 8f; reload = 8f;
@@ -960,6 +1047,7 @@ public class Blocks implements ContentList{
}}; }};
fuse = new ItemTurret("fuse"){{ fuse = new ItemTurret("fuse"){{
requirements(Category.turret, ItemStack.with(Items.copper, 450, Items.graphite, 450, Items.surgealloy, 250));
ammo(Items.graphite, Bullets.fuseShot); ammo(Items.graphite, Bullets.fuseShot);
reload = 50f; reload = 50f;
shootShake = 4f; shootShake = 4f;
@@ -972,10 +1060,11 @@ public class Blocks implements ContentList{
}}; }};
spectre = new DoubleTurret("spectre"){{ spectre = new DoubleTurret("spectre"){{
requirements(Category.turret, ItemStack.with(Items.copper, 700, Items.graphite, 600, Items.surgealloy, 500, Items.plastanium, 350, Items.thorium, 500));
ammo( ammo(
Items.graphite, Bullets.standardDenseBig, Items.graphite, Bullets.standardDenseBig,
Items.pyratite, Bullets.standardIncendiaryBig, Items.pyratite, Bullets.standardIncendiaryBig,
Items.thorium, Bullets.standardThoriumBig Items.thorium, Bullets.standardThoriumBig
); );
reload = 6f; reload = 6f;
coolantMultiplier = 0.5f; coolantMultiplier = 0.5f;
@@ -996,6 +1085,7 @@ public class Blocks implements ContentList{
}}; }};
meltdown = new LaserTurret("meltdown"){{ meltdown = new LaserTurret("meltdown"){{
requirements(Category.turret, ItemStack.with(Items.copper, 500, Items.lead, 700, Items.graphite, 600, Items.surgealloy, 650, Items.silicon, 650));
shootType = Bullets.meltdownLaser; shootType = Bullets.meltdownLaser;
shootEffect = Fx.shootBigSmoke2; shootEffect = Fx.shootBigSmoke2;
shootCone = 40f; shootCone = 40f;
@@ -1016,6 +1106,7 @@ public class Blocks implements ContentList{
//region units //region units
spiritFactory = new UnitFactory("spirit-factory"){{ spiritFactory = new UnitFactory("spirit-factory"){{
requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 130));
type = UnitTypes.spirit; type = UnitTypes.spirit;
produceTime = 5700; produceTime = 5700;
size = 2; size = 2;
@@ -1024,6 +1115,7 @@ public class Blocks implements ContentList{
}}; }};
phantomFactory = new UnitFactory("phantom-factory"){{ phantomFactory = new UnitFactory("phantom-factory"){{
requirements(Category.units, ItemStack.with(Items.titanium, 90, Items.thorium, 80, Items.lead, 110, Items.silicon, 210));
type = UnitTypes.phantom; type = UnitTypes.phantom;
produceTime = 7300; produceTime = 7300;
size = 2; size = 2;
@@ -1032,6 +1124,7 @@ public class Blocks implements ContentList{
}}; }};
wraithFactory = new UnitFactory("wraith-factory"){{ wraithFactory = new UnitFactory("wraith-factory"){{
requirements(Category.units, ItemStack.with(Items.titanium, 60, Items.lead, 80, Items.silicon, 90));
type = UnitTypes.wraith; type = UnitTypes.wraith;
produceTime = 1800; produceTime = 1800;
size = 2; size = 2;
@@ -1040,6 +1133,7 @@ public class Blocks implements ContentList{
}}; }};
ghoulFactory = new UnitFactory("ghoul-factory"){{ ghoulFactory = new UnitFactory("ghoul-factory"){{
requirements(Category.units, ItemStack.with(Items.plastanium, 80, Items.titanium, 100, Items.lead, 130, Items.silicon, 220));
type = UnitTypes.ghoul; type = UnitTypes.ghoul;
produceTime = 3600; produceTime = 3600;
size = 3; size = 3;
@@ -1048,6 +1142,7 @@ public class Blocks implements ContentList{
}}; }};
revenantFactory = new UnitFactory("revenant-factory"){{ revenantFactory = new UnitFactory("revenant-factory"){{
requirements(Category.units, ItemStack.with(Items.plastanium, 300, Items.titanium, 400, Items.lead, 300, Items.silicon, 400, Items.surgealloy, 100));
type = UnitTypes.revenant; type = UnitTypes.revenant;
produceTime = 8000; produceTime = 8000;
size = 4; size = 4;
@@ -1056,6 +1151,7 @@ public class Blocks implements ContentList{
}}; }};
daggerFactory = new UnitFactory("dagger-factory"){{ daggerFactory = new UnitFactory("dagger-factory"){{
requirements(Category.units, ItemStack.with(Items.lead, 90, Items.silicon, 70));
type = UnitTypes.dagger; type = UnitTypes.dagger;
produceTime = 1700; produceTime = 1700;
size = 2; size = 2;
@@ -1064,6 +1160,7 @@ public class Blocks implements ContentList{
}}; }};
titanFactory = new UnitFactory("titan-factory"){{ titanFactory = new UnitFactory("titan-factory"){{
requirements(Category.units, ItemStack.with(Items.thorium, 90, Items.lead, 140, Items.silicon, 90));
type = UnitTypes.titan; type = UnitTypes.titan;
produceTime = 3400; produceTime = 3400;
size = 3; size = 3;
@@ -1072,6 +1169,7 @@ public class Blocks implements ContentList{
}}; }};
fortressFactory = new UnitFactory("fortress-factory"){{ fortressFactory = new UnitFactory("fortress-factory"){{
requirements(Category.units, ItemStack.with(Items.thorium, 200, Items.lead, 220, Items.silicon, 150, Items.surgealloy, 100, Items.phasefabric, 50));
type = UnitTypes.fortress; type = UnitTypes.fortress;
produceTime = 5000; produceTime = 5000;
size = 3; size = 3;
@@ -1080,6 +1178,7 @@ public class Blocks implements ContentList{
}}; }};
repairPoint = new RepairPoint("repair-point"){{ repairPoint = new RepairPoint("repair-point"){{
requirements(Category.units, ItemStack.with(Items.lead, 30, Items.copper, 30, Items.silicon, 30));
repairSpeed = 0.1f; repairSpeed = 0.1f;
}}; }};
@@ -1091,48 +1190,56 @@ public class Blocks implements ContentList{
//region upgrades //region upgrades
alphaPad = new MechPad("alpha-mech-pad"){{ alphaPad = new MechPad("alpha-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 200, Items.graphite, 100, Items.copper, 150));
mech = Mechs.alpha; mech = Mechs.alpha;
size = 2; size = 2;
consumes.powerBuffered(50f); consumes.powerBuffered(50f);
}}; }};
deltaPad = new MechPad("delta-mech-pad"){{ deltaPad = new MechPad("delta-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 350, Items.titanium, 350, Items.copper, 400, Items.silicon, 450, Items.thorium, 300));
mech = Mechs.delta; mech = Mechs.delta;
size = 2; size = 2;
consumes.powerBuffered(70f); consumes.powerBuffered(70f);
}}; }};
tauPad = new MechPad("tau-mech-pad"){{ tauPad = new MechPad("tau-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 250, Items.titanium, 250, Items.copper, 250, Items.silicon, 250));
mech = Mechs.tau; mech = Mechs.tau;
size = 2; size = 2;
consumes.powerBuffered(100f); consumes.powerBuffered(100f);
}}; }};
omegaPad = new MechPad("omega-mech-pad"){{ omegaPad = new MechPad("omega-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 450, Items.graphite, 550, Items.silicon, 650, Items.thorium, 600, Items.surgealloy, 240));
mech = Mechs.omega; mech = Mechs.omega;
size = 3; size = 3;
consumes.powerBuffered(120f); consumes.powerBuffered(120f);
}}; }};
dartPad = new MechPad("dart-ship-pad"){{ dartPad = new MechPad("dart-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 150, Items.copper, 150, Items.silicon, 200, Items.titanium, 240));
mech = Mechs.dart; mech = Mechs.dart;
size = 2; size = 2;
consumes.powerBuffered(50f); consumes.powerBuffered(50f);
}}; }};
javelinPad = new MechPad("javelin-ship-pad"){{ javelinPad = new MechPad("javelin-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 350, Items.silicon, 450, Items.titanium, 500, Items.plastanium, 400, Items.phasefabric, 200));
mech = Mechs.javelin; mech = Mechs.javelin;
size = 2; size = 2;
consumes.powerBuffered(80f); consumes.powerBuffered(80f);
}}; }};
tridentPad = new MechPad("trident-ship-pad"){{ tridentPad = new MechPad("trident-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 250, Items.copper, 250, Items.silicon, 250, Items.titanium, 300, Items.plastanium, 200));
mech = Mechs.trident; mech = Mechs.trident;
size = 2; size = 2;
consumes.powerBuffered(100f); consumes.powerBuffered(100f);
}}; }};
glaivePad = new MechPad("glaive-ship-pad"){{ glaivePad = new MechPad("glaive-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 450, Items.silicon, 650, Items.titanium, 700, Items.plastanium, 600, Items.surgealloy, 200));
mech = Mechs.glaive; mech = Mechs.glaive;
size = 3; size = 3;
consumes.powerBuffered(120f); consumes.powerBuffered(120f);

View File

@@ -250,7 +250,7 @@ public class TechTree implements ContentList{
private TechNode node(Block block, Runnable children){ private TechNode node(Block block, Runnable children){
ItemStack[] requirements = new ItemStack[block.buildRequirements.length]; ItemStack[] requirements = new ItemStack[block.buildRequirements.length];
for(int i = 0; i < requirements.length; i++){ for(int i = 0; i < requirements.length; i++){
requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 40); requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 50);
} }
return new TechNode(block, requirements, children); return new TechNode(block, requirements, children);

View File

@@ -17,7 +17,7 @@ public class Zones implements ContentList{
public void load(){ public void load(){
groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1)){{ groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1)){{
deployCost = ItemStack.with(Items.copper, 100); deployCost = ItemStack.with(Items.copper, 60);
startingItems = ItemStack.with(Items.copper, 50); startingItems = ItemStack.with(Items.copper, 50);
alwaysUnlocked = true; alwaysUnlocked = true;
conditionWave = 10; conditionWave = 10;

View File

@@ -99,7 +99,7 @@ public class GlobalData{
//set up default values //set up default values
if(!Core.settings.has("item-" + Items.copper)){ if(!Core.settings.has("item-" + Items.copper)){
addItem(Items.copper, 1000); addItem(Items.copper, 500);
} }
} }