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

catchup misc

master
agp8x 2024-09-11 21:36:17 +02:00
parent b2d23b331c
commit 22b02b6495
4 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,11 +22,11 @@ public class Database {
public static final Building MANUFACTURER = new ProductionBuilding("Manufacturer", 55, manufacturer());
public static final Building MINER_MK1 = new ProductionBuilding("Miner Mk1", 5, minerMk1());
public static final Building MINER_MK2 = new ProductionBuilding("Miner Mk2", 12, minerMk2());
public static final Building MINER_MK3 = new ProductionBuilding("Miner Mk3", -9999, minerMk3()); // FIXME values
public static final Building MINER_MK3 = new ProductionBuilding("Miner Mk3", 30, minerMk3());
public static final Building OIL_EXTRACTOR = new ProductionBuilding("Oil Extractor", 40, oilExtractor());
public static final Building PACKAGER = new ProductionBuilding("Packager", 10, packager());
public static final Building REFINERY = new ProductionBuilding("Refinery", 30, refinery());
public static final Building RESOURCE_WELL_PRESSURIZER = new ProductionBuilding("Resource Well Pressurizer", -1, resourceWellPressurizer());
public static final Building RESOURCE_WELL_PRESSURIZER = new ProductionBuilding("Resource Well Pressurizer", 1501, resourceWellPressurizer());
public static final Building RESOURCE_WELL_EXTRACTOR = new ResourceWellExtractor("Resource Well Extractor", resourceWellExtractor(), RESOURCE_WELL_PRESSURIZER); // FIXME values // TODO: couple with Resource Well Pressurizer
public static final Building NUCLEAR_POWER_PLANT = new PowerGenerationBuilding("Nuclear Power Plant", 0, nuclearPowerPlantCost(), nuclearPowerPlantConsumes()); // TODO power
@ -151,8 +151,11 @@ public class Database {
private static Map<Item, Integer> minerMk3() {
Map<Item, Integer> cost = new HashMap<>();
cost.put(Database.PortableMiner, 2);
cost.put(TODO_ITEM, 1); //FIXME values
cost.put(Database.PortableMiner, 3);
cost.put(Database.SteelPipe, 50);
cost.put(Database.SuperComputer, 5);
cost.put(Database.FusedModularFrame, 10);
cost.put(Database.TurboMotor, 3);
return cost;
}
@ -187,7 +190,8 @@ public class Database {
private static Map<Item, Integer> resourceWellExtractor() {
Map<Item, Integer> cost = new HashMap<>();
cost.put(TODO_ITEM, 1); // FIXME values
cost.put(SteelBeam, 10);
cost.put(Plastic, 10);
return cost;
}
@ -499,9 +503,9 @@ public class Database {
ores.addAll(Arrays.asList(Bauxite, RawQuartz));// TODO: rly?
for (Item ore : ores) {
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();
new RecipeBuilder().setDuration(1).setName("Miner Mk3").setIsHandCraftable(false).setBuilding(Buildings.MINER_MK3).addOutput(ore, 4).createRecipe();
ore.setPreference(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();
ore.setPreference(mk3);
}
// fluids

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

@ -137,7 +137,21 @@ public class Test {
*/
//planFor("aluminumIngot", new Production(Database.AluminumIngot, 240));
//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(
"p4_nuclearPasta",
new Production(Database.NuclearPasta, 1)
);
planFor(
"p4_nuclearPasta_200copperpowder",
new Production(Database.CopperPowder, 200)
);
planFor("turboFuel", new Production(Database.Turbofuel, 1));
}

5
src/test/java/satisfactory/items/ItemTest.java
View File

@ -72,4 +72,9 @@ class ItemTest {
test("aluminumIngot", Database.AluminumIngot);
}
@Test
void productionBattery() {
test("battery", Database.Battery);
}
}

7
src/test/java/satisfactory/items/ValidatedValues.java
View File

@ -107,6 +107,13 @@ public class ValidatedValues {
ref.put(item, 1.0);
values.put(item, ref);
}
{
Item item = Database.Battery;
Map<Item, Double> ref = new HashMap<>();
ref.put(Database.Water, 0.0); // TODO: get values
ref.put(item, 1d);
values.put(item, ref);
}
}
public static Map<Item, Double> get(Item item) {