From bdc7ca921852a8e7fe226444d2ce7429ccff365b Mon Sep 17 00:00:00 2001
From: tracer4b <61507029+tracer4b@users.noreply.github.com>
Date: Tue, 12 Apr 2022 21:56:15 +0800
Subject: [PATCH] taranium balance fixes cleanup

---
 overrides/scripts/expert_processing.zs |  31 +++----
 overrides/scripts/expertmode.zs        | 110 +------------------------
 overrides/scripts/materials.zs         |   1 +
 overrides/scripts/normalmode.zs        |  26 ++++++
 4 files changed, 45 insertions(+), 123 deletions(-)

diff --git a/overrides/scripts/expert_processing.zs b/overrides/scripts/expert_processing.zs
index 75793a7..b17cac9 100644
--- a/overrides/scripts/expert_processing.zs
+++ b/overrides/scripts/expert_processing.zs
@@ -86,9 +86,9 @@ chemical_reactor.recipeBuilder()
     .duration(800).EUt(30).buildAndRegister();
 
 // Hydrazine Rocket Fuel
-mixer.recipeBuilder()
-    .fluidInputs(<liquid:hydrazine> * 1000, <liquid:dimethylhydrazine> * 1000)
-    .fluidOutputs(<liquid:rocket_fuel> * 9000)
+chemical_reactor.recipeBuilder()
+    .fluidInputs(<liquid:hydrazine> * 1000, <liquid:dimethylhydrazine> * 1000, <liquid:dinitrogen_tetroxide> * 2000)
+    .fluidOutputs(<liquid:rocket_fuel> * 18000)
     .duration(60).EUt(16).buildAndRegister();
 
 // Graphene 
@@ -681,9 +681,10 @@ centrifuge.recipeBuilder()
 
 // 1/48 scale
 centrifuge.recipeBuilder()
-    .inputs(<metaitem:dustStoneResidue> * 24, <metaitem:dustSodiumMethoxide>)
+    .inputs(<metaitem:dustStoneResidue> * 24, <metaitem:dustSodiumHydroxide> * 3)
+    .fluidInputs(<liquid:water> * 8000)
     .outputs(<metaitem:dustPotassiumFeldspar> * 12, <metaitem:dustSodalite> * 8, <metaitem:dustBiotite> * 6, <metaitem:dustMagnetite> * 4, <metaitem:dustMetalMixture> * 3, <metaitem:dustUncommonResidue>)
-    .duration(200).EUt(96).buildAndRegister();
+    .duration(400).EUt(96).buildAndRegister();
 
 large_chemical_reactor.recipeBuilder()
     .inputs(<metaitem:dustUncommonResidue>)
@@ -695,9 +696,9 @@ large_chemical_reactor.recipeBuilder()
 centrifuge.recipeBuilder()
     .inputs(<metaitem:dustOxidisedResidue> * 10)
     .fluidInputs(<liquid:distilled_water> * 10000)
-    .outputs(<metaitem:dustGarnetSand> * 12, <metaitem:dustBauxite> * 8, <metaitem:dustPhosphorusPentoxide> * 4, <metaitem:dustIlmenite> * 4, <metaitem:dustChalcopyrite> * 3, <metaitem:dustRefinedResidue>)
+    .outputs(<metaitem:dustGarnetSand> * 12, <metaitem:dustBasalticMineralSand> * 12, <metaitem:dustBauxite> * 8, <metaitem:dustPhosphorusPentoxide> * 4, <metaitem:dustIlmenite> * 4, <metaitem:dustRefinedResidue>)
     .fluidOutputs(<liquid:hydrofluoric_acid> * 2000, <liquid:lead_zinc_solution> * 250, <liquid:sulfuric_nickel_solution> * 250)
-    .duration(300).EUt(720).buildAndRegister();
+    .duration(600).EUt(720).buildAndRegister();
 
 // 1/4800 scale
 centrifuge.recipeBuilder()
@@ -705,27 +706,27 @@ centrifuge.recipeBuilder()
     .notConsumable(<draconicevolution:wyvern_core>)
     .notConsumable(<liquid:fluoroantimonic_acid> * 1000)
     .outputs(<metaitem:dustPitchblende> * 10, <metaitem:dustBorax> * 6, <metaitem:dustRareEarth> * 5, <metaitem:dustSnowchestite> * 4, <metaitem:dustDiamond> * 3, <metaitem:dustCleanInertResidue>)
