From 22b02b64950bb5ee65fe2462ee1331abe922995d Mon Sep 17 00:00:00 2001 From: agp8x Date: Wed, 11 Sep 2024 21:36:17 +0200 Subject: [PATCH] catchup misc --- src/main/java/satisfactory/Database.java | 20 +++++++++++-------- src/main/java/satisfactory/Test.java | 16 ++++++++++++++- .../java/satisfactory/items/ItemTest.java | 5 +++++ .../satisfactory/items/ValidatedValues.java | 7 +++++++ 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/main/java/satisfactory/Database.java b/src/main/java/satisfactory/Database.java index bf905c5..55e5ee9 100644 --- a/src/main/java/satisfactory/Database.java +++ b/src/main/java/satisfactory/Database.java @@ -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 minerMk3() { Map 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 resourceWellExtractor() { Map 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 diff --git a/src/main/java/satisfactory/Test.java b/src/main/java/satisfactory/Test.java index c09432b..7f5c7c2 100644 --- a/src/main/java/satisfactory/Test.java +++ b/src/main/java/satisfactory/Test.java @@ -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)); } diff --git a/src/test/java/satisfactory/items/ItemTest.java b/src/test/java/satisfactory/items/ItemTest.java index f3ae79b..89a3e85 100644 --- a/src/test/java/satisfactory/items/ItemTest.java +++ b/src/test/java/satisfactory/items/ItemTest.java @@ -72,4 +72,9 @@ class ItemTest { test("aluminumIngot", Database.AluminumIngot); } + @Test + void productionBattery() { + test("battery", Database.Battery); + } + } \ No newline at end of file diff --git a/src/test/java/satisfactory/items/ValidatedValues.java b/src/test/java/satisfactory/items/ValidatedValues.java index 498aa88..cfa047c 100644 --- a/src/test/java/satisfactory/items/ValidatedValues.java +++ b/src/test/java/satisfactory/items/ValidatedValues.java @@ -107,6 +107,13 @@ public class ValidatedValues { ref.put(item, 1.0); values.put(item, ref); } + { + Item item = Database.Battery; + Map ref = new HashMap<>(); + ref.put(Database.Water, 0.0); // TODO: get values + ref.put(item, 1d); + values.put(item, ref); + } } public static Map get(Item item) {