Merge pull request #1683 from TheBedrockMaster/main

Full Akashic Tome Quest and Quest Work
AllTheMods · Jan 7, 2025 · a781f88 · a781f88
2 parents 5ac69dd + 6054d20
commit a781f88
Show file tree

Hide file tree

Showing 61 changed files with 426 additions and 188 deletions.
diff --git a/config/ftbquests/quests/chapter_groups.snbt b/config/ftbquests/quests/chapter_groups.snbt
@@ -6,8 +6,8 @@
 		{ id: "3D4E23B1100491AB" }
 		{ id: "6614EE2378B8AFB9" }
 		{ id: "2B51AC12041E3F89" }
-		{ id: "49AECADBA9E79A3B" }
 		{ id: "6700DB960E16A321" }
+		{ id: "49AECADBA9E79A3B" }
 		{ id: "02FE661031A105D8" }
 		{ id: "5A4775CCD6D26C80" }
 	]

diff --git a/config/ftbquests/quests/chapters/artifacts.snbt b/config/ftbquests/quests/chapters/artifacts.snbt
diff --git a/config/ftbquests/quests/chapters/basic_logistics.snbt b/config/ftbquests/quests/chapters/basic_logistics.snbt
@@ -902,7 +902,7 @@
 				item: { count: 1, id: "laserio:filter_count" }
 				type: "item"
 			}]
-			x: 7.0d
+			x: 7.5d
 			y: 6.5d
 		}
 		{
@@ -924,8 +924,8 @@
 				item: { count: 1, id: "laserio:filter_tag" }
 				type: "item"
 			}]
-			x: 8.0d
-			y: 6.5d
+			x: 7.5d
+			y: 7.5d
 		}
 		{
 			dependencies: ["47A2BEFB11F4D581"]
@@ -946,29 +946,6 @@
 				item: { count: 1, id: "laserio:filter_mod" }
 				type: "item"
 			}]
-			x: 6.5d
-			y: 5.5d
-		}
-		{
-			dependencies: ["47A2BEFB11F4D581"]
-			icon_scale: 1.5d
-			id: "374F5557ABAE8360"
-			invisible: true
-			rewards: [{
-				count: 2
-				id: "58A5CB2C9A6C6D9C"
-				item: {
-					count: 1
-					id: "laserio:logic_chip"
-				}
-				type: "item"
-			}]
-			shape: "square"
-			tasks: [{
-				id: "42082A9D79010A54"
-				item: { count: 1, id: "laserio:filter_nbt" }
-				type: "item"
-			}]
 			x: 7.5d
 			y: 5.5d
 		}

diff --git a/config/ftbquests/quests/chapters/bounty_board.snbt b/config/ftbquests/quests/chapters/bounty_board.snbt
@@ -15,7 +15,7 @@
 		x: 0.0d
 		y: -10.0d
 	}]
-	order_index: 2
+	order_index: 1
 	progression_mode: "flexible"
 	quest_links: [ ]
 	quests: [

diff --git a/config/ftbquests/quests/chapters/building_tips.snbt b/config/ftbquests/quests/chapters/building_tips.snbt
@@ -498,7 +498,7 @@
 			y: 28.5d
 		}
 	]
