From bc94b1a64ea52f42419210d3721b16868f7bdceb Mon Sep 17 00:00:00 2001
From: tracer4b <61507029+tracer4b@users.noreply.github.com>
Date: Wed, 27 Jul 2022 22:15:39 +0800
Subject: [PATCH] naquadah reactor balance 2

---
 overrides/scripts/multiblocks_expert.zs | 13 ++++++-------
 overrides/scripts/multiblocks_normal.zs | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs
index ac00a26..64b92e8 100644
--- a/overrides/scripts/multiblocks_expert.zs
+++ b/overrides/scripts/multiblocks_expert.zs
@@ -211,7 +211,6 @@ microverse_projector_advanced_ii.hasMaintenanceMechanics = true;
 //microverse_projector_advanced_ii.frontOverlay = <cube_renderer:COMPRESSOR_OVERLAY>;
 
 
-
 // Naquadah Reactor 1
 <gcym:large_multiblock_casing:9>.displayName = "Reaction-Safe Casing";
 val naquadah_reactor_1 = Builder.start("naquadah_reactor_1")
@@ -239,8 +238,8 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1")
                 "CCC"
             )
             .where('S', controller.self())
-            .where('G', <blockstate:nuclearcraft:reactor_casing_transparent>)
-            .where('P', <metastate:gregtech:transparent_casing:1>)
+            .where('G', <metastate:gregtech:transparent_casing:1>)
+            .where('P', <blockstate:appliedenergistics2:spatial_pylon>)
             .where('O', <metastate:extendedcrafting:trimmed:5>)
             .where('N', <metastate:gregtech:meta_block_compressed_8:1>)
             .where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
@@ -298,8 +297,8 @@ val naquadah_reactor_2 = Builder.start("naquadah_reactor_2")
                 "CCC"
             )
             .where('S', controller.self())
-            .where('G', <blockstate:nuclearcraft:reactor_casing_transparent>)
-            .where('P', <metastate:gregtech:transparent_casing:1>)
+            .where('P', <blockstate:appliedenergistics2:spatial_pylon>)
+            .where('G', <metastate:gregtech:transparent_casing:1>)
             .where('O', <metastate:extendedcrafting:storage:4>)
             .where('N', <metastate:gregtech:meta_block_compressed_2006:13>)
             .where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
@@ -465,7 +464,7 @@ makeShaped("naquadah_reactor_1", <metaitem:multiblocktweaker:naquadah_reactor_1>
      "GSG",
      "PPP"],
     { C : <ore:circuitIv>, //T5
-      G : <nuclearcraft:reactor_casing_transparent>,
+      G : <gregtech:transparent_casing:1>,
       S : <metaitem:cover.screen>,
       P : <appliedenergistics2:spatial_pylon>,
       N : <extendedcrafting:material:33>}); //Omnium Nugget
@@ -475,7 +474,7 @@ makeShaped("naquadah_reactor_2", <metaitem:multiblocktweaker:naquadah_reactor_2>
      "GSG",
      "PPP"],
     { C : <ore:circuitLuv>, //T6
-      G : <nuclearcraft:reactor_casing_transparent>,
+      G : <gregtech:transparent_casing:1>,
       S : <metaitem:cover.screen>,
       P : <appliedenergistics2:spatial_pylon>,
       N : <extendedcrafting:material:32>}); //Omnium Ingot
diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs
index 2aa2c24..53f31a2 100644
--- a/overrides/scripts/multiblocks_normal.zs
+++ b/overrides/scripts/multiblocks_normal.zs
@@ -263,8 +263,8 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1")
                 "CCC"
             )
             .where('S', controller.self())
-            .where('G', <blockstate:nuclearcraft:reactor_casing_transparent>)
-            .where('P', <metastate:gregtech:transparent_casing:1>)
+            .where('G', <metastate:gregtech:transparent_casing:1>)
+            .where('P', <blockstate:appliedenergistics2:spatial_pylon>)
             .where('O', <metastate:extendedcrafting:trimmed:5>)
             .where('N', <metastate:gregtech:meta_block_compressed_8:1>)
             .where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
@@ -322,8 +322,8 @@ val naquadah_reactor_2 = Builder.start("naquadah_reactor_2")
                 "CCC"
             )
             .where('S', controller.self())
-            .where('P', <metastate:gregtech:transparent_casing:1>)
-            .where('G', <blockstate:nuclearcraft:reactor_casing_transparent>)
+            .where('P', <blockstate:appliedenergistics2:spatial_pylon>)
+            .where('G', <metastate:gregtech:transparent_casing:1>)
             .where('O', <metastate:extendedcrafting:storage:4>)
             .where('N', <metastate:gregtech:meta_block_compressed_27:0>)
             .where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
@@ -383,7 +383,7 @@ makeShaped("naquadah_reactor_1", <metaitem:multiblocktweaker:naquadah_reactor_1>
      "GSG",
      "PPP"],
     { C : <ore:circuitIv>, //T5
-      G : <nuclearcraft:reactor_casing_transparent>,
+      G : <gregtech:transparent_casing:1>,
       S : <metaitem:cover.screen>,
       P : <appliedenergistics2:spatial_pylon>,
       N : <extendedcrafting:material:33>}); //Omnium Nugget
@@ -393,7 +393,7 @@ makeShaped("naquadah_reactor_2", <metaitem:multiblocktweaker:naquadah_reactor_2>
      "GSG",
      "PPP"],
     { C : <ore:circuitLuv>, //T6
-      G : <nuclearcraft:reactor_casing_transparent>,
+      G : <gregtech:transparent_casing:1>,
       S : <metaitem:cover.screen>,
       P : <appliedenergistics2:spatial_pylon>,
       N : <extendedcrafting:material:32>}); //Omnium Ingot
@@ -807,7 +807,7 @@ naquadah_reactor_1.recipeMap
     .recipeBuilder()
     .duration(938)
     .EUt(-393216)
-    .inputs(<metaitem:boltNaquadahEnriched> * 8)
+    .inputs(<metaitem:boltNaquadahEnriched>)
     .outputs(<metaitem:boltLead>)
     .buildAndRegister();
 
@@ -815,7 +815,7 @@ naquadah_reactor_1.recipeMap
     .recipeBuilder()
     .duration(3750)
     .EUt(-393216)
-    .inputs(<metaitem:boltNaquadria> * 8)
+    .inputs(<metaitem:boltNaquadria>)
     .outputs(<metaitem:boltLead>)
     .buildAndRegister();
 
@@ -824,7 +824,7 @@ naquadah_reactor_2.recipeMap
     .recipeBuilder()
     .duration(1875)
     .EUt(-1572864)
-    .inputs(<metaitem:boltNaquadahEnriched> * 8)
+    .inputs(<metaitem:boltNaquadahEnriched>)
     .outputs(<metaitem:boltLead>)
     .buildAndRegister();
 
@@ -832,6 +832,6 @@ naquadah_reactor_2.recipeMap
     .recipeBuilder()
     .duration(7500)
     .EUt(-1572864)
-    .inputs(<metaitem:boltNaquadria> * 8)
+    .inputs(<metaitem:boltNaquadria>)
     .outputs(<metaitem:boltLead>)
     .buildAndRegister();