Merge branch 'develop' of https://github.com/EnigmaticaModpacks/Enigm…

…atica9 into develop
EnigmaticaModpacks · Dec 11, 2023 · 54e50a9 · 54e50a9
2 parents 2935681 + 89d8179
commit 54e50a9
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 9 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Enigmatica 9 v1.17.0
+
+### 🌟 Improvements
+
+-   Changed the Belt of Unstable Gifts to remove annoying vision altering buffs (Night Vision, Speed) while adding many other fun buffs. [\#803](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/803)
+-   [Expert] The Snow Queen and Questing Ram now drop Budding versions of their crystal resource to nudge players towards growing more. [\#805](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/805)
+
 ### Enigmatica 9 v1.16.1
 
 🚀 Forge-1.19.2-43.2.14 | [📜 Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/changelog_mods_1.16.1.md) | [📋 Modlist](https://github.com/EnigmaticaModpacks/Enigmatica9/blob/master/changelogs/modlist_1.16.1.md)

diff --git a/kubejs/server_scripts/base/tags/mob_effect/ars_nouveau/unstable_gifts.js b/kubejs/server_scripts/base/tags/mob_effect/ars_nouveau/unstable_gifts.js
@@ -0,0 +1,31 @@
+ServerEvents.tags('mob_effect', (event) => {
+    event
+        .get('ars_nouveau:unstable_gifts')
+        .removeAll()
+        .add([
+            'apotheosis:knowledge',
+            'apotheosis:vitality',
+            'ars_nouveau:mana_regen',
+            'ars_nouveau:recovery',
+            'ars_nouveau:shielding',
+            'ars_nouveau:spell_damage',
+            'cofh_core:clarity',
+            'cofh_core:cold_resistance',
+            'cofh_core:explosion_resistance',
+            'cofh_core:lightning_resistance',
+            'cofh_core:magic_resistance',
+            'cofh_core:slimed',
+            'farmersdelight:comfort',
+            'farmersdelight:nourishment',
+            'minecraft:absorption',
+            'minecraft:fire_resistance',
+            'minecraft:haste',
+            'minecraft:regeneration',
+            'minecraft:resistance',
+            'minecraft:saturation',
+            'minecraft:slow_falling',
+            'minecraft:strength',
+            'sushigocrafting:acquired_taste',
+            'sushigocrafting:small_bites'
+        ]);
+});
diff --git a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/questing_ram_rewards.js b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/questing_ram_rewards.js
@@ -14,7 +14,8 @@ ServerEvents.genericLootTables((event) => {
                 Item.of('minecraft:bundle', 1, {
                     Items: [
                         { id: 'twilightforest:quest_ram_trophy', Count: 1 },
-                        { id: 'byg:therium_crystal_block', Count: 16 },
+                        { id: 'byg:therium_crystal_shard', Count: 16 },
+                        { id: 'byg:budding_therium_crystal', Count: 1 },
                         { id: 'minecraft:sea_lantern', Count: 16 },
                         { id: 'twilightforest:steeleaf_block', Count: 16 }
                     ]

diff --git a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/snow_queen.js b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/snow_queen.js
@@ -4,12 +4,12 @@ ServerEvents.genericLootTables((event) => {
     }
     event.modify('twilightforest:entities/snow_queen', (table) => {
         table.addPool((pool) => {
-            pool.rolls = [4, 4];
+            pool.rolls = 4;
             pool.addItem(Item.of('ars_nouveau:stable_warp_scroll'), 1);
         });
 
         table.addPool((pool) => {
-            pool.rolls = [4, 4];
+            pool.rolls = 4;
             pool.addItem(
                 Item.of('ars_nouveau:enchanters_eye', {
                     display: {
@@ -22,18 +22,23 @@ ServerEvents.genericLootTables((event) => {
         });
 
         table.addPool((pool) => {
-            pool.rolls = [10, 24];
-            pool.addItem(Item.of('byg:subzero_crystal_shard'), 1);
+            pool.rolls = 1;
+            pool.addItem(Item.of('byg:subzero_crystal_shard'), 1, [10, 24]);
         });
 
         table.addPool((pool) => {
-            pool.rolls = [10, 16];
-            pool.addItem(Item.of('ars_nouveau:water_essence'), 1, 1);
+            pool.rolls = 1;
+            pool.addItem(Item.of('byg:budding_subzero_crystal'), 1, 1);
         });
 
         table.addPool((pool) => {
-            pool.rolls = [10, 16];
-            pool.addItem(Item.of('ars_nouveau:conjuration_essence'), 1, 1);
+            pool.rolls = 1;
+            pool.addItem(Item.of('ars_nouveau:water_essence'), 1, [10, 16]);
+        });
+
+        table.addPool((pool) => {
+            pool.rolls = 1;
+            pool.addItem(Item.of('ars_nouveau:conjuration_essence'), 1, [10, 16]);
         });
     });
 });