-	order_index: 3
+	order_index: 2
 	quest_links: [ ]
 	quests: [
 		{

diff --git a/config/ftbquests/quests/chapters/chapter_2_the_star.snbt b/config/ftbquests/quests/chapters/chapter_2_the_star.snbt
@@ -1504,11 +1504,6 @@
 			hide_dependent_lines: true
 			id: "7766E66A14643F4D"
 			rewards: [
-				{
-					id: "097E90676B1F08F7"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					id: "5BA7B45280682ADA"
 					item: {
@@ -1517,6 +1512,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "2EF2765E1382D05A"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -1591,11 +1591,6 @@
 			hide_dependent_lines: true
 			id: "3145B847A15F97F2"
 			rewards: [
-				{
-					id: "63994E23E2EC005F"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					id: "14B4224E6066F20C"
 					item: {
@@ -1604,6 +1599,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "714884C19CB2C991"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -1619,11 +1619,6 @@
 			hide_dependent_lines: true
 			id: "2B0C3AAAA6D0B0D2"
 			rewards: [
-				{
-					id: "22947FC7DD8DC399"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					count: 4
 					id: "24BD4F1B6E56E248"
@@ -1642,6 +1637,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "494BDD66AB9E84F6"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -2406,11 +2406,6 @@
 			hide_dependent_lines: true
 			id: "42AF4EBDA5D6CC36"
 			rewards: [
-				{
-					id: "4266F4FB9B52ED8E"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					count: 3
 					id: "752F07A030329446"
@@ -2438,6 +2433,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "0516865011B5CBFA"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -2453,11 +2453,6 @@
 			hide_dependent_lines: true
 			id: "5869E198DA416346"
 			rewards: [
-				{
-					id: "154AC9FC1DB2A49F"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					count: 2
 					id: "26F805492344C137"
@@ -2467,6 +2462,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "649380093B45CDF1"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -2570,11 +2570,6 @@
 			hide_dependent_lines: true
 			id: "17598C171E610752"
 			rewards: [
-				{
-					id: "4CA878CDB35965D7"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					count: 3
 					id: "06DBF3B04AE1D184"
@@ -2584,6 +2579,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "67B9AC951EA5F29A"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -2656,11 +2656,6 @@
 			hide_dependent_lines: true
 			id: "77F2271C45DB49BA"
 			rewards: [
-				{
-					id: "09CCFCF39752D26E"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					id: "4666A7CE4F3A8ED3"
 					item: {
@@ -2669,6 +2664,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "564CF16CD663E59B"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -2740,11 +2740,6 @@
 			hide_dependent_lines: true
 			id: "09D76E9B8CABC31E"
 			rewards: [
-				{
-					id: "6DB80491B0287928"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					id: "3302BA4BC2D4CE69"
 					item: {
@@ -2753,6 +2748,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "7CF45D42589EE566"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -2769,11 +2769,6 @@
 			hide_dependent_lines: true
 			id: "215AD616E6847E9A"
 			rewards: [
-				{
-					id: "7F33DA9BF81E8115"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					count: 2
 					id: "6AA0F49C505BFBA9"
@@ -2783,6 +2778,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "2FB2E192281A3F3D"
+					type: "xp"
+					xp: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{
@@ -2799,11 +2799,6 @@
 			hide_dependent_lines: true
 			id: "6E3AD764A67829CB"
 			rewards: [
-				{
-					id: "6DE6D0DFF974E300"
-					type: "xp_levels"
-					xp_levels: 1
-				}
 				{
 					count: 4
 					id: "79D053A91F786D28"
@@ -2813,6 +2808,11 @@
 					}
 					type: "item"
 				}
+				{
+					id: "674DBCACF5CA41AA"
+					type: "xp_levels"
+					xp_levels: 1
+				}
 			]
 			size: 1.25d
 			tasks: [{

diff --git a/config/ftbquests/quests/chapters/generators.snbt b/config/ftbquests/quests/chapters/generators.snbt
@@ -1619,7 +1619,7 @@
 			]
 			tasks: [{
 				id: "31E6FDB712244B72"
-				item: { components: { "ftbfiltersystem:filter": "or(item(generatorgalore:culinary_generator_64x)item(generatorgalore:enchantment_generator_64x)item(generatorgalore:ender_generator_64x)item(generatorgalore:halitosis_generator_64x)item(generatorgalore:honey_generator_64x)item(generatorgalore:magmatic_generator_64x)item(generatorgalore:netherite_generator_64x)item(generatorgalore:potion_generator_8x))" }, count: 1, id: "ftbfiltersystem:smart_filter" }
+				item: { components: { "ftbfiltersystem:filter": "or(item(generatorgalore:culinary_generator_64x)item(generatorgalore:enchantment_generator_64x)item(generatorgalore:ender_generator_64x)item(generatorgalore:halitosis_generator_64x)item(generatorgalore:honey_generator_64x)item(generatorgalore:magmatic_generator_64x)item(generatorgalore:netherite_generator_64x)item(generatorgalore:netherstar_generator_64x)item(generatorgalore:potion_generator_64x))" }, count: 1, id: "ftbfiltersystem:smart_filter" }
 				type: "item"
 			}]
 			x: 5.0d

diff --git a/config/ftbquests/quests/chapters/industrial_foregoing.snbt b/config/ftbquests/quests/chapters/industrial_foregoing.snbt
@@ -268,7 +268,7 @@
 			y: 5.9d
 		}
 	]
-	order_index: 2
+	order_index: 0
 	progression_mode: "flexible"
 	quest_links: [ ]
 	quests: [
@@ -428,12 +428,6 @@
 								id: "industrialforegoing:latex"
 							}]
 						}
-						"mekanism:owner": [I;
-							-1759399696
-							-527154021
-							-1496736294
-							768480398
-						]
 					}
 					count: 1
 					id: "mekanism:basic_fluid_tank"
@@ -555,12 +549,6 @@
 									id: "industrialforegoing:pink_slime"
 								}]
 							}
-							"mekanism:owner": [I;
-								-1759399696
-								-527154021
-								-1496736294
-								768480398
-							]
 						}
 						count: 1
 						id: "mekanism:basic_fluid_tank"
@@ -577,12 +565,6 @@
 									id: "industrialforegoing:meat"
 								}]
 							}
-							"mekanism:owner": [I;
-								-1759399696
-								-527154021
-								-1496736294
-								768480398
-							]
 						}
 						count: 1
 						id: "mekanism:basic_fluid_tank"

diff --git a/config/ftbquests/quests/chapters/iron_spells_and_spellbooks.snbt b/config/ftbquests/quests/chapters/iron_spells_and_spellbooks.snbt
@@ -168,7 +168,7 @@
 			y: 6.199999999999999d
 		}
 	]
-	order_index: 3
+	order_index: 4
 	quest_links: [ ]
 	quests: [
 		{

diff --git a/config/ftbquests/quests/chapters/justdirethings.snbt b/config/ftbquests/quests/chapters/justdirethings.snbt
@@ -7,7 +7,7 @@
 		id: "justdirethings:fuel_canister"
 	}
 	id: "4EAAE0CEB26378A6"
-	order_index: 3
+	order_index: 1
 	quest_links: [ ]
 	quests: [
 		{