Merge pull request #1089 from trainvoi/pump-controller-recipe-redone

add recipe for large pump

config/betterquesting/DefaultQuests/Quests/3/599.json

@@ -5,46 +5,41 @@
   "properties:10": {
     "betterquesting:10": {
       "desc:8": "susy.quest.db.599.desc",
-      "frame:8": "ROUNDED_SQUARE",
       "icon:10": {
         "Damage:2": 4,
         "id:8": "gregtech:meta_block_frame_20"
       },
-      "ignoresview:1": 0,
-      "name:8": "susy.quest.db.599.title",
-      "visibility:8": "ALWAYS"
+      "name:8": "susy.quest.db.599.title"
     }
   },
-  "rewards:9": {},
+  "questID:3": 599,
   "tasks:9": {
     "0:10": {
-      "entryLogic:8": "AND",
-      "partialMatch:1": 1,
       "requiredItems:9": {
         "0:10": {
           "Count:3": 1,
-          "Damage:2": 17011,
+          "Damage:2": 17021,
           "id:8": "gregtech:machine"
         },
         "1:10": {
-          "Count:3": 36,
+          "Count:3": 9,
           "Damage:2": 1,
           "id:8": "gregtech:boiler_casing"
         },
         "2:10": {
-          "Count:3": 16,
-          "Damage:2": 2,
-          "id:8": "gregtech:multiblock_casing"
-        },
-        "3:10": {
-          "Count:3": 91,
+          "Count:3": 28,
           "Damage:2": 4,
           "id:8": "gregtech:metal_casing"
         },
-        "4:10": {
-          "Count:3": 300,
+        "3:10": {
+          "Count:3": 4,
           "Damage:2": 4,
           "id:8": "gregtech:meta_block_frame_20"
+        },
+        "4:10": {
+          "Count:3": 2,
+          "Damage:2": 1,
+          "id:8": "gregtech:turbine_casing"
         }
       },
       "taskID:8": "bq_standard:retrieval"

config/betterquesting/resources/supersymmetry/lang/en_us.lang

@@ -1252,8 +1252,8 @@ susy.quest.db.597.title=Thompson
 susy.quest.db.597.desc=The §6Thompson §ris a §ctwo-handed§r sub-machine gun (SMG) you can make at MV. It uses §6SMG Magazines §ras ammo.
 susy.quest.db.598.title=Raw Electrum
 susy.quest.db.598.desc=§6Electrum §rdeposits can be found naturally. They contain a source of §7Silver §rand §6Gold§r.
-susy.quest.db.599.title=Ocean Drill
-susy.quest.db.599.desc=The §bOcean Drill§r is an electric machine that collect§b 8,000 L of seawater per second §rif its§c controller §ris placed between altitude levels §970 and 75 §rin an ocean.%n%nThe Ocean Drill requires:%n§6%n- 1 Ocean Drill Controller%n- 300 Steel Frame Boxes%n- 16 Grate Machine Casings%n- 91 Solid Steel Machine Casings%n- 36 Steel Pipe Casings%n- 1 Maintenance Hatch%n- 1 MV Energy Hatch%n
+susy.quest.db.599.title=Large Fluid Pump
+susy.quest.db.599.desc=The §bLarge Fluid Pump§r is an electric machine that collect §b1000 L of fluid per second§r, depending on the §ebiome§r if its§c controller §ris placed at Y level equal to §964§r. The maximum amount of parallel recipes that can be done in this multiblock is 256.%nThe §bLarge Fluid Pump§r requires:%n§6%n- 1 Large Fluid Pump Controller%n- 28 Solid Steel Machine Casings%n- 9 Steel Pipe Casings%n- 2 Steel Gearbox Casings%n- 1 Maintenance Hatch%n- 1 to 2 Energy Hatch%n- 1 Input Bus%n§r%n%nIf you are wondering what happened to the Ocean Pump, that multiblock will be removed from the pack in the near future, and its role has been replaced by Large Fluid Pump.
 susy.quest.db.600.title=Auto Chisel
 susy.quest.db.600.desc=The §6Auto Chisel §rcan chisel blocks §aautomatically§r.%n%nThe §6Auto Chisel §rrequires a §6chisel §rto be placed into the top middle slot to work. %n%nThe block to be created is placed into the bottom middle slot, and blocks to be chiseled should be in the left slots. %n%nThe machine will output to the right slots.%n%nThe machine can hold up to 10,000 FE (2,500 EU)
 susy.quest.db.601.title=Elevators

groovy/postInit/mod/GregTech.groovy

@@ -302,7 +302,7 @@ mods.gregtech.assembler.recipeBuilder()
         .duration(100)
         .EUt(30)
         .buildAndRegister();
-		
+
 //Steam Conveyor (no recipe for now)
 
 

groovy/postInit/mod/MachineRecipes.groovy

@@ -813,11 +813,11 @@ RecyclingHelper.addShaped("gregtech:dumper", metaitem('dumper'), [
 		[metaitem('plateSteel'), metaitem('plateSteel'), metaitem('plateSteel')]
 ])
 
-RecyclingHelper.addShaped("gregtech:ocean_pumper", metaitem('ocean_pumper'), [
+/*RecyclingHelper.addShaped("gregtech:ocean_pumper", metaitem('ocean_pumper'), [
 		[metaitem('stickLongAluminium'), metaitem('electric.pump.mv'), metaitem('stickLongAluminium')],
 		[ore('circuitMv'), metaitem('hull.mv'), ore('circuitMv')],
 		[metaitem('cableGtSingleCopper'), metaitem('electric.pump.mv'), metaitem('cableGtSingleCopper')]
-])
+*/
 
 RecyclingHelper.addShaped("gregtech:coking_tower", metaitem('coking_tower'), [
 		[metaitem('pipeHugeFluidSteel'), pumps[3], metaitem('pipeHugeFluidSteel')],
@@ -1085,3 +1085,11 @@ recipemap('assembler').recipeBuilder()
 		.EUt(30)
 		.duration(600)
 		.buildAndRegister()
+
+RecyclingHelper.addShaped('gregtech:large_fluid_pump', metaitem('large_fluid_pump'), [
+		[metaitem('rotorBronze'), ore('circuitLv'), metaitem('rotorBronze')],
+		[metaitem('cableGtQuadrupleTin'), metaitem('hull.lv'), metaitem('cableGtQuadrupleTin')],
+		[metaitem('rotorBronze'), ore('circuitLv'), metaitem('rotorBronze')]
+])
+
+crafting.addShapeless("gregtech:ocean_pumper_switching", metaitem('large_fluid_pump'), [metaitem('ocean_pumper')]);