From 0cc38455c2492f18afe2070eeea3c69417cfa670 Mon Sep 17 00:00:00 2001
From: superbrotherx4 <superboxer47@gmail.com>
Date: Sat, 28 Sep 2024 20:27:17 -0500
Subject: [PATCH] Fix Thermal Quests

Fixed the Or Filters for the Thermal quests as well as added them to the potion augments
---
 .../quests/chapters/thermal_expansion.snbt    | 198 +++++++++++++-----
 1 file changed, 146 insertions(+), 52 deletions(-)

diff --git a/config/ftbquests/quests/chapters/thermal_expansion.snbt b/config/ftbquests/quests/chapters/thermal_expansion.snbt
index 85abb1f..3ac757b 100644
--- a/config/ftbquests/quests/chapters/thermal_expansion.snbt
+++ b/config/ftbquests/quests/chapters/thermal_expansion.snbt
@@ -805,23 +805,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_augment_1"
+								id: "thermal_extra:soul_infused_rf_coil_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_augment_2"
+								id: "thermal_extra:twinite_rf_coil_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_augment_3"
+								id: "thermal_extra:shellite_rf_coil_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_augment_4"
+								id: "thermal_extra:dragonsteel_rf_coil_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_augment_5"
+								id: "thermal_extra:abyssal_rf_coil_augment"
 							}
 						]
 					}
@@ -865,23 +865,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_storage_augment_1"
+								id: "thermal_extra:soul_infused_rf_coil_storage_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_storage_augment_2"
+								id: "thermal_extra:twinite_rf_coil_storage_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_storage_augment_3"
+								id: "thermal_extra:shellite_rf_coil_storage_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_storage_augment_4"
+								id: "thermal_extra:dragonsteel_rf_coil_storage_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_storage_augment_5"
+								id: "thermal_extra:abyssal_rf_coil_storage_augment"
 							}
 						]
 					}
@@ -924,23 +924,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_xfer_augment_1"
+								id: "thermal_extra:soul_infused_rf_coil_xfer_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_xfer_augment_2"
+								id: "thermal_extra:twinite_rf_coil_xfer_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_xfer_augment_3"
+								id: "thermal_extra:shellite_rf_coil_xfer_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_xfer_augment_4"
+								id: "thermal_extra:dragonsteel_rf_coil_xfer_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:rf_coil_xfer_augment_5"
+								id: "thermal_extra:abyssal_rf_coil_xfer_augment"
 							}
 						]
 					}
@@ -976,27 +976,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:fluid_tank_augment_1"
+								id: "thermal_extra:soul_infused_fluid_tank_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:fluid_tank_augment_2"
+								id: "thermal_extra:twinite_fluid_tank_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:fluid_tank_augment_3"
+								id: "thermal_extra:shellite_fluid_tank_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:fluid_tank_augment_4"
+								id: "thermal_extra:dragonsteel_fluid_tank_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:fluid_tank_augment_5"
-							}
-							{
-								Count: 1b
-								id: "thermal_extra:fluid_tank_augment_6"
+								id: "thermal_extra:abyssal_fluid_tank_augment"
 							}
 						]
 					}
@@ -1059,19 +1055,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_speed_augment_1"
+								id: "thermal_extra:soul_infused_machine_speed_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:twinite_machine_speed_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_speed_augment_2"
+								id: "thermal_extra:shellite_machine_speed_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_speed_augment_3"
+								id: "thermal_extra:dragonsteel_machine_speed_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_speed_augment_4"
+								id: "thermal_extra:abyssal_machine_speed_augment"
 							}
 						]
 					}
@@ -1114,19 +1114,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_efficiency_augment_1"
+								id: "thermal_extra:soul_infused_machine_efficiency_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_efficiency_augment_2"
+								id: "thermal_extra:twinite_machine_efficiency_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_efficiency_augment_3"
+								id: "thermal_extra:shellite_machine_efficiency_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_efficiency_augment_4"
+								id: "thermal_extra:dragonsteel_machine_efficiency_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:abyssal_machine_efficiency_augment"
 							}
 						]
 					}
