Merge pull request #435 from MuteTiefling/expert-tweaks

E9E Feedback Changes
EnigmaticaModpacks · Jun 20, 2023 · 686d9ae · 686d9ae
2 parents 013bfc2 + f721615
commit 686d9ae
Show file tree

Hide file tree

Showing 20 changed files with 335 additions and 39 deletions.
diff --git a/config/ars_nouveau/glyph_aoe.toml b/config/ars_nouveau/glyph_aoe.toml
@@ -1,17 +1,17 @@
 
 #General settings
 [general]
-	#Is Enabled?
-	enabled = true
 	#Cost
 	#Range: > -2147483648
 	cost = 35
-	#Is Starter Glyph?
-	starter = false
 	#The maximum number of times this glyph may appear in a single spell
 	#Range: > 1
 	per_spell_limit = 2147483647
+	#Is Starter Glyph?
+	starter = false
 	#The tier of the glyph
 	#Range: 1 ~ 99
-	glyph_tier = 2
+	glyph_tier = 1
+	#Is Enabled?
+	enabled = true
 
diff --git a/config/configswapper/expert/config/ars_nouveau/glyph_aoe.toml b/config/configswapper/expert/config/ars_nouveau/glyph_aoe.toml
@@ -13,5 +13,5 @@
 	per_spell_limit = 2147483647
 	#The tier of the glyph
 	#Range: 1 ~ 99
-	glyph_tier = 2
+	glyph_tier = 1
 
diff --git a/config/configswapper/expert/config/ars_nouveau/glyph_blink.toml b/config/configswapper/expert/config/ars_nouveau/glyph_blink.toml
@@ -13,7 +13,7 @@
 	per_spell_limit = 2147483647
 	#The tier of the glyph
 	#Range: 1 ~ 99
-	glyph_tier = 3
+	glyph_tier = 2
 	#Limits the number of times a given augment may be applied to a given effect
 	#Example entry: "glyph_amplify=5"
 	augment_limits = []

diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt
@@ -2283,6 +2283,38 @@
 			x: -5.5d
 			y: 2.5d
 		}
+		{
+			dependencies: ["4D5B41D89738D3EE"]
+			description: [
+				"Far from home and need a few more potions to top up? The Enchanter’s Eye allows remote casting to a fixed location when bound to a Scry Crystal, or multiple locations with Scryer’s Scrolls. "
+				""
+				"As a simple example of how this may be useful, a Scry Crystal placed facing a Storage Lectern would allow the following spell form to access the Lectern remotely:"
+				""
+				"&5Touch&r > &2Interact&r"
+				""
+				"Adding Sensitive to the spell form would allow remote filling of a flask. Simply hold the flask in the off hand and ensure the Scry Crystal is set facing a Potion Jar:"
+				""
+				"&5Touch&r > &2Interact&r > &6Sensitive&r"
+			]
+			id: "4B6B442259091E1C"
+			rewards: [{
+				count: 2
+				id: "257A6006929C3193"
+				item: "ars_nouveau:scryers_crystal"
+				type: "item"
+			}]
+			tasks: [{
+				id: "12E8A3624A6491C9"
+				item: {
+					Count: 1b
+					id: "ars_nouveau:enchanters_eye"
+					tag: { }
+				}
+				type: "item"
+			}]
+			x: -2.0d
+			y: -1.0d
+		}
 	]
 	title: "Ars Nouveau"
 }
diff --git a/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt b/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt
@@ -2312,6 +2312,38 @@
 			x: -5.5d
 			y: 2.5d
 		}
+		{
+			dependencies: ["5A14F3DE74BAE772"]
+			description: [
+				"Far from home and need a few more potions to top up? The Enchanter’s Eye allows remote casting to a fixed location when bound to a Scry Crystal, or multiple locations with Scryer’s Scrolls. "
+				""
+				"As a simple example of how this may be useful, a Scry Crystal placed facing a Storage Lectern would allow the following spell form to access the Lectern remotely:"
+				""
+				"&5Touch&r > &2Interact&r"
+				""
+				"Adding Sensitive to the spell form would allow remote filling of a flask. Simply hold the flask in the off hand and ensure the Scry Crystal is set facing a Potion Jar:"
+				""
+				"&5Touch&r > &2Interact&r > &6Sensitive&r"
+			]
+			id: "62DC38C5A8D7AA3A"
+			rewards: [{
+				count: 2
+				id: "12F3CB6463DA3B43"
+				item: "ars_nouveau:scryers_crystal"
+				type: "item"
+			}]
+			tasks: [{
+				id: "4CA1EF93C063A2EF"
+				item: {
+					Count: 1b
+					id: "ars_nouveau:enchanters_eye"
+					tag: { }
+				}
+				type: "item"
+			}]
+			x: -2.0d
+			y: -1.0d
+		}
 	]
 	title: "Ars Nouveau"
 }
diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt
@@ -2148,6 +2148,45 @@
 			x: -8.0d
 			y: -0.5d
 		}