-    .duration(320).EUt(400).buildAndRegister();
+    .duration(800).EUt(400).buildAndRegister();
 
 // 1/4800 scale
 mixer.recipeBuilder()
     .inputs(<metaitem:dustCleanInertResidue>)
-    .fluidInputs(<liquid:helium_hydride> * 1000, <liquid:helium> * 9000)
-    .fluidOutputs(<liquid:ultraacidic_residue> * 10000)
+    .fluidInputs(<liquid:helium_hydride> * 1000)
+    .fluidOutputs(<liquid:ultraacidic_residue> * 1000)
     .duration(160).EUt(1920).buildAndRegister();
 
 // 1/9600 scale
 large_chemical_reactor.recipeBuilder()
-    .fluidInputs(<liquid:xenon> * 1000, <liquid:oxygen> * 4000, <liquid:ultraacidic_residue> * 20000)
+    .fluidInputs(<liquid:xenon> * 1000, <liquid:oxygen> * 4000, <liquid:ultraacidic_residue> * 2000)
     .notConsumable(<draconicevolution:awakened_core>)
-    .outputs(<metaitem:dustEuropium> * 3, <metaitem:dustKaemanite>, <metaitem:dustSmallOsmiridium8020>)
-    .fluidOutputs(<liquid:xenic_acid> * 1000, <liquid:dusty_helium> * 20000)
+    .outputs(<metaitem:dustEuropium> * 2, <metaitem:dustKaemanite>, <metaitem:dustSmallOsmiridium8020>)
+    .fluidOutputs(<liquid:xenic_acid> * 1000, <liquid:dusty_helium> * 2000)
     .duration(120).EUt(1920).buildAndRegister();
 
 // Taranium
 centrifuge.recipeBuilder()
-    .fluidInputs(<liquid:dusty_helium> * 10000)
-    .fluidOutputs(<liquid:taranium_enriched_helium> * 150, <liquid:taranium_depleted_helium> * 850, <liquid:helium> * 9000)
+    .fluidInputs(<liquid:dusty_helium> * 1000)
+    .fluidOutputs(<liquid:taranium_enriched_helium> * 150, <liquid:taranium_depleted_helium> * 850)
     .duration(400).EUt(2880).buildAndRegister();
 
 fusion_reactor.recipeBuilder()
diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs
index 0b44ba3..ada5727 100644
--- a/overrides/scripts/expertmode.zs
+++ b/overrides/scripts/expertmode.zs
@@ -271,112 +271,6 @@ makeExtremeRecipe9(<metaitem:creative_chest> * 2,
       X : <thermalexpansion:capacitor:32000>.withTag({Energy: 250000000}, false)
     });
 
