agp8x
/
satisfactory
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

duration fixes

master
agp8x 2024-03-08 21:59:17 +01:00
parent 7e5c0e8e35
commit b2d23b331c
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/satisfactory/Database.java
View File

@ -408,13 +408,12 @@ public class Database {
public static final Item PackagedOil = new Part("Packaged Oil", -1); public static final Item PackagedOil = new Part("Packaged Oil", -1);
public static final Item PackagedHeavyOilResidue = new Part("Packaged Heavy Oil Residue", -1); public static final Item PackagedHeavyOilResidue = new Part("Packaged Heavy Oil Residue", -1);
public static final Item PackagedAluminaSolution = new Part("Packaged Alumina Solution", -1); public static final Item PackagedAluminaSolution = new Part("Packaged Alumina Solution", -1);
public static final Item PackagedSulfuricAcid = new Part("Packaged Sulfuric Acid", -1); // TODO public static final Item PackagedSulfuricAcid = new Part("Packaged Sulfuric Acid", -1);
public static final Item PackagedNitrogenGas = new Part("Packaged Nitrogen Gas", -1); public static final Item PackagedNitrogenGas = new Part("Packaged Nitrogen Gas", -1);
public static final Item LiquidBiofuel = new ProcessedFluid("Liquid Biofuel"); public static final Item LiquidBiofuel = new ProcessedFluid("Liquid Biofuel");
public static final Item PackagedLiquidBiofuel = new Part("Packaged Liquid Biofuel", -1); public static final Item PackagedLiquidBiofuel = new Part("Packaged Liquid Biofuel", -1);
public static final Item PetroleumCoke = new Part("Petroleum Coke", -1); public static final Item PetroleumCoke = new Part("Petroleum Coke", -1);
public static final Item PolymerResin = new Part("Polymer Resin", -1); public static final Item PolymerResin = new Part("Polymer Resin", -1);
// TODO: verify below!
public static final Item AluminumIngot = new Part("Aluminum Ingot", -1); public static final Item AluminumIngot = new Part("Aluminum Ingot", -1);
public static final Item AlcladAluminumSheet = new Part("Alclad Aluminum Sheet", -1); public static final Item AlcladAluminumSheet = new Part("Alclad Aluminum Sheet", -1);
public static final Item AluminumCasing = new Part("Aluminum Casing", -1); public static final Item AluminumCasing = new Part("Aluminum Casing", -1);
@ -499,15 +498,13 @@ public class Database {
Set<Item> ores = new HashSet<>(Arrays.asList(IronOre, Coal, Limestone, CopperOre, CateriumOre, Sulfur, Uranium)); Set<Item> ores = new HashSet<>(Arrays.asList(IronOre, Coal, Limestone, CopperOre, CateriumOre, Sulfur, Uranium));
ores.addAll(Arrays.asList(Bauxite, RawQuartz));// TODO: rly? ores.addAll(Arrays.asList(Bauxite, RawQuartz));// TODO: rly?
for (Item ore : ores) { for (Item ore : ores) {
Recipe mk1 = new RecipeBuilder().setDuration(1).setName("Miner Mk1").setIsHandCraftable(false).setBuilding(Buildings.MINER_MK1).addOutput(ore, 1).createRecipe(); new RecipeBuilder().setDuration(1).setName("Miner Mk1").setIsHandCraftable(false).setBuilding(Buildings.MINER_MK1).addOutput(ore, 1).createRecipe();
Recipe mk2 = new RecipeBuilder().setDuration(1).setName("Miner Mk2").setIsHandCraftable(false).setBuilding(Buildings.MINER_MK2).addOutput(ore, 2).createRecipe(); Recipe mk2 = new RecipeBuilder().setDuration(1).setName("Miner Mk2").setIsHandCraftable(false).setBuilding(Buildings.MINER_MK2).addOutput(ore, 2).createRecipe();
Recipe mk3 = new RecipeBuilder().setDuration(1).setName("Miner Mk3").setIsHandCraftable(false).setBuilding(Buildings.MINER_MK3).addOutput(ore, 4).createRecipe(); new RecipeBuilder().setDuration(1).setName("Miner Mk3").setIsHandCraftable(false).setBuilding(Buildings.MINER_MK3).addOutput(ore, 4).createRecipe();
ore.setPreference(mk2); ore.setPreference(mk2);
} }
// fluids // fluids
Set<Item> rawFluids = new HashSet<>(Arrays.asList(CrudeOil, Water));
// no common well yet
new RecipeBuilder().setDuration(1).setName("Oil extracting thingy").setIsHandCraftable(false).setBuilding(Buildings.OIL_EXTRACTOR).addOutput(CrudeOil, 2).createRecipe(); new RecipeBuilder().setDuration(1).setName("Oil extracting thingy").setIsHandCraftable(false).setBuilding(Buildings.OIL_EXTRACTOR).addOutput(CrudeOil, 2).createRecipe();
//CrudeOil.setPreference(); //CrudeOil.setPreference();
Recipe water = new RecipeBuilder().setDuration(1).setName("water pump thingy").setIsHandCraftable(false).setBuilding(Buildings.WATER_EXTRACTOR).addOutput(Water, 2).createRecipe(); Recipe water = new RecipeBuilder().setDuration(1).setName("water pump thingy").setIsHandCraftable(false).setBuilding(Buildings.WATER_EXTRACTOR).addOutput(Water, 2).createRecipe();
@ -529,7 +526,7 @@ public class Database {
{ {
// Copper Ingot // Copper Ingot
new RecipeBuilder().setDuration(2).addInput(CopperOre, 1).addOutput(CopperIngot, 1).setBuilding(Buildings.SMELTER).createRecipe(); new RecipeBuilder().setDuration(2).addInput(CopperOre, 1).addOutput(CopperIngot, 1).setBuilding(Buildings.SMELTER).createRecipe();
Recipe alloyIngot = new RecipeBuilder().setName("Coper Alloy Ingot").setDuration(12).setBuilding(Buildings.FOUNDRY) new RecipeBuilder().setName("Coper Alloy Ingot").setDuration(12).setBuilding(Buildings.FOUNDRY)
.addInput(CopperOre, 10) .addInput(CopperOre, 10)
.addInput(IronOre, 5) .addInput(IronOre, 5)
.addOutput(CopperIngot, 20) .addOutput(CopperIngot, 20)
@ -641,7 +638,6 @@ public class Database {
.addInput(SteelPipe, 36) .addInput(SteelPipe, 36)
.addInput(Concrete, 22) .addInput(Concrete, 22)
.addOutput(HeavyModularFrame, 3).createRecipe(); .addOutput(HeavyModularFrame, 3).createRecipe();
// TODO: duration = 60/2.812
} }
{ {
// Wire // Wire
@ -658,6 +654,7 @@ public class Database {
// Cable // Cable
new RecipeBuilder().setDuration(2).addInput(Wire, 2).addOutput(Cable, 1).setBuilding(Buildings.CONSTRUCTOR).createRecipe(); new RecipeBuilder().setDuration(2).addInput(Wire, 2).addOutput(Cable, 1).setBuilding(Buildings.CONSTRUCTOR).createRecipe();
new RecipeBuilder().setDuration(2).setBuilding(Buildings.ASSEMBLER) new RecipeBuilder().setDuration(2).setBuilding(Buildings.ASSEMBLER)
.setName("--unkown-cable-recipe-maybe-quickwire-cable--")
.addInput(Quickwire, 3) .addInput(Quickwire, 3)
.addInput(Rubber, 2) .addInput(Rubber, 2)
.addOutput(Cable, 11).createRecipe(); .addOutput(Cable, 11).createRecipe();
@ -916,16 +913,21 @@ public class Database {
} }
{ {
// Packaged Fuel // Packaged Fuel
//TODO new RecipeBuilder().setBuilding(Buildings.PACKAGER)
.addInput(Turbofuel, 2)
.addInput(EmptyCanister, 2)
.addOutput(PackagedTurboFuel, 2)
.setDuration(6)
.createRecipe();
} }
{ {
// Polymer Resin // Polymer Resin
Recipe polymerResin = new RecipeBuilder().setDuration(1).setBuilding(Buildings.REFINERY) new RecipeBuilder().setDuration(6).setBuilding(Buildings.REFINERY)
.addInput(CrudeOil, 6) .addInput(CrudeOil, 3)
.addOutput(PolymerResin, 13) .addOutput(PolymerResin, 2)
.addOutput(HeavyOilResidue, 2, true).createRecipe(); .addOutput(HeavyOilResidue, 4, true)
// TODO: duration=60/130 .setName("Polymer Resin")
PolymerResin.add(polymerResin); .createRecipe();
} }
{ {
// Liquid Biofuel // Liquid Biofuel
@ -1134,7 +1136,6 @@ public class Database {
.addInput(CompactedCoal, 4) .addInput(CompactedCoal, 4)
.addOutput(Turbofuel, 5) .addOutput(Turbofuel, 5)
.createRecipe(); .createRecipe();
//TODO: 60/18,75
Recipe packaged = new RecipeBuilder() Recipe packaged = new RecipeBuilder()
.setDuration(3) .setDuration(3)
.setBuilding(Buildings.PACKAGER) .setBuilding(Buildings.PACKAGER)
@ -1265,11 +1266,11 @@ public class Database {
} }
{ {
// Coal // Coal
Recipe biocoal = new RecipeBuilder().setName("Biocoal").setBuilding(Buildings.CONSTRUCTOR).setDuration(8) new RecipeBuilder().setName("Biocoal").setBuilding(Buildings.CONSTRUCTOR).setDuration(8)
.addInput(Biomass, 5) .addInput(Biomass, 5)
.addOutput(Coal, 6) .addOutput(Coal, 6)
.createRecipe(); .createRecipe();
Recipe charcoal = new RecipeBuilder().setName("Charcoal").setBuilding(Buildings.CONSTRUCTOR).setDuration(4) new RecipeBuilder().setName("Charcoal").setBuilding(Buildings.CONSTRUCTOR).setDuration(4)
.addInput(Wood, 1) .addInput(Wood, 1)
.addOutput(Coal, 10) .addOutput(Coal, 10)
.createRecipe(); .createRecipe();
@ -1457,7 +1458,7 @@ public class Database {
.addInput(Motor, 4) .addInput(Motor, 4)
.addInput(Rubber, 24) .addInput(Rubber, 24)
.addOutput(TurboMotor, 1) .addOutput(TurboMotor, 1)
.setDuration(112) // TODO: 1.875/min .setDuration(32)
.createRecipe(); .createRecipe();
} }
{ {
@ -1522,7 +1523,7 @@ public class Database {
.addInput(PackagedNitrogenGas, 1) .addInput(PackagedNitrogenGas, 1)
.addOutput(NitrogenGas, 4) .addOutput(NitrogenGas, 4)
.addOutput(EmptyFluidTank, 1, true) .addOutput(EmptyFluidTank, 1, true)
.setDuration(1) // TODO 240/min .setDuration(1)
.createRecipe(); .createRecipe();
} }
{ {
@ -1571,7 +1572,7 @@ public class Database {
.addInput(SulfuricAcid, 6) .addInput(SulfuricAcid, 6)
.addOutput(NonfissileUranium, 20) .addOutput(NonfissileUranium, 20)
.addOutput(Water, 6, true) .addOutput(Water, 6, true)
.setDuration(12) //TODO: 50/min .setDuration(24)
.createRecipe(); .createRecipe();
} }
} }

1
src/main/java/satisfactory/Test.java
View File

@ -138,6 +138,7 @@ public class Test {
//planFor("aluminumIngot", new Production(Database.AluminumIngot, 240)); //planFor("aluminumIngot", new Production(Database.AluminumIngot, 240));
//planFor("fusedFrame", new Production(Database.FusedModularFrame, 1.5)); //planFor("fusedFrame", new Production(Database.FusedModularFrame, 1.5));
planFor("p4", new Production(Database.AssemblyDirectorSystem,4), new Production(Database.MagneticFieldGenerator, 4), new Production(Database.ThermalPropulsionRocket, 1), new Production(Database.NuclearPasta, 1)); planFor("p4", new Production(Database.AssemblyDirectorSystem,4), new Production(Database.MagneticFieldGenerator, 4), new Production(Database.ThermalPropulsionRocket, 1), new Production(Database.NuclearPasta, 1));
planFor("turboFuel", new Production(Database.Turbofuel, 1));
} }
private static void planFor(Item item, int amount, String name) { private static void planFor(Item item, int amount, String name) {