@@ -1169,15 +1173,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_output_augment_1"
+								id: "thermal_extra:soul_infused_machine_output_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_output_augment_2"
+								id: "thermal_extra:twinite_machine_output_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_output_augment_3"
+								id: "thermal_extra:shellite_machine_output_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:dragonsteel_machine_output_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:abyssal_machine_output_augment"
 							}
 						]
 					}
@@ -1226,15 +1238,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_catalyst_augment_1"
+								id: "thermal_extra:soul_infused_machine_catalyst_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:twinite_machine_catalyst_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:shellite_machine_catalyst_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_catalyst_augment_2"
+								id: "thermal_extra:dragonsteel_machine_catalyst_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:machine_catalyst_augment_3"
+								id: "thermal_extra:abyssal_machine_catalyst_augment"
 							}
 						]
 					}
@@ -1297,19 +1317,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_output_augment_1"
+								id: "thermal_extra:soul_infused_dynamo_output_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_output_augment_2"
+								id: "thermal_extra:twinite_dynamo_output_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_output_augment_3"
+								id: "thermal_extra:shellite_dynamo_output_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_output_augment_4"
+								id: "thermal_extra:dragonsteel_dynamo_output_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:abyssal_dynamo_output_augment"
 							}
 						]
 					}
@@ -1352,19 +1376,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_fuel_augment_1"
+								id: "thermal_extra:soul_infused_dynamo_fuel_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:twinite_dynamo_fuel_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_fuel_augment_2"
+								id: "thermal_extra:shellite_dynamo_fuel_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_fuel_augment_3"
+								id: "thermal_extra:dragonsteel_dynamo_fuel_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:dynamo_fuel_augment_4"
+								id: "thermal_extra:abyssal_dynamo_fuel_augment"
 							}
 						]
 					}
@@ -1400,19 +1428,23 @@
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:area_radius_augment_1"
+								id: "thermal_extra:soul_infused_area_radius_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:area_radius_augment_2"
+								id: "thermal_extra:twinite_area_radius_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:area_radius_augment_3"
+								id: "thermal_extra:shellite_area_radius_augment"
 							}
 							{
 								Count: 1b
-								id: "thermal_extra:area_radius_augment_4"
+								id: "thermal_extra:dragonsteel_area_radius_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:abyssal_area_radius_augment"
 							}
 						]
 					}
@@ -1449,7 +1481,38 @@
 			subtitle: "{atm9.quest.thermalExpansion.subt.amplifyPotionEffect}"
 			tasks: [{
 				id: "08ED05EBDFF0B4D9"
-				item: "thermal:potion_amplifier_augment"
+				item: {
+					Count: 1
+					id: "itemfilters:or"
+					tag: {
+						items: [
+							{
+								Count: 1b
+								id: "thermal:potion_amplifier_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:soul_infused_potion_amplifier_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:twinite_potion_amplifier_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:shellite_potion_amplifier_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:dragonsteel_potion_amplifier_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:abyssal_potion_amplifier_augment"
+							}
+						]
+					}
+				}
 				type: "item"
 			}]
 			x: -5.0d
@@ -1475,7 +1538,38 @@
 			subtitle: "{atm9.quest.thermalExpansion.subt.increasePotionDuration}"
 			tasks: [{
 				id: "501A3B2548F6DB3E"
-				item: "thermal:potion_duration_augment"
+				item: {
+					Count: 1
+					id: "itemfilters:or"
+					tag: {
+						items: [
+							{
+								Count: 1b
+								id: "thermal:potion_duration_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:soul_infused_potion_duration_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:twinite_potion_duration_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:shellite_potion_duration_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:dragonsteel_potion_duration_augment"
+							}
+							{
+								Count: 1b
+								id: "thermal_extra:abyssal_potion_duration_augment"
+							}
+						]
+					}
+				}
 				type: "item"
 			}]
 			x: -4.0d