-// Ported Hard Recipe Configs
-//// Harder Glass
-//recipes.addShaped(<metaitem:dustQuartzSand>, [
-//    [<minecraft:sand>, <ore:gtceMortars>]
-//]);
-//
-//macerator.recipeBuilder() 
-//    .inputs(<minecraft:sand>)
-//    .outputs(<metaitem:dustQuartzSand>)
-//    .duration(30).EUt(2)
-//    .buildAndRegister();
-//
-//recipes.addShapeless(<metaitem:dustGlass>, [<metaitem:dustQuartzSand>, <metaitem:dustTinyFlint>]);
-//
-//furnace.remove(<minecraft:glass>);
-//recipes.remove(<minecraft:glass_bottle>);
-//
-//// Harder Redstone
-//recipes.remove(<minecraft:dispenser>);
-//recipes.addShaped(<minecraft:dispenser>, [
-//    [<minecraft:cobblestone>, <metaitem:ringIron>, <minecraft:cobblestone>],
-//    [<metaitem:springIron>, <minecraft:string>, <metaitem:springIron>],
-//    [<metaitem:gearSmallIron>, <metaitem:stickRedAlloy>, <metaitem:gearSmallIron>]
-//]);
-//
-//recipes.remove(<minecraft:comparator>);
-//recipes.remove(<minecraft:repeater>);
-//
-//recipes.remove(<minecraft:piston>);
-//// Piston * 4
-//<recipemap:assembler>.findRecipe(16, [<metaitem:plateAluminium>, <minecraft:planks:0> * 3, <minecraft:cobblestone:0> * 4, <minecraft:redstone:0>], null).remove();
-//// Piston * 2
-//<recipemap:assembler>.findRecipe(16, [<metaitem:plateSteel>, <minecraft:planks:0> * 3, <minecraft:cobblestone:0> * 4, <minecraft:redstone:0>], null).remove();
-//// Piston * 8
-//<recipemap:assembler>.findRecipe(16, [<metaitem:plateTitanium>, <minecraft:planks:0> * 3, <minecraft:cobblestone:0> * 4, <minecraft:redstone:0>], null).remove();
-//// Piston * 1
-//<recipemap:assembler>.findRecipe(16, [<metaitem:plateBronze>, <minecraft:planks:0> * 3, <minecraft:cobblestone:0> * 4, <minecraft:redstone:0>], null).remove();
-//// Piston * 1
-//<recipemap:assembler>.findRecipe(16, [<metaitem:plateIron>, <minecraft:planks:0> * 3, <minecraft:cobblestone:0> * 4, <minecraft:redstone:0>], null).remove();
-//
-//recipes.addShaped(<minecraft:piston>, [
-//    [<ore:plankWood>,<ore:plankWood>,<ore:plankWood>],
-//    [<metaitem:gearSmallIron>, <ore:fenceWood>, <metaitem:gearSmallIron>],
-//    [<minecraft:cobblestone>, <metaitem:plateRedAlloy>, <minecraft:cobblestone>]
-//]);
-//assembler.recipeBuilder()
-//    .inputs(<ore:stickIron>, <metaitem:gearSmallIron>, <ore:slabWood>, <minecraft:cobblestone>)
-//    .fluidInputs(<liquid:red_alloy> * 144)
-//    .outputs(<minecraft:piston>)
-//    .duration(240).EUt(7).buildAndRegister();
-//
-//assembler.recipeBuilder()
-//    .inputs(<ore:stickSteel>, <metaitem:gearSmallSteel>, <ore:slabWood> * 2, <minecraft:cobblestone> * 2)
-//    .fluidInputs(<liquid:red_alloy> * 288)
-//    .outputs(<minecraft:piston> * 2)
-//    .duration(240).EUt(7).buildAndRegister();
-//
-//assembler.recipeBuilder()
-//    .inputs(<ore:stickAluminium>, <metaitem:gearSmallAluminium>, <ore:slabWood> * 4, <minecraft:cobblestone> * 4)
-//    .fluidInputs(<liquid:red_alloy> * 432)
-//    .outputs(<minecraft:piston> * 4)
-//    .duration(240).EUt(7).buildAndRegister();
-//
-//assembler.recipeBuilder()
-//    .inputs(<ore:stickStainlessSteel>, <metaitem:gearSmallStainlessSteel>, <ore:slabWood> * 8, <minecraft:cobblestone> * 8)
-//    .fluidInputs(<liquid:red_alloy> * 576)
-//    .outputs(<minecraft:piston> * 8)
-//    .duration(240).EUt(7).buildAndRegister();
-//
-//assembler.recipeBuilder()
-//    .inputs(<ore:stickTitanium>, <metaitem:gearSmallTitanium>, <ore:slabWood> * 16, <minecraft:cobblestone> * 16)
-//    .fluidInputs(<liquid:red_alloy> * 1152)
-//    .outputs(<minecraft:piston> * 16)
-//    .duration(240).EUt(7).buildAndRegister();
-//
-//recipes.remove(<minecraft:observer>);
-//recipes.addShaped(<minecraft:observer>, [
-//    [<metaitem:ringIron>, <ore:cobblestone>, <metaitem:ringIron>],
-//    [ <ore:cobblestone>, <minecraft:quartz>, <ore:cobblestone>],
-//    [<ore:gearSmallIron>, <ore:stickRedAlloy>, <ore:gearSmallIron>]
-//]);
-//
-//recipes.addShaped(<minecraft:observer>, [
-//    [<metaitem:ringIron>, <ore:cobblestone>, <metaitem:ringIron>],
-//    [ <ore:cobblestone>, <ore:crystalCertusQuartz>, <ore:cobblestone>],
-//    [<ore:gearSmallIron>, <ore:stickRedAlloy>, <ore:gearSmallIron>]
-//]);
-//
-//recipes.addShaped(<minecraft:observer>, [
-//    [<metaitem:ringIron>, <ore:cobblestone>, <metaitem:ringIron>],
-//    [ <ore:cobblestone>, <ore:gemQuartzite>, <ore:cobblestone>],
-//    [<ore:gearSmallIron>, <ore:stickRedAlloy>, <ore:gearSmallIron>]
-//]);
-//
-//// Charcoal
-//furnace.remove(<minecraft:coal:1>);
-//
-//// Hard EBF
-//recipes.removeByRecipeName("gregtech:electric_blast_furnace");
-//recipes.addShaped(<metaitem:electric_blast_furnace>, [
-//    [<metaitem:electric_furnace.lv>,<metaitem:electric_furnace.lv>,<metaitem:electric_furnace.lv>],
-//    [<ore:circuitLv>, <gregtech:metal_casing:2>, <ore:circuitLv>],
-//    [<ore:cableGtSingleTin>,<ore:circuitLv> ,<ore:cableGtSingleTin>]
-//]);
-//
-
 //Numismatic Dynamo
 recipes.remove(<thermalexpansion:dynamo:5>);
 recipes.addShaped(<thermalexpansion:dynamo:5>, [
@@ -464,9 +358,9 @@ makeShaped("of_nc_cobblestone_generator_mirrored",
 
 //Crystal Growth Chamber
 recipes.addShaped(<ae2stuff:grower>, [
-	[<ore:frameGtHslaSteel>, <appliedenergistics2:material:1>, <ore:frameGtHslaSteel>], 
+	[<ore:frameGtBlueSteel>, <appliedenergistics2:material:1>, <ore:frameGtBlueSteel>], 
 	[<appliedenergistics2:material:1>, <meta_tile_entity:hull.lv>, <appliedenergistics2:material:1>], 
-	[<ore:frameGtHslaSteel>, <appliedenergistics2:material:1>, <ore:frameGtHslaSteel>]]);	
+	[<ore:frameGtBlueSteel>, <appliedenergistics2:material:1>, <ore:frameGtBlueSteel>]]);	
 
 // Remove LCR Radon
 <recipemap:large_chemical_reactor>.findRecipe(480, [<metaitem:ingotPlutonium> * 8, <metaitem:dustUranium>], [<liquid:air> * 10000]).remove();
diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs
index 50cbcb7..6bd1cbd 100644
--- a/overrides/scripts/materials.zs
+++ b/overrides/scripts/materials.zs
@@ -774,6 +774,7 @@ var taranium = MaterialBuilder(32109, "taranium")
 <material:lapis>.addFlags(["generate_dense"]);
 <material:graphene>.addFlags(["generate_foil"]);
 <material:berkelium>.addFlags(["generate_frame"]);
+<material:blue_steel>.addFlags(["generate_frame"]);
 // Prevent TE Gears from showing up
 <material:tin>.addFlags(["generate_gear"]);
 <material:copper>.addFlags(["generate_gear"]);
diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs
index c8f8066..4b00fad 100644
--- a/overrides/scripts/normalmode.zs
+++ b/overrides/scripts/normalmode.zs
@@ -638,6 +638,32 @@ removeMaterialSolid(32059);
 removeMaterialSolid(32060);
 removeMaterialSolid(32061);
 removeMaterialSolid(32066);
+removeMaterialSolid(32067);
+removeMaterialSolid(32068);
+removeMaterialSolid(32069);
+removeMaterialSolid(32071);
+removeMaterialSolid(32072);
+removeMaterialSolid(32073);
+removeMaterialSolid(32074);
+removeMaterialSolid(32075);
+removeMaterialSolid(32076);
+removeMaterialSolid(32077);
+removeMaterialSolid(32078);
+removeMaterialSolid(32079);
+removeMaterialSolid(32080);
+removeMaterialSolid(32081);
+removeMaterialSolid(32083);
+removeMaterialSolid(32084);
+removeMaterialSolid(32085);
+removeMaterialSolid(32087);
+removeMaterialSolid(32088);
+removeMaterialSolid(32093);
+removeMaterialSolid(32096);
+removeMaterialSolid(32097);
+removeMaterialSolid(32098);
+removeMaterialSolid(32099);
+removeMaterialSolid(32100);
+removeMaterialSolid(32109);
 
 removeMaterialFluid(32046, [<liquid:hydrogen_peroxide>]);
 removeMaterialFluid(32047, [<liquid:hydrazine>]);