Merge pull request #425 from MuteTiefling/feedback-fixes

E9E Feedback Fixes
EnigmaticaModpacks · Jun 18, 2023 · ef4ea9d · ef4ea9d
2 parents 1644553 + f7a2c9b
commit ef4ea9d
Show file tree

Hide file tree

Showing 20 changed files with 467 additions and 100 deletions.
diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt
diff --git a/config/ftbquests/quests/chapters/chapter_two.snbt b/config/ftbquests/quests/chapters/chapter_two.snbt
@@ -100,10 +100,7 @@
 			y: 4.0d
 		}
 		{
-			dependencies: [
-				"2CCCDD05AED3153F"
-				"60324503ED7AC4C1"
-			]
+			dependencies: ["60324503ED7AC4C1"]
 			description: ["It would seem the Cult of the Ur-Ghast were up to something far more sinister than previously thought. The rift they opened with their Carminite Reactor also gave them the opportunity to obtain this strange debris.  "]
 			hide: true
 			hide_dependency_lines: true
@@ -405,11 +402,7 @@
 		}
 		{
 			dependencies: ["6044FE23384692A5"]
-			description: [
-				"Supplying enough heat to work with Iron directly has proved difficult until now. With a magically enhanced blast furnace and Horizonite as fuel, it should prove more feasible."
-				""
-				"Horizonite appears to only occur naturally within the moon of Everdawn. "
-			]
+			description: ["Supplying enough heat to work with Iron directly has proved difficult until now. With a magically enhanced blast furnace and Blazing Crystals as fuel, it should prove more feasible."]
 			icon: "immersiveengineering:advanced_blast_furnace"
 			id: "2BA70920EA1ED0A8"
 			tasks: [{
@@ -882,6 +875,37 @@
 			x: 3.5d
 			y: 0.0d
 		}
+		{
+			dependencies: ["60324503ED7AC4C1"]
+			description: ["An empowered ritual that grants an hour of flight to up to five entities. Useful for exploration far from home. Be sure to bring the materials to re-cast it if necessary. "]
+			hide_dependency_lines: true
+			icon: "ars_nouveau:ritual_flight"
+			id: "6952D7AD61181E37"
+			rewards: [{
+				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/sorcerers_delight"
+				icon: "kubejs:sorcerers_delight"
+				id: "64D8345AD1B57F8B"
+				player_command: false
+				title: "Sorcerer's Delight"
+				type: "command"
+			}]
+			shape: "hexagon"
+			tasks: [
+				{
+					id: "5623626CB05FAC41"
+					item: "ars_nouveau:ritual_flight"
+					type: "item"
+				}
+				{
+					id: "39C158A69FF4C6FE"
+					item: "kubejs:ritual_of_enduring_flight"
+					optional_task: true
+					type: "item"
+				}
+			]
+			x: 6.5d
+			y: 0.0d
+		}
 	]
 	title: "Chapter Two"
 }
diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
@@ -323,6 +323,13 @@
     "ritual.enigmatica.occultism/ritual/ritual_craft_electric_motor.interrupted": "Ritual of Binding interrupted.",
     "ritual.enigmatica.occultism/ritual/ritual_craft_electric_motor.conditions": "Not all requirements for this ritual are met.",
 
+    "item.kubejs.ritual_of_enduring_flight": "Ritual: Enduring Flight",
+    "item.kubejs.ritual_of_enduring_flight.tooltip": "Grants an hour of flight to up to five entities in the area of effect.",
+    "ritual.enigmatica.occultism/ritual/ritual_of_enduring_flight.started": "Ritual of Enduring Flight started.",
+    "ritual.enigmatica.occultism/ritual/ritual_of_enduring_flight.finished": "Ritual of Enduring Flight completed.",
+    "ritual.enigmatica.occultism/ritual/ritual_of_enduring_flight.interrupted": "Ritual of Enduring Flight interrupted.",
+    "ritual.enigmatica.occultism/ritual/ritual_of_enduring_flight.conditions": "Not all requirements for this ritual are met.",
+
     "ritual.enigmatica.occultism/ritual/creeper_gate_small.started": "Started Opening Small Creeper Gateway",
     "ritual.enigmatica.occultism/ritual/creeper_gate_small.finished": "Small Creeper Gateway Opened",
     "ritual.enigmatica.occultism/ritual/creeper_gate_small.interrupted": "Small Creeper Gateway Interrupted",