+		{
+			dependencies: ["345CBD118EAA0C09"]
+			description: [
+				"The practice of divination dates back centuries and all manner of material has been used for a focus, from tea leaves to entrails. "
+				""
+				"While certainly effective, those methods were preferred by some merely for the spectacle; anything can be used to tune one’s mind for the task. "
+			]
+			hide_dependency_lines: true
+			id: "37A128B304BAC0EC"
+			rewards: [{
+				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/miners_delight"
+				icon: "kubejs:miners_delight"
+				id: "0278C7667B0EC3FE"
+				player_command: false
+				title: "Miner's Delight"
+				type: "command"
+			}]
+			shape: "hexagon"
+			tasks: [{
+				id: "38BBFF1EA9A911FD"
+				item: {
+					Count: 1b
+					id: "theurgy:divination_rod_t3"
+					tag: {
+						Damage: 0
+						"theurgy:divination.setting.allow_attuning": 1b
+						"theurgy:divination.setting.allowed_blocks_tag": "theurgy:divination_rod_t4_allowed_blocks"
+						"theurgy:divination.setting.disallowed_blocks_tag": "theurgy:divination_rod_t4_disallowed_blocks"
+						"theurgy:divination.setting.duration": 40.0d
+						"theurgy:divination.setting.max_damage": 512.0d
+						"theurgy:divination.setting.range": 96.0d
+						"theurgy:divination.setting.tier": "minecraft:netherite"
+					}
+				}
+				type: "item"
+			}]
+			x: 2.0d
+			y: 2.5d
+		}
 	]
 	title: "Chapter One"
 }
diff --git a/config/ftbquests/quests/chapters/chapter_two.snbt b/config/ftbquests/quests/chapters/chapter_two.snbt
@@ -916,7 +916,7 @@
 				}
 			]
 			title: "Tree of Life"
-			x: 6.5d
+			x: 7.5d
 			y: 3.0d
 		}
 		{
@@ -948,7 +948,7 @@
 					type: "item"
 				}
 			]
-			x: 6.5d
+			x: 7.5d
 			y: 4.0d
 		}
 		{
@@ -1122,6 +1122,32 @@
 			x: 6.5d
 			y: 1.0d
 		}
+		{
+			dependencies: ["60324503ED7AC4C1"]
+			hide_dependency_lines: true
+			id: "6DB541631BF1FBFC"
+			shape: "hexagon"
+			tasks: [{
+				id: "67E12A5977051DA4"
+				item: {
+					Count: 1b
+					id: "theurgy:divination_rod_t3"
+					tag: {
+						Damage: 0
+						"theurgy:divination.setting.allow_attuning": 1b
+						"theurgy:divination.setting.allowed_blocks_tag": "theurgy:divination_rod_t4_allowed_blocks"
+						"theurgy:divination.setting.disallowed_blocks_tag": "theurgy:divination_rod_t4_disallowed_blocks"
+						"theurgy:divination.setting.duration": 40.0d
+						"theurgy:divination.setting.max_damage": 512.0d
+						"theurgy:divination.setting.range": 96.0d
+						"theurgy:divination.setting.tier": "minecraft:netherite"
+					}
+				}
+				type: "item"
+			}]
+			x: 6.5d
+			y: 2.0d
+		}
 	]
 	title: "Chapter Two"
 }
diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
@@ -562,5 +562,11 @@
     "ritual.enigmatica.occultism/ritual/wilden_grove_gate.started": "Started Summoning the Grove of the Wilden",
     "ritual.enigmatica.occultism/ritual/wilden_grove_gate.finished": "The Grove of the Wilden gateway has opened",
     "ritual.enigmatica.occultism/ritual/wilden_grove_gate.interrupted": "The Grove of the Wilden gateway has been interrupted",
-    "ritual.enigmatica.occultism/ritual/wilden_grove_gate.conditions": "Not all requirements for this ritual are met."
+    "ritual.enigmatica.occultism/ritual/wilden_grove_gate.conditions": "Not all requirements for this ritual are met.",
+
+    "gateways.wild_hunt_gate": "Wild Hunt Gate",
+    "ritual.enigmatica.occultism/ritual/wild_hunt_gate.started": "Started Summoning the Wild Hunt",
+    "ritual.enigmatica.occultism/ritual/wild_hunt_gate.finished": "The Wild Hunt gateway has opened",
+    "ritual.enigmatica.occultism/ritual/wild_hunt_gate.interrupted": "The Wild Hunt gateway has been interrupted",
+    "ritual.enigmatica.occultism/ritual/wild_hunt_gate.conditions": "Not all requirements for this ritual are met."
 }
diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js
@@ -539,6 +539,7 @@ jei.expert.items.disabled = [
     'occultism:lenses',
     'occultism:magic_lamp_empty',
     'occultism:spirit_attuned_pickaxe_head',
+    'occultism:ritual_dummy/summon_wild_hunt',
 
     'pneumaticcraft:air_compressor',
     'pneumaticcraft:electrostatic_compressor',

diff --git a/kubejs/server_scripts/base/gamerules/default.js b/kubejs/server_scripts/base/gamerules/default.js
@@ -0,0 +1,11 @@
+ServerEvents.loaded((event) => {
+    let gamerules = [{ rule: 'doFireTick', value: 'false' }];
+
+    gamerules.forEach((gamerule) => {
+        if (!event.server.persistentData[gamerule.rule]) {
+            event.server.runCommandSilent(`/gamerule ${gamerule.rule} ${gamerule.value}`);
+            console.log(`Default Gamerule Applied: ${gamerule.rule} = ${gamerule.value}`);
+            event.server.persistentData[gamerule.rule] = gamerule.value;
+        }
+    });
+});
diff --git a/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/wild_hunt.js b/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/wild_hunt.js
@@ -81,12 +81,9 @@ ServerEvents.highPriorityData((event) => {
             ],
             helmets: [
                 {
-                    stack: {
-                        item: 'minecraft:leather_helmet',
-                        nbt: leather_colors.black
-                    },
+                    stack: { item: 'minecraft:wither_skeleton_skull' },
                     weight: 100,
-                    drop_chance: 0.085
+                    drop_chance: 1.0
                 }
             ],
             chestplates: [