Merge pull request #758 from MuteTiefling/quest-updates

potions
EnigmaticaModpacks · Nov 8, 2023 · 9592092 · 9592092
2 parents f8e5e21 + 4b607a8
commit 9592092
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -13,6 +13,10 @@
 -   [Expert] Soul Powder quest has been updated to help clarify that it can be mined in the Twilight Forest too [\#751](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/751)
 -   [Expert] Skyseeker Shoes now grants a massive step height bonus [\#753](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/753)
 -   [Expert] Stonecutter upgrades for Sophisticated Storage/Backpacks now require Knightmetal instead of Iron [\#756](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/756)
+-   [Expert] Resistance potions are now brewed exclusively with Spinach to avoid confusion in how to obtain them [\#758](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/758)
+-   [Expert] Stability potions are now brewed exclusively with Sadiroot to avoid confusion in how to obtain them [\#758](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/758)
+-   [Expert] New quest has been added to make a Market block, helping people discover they can buy seeds for plants they may wish to use for potions [\#758](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/758)
+-   [Expert] The naga now drops spinach and sadiroot seeds as they're required for progression. This is in addition to them being purchasble from the Market [\#758](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/758)
 
 ### 🐛 Fixed Bugs
 

diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt
@@ -2317,7 +2317,7 @@
 				type: "item"
 			}]
 			x: 2.0d
-			y: 3.0d
+			y: -3.0d
 		}
 		{
 			dependencies: ["66A59B3CD77FB54A"]
@@ -2587,6 +2587,34 @@
 			x: -4.0d
 			y: -1.5d
 		}
+		{
+			dependencies: ["7CFD3DFD4C593EB5"]
+			description: [
+				"Build it and they’ll come, or so it was said. These tiny market stalls were once a common sight in places of business, trade, and agriculture and served as a way of making offerings to fae creatures that roam the lands. "
+				""
+				"With so few offerings happening these days, setting one out will surely attract some helpful company.  "
+				""
+				"================================="
+				""
+				"The Market is in many cases the only source for seeds and saplings, and is therefore invaluable. Crafting one is highly recommended for obtaining missing plants one might need. "
+			]
+			hide_dependency_lines: true
+			id: "37F045F66CCA1389"
+			rewards: [{
+				count: 7
+				id: "2C4B9277BDBFC583"
+				item: "minecraft:emerald"
+				type: "item"
+			}]
+			shape: "hexagon"
+			tasks: [{
+				id: "2B53987B276A6521"
+				item: "farmingforblockheads:market"
+				type: "item"
+			}]
+			x: 2.0d
+			y: 3.0d
+		}
 	]
 	title: "Chapter One"
 }
diff --git a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/naga.js b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/naga.js
@@ -41,12 +41,14 @@ ServerEvents.genericLootTables((event) => {
 
                         { id: 'hexerei:sage_seed', Count: 4 },
                         { id: 'immersiveengineering:seed', Count: 4 },
-                        { id: 'occultism:datura_seeds', Count: 4 },
 
+                        { id: 'occultism:datura_seeds', Count: 1 },
                         { id: 'minecraft:pumpkin_seeds', Count: 1 },
                         { id: 'minecraft:beetroot_seeds', Count: 1 },
                         { id: 'minecraft:wheat_seeds', Count: 1 },
                         { id: 'minecraft:melon_seeds', Count: 1 },
+                        { id: 'thermal:spinach_seeds', Count: 1 },
+                        { id: 'thermal:sadiroot_seeds', Count: 1 },
 
                         { id: 'ars_nouveau:frostaya_pod', Count: 3 },
                         { id: 'ars_nouveau:mendosteen_pod', Count: 3 },

diff --git a/kubejs/startup_scripts/expert/brewing_remove.js b/kubejs/startup_scripts/expert/brewing_remove.js
@@ -14,4 +14,6 @@ MoreJSEvents.registerPotionBrewing((event) => {
     //event.removeByPotion("minecraft:awkward", null, null);
 
     event.removeByPotion(null, 'minecraft:nether_wart', null);
+    event.removeByPotion(null, 'minecraft:shulker_shell', null);
+    event.removeByPotion(null, 'quark:crab_shell', null);
 });