diff --git a/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/skeleton.js b/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/skeleton.js
@@ -59,6 +59,66 @@ ServerEvents.highPriorityData((event) => {
             ],
             tags: ['miniboss/skeleton_forsaken_knight']
         },
+        {
+            name: 'skeleton_siege_breaker',
+            weight: 100,
+            quality: 2.5,
+            mainhands: [
+                {
+                    stack: { item: 'minecraft:bow', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            offhands: [
+                {
+                    stack: { item: 'minecraft:tipped_arrow', nbt: tipped_arrow_nbt.blasting, count: 5 },
+                    weight: 100,
+                    drop_chance: 1.0
+                }
+            ],
+            helmets: [
+                {
+                    stack: {
+                        item: 'minecraft:leather_helmet',
+                        nbt: leather_colors.sapper_red
+                    },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            chestplates: [
+                {
+                    stack: {
+                        item: 'minecraft:leather_chestplate',
+                        nbt: leather_colors.sapper_red
+                    },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            leggings: [
+                {
+                    stack: {
+                        item: 'minecraft:leather_leggings',
+                        nbt: leather_colors.sapper_red
+                    },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            boots: [
+                {
+                    stack: {
+                        item: 'minecraft:leather_boots',
+                        nbt: leather_colors.sapper_red
+                    },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            tags: ['miniboss/skeleton_siege_breaker']
+        },
         {
             name: 'skeleton_bow_chainmail',
             weight: 100,
@@ -76,11 +136,6 @@ ServerEvents.highPriorityData((event) => {
                     weight: 25,
                     drop_chance: 1.0
                 },
-                {
-                    stack: { item: 'minecraft:tipped_arrow', nbt: tipped_arrow_nbt.blasting, count: 5 },
-                    weight: 15,
-                    drop_chance: 1.0
-                },
                 {
                     stack: { item: 'minecraft:tipped_arrow', nbt: tipped_arrow_nbt.sundering, count: 5 },
                     weight: 35,
@@ -133,11 +188,6 @@ ServerEvents.highPriorityData((event) => {
                     weight: 25,
                     drop_chance: 1.0
                 },
-                {
-                    stack: { item: 'minecraft:tipped_arrow', nbt: tipped_arrow_nbt.blasting, count: 5 },
-                    weight: 15,
-                    drop_chance: 1.0
-                },
                 {
                     stack: { item: 'minecraft:tipped_arrow', nbt: tipped_arrow_nbt.sundering, count: 5 },
                     weight: 35,

diff --git a/kubejs/server_scripts/base/recipes/apotheosis/minibosses/minecraft.js b/kubejs/server_scripts/base/recipes/apotheosis/minibosses/minecraft.js
@@ -10,10 +10,28 @@ enchantment_levels: [50, 30, 120, 40],
 ServerEvents.highPriorityData((event) => {
     const id_prefix = 'apotheosis:minibosses/minecraft/';
     const recipes = [
+        {
+            id: 'skeleton_siege_breaker',
+            name: 'Skeletal Siege Breaker',
+            chance: 1.0,
+            weight: 5,
+            quality: 0,
+            entities: ['minecraft:skeleton'],
+            valid_gear_sets: ['#miniboss/skeleton_siege_breaker'],
+            dimensions: [],
+            affixed: false,
+            nbt: {},
+            stats: {
+                enchant_chance: 0.5,
+                enchantment_levels: [15, 15, 15, 15],
+                effects: [{ effect: 'minecraft:speed', amplifier: 1, chance: 1.0 }],
+                attribute_modifiers: []
+            }
+        },
         {
             id: 'skeleton_bow',
             chance: 1.0,
-            weight: 85,
+            weight: 80,
             quality: 0,
             entities: ['minecraft:skeleton'],
             valid_gear_sets: ['#miniboss/skeleton_bow'],

diff --git a/kubejs/server_scripts/base/tags/blocks/ars_nouveau/break_blacklist.js b/kubejs/server_scripts/base/tags/blocks/ars_nouveau/break_blacklist.js
@@ -1,3 +1,3 @@
 ServerEvents.tags('block', (event) => {
-    event.add('ars_nouveau:break_blacklist', ['twilightforest:mazestone']);
+    event.add('ars_nouveau:break_blacklist', ['twilightforest:mazestone', /heartwood_stage/]);
 });
diff --git a/kubejs/server_scripts/base/tags/blocks/ars_nouveau/gravity_blacklist.js b/kubejs/server_scripts/base/tags/blocks/ars_nouveau/gravity_blacklist.js
@@ -1,3 +1,3 @@
 ServerEvents.tags('block', (event) => {
-    event.add('ars_nouveau:gravity_blacklist', ['ae2:flawless_budding_quartz']);
+    event.add('ars_nouveau:gravity_blacklist', ['ae2:flawless_budding_quartz', /heartwood_stage/]);
 });
diff --git a/kubejs/server_scripts/base/tags/items/ars_nouveau/golem.js b/kubejs/server_scripts/base/tags/items/ars_nouveau/golem.js
@@ -4,6 +4,9 @@ ServerEvents.tags('item', (event) => {
         'minecraft:amethyst_shard',
         'ae2:certus_quartz_crystal',
         'byg:therium_crystal_shard',
-        'byg:subzero_crystal_shard'
+        'byg:subzero_crystal_shard',
+        'emendatusenigmatica:fluorite_gem',
+        'emendatusenigmatica:sulfur_gem',
+        'rftoolsbase:dimensionalshard'
     ]);
 });
diff --git a/kubejs/server_scripts/constants/ritual_effects.js b/kubejs/server_scripts/constants/ritual_effects.js
@@ -14,19 +14,19 @@ const ritual_effects = {
             ]
         }
     },
-    spell_night_vision: {
+    ritual_of_enduring_flight: {
         potion: {
             // Spell effects to be applied.
             spells: [
                 {
                     // Maximum number of entities to affect
-                    limit: 3,
+                    limit: 5,
                     // Diameter of selection area, centered on ritual
                     range: 10,
                     // Effect to apply
-                    effect: 'minecraft:night_vision',
+                    effect: 'ars_nouveau:flight',
                     // Effect Duration in seconds
-                    duration: 1800,
+                    duration: 72000,
                     // Effect level. 1 means 1
                     level: 1
                 }

diff --git a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/darktower_boss.js b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/darktower_boss.js
@@ -2,7 +2,7 @@ ServerEvents.genericLootTables((event) => {
     if (global.isExpertMode == false) {
         return;
     }
-    event.modify('twilightforest:structures/darktower_boss', (table) => {
+    event.modify('twilightforest:entities/ur_ghast', (table) => {
         table.addPool((pool) => {
             pool.rolls = [1, 1];
             pool.addItem(Item.of('kubejs:dream_stone'), 1, 1);

diff --git a/kubejs/server_scripts/expert/recipes/apotheosis/potion_charm.js b/kubejs/server_scripts/expert/recipes/apotheosis/potion_charm.js
@@ -0,0 +1,12 @@
+ServerEvents.recipes((event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+
+    const id_prefix = 'enigmatica:expert/apotheosis/potion_charm/';
+
+    event.custom({
+        type: 'apotheosis:potion_charm',
+        recipe: [[{ item: 'hexerei:mindful_trance_blend' }], ['potion'], [{ item: 'occultism:otherstone_slab' }]]
+    });
+});
diff --git a/kubejs/server_scripts/expert/recipes/ars_nouveau/armor_upgrade.js b/kubejs/server_scripts/expert/recipes/ars_nouveau/armor_upgrade.js
@@ -7,19 +7,19 @@ ServerEvents.recipes((event) => {
     const recipes = [
         {
             pedestalItems: [
-                { item: { tag: 'forge:gems/infused_diamond' } },
-                { item: { tag: 'forge:gems/infused_diamond' } },
-                { item: { tag: 'forge:gems/infused_diamond' } }
+                { item: { item: 'kubejs:spirit_of_devotion' } },
+                { item: { item: 'kubejs:spirit_of_devotion' } },
+                { item: { item: 'kubejs:spirit_of_devotion' } }
             ],
             sourceCost: 2500,
             tier: 1,
             id: `ars_nouveau:upgrade_1`
         },
         {
             pedestalItems: [
-                { item: { tag: 'forge:gems/niotic' } },
-                { item: { tag: 'forge:gems/niotic' } },
-                { item: { tag: 'forge:gems/niotic' } }
+                { item: { tag: 'forge:gems/spirited' } },
+                { item: { tag: 'forge:gems/spirited' } },
+                { item: { tag: 'forge:gems/spirited' } }
             ],
             sourceCost: 5000,
             tier: 2,

diff --git a/kubejs/server_scripts/expert/recipes/ars_nouveau/imbuement.js b/kubejs/server_scripts/expert/recipes/ars_nouveau/imbuement.js
@@ -6,6 +6,20 @@ ServerEvents.recipes((event) => {
     const id_prefix = 'enigmatica:expert/ars_nouveau/imbuement/';
 
     const recipes = [
+        {
+            output: 'emendatusenigmatica:source_gem',
+            count: 1,
+            reagent: '#forge:gems/amethyst',
+            source: 100,
+            id: 'ars_nouveau:imbuement_amethyst'
+        },
+        {
+            output: 'emendatusenigmatica:source_block',
+            count: 1,
+            reagent: '#forge:storage_blocks/amethyst',
+            source: 400,
+            id: 'ars_nouveau:imbuement_amethyst_block'
+        },
         {
             output: 'ars_nouveau:fire_essence',
             count: 1,
@@ -42,7 +56,7 @@ ServerEvents.recipes((event) => {
             output: 'ars_nouveau:abjuration_essence',
             count: 1,
             reagent: '#forge:gems/source',
-            inputs: ['#forge:ingots/ironwood', 'twilightforest:cicada', 'twilightforest:naga_scale'],
+            inputs: ['#forge:ingots/bronze', 'twilightforest:cicada', 'twilightforest:naga_scale'],
             source: 500,
             id: 'ars_nouveau:imbuement_abjuration_essence'
         },

diff --git a/kubejs/server_scripts/expert/recipes/ars_nouveau/shaped.js b/kubejs/server_scripts/expert/recipes/ars_nouveau/shaped.js
@@ -87,12 +87,11 @@ ServerEvents.recipes((event) => {
         },
         {
             output: 'ars_nouveau:alchemists_crown',
-            pattern: ['ABA', 'BCB', '  D'],
+            pattern: ['ABA', 'BCB'],
             key: {
                 A: 'thermal:jar',
-                B: '#forge:wires/electrum',
-                C: 'ars_nouveau:mundane_belt',
-                D: 'createaddition:straw'
+                B: '#forge:nuggets/electrum',
+                C: 'ars_nouveau:mundane_belt'
             },
             id: `${id_prefix}alchemists_crown`
         },

diff --git a/kubejs/server_scripts/expert/recipes/createaddition/charging.js b/kubejs/server_scripts/expert/recipes/createaddition/charging.js
@@ -32,13 +32,13 @@ ServerEvents.recipes((event) => {
         {
             input: { tag: 'forge:storage_blocks/amethyst' },
             result: { item: 'emendatusenigmatica:source_block' },
-            energy: 20000,
+            energy: 4000,
             id: `${id_prefix}source_block`
         },
         {
             input: { tag: 'forge:gems/amethyst' },
             result: { item: 'emendatusenigmatica:source_gem' },
-            energy: 5000,
+            energy: 1000,
             id: `${id_prefix}source_gem`
         },
         {