Merge main into dx 2 electric boogaloo

ThePansmith · Jan 26, 2025 · 8fcf7df · 8fcf7df
1 parent 4b7f8ed
commit 8fcf7df
Show file tree

Hide file tree

Showing 13 changed files with 1,259 additions and 245 deletions.
diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt
@@ -135,6 +135,28 @@
 			x: 25.5d
 			y: -9.0d
 		}
+		{
+			id: "09227387EDA8221C"
+			linked_quest: "19084E91F357C8C2"
+			size: 2.0d
+			x: 45.75d
+			y: -26.75d
+		}
+		{
+			id: "1CA6CD149782D98B"
+			linked_quest: "22DC32C2B67EFD25"
+			shape: "hexagon"
+			x: 25.5d
+			y: -11.5d
+		}
+		{
+			id: "52051DFD357D8D29"
+			linked_quest: "3B57A9816A61C1DC"
+			shape: "hexagon"
+			size: 1.25d
+			x: 25.5d
+			y: -20.0d
+		}
 	]
 	quests: [
 		{
@@ -348,34 +370,6 @@
 			x: 60.25d
 			y: -13.5d
 		}
-		{
-			dependencies: ["738A141D31AD7CE3"]
-			description: [
-				"{moni.quest.22DC32C2B67EFD25.description1}"
-				""
-				"{moni.quest.22DC32C2B67EFD25.description2}"
-				""
-				"{moni.quest.22DC32C2B67EFD25.description3}"
-			]
-			id: "22DC32C2B67EFD25"
-			rewards: [{
-				id: "7B7E7F5CE4947127"
-				item: "kubejs:moni_dollar"
-				type: "item"
-			}]
-			shape: "hexagon"
-			size: 1.0d
-			subtitle: "{moni.quest.22DC32C2B67EFD25.subtitle}"
-			tasks: [{
-				count: 2L
-				id: "6F9246E97321EF11"
-				item: "solarflux:sp_custom_neutronium"
-				type: "item"
-			}]
-			title: "{moni.quest.22DC32C2B67EFD25.title}"
-			x: 25.5d
-			y: -11.5d
-		}
 		{
 			dependencies: [
 				"57E7182198B2EA9A"
@@ -435,25 +429,6 @@
 			x: 27.0d
 			y: -14.625d
 		}
-		{
-			dependencies: [
-				"4EA1E0D437528747"
-				"22DC32C2B67EFD25"
-			]
-			description: ["{moni.quest.3B57A9816A61C1DC.description1}"]
-			id: "3B57A9816A61C1DC"
-			shape: "hexagon"
-			size: 1.25d
-			subtitle: "{moni.quest.3B57A9816A61C1DC.subtitle}"
-			tasks: [{
-				id: "2EE60D5EE1564FCF"
-				item: "solarflux:sp_custom_infinity"
-				type: "item"
-			}]
-			title: "{moni.quest.3B57A9816A61C1DC.title}"
-			x: 25.5d
-			y: -20.0d
-		}
 		{
 			dependencies: ["7C9C91EC9F3930C2"]
 			description: [
@@ -472,24 +447,6 @@
 			x: 38.75d
 			y: -4.75d
 		}
-		{
-			dependencies: ["13578427FD9CC2CE"]
-			description: [
-				"{moni.quest.19084E91F357C8C2.description1}"
-				""
-				"{moni.quest.19084E91F357C8C2.description2}"
-			]
-			id: "19084E91F357C8C2"
-			size: 2.0d
-			tasks: [{
-				id: "25F7D8080E9B62C1"
-				item: "kubejs:creative_energy_data"
-				type: "item"
-			}]
-			title: "{moni.quest.19084E91F357C8C2.title}"
-			x: 45.75d
-			y: -26.75d
-		}
 		{
 			dependencies: ["0DE1BF1648CAF6D6"]
 			description: ["{moni.quest.1C861E0C62D5B97D.description1}"]
@@ -1223,22 +1180,6 @@
 			x: 48.0d
 			y: -8.75d
 		}
-		{
-			dependencies: ["7C4E04E3EA603000"]
-			description: ["{moni.quest.21E10888F52A3C73.description1}"]
-			icon: "gtceu:large_naquadah_reactor"
-			id: "21E10888F52A3C73"
-			shape: "hexagon"
-			size: 1.5d
-			tasks: [{
-				id: "51C99B20F637AA2C"
-				item: "gtceu:large_naquadah_reactor"
-				type: "item"
-			}]
-			title: "{moni.quest.21E10888F52A3C73.title}"
-			x: 35.0d
-			y: -8.75d
-		}
 		{
 			dependencies: [
 				"21E10888F52A3C73"

diff --git a/config/ftbquests/quests/chapters/fun_with_fusion.snbt b/config/ftbquests/quests/chapters/fun_with_fusion.snbt
@@ -71,42 +71,15 @@
 			x: 5.0d
 			y: -2.0d
 		}
-	]
-	quests: [
 		{
-			dependencies: ["2D10F2E538486624"]
-			description: ["{moni.quest.1405D08C6A87B3BB.description1}"]
-			icon: "gtceu:plasma_large_turbine"
-			id: "1405D08C6A87B3BB"
-			rewards: [{
-				id: "265F8AF395C89377"
-				item: "kubejs:moni_dollar"
-				type: "item"
-			}]
+			id: "50BE763190346D54"
+			linked_quest: "1405D08C6A87B3BB"
 			shape: "square"
-			tasks: [
-				{
-					id: "5CA6A3EE3EF632F5"
-					item: "gtceu:plasma_large_turbine"
-					type: "item"
-				}
-				{
-					count: 28L
-					id: "6324614154FC58BF"
-					item: "gtceu:tungstensteel_turbine_casing"
-					type: "item"
-				}
-				{
-					count: 2L
-					id: "3D5916D81DAB1BCC"
-					item: "gtceu:tungstensteel_gearbox"
-					type: "item"
-				}
-			]
-			title: "{moni.quest.1405D08C6A87B3BB.title}"
 			x: -4.0d
-			y: -1.75d
+			y: -2.0d
 		}
+	]
+	quests: [
 		{
 			dependencies: ["2A6E9E7C80754936"]
 			description: ["{moni.quest.1183B96529D08326.description1}"]

diff --git a/config/ftbquests/quests/chapters/late_game.snbt b/config/ftbquests/quests/chapters/late_game.snbt
@@ -221,6 +221,12 @@
 			x: 11.0d
 			y: 17.0d
 		}
+		{
+			id: "03BAC1C5A779EFAE"
+			linked_quest: "425D1C34A82B054D"
+			x: 21.0d
+			y: 16.5d
+		}
 	]
 	quests: [
 		{
@@ -2459,60 +2465,6 @@
 			x: 3.0d
 			y: 24.0d
 		}
-		{
-			dependencies: ["7A65459E4DFAAC2D"]
-			description: [
-				"{moni.quest.425D1C34A82B054D.description1}"
-				""
-				"{moni.quest.425D1C34A82B054D.description2}"
-			]
-			icon: "gtceu:naquadah_reactor"
-			id: "425D1C34A82B054D"
-			rewards: [{
-				id: "01C277FEA61EBA19"
-				item: "kubejs:moni_dollar"
-				type: "item"
-			}]
-			tasks: [
-				{
-					id: "7890B705137B8EA5"
-					item: "gtceu:naquadah_reactor"
-					type: "item"
-				}
-				{
-					count: 4L
-					id: "435C35B1F49B7B2C"
-					item: "gtceu:trinium_coil_block"
-					type: "item"
-				}
-				{
-					count: 16L
-					id: "2FF2B4C219053E6A"
-					item: "ae2:spatial_pylon"
-					type: "item"
-				}
-				{
-					count: 16L
-					id: "27B323E3ADED4829"
-					item: "gtceu:fusion_glass"
-					type: "item"
-				}
-				{
-					count: 14L
-					id: "2D40468415EA637F"
-					item: "gtceu:reaction_safe_mixing_casing"
-					type: "item"
-				}
-				{
-					id: "1685A72D65A02E82"
-					item: "gtceu:zpm_energy_output_hatch_4a"
-					type: "item"
-				}
-			]
-			title: "{moni.quest.425D1C34A82B054D.title}"
-			x: 20.5d
-			y: 15.25d
-		}
 		{
 			dependencies: ["0889C9E0DD0FDF06"]
 			description: [