From 90ed02b4856a614297d6a282414384f7d881ce65 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 09:29:13 -0400 Subject: [PATCH 01/37] ars quests --- .../quests/chapters/ars_nouveau.snbt | 95 +++++++++++++++---- config/ftbquests/quests/lang/en_us.snbt | 26 +++++ .../reward_tables/4C3908A1EDE782F7.snbt | 4 +- 3 files changed, 103 insertions(+), 22 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 12e35086..868f0820 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -10,27 +10,82 @@ id: "5C2F675CD8139E11" order_index: 0 quest_links: [ ] - quests: [{ - icon: { - components: { - "ftbquests:icon": "ars_nouveau:block/sourceberry/sourceberry3" + quests: [ + { + icon: { + components: { + "ftbquests:icon": "ars_nouveau:block/sourceberry/sourceberry3" + } + id: "ftbquests:custom_icon" } - id: "ftbquests:custom_icon" + id: "41614A924E5556EE" + rewards: [ + { + id: "0F6C9D6ED1B29251" + item: { + count: 1 + id: "ars_nouveau:worn_notebook" + } + type: "item" + } + { + id: "393D3E6B0F90FA3E" + item: { + count: 1 + id: "ars_nouveau:sourceberry_bush" + } + type: "item" + } + ] + tasks: [{ + id: "5AE1C3BF867DD395" + item: { count: 1, id: "minecraft:gold_ingot" } + type: "item" + }] + x: 0.5d + y: -0.5d } - id: "41614A924E5556EE" - rewards: [{ - id: "0F6C9D6ED1B29251" - item: { - count: 1 - id: "ars_nouveau:worn_notebook" + { + dependencies: ["41614A924E5556EE"] + icon: { + id: "ars_nouveau:purple_archwood_sapling" } - type: "item" - }] - tasks: [{ - id: "37A217A1754608F6" - type: "checkmark" - }] - x: 0.5d - y: -0.5d - }] + id: "69A9A6E9B7CB34B4" + tasks: [ + { + id: "07D8961C49D02845" + item: { components: { "ftbfiltersystem:filter": "and(item_tag(minecraft:saplings)or(mod(ars_additions)mod(ars_elemental)mod(ars_nouveau)))" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + } + { + id: "418BC399B733818A" + item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(c:logs/archwood)" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + } + ] + x: 0.5d + y: 0.5d + } + { + dependencies: ["69A9A6E9B7CB34B4"] + icon: { + id: "ars_nouveau:imbuement_chamber" + } + id: "7750C6E87B1EBF43" + tasks: [ + { + id: "1E094E135E6FF0F5" + item: { count: 1, id: "ars_nouveau:imbuement_chamber" } + type: "item" + } + { + id: "3DBE3AF880802D53" + item: { components: { "ftbfiltersystem:filter": "or(item(ars_nouveau:arcane_platform)item(ars_nouveau:arcane_pedestal))" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + } + ] + x: 0.5d + y: 1.5d + } + ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 3892ac13..a4c8b940 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1493,6 +1493,16 @@ "&a Configurator to set the tank to" "&a auto-output from the bottom." ] + quest.41614A924E5556EE.quest_desc: [ + "Welcome to Ars Nouveau!" + "" + "This exciting mod will fulfil your every magical fantasy, from casting spells to brewing potions. " + "" + "Summon magical creatures and craft magical gadgets to automagically perform nearly any task around your home!" + "" + "&a🛈 Tip: Sourceberries can be planted " + "&a on grass!" + ] quest.41614A924E5556EE.title: "Ars Nouveau" quest.4229112D97BB45E6.quest_desc: [ "Power cables that double as limited storage, keeping a buffer of power in each block space. " @@ -2457,6 +2467,11 @@ "&a crystal like Glistering Honey" "&a or Amethyst" ] + quest.69A9A6E9B7CB34B4.quest_desc: [ + "The first thing you’ll need to do to get started with Ars Nouveau is find some Archwood trees. " + "" + "For now, any color will do, but you’ll eventually want to collect some saplings from each variety." + ] quest.69AAE7C502629B3E.quest_desc: [ "As with the conversion from LV to MV, converting to HV will likely take a little time. Upgrading your power production first will be key. " "" @@ -2865,6 +2880,14 @@ "" "Feel free to hook up any Logistics you wish to extract the result." ] + quest.7750C6E87B1EBF43.quest_desc: [ + "" + "The humble Imbuement Chamber is perhaps the single most important apparatus in Ars Nouveau. " + "" + "With it, you’ll be able to generate the Source Gems and Essences you’ll need for all future crafts. " + "" + "&a🛈 Tip: Source is optional!" + ] quest.77A66ADAB0845804.quest_desc: [ "Macaw’s Mods are an expansive suite of decorative mods to fit just about any build. Enigmatica 10 currently has the following:" "" @@ -3009,6 +3032,7 @@ task.04A7890742B7519E.title: "Observe: Spirit Fire" task.069760235257E581.title: "String Curtains" task.073DDF6031485D23.title: "Covered Cables" + task.07D8961C49D02845.title: "Archwood Saplings" task.0C66972E31440AAF.title: "Ender Cells" task.0CB92589AF70B557.title: "Any &3Handcrafted&r Item" task.0DAE4E6D7B7DC9FB.title: "Summon: Foliot Crusher" @@ -3039,11 +3063,13 @@ task.37CDC8E9B9004A0D.title: "Crafting Storage" task.3C9F8F7D407AC253.title: "Sender Modules" task.3D1A362E43EE4BED.title: "Other Compressors" + task.3DBE3AF880802D53.title: "Arcane Pedestals" task.3DED6DAEE4419675.title: "Any Chipped Workbench" task.3E77920F150C9F9A.title: "Any Pickaxe" task.3EAFB384DAB520FD.title: "Any &3Arts and Crafts&r Item" task.3FAF9DE9DBBA6228.title: "Celestigem Tools" task.40F7F5B9E57315CB.title: "Energy Cables" + task.418BC399B733818A.title: "Archwood" task.42E9F9AE06C46A76.title: "Any Pickaxe" task.42EE7B1C5F75BCAF.title: "Welcome!" task.4315ED9269099C81.title: "Any Chest" diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 671bf928..7a5b73c6 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } From a2c21b70ac00c34557d534cb48c7ca8c6b3e6103 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 10:02:50 -0400 Subject: [PATCH 02/37] tags and quests --- .../quests/chapters/ars_nouveau.snbt | 25 +++++++++++++++++-- config/ftbquests/quests/lang/en_us.snbt | 15 +++++++++-- .../recipes/ars_nouveau/imbuement.js | 18 +++++++++++++ .../tags/block/neoforge/storage_blocks.js | 2 ++ .../tags/item/neoforge/essences.js | 17 +++++++++++++ .../tags/item/neoforge/storage_blocks.js | 2 ++ 6 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 kubejs/server_scripts/recipes/ars_nouveau/imbuement.js create mode 100644 kubejs/server_scripts/tags/item/neoforge/essences.js diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 868f0820..abdf460e 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -79,13 +79,34 @@ type: "item" } { - id: "3DBE3AF880802D53" - item: { components: { "ftbfiltersystem:filter": "or(item(ars_nouveau:arcane_platform)item(ars_nouveau:arcane_pedestal))" }, count: 1, id: "ftbfiltersystem:smart_filter" } + id: "41F950FE18700674" + item: { count: 1, id: "ars_nouveau:source_gem" } type: "item" } ] x: 0.5d y: 1.5d } + { + dependencies: ["7750C6E87B1EBF43"] + icon: { + id: "ars_nouveau:arcane_pedestal" + } + id: "09C3C5173499DF7C" + tasks: [ + { + id: "3898E7E189555B8C" + item: { components: { "ftbfiltersystem:filter": "or(item(ars_nouveau:arcane_platform)item(ars_nouveau:arcane_pedestal))" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + } + { + id: "0767C8200D0389A6" + item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(c:essences)" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + } + ] + x: -0.5d + y: 2.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index a4c8b940..4cdd841b 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -117,6 +117,15 @@ "" "If you did, take that GM Cell back to the DNA Extractor and proceed from there as you would with any Cell. By the end of the process, you’ll have a blood sample with your fancy new upgraded trait." ] + quest.09C3C5173499DF7C.quest_desc: [ + "To craft essences, you’ll need to place some pedestals adjacent to the Imbuement Chamber with key items installed in the pedestal. " + "" + "These key items are &nnot consumed&r and are only there to set the recipe. " + "" + "Valid placement is a 3x3x3 area centered on the Imbuement Chamber." + "" + "&a🛈 Tip: Source is optional!" + ] quest.09E7D266A7724F09.quest_desc: [ "Fluid pipes that double as limited storage, keeping a buffer of fluid in each block space. " "" @@ -2881,11 +2890,12 @@ "Feel free to hook up any Logistics you wish to extract the result." ] quest.7750C6E87B1EBF43.quest_desc: [ - "" "The humble Imbuement Chamber is perhaps the single most important apparatus in Ars Nouveau. " "" "With it, you’ll be able to generate the Source Gems and Essences you’ll need for all future crafts. " "" + "For now, we'll need to start by converting some Lapis to Source Gems. " + "" "&a🛈 Tip: Source is optional!" ] quest.77A66ADAB0845804.quest_desc: [ @@ -3032,6 +3042,7 @@ task.04A7890742B7519E.title: "Observe: Spirit Fire" task.069760235257E581.title: "String Curtains" task.073DDF6031485D23.title: "Covered Cables" + task.0767C8200D0389A6.title: "Essences" task.07D8961C49D02845.title: "Archwood Saplings" task.0C66972E31440AAF.title: "Ender Cells" task.0CB92589AF70B557.title: "Any &3Handcrafted&r Item" @@ -3061,9 +3072,9 @@ task.35B971D8A6CCBC94.title: "EU Cables" task.3745AFEF378D7217.title: "Steel or Energized Steel" task.37CDC8E9B9004A0D.title: "Crafting Storage" + task.3898E7E189555B8C.title: "Arcane Platforms" task.3C9F8F7D407AC253.title: "Sender Modules" task.3D1A362E43EE4BED.title: "Other Compressors" - task.3DBE3AF880802D53.title: "Arcane Pedestals" task.3DED6DAEE4419675.title: "Any Chipped Workbench" task.3E77920F150C9F9A.title: "Any Pickaxe" task.3EAFB384DAB520FD.title: "Any &3Arts and Crafts&r Item" diff --git a/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js new file mode 100644 index 00000000..1e4a6b41 --- /dev/null +++ b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js @@ -0,0 +1,18 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:ars_nouveau/imbuement/'; + + const recipes = [ + { + input: { tag: 'c:storage_blocks/amethyst' }, + output: { id: 'ars_nouveau:source_gem_block', count: 1 }, + pedestalItems: [], + source: 1500, + id: `ars_nouveau:imbuement_amethyst_block` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'ars_nouveau:imbuement'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js index c4eb7684..42625c8c 100644 --- a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js @@ -1,5 +1,7 @@ ServerEvents.tags('block', (event) => { let additions = { + amethyst: ['minecraft:amethyst_block'], + ferricore: ['justdirethings:ferricore_block'], blazegold: ['justdirethings:blazegold_block'], celestigem: ['justdirethings:celestigem_block'], diff --git a/kubejs/server_scripts/tags/item/neoforge/essences.js b/kubejs/server_scripts/tags/item/neoforge/essences.js new file mode 100644 index 00000000..c90f3985 --- /dev/null +++ b/kubejs/server_scripts/tags/item/neoforge/essences.js @@ -0,0 +1,17 @@ +ServerEvents.tags('item', (event) => { + let additions = { + air: ['ars_nouveau:air_essence'], + fire: ['ars_nouveau:fire_essence'], + earth: ['ars_nouveau:earth_essence'], + water: ['ars_nouveau:water_essence'], + anima: ['ars_elemental:anima_essence'], + abjuration: ['ars_nouveau:abjuration_essence'], + conjuration: ['ars_nouveau:conjuration_essence'], + manipulation: ['ars_nouveau:manipulation_essence'] + }; + + Object.keys(additions).forEach((tag) => { + event.get(`c:essences/${tag}`).add(additions[tag]); + event.get('c:essences').add(additions[tag]); + }); +}); diff --git a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js index e63bd9a8..e687743d 100644 --- a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js @@ -1,5 +1,7 @@ ServerEvents.tags('item', (event) => { let additions = { + amethyst: ['minecraft:amethyst_block'], + ferricore: ['justdirethings:ferricore_block'], blazegold: ['justdirethings:blazegold_block'], celestigem: ['justdirethings:celestigem_block'], From 5730cc0bdda64326b33d3fa0103db0e9a7fa07d3 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 10:22:42 -0400 Subject: [PATCH 03/37] Update imbuement.js --- .../recipes/ars_nouveau/imbuement.js | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js index 1e4a6b41..d7fbe5de 100644 --- a/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js +++ b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js @@ -8,6 +8,82 @@ ServerEvents.recipes((event) => { pedestalItems: [], source: 1500, id: `ars_nouveau:imbuement_amethyst_block` + }, + { + input: { tag: 'c:gems/source' }, + output: { count: 1, id: 'ars_nouveau:air_essence' }, + pedestalItems: [{ tag: 'c:feathers' }, { item: 'ars_nouveau:wilden_wing' }, { tag: 'minecraft:arrows' }], + source: 2000 * 3, + id: `ars_nouveau:air_essence` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_nouveau:air_essence', count: 4 }, + pedestalItems: [{ tag: 'c:feathers' }, { item: 'ars_nouveau:wilden_wing' }, { tag: 'minecraft:arrows' }], + source: 2000 * 3, + id: `${id_prefix}charged_certus_quartz_crystal` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_nouveau:earth_essence', count: 4 }, + pedestalItems: [{ tag: 'c:ingots/iron' }, { tag: 'c:seeds' }, { tag: 'minecraft:dirt' }], + source: 2000 * 3, + id: `${id_prefix}earth_essence` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_nouveau:fire_essence', count: 4 }, + pedestalItems: [ + { item: 'minecraft:flint_and_steel' }, + { item: 'minecraft:torch' }, + { item: 'minecraft:gunpowder' } + ], + source: 2000 * 3, + id: `${id_prefix}fire_essence` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_nouveau:water_essence', count: 4 }, + pedestalItems: [ + { item: 'minecraft:water_bucket' }, + { item: 'minecraft:snow_block' }, + { item: 'minecraft:kelp' } + ], + source: 2000 * 3, + id: `${id_prefix}water_essence` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_nouveau:manipulation_essence', count: 4 }, + pedestalItems: [ + { item: 'minecraft:stone_button' }, + { item: 'minecraft:redstone' }, + { item: 'minecraft:clock' } + ], + source: 2000 * 3, + id: `${id_prefix}manipulation_essence` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_nouveau:abjuration_essence', count: 4 }, + pedestalItems: [ + { item: 'minecraft:fermented_spider_eye' }, + { item: 'minecraft:sugar' }, + { item: 'minecraft:milk_bucket' } + ], + source: 2000 * 3, + id: `${id_prefix}abjuration_essence` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_nouveau:conjuration_essence', count: 4 }, + pedestalItems: [ + { item: 'ars_nouveau:wilden_horn' }, + { item: 'ars_nouveau:starbuncle_shards' }, + { item: 'minecraft:book' } + ], + source: 2000 * 3, + id: `${id_prefix}conjuration_essence` } ]; From 418c186e63548095e5976b1490a8fc6ca1d5aad1 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 10:24:44 -0400 Subject: [PATCH 04/37] Update ars_nouveau.snbt --- config/ftbquests/quests/chapters/ars_nouveau.snbt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index abdf460e..45d08792 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -1,5 +1,4 @@ { - always_invisible: true default_hide_dependency_lines: false default_quest_shape: "" filename: "ars_nouveau" @@ -51,6 +50,12 @@ id: "ars_nouveau:purple_archwood_sapling" } id: "69A9A6E9B7CB34B4" + rewards: [{ + exclude_from_claim_all: true + id: "58EF8CA6CF0F832A" + table_id: 23658154196454858L + type: "loot" + }] tasks: [ { id: "07D8961C49D02845" From 843d637214390e9f0284dc398e5fe4bb497afff7 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 11:23:05 -0400 Subject: [PATCH 05/37] batch --- CHANGELOG.md | 1 + config/patchouli-client.toml | 2 +- .../recipes/ars_nouveau/enchantment.js | 27 +++++++++++++++++++ .../recipes/ars_nouveau/imbuement.js | 11 ++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 kubejs/server_scripts/recipes/ars_nouveau/enchantment.js diff --git a/CHANGELOG.md b/CHANGELOG.md index cdb4fd24..60c533df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Queen Bee loves music and will share her treasures for sick beats! [\#97](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/97) - More Wandering Trader trades! [\#97](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/97) - More Amadron trades! [\#97](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/97) +- New batch craft recipes for essences [\#101](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/101) #### 🦟 Bugs Fixed diff --git a/config/patchouli-client.toml b/config/patchouli-client.toml index 9832aa6f..ad39a5ea 100644 --- a/config/patchouli-client.toml +++ b/config/patchouli-client.toml @@ -1,5 +1,5 @@ #Set this to true to disable advancement locking for ALL books, making all entries visible at all times. Config Flag: advancements_disabled -disableAdvancementLocking = false +disableAdvancementLocking = true #Granular list of Book ID's to disable advancement locking for, e.g. [ "botania:lexicon" ]. Config Flags: advancements_disabled_ noAdvancementBooks = [] #Enable testing mode. By default this doesn't do anything, but you can use the config flag in your books if you want. Config Flag: testing_mode diff --git a/kubejs/server_scripts/recipes/ars_nouveau/enchantment.js b/kubejs/server_scripts/recipes/ars_nouveau/enchantment.js new file mode 100644 index 00000000..6b56c66b --- /dev/null +++ b/kubejs/server_scripts/recipes/ars_nouveau/enchantment.js @@ -0,0 +1,27 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:ars_nouveau/enchantment/'; + + const recipes = [ + { + enchantment: 'geneticsresequenced:delicate_touch', + level: 1, + pedestalItems: [ + { tag: 'c:feathers' }, + { tag: 'c:feathers' }, + { tag: 'c:ingots/copper' }, + { tag: 'c:ingots/copper' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/lapis' }, + { tag: 'c:storage_blocks/lapis' } + ], + sourceCost: 9000, + id: `${id_prefix}delicate_touch` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'ars_nouveau:enchantment'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js index d7fbe5de..d9a40e46 100644 --- a/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js +++ b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js @@ -84,6 +84,17 @@ ServerEvents.recipes((event) => { ], source: 2000 * 3, id: `${id_prefix}conjuration_essence` + }, + { + input: { tag: 'c:storage_blocks/source' }, + output: { id: 'ars_elemental:anima_essence', count: 4 }, + pedestalItems: [ + { item: 'minecraft:wither_skeleton_skull' }, + { item: 'minecraft:bone_meal' }, + { item: 'minecraft:golden_apple' } + ], + source: 2000 * 3, + id: `${id_prefix}anima_essence` } ]; From 7f6ab6ffc05d78fb0e72ea93ced433a21b205443 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 12:06:55 -0400 Subject: [PATCH 06/37] ars --- .../quests/chapters/ars_nouveau.snbt | 54 ++++++++++++++++--- config/ftbquests/quests/lang/en_us.snbt | 29 +++++++++- .../reward_tables/0F3B57D5BCDEFA8D.snbt | 14 +++++ .../reward_tables/4C3908A1EDE782F7.snbt | 4 +- .../reward_tables/63595DAD65E0F896.snbt | 14 +++++ .../reward_tables/77FB07B0CC8EAE79.snbt | 21 ++++++++ 6 files changed, 126 insertions(+), 10 deletions(-) create mode 100644 config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt create mode 100644 config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt create mode 100644 config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 45d08792..6efe6a2f 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -68,8 +68,8 @@ type: "item" } ] - x: 0.5d - y: 0.5d + x: 1.5d + y: -1.0d } { dependencies: ["69A9A6E9B7CB34B4"] @@ -77,6 +77,12 @@ id: "ars_nouveau:imbuement_chamber" } id: "7750C6E87B1EBF43" + rewards: [{ + exclude_from_claim_all: true + id: "35D97B5097E131F2" + table_id: 8645512365595340409L + type: "loot" + }] tasks: [ { id: "1E094E135E6FF0F5" @@ -89,15 +95,21 @@ type: "item" } ] - x: 0.5d - y: 1.5d + x: 2.5d + y: -1.0d } { dependencies: ["7750C6E87B1EBF43"] icon: { - id: "ars_nouveau:arcane_pedestal" + id: "ars_nouveau:abjuration_essence" } id: "09C3C5173499DF7C" + rewards: [{ + exclude_from_claim_all: true + id: "32BA3B15B976562B" + table_id: 8645512365595340409L + type: "loot" + }] tasks: [ { id: "3898E7E189555B8C" @@ -110,8 +122,36 @@ type: "item" } ] - x: -0.5d - y: 2.0d + x: 3.5d + y: -1.0d + } + { + dependencies: ["41614A924E5556EE"] + id: "08E99B65ABE19047" + min_width: 250 + rewards: [ + { + id: "3638FD77A8101CA8" + item: { + count: 1 + id: "ars_additions:codex_entry" + } + type: "item" + } + { + exclude_from_claim_all: true + id: "2CA82CB4F15F7BD1" + table_id: 8645512365595340409L + type: "loot" + } + ] + tasks: [{ + id: "3F0E38A79A1A1466" + item: { count: 1, id: "ars_nouveau:novice_spell_book" } + type: "item" + }] + x: 1.5d + y: 0.0d } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 4cdd841b..4037da11 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -117,8 +117,31 @@ "" "If you did, take that GM Cell back to the DNA Extractor and proceed from there as you would with any Cell. By the end of the process, you’ll have a blood sample with your fancy new upgraded trait." ] + quest.08E99B65ABE19047.quest_desc: [ + "Spellcraft is important to any practitioner of the arcane arts. Doubly so in Ars Nouveau where spells can be used both directly from the Spell Book or imbued into a Spell Turret to fire automatically. " + "" + "Begin by making yourself the Novice Spell Book. It comes with a few glyphs that you’ll be able to put together, but you’ll soon want to explore more glyphs to pull off ever more impressive feats." + "" + "If you're feeling a little daunted by spellcraft, that's normal. It's a huge and very powerful system. We'll try to point out useful spells to know throughout the quests, however. " + "" + "The guidebook also has a section that explains the rules, such as placing &5Form&r before &aEffect&r or where &6Augments&r are allowed. " + "" + "[\"Lastly, the community driven \",{\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://wiki.aidancbrady.com\"},\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\":\"Ars.Guide\",\"underlined\":true},\" has a repository of useful spells. Feel free to explore them and submit your own creations!\"]" + "" + "&6&nExample Spells&r" + "" + "&7Multi-Tool&r" + " &5Touch&r > &aBreak&r" + "" + "&7Magic Missile&r" + " &5Projectile&r > &aHarm&r" + "" + "&a🛈 Tip: Refer to the guide for more examples." + "" + "&6⚠ Note: Spells may contain up to twenty glyphs." + ] quest.09C3C5173499DF7C.quest_desc: [ - "To craft essences, you’ll need to place some pedestals adjacent to the Imbuement Chamber with key items installed in the pedestal. " + "To craft essences, you’ll need to place some pedestals adjacent to the Imbuement Chamber with key items installed in each pedestal. " "" "These key items are &nnot consumed&r and are only there to set the recipe. " "" @@ -126,6 +149,7 @@ "" "&a🛈 Tip: Source is optional!" ] + quest.09C3C5173499DF7C.title: "Essences" quest.09E7D266A7724F09.quest_desc: [ "Fluid pipes that double as limited storage, keeping a buffer of fluid in each block space. " "" @@ -3023,6 +3047,7 @@ reward_table.0765A447BA2E5EDF.title: "MI Lootbox: Quantum Tier" reward_table.09B745401897355C.title: "PneumaticCraft Lootbox: Epic" reward_table.0D9287B7A88E2255.title: "MI Lootbox: HV Tier" + reward_table.0F3B57D5BCDEFA8D.title: "Ars Nouveau Lootbox: Legendary" reward_table.1FB94504FC4F0807.title: "MI Lootbox: EV Tier" reward_table.2806F6BEA4A73B0B.title: "Occultism Lootbox" reward_table.3989965A6A96B854.title: "MI Lootbox: MV Tier" @@ -3033,9 +3058,11 @@ reward_table.523EF680C25C2831.title: "MI Lootbox: LV Tier" reward_table.57D690FA70BABEA6.title: "PneumaticCraft Lootbox: Legendary" reward_table.59C93D37C8A23DE3.title: "Mekanism Lootbox: Legendary" + reward_table.63595DAD65E0F896.title: "Ars Nouveau Lootbox: Epic" reward_table.65B36FE5D4A2DE53.title: "Bed" reward_table.6C6D0A33A13CE96A.title: "Mekanism Lootbox: Epic" reward_table.73BCB0998B70644B.title: "MI Lootbox: Bronze Tier" + reward_table.77FB07B0CC8EAE79.title: "Ars Nouveau Lootbox: Rare" task.0164AF75B5EA3F49.title: "Fluid Tanks" task.0219421FBD8DB647.title: "Just Dire Upgrades" task.0459BF27966A67E4.title: "Iron Chests" diff --git a/config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt b/config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt new file mode 100644 index 00000000..c22512e3 --- /dev/null +++ b/config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt @@ -0,0 +1,14 @@ +{ + hide_tooltip: true + icon: { + components: { + "ftbquests:icon": "kubejs:item/lootbox/legendary" + } + id: "ftbquests:custom_icon" + } + id: "0F3B57D5BCDEFA8D" + loot_size: 2 + order_index: 21 + rewards: [{ item: { count: 1, id: "ars_additions:ancient_codex_entry" } }] + use_title: true +} diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 7a5b73c6..671bf928 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } diff --git a/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt new file mode 100644 index 00000000..400287e2 --- /dev/null +++ b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt @@ -0,0 +1,14 @@ +{ + hide_tooltip: true + icon: { + components: { + "ftbquests:icon": "kubejs:item/lootbox/epic" + } + id: "ftbquests:custom_icon" + } + id: "63595DAD65E0F896" + loot_size: 2 + order_index: 20 + rewards: [{ item: { count: 1, id: "ars_additions:lost_codex_entry" } }] + use_title: true +} diff --git a/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt new file mode 100644 index 00000000..dcfef543 --- /dev/null +++ b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt @@ -0,0 +1,21 @@ +{ + hide_tooltip: true + icon: { + components: { + "ftbquests:icon": "kubejs:item/lootbox/rare" + } + id: "ftbquests:custom_icon" + } + id: "77FB07B0CC8EAE79" + loot_size: 2 + order_index: 19 + rewards: [ + { item: { count: 1, id: "ars_additions:codex_entry" } } + { item: { count: 1, id: "ars_nouveau:starbuncle_shards" } } + { item: { count: 1, id: "ars_nouveau:whirlisprig_shards" } } + { item: { count: 1, id: "ars_nouveau:wixie_shards" } } + { item: { count: 1, id: "ars_nouveau:drygmy_shard" } } + { item: { count: 1, id: "ars_elemental:siren_shards" } } + ] + use_title: true +} From 5f090fff7ff8fab339d80fdb16409ca4221531ab Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 12:27:35 -0400 Subject: [PATCH 07/37] quests --- .../quests/chapters/ars_nouveau.snbt | 37 +++++++++++++++++++ config/ftbquests/quests/lang/en_us.snbt | 26 +++++++++++++ 2 files changed, 63 insertions(+) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 6efe6a2f..24c99194 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -153,5 +153,42 @@ x: 1.5d y: 0.0d } + { + dependencies: ["08E99B65ABE19047"] + icon: { + id: "ars_nouveau:scribes_table" + } + id: "309083107758B10C" + rewards: [ + { + id: "5C25C64212C4C59B" + item: { + count: 1 + id: "ars_nouveau:glyph_crush" + } + type: "item" + } + { + exclude_from_claim_all: true + id: "5554DAF5CCAD1E28" + table_id: 8645512365595340409L + type: "loot" + } + ] + tasks: [ + { + id: "2BC7CA0B413D24B0" + item: { count: 1, id: "ars_nouveau:scribes_table" } + type: "item" + } + { + id: "3ADF4803B5DF4AF9" + item: { count: 1, id: "ars_nouveau:glyph_sensitive" } + type: "item" + } + ] + x: 2.5d + y: 0.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 4037da11..f443f15a 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1024,6 +1024,32 @@ ] quest.2F898C0C2DF380AE.quest_desc: ["The following are bulk energy storage units."] quest.2F898C0C2DF380AE.title: "Bulk Energy Storage" + quest.309083107758B10C.quest_desc: [ + "Now that you’ve got your first Spell Book, let’s see about adding some extra glyphs to spice things up." + "" + "To make a new glyph, simply Right-Click on the Scribe’s Table with your Spell Book. This will show all known and unknown glyphs grouped by tier. It’s also searchable, so finding the Glyph you’re after shouldn’t be hard. " + "" + "Let’s start with something easy to craft: Sensitive. " + "" + "This allows you to change the target of a spell, such as hitting Water instead of the blocks below. It also augments effects like Crush to work on items instead of blocks." + "" + "&6&nExample Spells&r" + "" + "&7Crush Items&r" + " &5Projectile&r > &aCrush&r > &6Sensitive&r" + "" + "&7Freeze Water&r" + " &5Touch&r > &6Sensitive&r > &aFreeze&r " + "" + "&a🛈 Tip: The Scribe's Table will pull from " + "&a nearby inventories automatically!" + "" + "&6⚠ Note: Known Glyphs are stored in " + "&6 your player data. Losing a book " + "&6 just means losing the spell combos" + "&6 you’ve made rather than all Glyph " + "&6 knowledge." + ] quest.31129C8D75EFD8E9.quest_desc: ["The Gas-Burning Generator can burn Ethene to produce even more energy. A couple of these combined with some sort of automated crop farm should cover power needs for a good while to come."] quest.3263757C9A240C70.quest_desc: [ "Chipped offers a multitude of block variants to fit your every decorative need. The Workbenches themselves are equally lovely and can spruce up your interiors quite easily." From 7dc5d1a25888558ce3215fadca19775a22317f47 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 12:39:02 -0400 Subject: [PATCH 08/37] quest --- .../ftbquests/quests/chapters/ars_nouveau.snbt | 1 + config/ftbquests/quests/lang/en_us.snbt | 6 +++++- .../quests/reward_tables/0F3B57D5BCDEFA8D.snbt | 9 ++++++++- .../quests/reward_tables/63595DAD65E0F896.snbt | 12 +++++++++++- .../quests/reward_tables/77FB07B0CC8EAE79.snbt | 17 ++++++++++++++++- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 24c99194..37e62d87 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -159,6 +159,7 @@ id: "ars_nouveau:scribes_table" } id: "309083107758B10C" + min_width: 250 rewards: [ { id: "5C25C64212C4C59B" diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index f443f15a..3b0991ab 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -138,7 +138,7 @@ "" "&a🛈 Tip: Refer to the guide for more examples." "" - "&6⚠ Note: Spells may contain up to twenty glyphs." + "&6⚠ Note: Spells may contain up to thirty glyphs." ] quest.09C3C5173499DF7C.quest_desc: [ "To craft essences, you’ll need to place some pedestals adjacent to the Imbuement Chamber with key items installed in each pedestal. " @@ -1559,6 +1559,10 @@ "" "Summon magical creatures and craft magical gadgets to automagically perform nearly any task around your home!" "" + "Ars Nouveau also has a number of add-on mods which bring many new mechanics and features. " + "" + "These quests can't cover everything, but the guidebook should have you covered!" + "" "&a🛈 Tip: Sourceberries can be planted " "&a on grass!" ] diff --git a/config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt b/config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt index c22512e3..da6a619f 100644 --- a/config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt +++ b/config/ftbquests/quests/reward_tables/0F3B57D5BCDEFA8D.snbt @@ -9,6 +9,13 @@ id: "0F3B57D5BCDEFA8D" loot_size: 2 order_index: 21 - rewards: [{ item: { count: 1, id: "ars_additions:ancient_codex_entry" } }] + rewards: [{ + count: 2 + item: { + count: 1 + id: "ars_additions:ancient_codex_entry" + } + random_bonus: 2 + }] use_title: true } diff --git a/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt index 400287e2..c88464c6 100644 --- a/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt +++ b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt @@ -9,6 +9,16 @@ id: "63595DAD65E0F896" loot_size: 2 order_index: 20 - rewards: [{ item: { count: 1, id: "ars_additions:lost_codex_entry" } }] + rewards: [ + { + count: 2 + item: { + count: 1 + id: "ars_additions:lost_codex_entry" + } + random_bonus: 2 + } + { item: { count: 1, id: "ars_nouveau:stable_warp_scroll" } } + ] use_title: true } diff --git a/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt index dcfef543..4a6e22d5 100644 --- a/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt +++ b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt @@ -10,12 +10,27 @@ loot_size: 2 order_index: 19 rewards: [ - { item: { count: 1, id: "ars_additions:codex_entry" } } + { + count: 2 + item: { + count: 1 + id: "ars_additions:codex_entry" + } + random_bonus: 2 + } { item: { count: 1, id: "ars_nouveau:starbuncle_shards" } } { item: { count: 1, id: "ars_nouveau:whirlisprig_shards" } } { item: { count: 1, id: "ars_nouveau:wixie_shards" } } { item: { count: 1, id: "ars_nouveau:drygmy_shard" } } { item: { count: 1, id: "ars_elemental:siren_shards" } } + { + count: 2 + item: { + count: 1 + id: "ars_nouveau:warp_scroll" + } + random_bonus: 2 + } ] use_title: true } From d2eaa8ab78312c1425f857734e827ea33e163cd3 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 13:18:50 -0400 Subject: [PATCH 09/37] quest --- .../quests/chapters/ars_nouveau.snbt | 17 ++++++++++++++ config/ftbquests/quests/lang/en_us.snbt | 15 +++++++++---- .../reward_tables/4C3908A1EDE782F7.snbt | 4 ++-- .../recipes/ars_nouveau/imbuement.js | 22 +++++-------------- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 37e62d87..a88fb685 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -191,5 +191,22 @@ x: 2.5d y: 0.0d } + { + dependencies: ["309083107758B10C"] + id: "07684F58521A4D34" + rewards: [{ + exclude_from_claim_all: true + id: "1237A9E9ED20D8F8" + table_id: 8645512365595340409L + type: "loot" + }] + tasks: [{ + id: "4958F0F7B2EC5012" + item: { count: 1, id: "ars_nouveau:annotated_codex" } + type: "item" + }] + x: 3.0d + y: 1.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 3b0991ab..34bb417a 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -112,6 +112,11 @@ "[\"Additionally, the author has a number of helpful \",{\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://www.youtube.com/playlist?list=PLvGYM7MCieIomj0tKtO9T5DUhvaYFjSxA\"},\"color\":\"blue\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\":\"video guides\",\"underlined\":true},\" on YouTube. Check them out if you need a little extra help.\"]" ] quest.062BB5F675CF9F45.title: "Just Dire Things" + quest.07684F58521A4D34.quest_desc: [ + "Playing with friends? " + "" + "You can share your Glyph knowledge with one another using an Annotated Codex. Right-Click to record them and your friend can Right-Click to learn them." + ] quest.08D496EFE575AD1E.quest_desc: [ "With any luck, you’ll have received a Genetically Modified Cell with the trait you’re after. If not, better luck next time." "" @@ -1031,15 +1036,17 @@ "" "Let’s start with something easy to craft: Sensitive. " "" - "This allows you to change the target of a spell, such as hitting Water instead of the blocks below. It also augments effects like Crush to work on items instead of blocks." + "This allows you to change the target of a spell, such as hitting Water instead of the blocks below, or connecting with Grass and Saplings. " + "" + "It also augments effects like Crush to work on items instead of blocks." "" "&6&nExample Spells&r" "" "&7Crush Items&r" " &5Projectile&r > &aCrush&r > &6Sensitive&r" "" - "&7Freeze Water&r" - " &5Touch&r > &6Sensitive&r > &aFreeze&r " + "&7Sapling Growth&r" + " &5Projectile&r > &6Sensitive&r > &aGrow&r " "" "&a🛈 Tip: The Scribe's Table will pull from " "&a nearby inventories automatically!" @@ -1561,7 +1568,7 @@ "" "Ars Nouveau also has a number of add-on mods which bring many new mechanics and features. " "" - "These quests can't cover everything, but the guidebook should have you covered!" + "These quests can't cover everything, but the guidebook should help with anything not covered here." "" "&a🛈 Tip: Sourceberries can be planted " "&a on grass!" diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 671bf928..7a5b73c6 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } diff --git a/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js index d9a40e46..fdda7ee4 100644 --- a/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js +++ b/kubejs/server_scripts/recipes/ars_nouveau/imbuement.js @@ -2,26 +2,16 @@ ServerEvents.recipes((event) => { const id_prefix = 'enigmatica:ars_nouveau/imbuement/'; const recipes = [ - { - input: { tag: 'c:storage_blocks/amethyst' }, - output: { id: 'ars_nouveau:source_gem_block', count: 1 }, - pedestalItems: [], - source: 1500, - id: `ars_nouveau:imbuement_amethyst_block` - }, - { - input: { tag: 'c:gems/source' }, - output: { count: 1, id: 'ars_nouveau:air_essence' }, - pedestalItems: [{ tag: 'c:feathers' }, { item: 'ars_nouveau:wilden_wing' }, { tag: 'minecraft:arrows' }], - source: 2000 * 3, - id: `ars_nouveau:air_essence` - }, { input: { tag: 'c:storage_blocks/source' }, output: { id: 'ars_nouveau:air_essence', count: 4 }, - pedestalItems: [{ tag: 'c:feathers' }, { item: 'ars_nouveau:wilden_wing' }, { tag: 'minecraft:arrows' }], + pedestalItems: [ + { item: 'minecraft:feather' }, + { item: 'ars_nouveau:wilden_wing' }, + { tag: 'minecraft:arrows' } + ], source: 2000 * 3, - id: `${id_prefix}charged_certus_quartz_crystal` + id: `${id_prefix}air_essence` }, { input: { tag: 'c:storage_blocks/source' }, From 8ca833dd1916221e018028b70dbb36fedc3aa39a Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 13:54:41 -0400 Subject: [PATCH 10/37] quests --- .../quests/chapters/ars_nouveau.snbt | 108 +++++++++++++++++- config/ftbquests/quests/lang/en_us.snbt | 55 +++++++++ .../reward_tables/77FB07B0CC8EAE79.snbt | 10 +- 3 files changed, 166 insertions(+), 7 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index a88fb685..177c2b12 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -35,6 +35,14 @@ } type: "item" } + { + id: "4D3D50A9B14D1D16" + item: { + count: 1 + id: "ars_nouveau:dominion_wand" + } + type: "item" + } ] tasks: [{ id: "5AE1C3BF867DD395" @@ -122,8 +130,8 @@ type: "item" } ] - x: 3.5d - y: -1.0d + x: 3.0d + y: -2.0d } { dependencies: ["41614A924E5556EE"] @@ -208,5 +216,101 @@ x: 3.0d y: 1.0d } + { + dependencies: ["7750C6E87B1EBF43"] + icon: { + id: "ars_nouveau:enchanting_apparatus" + } + id: "09B6773CDA5A7565" + rewards: [{ + exclude_from_claim_all: true + id: "0F76138BEE7A0831" + table_id: 8645512365595340409L + type: "loot" + }] + tasks: [ + { + id: "7D066BDDB5D28852" + item: { count: 1, id: "ars_nouveau:enchanting_apparatus" } + type: "item" + } + { + id: "57EDDF96846F14F4" + item: { count: 1, id: "ars_nouveau:arcane_core" } + type: "item" + } + { + id: "35F8589774CE48D9" + item: { components: { "ftbfiltersystem:filter": "or(item(ars_nouveau:arcane_platform)item(ars_nouveau:arcane_pedestal))" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + } + ] + x: 3.5d + y: -1.0d + } + { + dependencies: ["09B6773CDA5A7565"] + id: "5AD1A273F3714FAF" + min_width: 250 + rewards: [{ + id: "74361348E4B2BFEF" + item: { + count: 1 + id: "ars_nouveau:source_jar" + } + type: "item" + }] + tasks: [{ + id: "47D22C2E34E9A099" + item: { components: { "ftbfiltersystem:filter": "or(item(ars_nouveau:agronomic_sourcelink)item(ars_nouveau:volcanic_sourcelink)item(ars_nouveau:alchemical_sourcelink)item(ars_nouveau:vitalic_sourcelink)item(ars_nouveau:mycelial_sourcelink))" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + }] + x: 4.5d + y: -1.0d + } + { + dependencies: ["5AD1A273F3714FAF"] + id: "69295042E8C3A609" + rewards: [ + { + id: "0B7C702E7CB5DD2D" + item: { + count: 1 + id: "ars_nouveau:source_jar" + } + type: "item" + } + { + exclude_from_claim_all: true + id: "6910C464FC00DDFD" + table_id: 8645512365595340409L + type: "loot" + } + ] + tasks: [{ + id: "6F03E717641EDA39" + item: { count: 1, id: "ars_nouveau:relay" } + type: "item" + }] + x: 5.5d + y: -1.0d + } + { + dependencies: ["5AD1A273F3714FAF"] + id: "4914692B607F8BE0" + rewards: [{ + exclude_from_claim_all: true + id: "01033F85BF765EDE" + table_id: 1097567509703228045L + type: "loot" + }] + tasks: [{ + id: "6E57C225504E6BF0" + item: { count: 1, id: "ars_additions:ender_source_jar" } + type: "item" + }] + x: 5.0d + y: -2.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 34bb417a..42f56cfa 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -145,6 +145,13 @@ "" "&6⚠ Note: Spells may contain up to thirty glyphs." ] + quest.09B6773CDA5A7565.quest_desc: [ + "The Enchanting Apparatus will likely be the next device you’ll wish to set up as it’s used for many more advanced crafts, upgrading equipment, and applying enchantments!" + "" + "This device is a free form multiblock. The Enchanting Apparatus must sit atop the Arcane Core, but the Pedestals may go anywhere within 3 blocks of the Core." + "" + "The items in the Pedestals will be consumed by these recipes. " + ] quest.09C3C5173499DF7C.quest_desc: [ "To craft essences, you’ll need to place some pedestals adjacent to the Imbuement Chamber with key items installed in each pedestal. " "" @@ -1811,6 +1818,11 @@ "Each of these steps, and how they come together will be discussed in the following quests." ] quest.48F901DB80482CAA.title: "Ore Processing" + quest.4914692B607F8BE0.quest_desc: [ + "The Ender Source Jar is ideal for cross dimensional Source Transport. " + "" + "So, if you’ve set up a crazy mob spawner in The End, maybe consider using this and a Vitalic Sourcelink to bring back all that delicious Source." + ] quest.49878D1219A63A4E.quest_desc: [ "Just another solar panel. It produces power during daylight hours and works best if paired with an Energy Cube or other power storage device." "" @@ -2231,6 +2243,37 @@ "" "Craft some Otherworld Goggles. These grant Spirit sight and allow you to see Iesnium Ore." ] + quest.5AD1A273F3714FAF.quest_desc: [ + "It’s probably about time we started thinking about power. " + "" + "Many of Ars Nouveau’s devices either require Source to run, such as certain Enchanting Apparatus recipes, or are dramatically improved by having Source supplied, like the Imbuement Chamber." + "" + "So, let’s pick a method and get some Source generated!" + "&n &r" + "" + "Each Sourcelink uses a different \"fuel\" to generate Source, which it deposits into a nearby Source Jar." + "" + "• &7Agronomic&r – Generates Source from natural " + " crop growth. Place in the middle of a field " + " for best results." + "" + "• &7Volcanic&r – Consumes furnace fuels like coal. " + " This can be dropped nearby or inserted into " + " an adjacent Arcane Pedestal." + "" + "• &7Alchemical&r – Consumes potions from an " + " adjacent Potion Jar. Best paired with a Wixie " + " designated to craft potions into the jar." + "" + "• &7Vitalic&r – Converts mob deaths to Source, an " + " excellent addition to any mob farm." + "" + "• &7Mycelial&r – Consume food. This can be dropped " + " nearby or inserted into an adjacent " + " Arcane Pedestal." + "" + "&a🛈 Tip: Source Jars hold 10,000 Source." + ] quest.5AFA08920E94A02B.quest_desc: [ "The Spirit Fire will act as your primary interface to the Otherworld for now. " "" @@ -2513,6 +2556,16 @@ "&a Wormhole or Storage Accessor" "&a on the Actuator to link them." ] + quest.69295042E8C3A609.quest_desc: [ + "Source Relays are used for transporting Source from place to place. This way you can have a centralized Source generation area that feeds multiple devices or Spell Turrets around your home." + "" + "These come in a variety of flavors, however perhaps the most relevant right now will be the Splitter. Not only will this transfer Source faster than the basic Relay, but it can also be used to pull from or deposit to multiple targets. " + "" + "Use a Dominion Wand to link Relays to other Relays or Source Jars. First Right-Click the origin, then Right-Click the destination." + "" + "&a🛈 Tip: Relays may be linked to each" + "&a other in a broad network!" + ] quest.692EDEAEC3F4A2AD.quest_desc: [ "The Swapper is a powerful teleportation device that swaps the blocks or entities in front of it with its linked partner. " "" @@ -3134,6 +3187,7 @@ task.3444EAB8952876B1.title: "Observe a Rift" task.34E6ED3A221ADB0E.title: "Just Dire Tools" task.35B971D8A6CCBC94.title: "EU Cables" + task.35F8589774CE48D9.title: "Arcane Pedestals" task.3745AFEF378D7217.title: "Steel or Energized Steel" task.37CDC8E9B9004A0D.title: "Crafting Storage" task.3898E7E189555B8C.title: "Arcane Platforms" @@ -3153,6 +3207,7 @@ task.44956BC067ED019C.title: "Pressurized Tubes" task.45BEB4E841507571.title: "Budding Certus" task.4775BC243353527B.title: "Any Mining Gadget" + task.47D22C2E34E9A099.title: "Sourcelinks" task.484FF1BEA9145D5F.title: "Puller Modules" task.488180E25D5B815A.title: "Anti-Fields" task.49C1EEBEED453B1C.title: "Mechanical Pipes" diff --git a/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt index 4a6e22d5..d6b72f89 100644 --- a/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt +++ b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt @@ -18,11 +18,11 @@ } random_bonus: 2 } - { item: { count: 1, id: "ars_nouveau:starbuncle_shards" } } - { item: { count: 1, id: "ars_nouveau:whirlisprig_shards" } } - { item: { count: 1, id: "ars_nouveau:wixie_shards" } } - { item: { count: 1, id: "ars_nouveau:drygmy_shard" } } - { item: { count: 1, id: "ars_elemental:siren_shards" } } + { item: { count: 1, id: "ars_nouveau:starbuncle_shards" }, weight: 0.2f } + { item: { count: 1, id: "ars_nouveau:whirlisprig_shards" }, weight: 0.2f } + { item: { count: 1, id: "ars_nouveau:wixie_shards" }, weight: 0.2f } + { item: { count: 1, id: "ars_nouveau:drygmy_shard" }, weight: 0.2f } + { item: { count: 1, id: "ars_elemental:siren_shards" }, weight: 0.2f } { count: 2 item: { From 0ca7eafb143c4e42b0bc687b8e95c96ad5f78100 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 14:22:47 -0400 Subject: [PATCH 11/37] glyph cleanup --- config/ars_additions-server.toml | 44 +++++++++++++++ .../glyph_mark.toml} | 48 ++++++++-------- .../glyph_recall.toml} | 42 +++++++------- .../glyph_retaliate.toml} | 42 +++++++------- config/ars_nouveau/glyph_accelerate | 15 ----- config/ars_nouveau/glyph_amplify | 15 ----- config/ars_nouveau/glyph_animate_block | 30 ---------- config/ars_nouveau/glyph_aoe | 15 ----- config/ars_nouveau/glyph_blink | 29 ---------- config/ars_nouveau/glyph_bounce | 30 ---------- config/ars_nouveau/glyph_break | 24 -------- config/ars_nouveau/glyph_burst | 24 -------- config/ars_nouveau/glyph_cold_snap | 34 ----------- config/ars_nouveau/glyph_craft | 24 -------- config/ars_nouveau/glyph_cut | 28 ---------- config/ars_nouveau/glyph_dampen | 15 ----- config/ars_nouveau/glyph_decelerate | 15 ----- config/ars_nouveau/glyph_delay | 30 ---------- config/ars_nouveau/glyph_dispel | 24 -------- config/ars_nouveau/glyph_duration_down | 15 ----- config/ars_nouveau/glyph_ender_inventory | 24 -------- config/ars_nouveau/glyph_evaporate | 24 -------- config/ars_nouveau/glyph_exchange | 24 -------- config/ars_nouveau/glyph_explosion | 37 ------------ config/ars_nouveau/glyph_extend_time | 15 ----- config/ars_nouveau/glyph_extract | 15 ----- config/ars_nouveau/glyph_fangs | 28 ---------- config/ars_nouveau/glyph_fell | 30 ---------- config/ars_nouveau/glyph_fell.toml | 2 +- config/ars_nouveau/glyph_firework | 24 -------- config/ars_nouveau/glyph_flare | 31 ---------- config/ars_nouveau/glyph_fortune | 15 ----- config/ars_nouveau/glyph_freeze | 30 ---------- config/ars_nouveau/glyph_glide | 30 ---------- config/ars_nouveau/glyph_gravity | 30 ---------- config/ars_nouveau/glyph_gust | 29 ---------- config/ars_nouveau/glyph_harm | 34 ----------- config/ars_nouveau/glyph_harvest | 24 -------- config/ars_nouveau/glyph_heal | 29 ---------- config/ars_nouveau/glyph_hex | 30 ---------- config/ars_nouveau/glyph_ignite | 30 ---------- config/ars_nouveau/glyph_infuse | 24 -------- config/ars_nouveau/glyph_intangible | 30 ---------- config/ars_nouveau/glyph_interact | 24 -------- config/ars_nouveau/glyph_invisibility | 30 ---------- config/ars_nouveau/glyph_launch | 29 ---------- config/ars_nouveau/glyph_leap | 31 ---------- config/ars_nouveau/glyph_light | 30 ---------- config/ars_nouveau/glyph_lightning | 31 ---------- config/ars_nouveau/glyph_name | 24 -------- config/ars_nouveau/glyph_orbit | 24 -------- config/ars_nouveau/glyph_phantom_block | 24 -------- config/ars_nouveau/glyph_pickup | 24 -------- config/ars_nouveau/glyph_pierce | 15 ----- config/ars_nouveau/glyph_place_block | 24 -------- config/ars_nouveau/glyph_projectile | 24 -------- config/ars_nouveau/glyph_pull | 29 ---------- config/ars_nouveau/glyph_randomize | 15 ----- config/ars_nouveau/glyph_redstone_signal | 30 ---------- config/ars_nouveau/glyph_rotate | 24 -------- config/ars_nouveau/glyph_rune | 24 -------- config/ars_nouveau/glyph_self | 21 ------- config/ars_nouveau/glyph_sense_magic | 30 ---------- config/ars_nouveau/glyph_sensitive | 15 ----- config/ars_nouveau/glyph_slowfall | 30 ---------- config/ars_nouveau/glyph_snare | 30 ---------- config/ars_nouveau/glyph_split | 15 ----- config/ars_nouveau/glyph_summon_decoy | 30 ---------- config/ars_nouveau/glyph_summon_steed | 30 ---------- config/ars_nouveau/glyph_summon_undead | 30 ---------- config/ars_nouveau/glyph_summon_vex | 30 ---------- config/ars_nouveau/glyph_summon_wolves | 30 ---------- config/ars_nouveau/glyph_toss | 24 -------- config/ars_nouveau/glyph_wall | 24 -------- config/ars_nouveau/glyph_wind_shear | 31 ---------- config/ars_nouveau/glyph_wither | 30 ---------- config/ars_nouveau/reset | 24 -------- config/ars_nouveau/rewind | 36 ------------ config/ars_nouveau/wololo | 24 -------- .../glyph_flatten.toml} | 56 +++++++++---------- .../glyph_propagate_projectile.toml} | 48 ++++++++-------- .../glyph_propagate_self.toml} | 48 ++++++++-------- .../glyph_propagate_underfoot.toml} | 48 ++++++++-------- .../quests/chapters/ars_nouveau.snbt | 41 +++++++++++++- config/ftbquests/quests/lang/en_us.snbt | 22 +++++++- .../reward_tables/4C3908A1EDE782F7.snbt | 4 +- 86 files changed, 272 insertions(+), 2067 deletions(-) create mode 100644 config/ars_additions-server.toml rename config/{ars_nouveau/glyph_linger => ars_additions/glyph_mark.toml} (95%) rename config/{ars_nouveau/glyph_underfoot => ars_additions/glyph_recall.toml} (92%) rename config/{ars_nouveau/glyph_touch => ars_additions/glyph_retaliate.toml} (90%) delete mode 100644 config/ars_nouveau/glyph_accelerate delete mode 100644 config/ars_nouveau/glyph_amplify delete mode 100644 config/ars_nouveau/glyph_animate_block delete mode 100644 config/ars_nouveau/glyph_aoe delete mode 100644 config/ars_nouveau/glyph_blink delete mode 100644 config/ars_nouveau/glyph_bounce delete mode 100644 config/ars_nouveau/glyph_break delete mode 100644 config/ars_nouveau/glyph_burst delete mode 100644 config/ars_nouveau/glyph_cold_snap delete mode 100644 config/ars_nouveau/glyph_craft delete mode 100644 config/ars_nouveau/glyph_cut delete mode 100644 config/ars_nouveau/glyph_dampen delete mode 100644 config/ars_nouveau/glyph_decelerate delete mode 100644 config/ars_nouveau/glyph_delay delete mode 100644 config/ars_nouveau/glyph_dispel delete mode 100644 config/ars_nouveau/glyph_duration_down delete mode 100644 config/ars_nouveau/glyph_ender_inventory delete mode 100644 config/ars_nouveau/glyph_evaporate delete mode 100644 config/ars_nouveau/glyph_exchange delete mode 100644 config/ars_nouveau/glyph_explosion delete mode 100644 config/ars_nouveau/glyph_extend_time delete mode 100644 config/ars_nouveau/glyph_extract delete mode 100644 config/ars_nouveau/glyph_fangs delete mode 100644 config/ars_nouveau/glyph_fell delete mode 100644 config/ars_nouveau/glyph_firework delete mode 100644 config/ars_nouveau/glyph_flare delete mode 100644 config/ars_nouveau/glyph_fortune delete mode 100644 config/ars_nouveau/glyph_freeze delete mode 100644 config/ars_nouveau/glyph_glide delete mode 100644 config/ars_nouveau/glyph_gravity delete mode 100644 config/ars_nouveau/glyph_gust delete mode 100644 config/ars_nouveau/glyph_harm delete mode 100644 config/ars_nouveau/glyph_harvest delete mode 100644 config/ars_nouveau/glyph_heal delete mode 100644 config/ars_nouveau/glyph_hex delete mode 100644 config/ars_nouveau/glyph_ignite delete mode 100644 config/ars_nouveau/glyph_infuse delete mode 100644 config/ars_nouveau/glyph_intangible delete mode 100644 config/ars_nouveau/glyph_interact delete mode 100644 config/ars_nouveau/glyph_invisibility delete mode 100644 config/ars_nouveau/glyph_launch delete mode 100644 config/ars_nouveau/glyph_leap delete mode 100644 config/ars_nouveau/glyph_light delete mode 100644 config/ars_nouveau/glyph_lightning delete mode 100644 config/ars_nouveau/glyph_name delete mode 100644 config/ars_nouveau/glyph_orbit delete mode 100644 config/ars_nouveau/glyph_phantom_block delete mode 100644 config/ars_nouveau/glyph_pickup delete mode 100644 config/ars_nouveau/glyph_pierce delete mode 100644 config/ars_nouveau/glyph_place_block delete mode 100644 config/ars_nouveau/glyph_projectile delete mode 100644 config/ars_nouveau/glyph_pull delete mode 100644 config/ars_nouveau/glyph_randomize delete mode 100644 config/ars_nouveau/glyph_redstone_signal delete mode 100644 config/ars_nouveau/glyph_rotate delete mode 100644 config/ars_nouveau/glyph_rune delete mode 100644 config/ars_nouveau/glyph_self delete mode 100644 config/ars_nouveau/glyph_sense_magic delete mode 100644 config/ars_nouveau/glyph_sensitive delete mode 100644 config/ars_nouveau/glyph_slowfall delete mode 100644 config/ars_nouveau/glyph_snare delete mode 100644 config/ars_nouveau/glyph_split delete mode 100644 config/ars_nouveau/glyph_summon_decoy delete mode 100644 config/ars_nouveau/glyph_summon_steed delete mode 100644 config/ars_nouveau/glyph_summon_undead delete mode 100644 config/ars_nouveau/glyph_summon_vex delete mode 100644 config/ars_nouveau/glyph_summon_wolves delete mode 100644 config/ars_nouveau/glyph_toss delete mode 100644 config/ars_nouveau/glyph_wall delete mode 100644 config/ars_nouveau/glyph_wind_shear delete mode 100644 config/ars_nouveau/glyph_wither delete mode 100644 config/ars_nouveau/reset delete mode 100644 config/ars_nouveau/rewind delete mode 100644 config/ars_nouveau/wololo rename config/{ars_nouveau/glyph_crush => arsomega/glyph_flatten.toml} (96%) rename config/{ars_nouveau/glyph_smelt => arsomega/glyph_propagate_projectile.toml} (96%) rename config/{ars_nouveau/glyph_conjure_water => arsomega/glyph_propagate_self.toml} (95%) rename config/{ars_nouveau/glyph_grow => arsomega/glyph_propagate_underfoot.toml} (95%) diff --git a/config/ars_additions-server.toml b/config/ars_additions-server.toml new file mode 100644 index 00000000..4a25bde2 --- /dev/null +++ b/config/ars_additions-server.toml @@ -0,0 +1,44 @@ +#Ritual of Arcane Permanence +[chunkloading] + #Should the ritual cost source? + has_cost = true + #Should the ritual cost be continuous? + repeat_cost = true + #How much source should it cost to run the ritual? + #Range: 1 ~ 10000 + cost = 10000 + #How often should the ritual cost source? (in ticks, defaults to 1 in-game day) + #Range: > 1 + interval = 24000 + #How far should the ritual chunk-load? (in chunks, 0 = 1x1, 1 = 3x3, 2 = 5x5, 3 = 7x7, 4 = 9x9) + #Range: > 0 + initial_radius = 0 + #Should the radius be able to be increased with an item? + radius_incremental = false + #What item is required to increase the chunk-loading radius? + radius_increment_item = "ars_nouveau:source_gem_block" + #What's the maximum amount of augmented increases the ritual should accept? + #Range: > 1 + radius_increment_max = 1 + #Should the ritual require the player who started it to be online? + require_online = true + #How many rituals should players be able to run? + #Range: > 1 + max_rituals = 2147483647 + #Should the server log when a chunk is loaded/unloaded? + log_chunkloading = false + +#Reliquary +[mark_and_recall] + #How much durability should targeting a player with Recall cost? + #Range: 0 ~ 1000 + cost_player = 1000 + #How much durability should targeting an entity with Recall cost? + #Range: 0 ~ 1000 + cost_entity = 250 + #How much durability should targeting a location with Recall cost? + #Range: 0 ~ 1000 + cost_location = 50 + #How long should the Marked effect last (in seconds) when Mark is cast on a player? + #Range: 0 ~ 900 + effect_duration = 300 diff --git a/config/ars_nouveau/glyph_linger b/config/ars_additions/glyph_mark.toml similarity index 95% rename from config/ars_nouveau/glyph_linger rename to config/ars_additions/glyph_mark.toml index 5881f609..6e1a0584 100644 --- a/config/ars_nouveau/glyph_linger +++ b/config/ars_additions/glyph_mark.toml @@ -1,24 +1,24 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 500 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: 1 ~ 1 - per_spell_limit = 1 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 25 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: 1 ~ 1 + per_spell_limit = 1 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 3 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/ars_nouveau/glyph_underfoot b/config/ars_additions/glyph_recall.toml similarity index 92% rename from config/ars_nouveau/glyph_underfoot rename to config/ars_additions/glyph_recall.toml index 9820ddee..21cebc3f 100644 --- a/config/ars_nouveau/glyph_underfoot +++ b/config/ars_additions/glyph_recall.toml @@ -1,21 +1,21 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 5 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 50 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 3 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] diff --git a/config/ars_nouveau/glyph_touch b/config/ars_additions/glyph_retaliate.toml similarity index 90% rename from config/ars_nouveau/glyph_touch rename to config/ars_additions/glyph_retaliate.toml index 478d9786..fc67fec0 100644 --- a/config/ars_nouveau/glyph_touch +++ b/config/ars_additions/glyph_retaliate.toml @@ -1,21 +1,21 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 5 - #Is Starter Glyph? - starter = true - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 25 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 3 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] diff --git a/config/ars_nouveau/glyph_accelerate b/config/ars_nouveau/glyph_accelerate deleted file mode 100644 index f2332d9d..00000000 --- a/config/ars_nouveau/glyph_accelerate +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_amplify b/config/ars_nouveau/glyph_amplify deleted file mode 100644 index 45126276..00000000 --- a/config/ars_nouveau/glyph_amplify +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 20 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 diff --git a/config/ars_nouveau/glyph_animate_block b/config/ars_nouveau/glyph_animate_block deleted file mode 100644 index 0ba2c72c..00000000 --- a/config/ars_nouveau/glyph_animate_block +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 200 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base duration in seconds - #Range: > 0 - duration = 60 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 60 diff --git a/config/ars_nouveau/glyph_aoe b/config/ars_nouveau/glyph_aoe deleted file mode 100644 index 51d776bc..00000000 --- a/config/ars_nouveau/glyph_aoe +++ /dev/null @@ -1,15 +0,0 @@ -#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 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_blink b/config/ars_nouveau/glyph_blink deleted file mode 100644 index f86d705b..00000000 --- a/config/ars_nouveau/glyph_blink +++ /dev/null @@ -1,29 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base teleport distance - #Range: > 0 - distance = 8 - #Range: 0.0 ~ 2.147483647E9 - amplify = 3.0 diff --git a/config/ars_nouveau/glyph_bounce b/config/ars_nouveau/glyph_bounce deleted file mode 100644 index 22774beb..00000000 --- a/config/ars_nouveau/glyph_bounce +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 30 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 8 diff --git a/config/ars_nouveau/glyph_break b/config/ars_nouveau/glyph_break deleted file mode 100644 index 474613dc..00000000 --- a/config/ars_nouveau/glyph_break +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = true - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_fortune=4"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_burst b/config/ars_nouveau/glyph_burst deleted file mode 100644 index eed05c27..00000000 --- a/config/ars_nouveau/glyph_burst +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 500 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: 1 ~ 1 - per_spell_limit = 1 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = ["ars_nouveau:glyph_wall", "ars_nouveau:glyph_linger"] diff --git a/config/ars_nouveau/glyph_cold_snap b/config/ars_nouveau/glyph_cold_snap deleted file mode 100644 index 05f32758..00000000 --- a/config/ars_nouveau/glyph_cold_snap +++ /dev/null @@ -1,34 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = ["ars_nouveau:glyph_amplify=2", "ars_nouveau:glyph_aoe=1"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 6.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 2.5 - #Potion duration, in seconds - #Range: > 0 - potion_time = 5 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 1 diff --git a/config/ars_nouveau/glyph_craft b/config/ars_nouveau/glyph_craft deleted file mode 100644 index e8753fe2..00000000 --- a/config/ars_nouveau/glyph_craft +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_cut b/config/ars_nouveau/glyph_cut deleted file mode 100644 index 5f2b0369..00000000 --- a/config/ars_nouveau/glyph_cut +++ /dev/null @@ -1,28 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 0 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 1.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 1.0 diff --git a/config/ars_nouveau/glyph_dampen b/config/ars_nouveau/glyph_dampen deleted file mode 100644 index 4cd7513c..00000000 --- a/config/ars_nouveau/glyph_dampen +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 0 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_decelerate b/config/ars_nouveau/glyph_decelerate deleted file mode 100644 index 65e7b2cb..00000000 --- a/config/ars_nouveau/glyph_decelerate +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 5 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_delay b/config/ars_nouveau/glyph_delay deleted file mode 100644 index 368232f3..00000000 --- a/config/ars_nouveau/glyph_delay +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 0 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Randomize chance, in percentage (0-1 = 0% - 100%) - #Range: 0.0 ~ 2.147483647E9 - extend_time = 0.25 - #The base duration of the delay effect in ticks. - #Range: > 0 - base_duration = 20 diff --git a/config/ars_nouveau/glyph_dispel b/config/ars_nouveau/glyph_dispel deleted file mode 100644 index bdee3f11..00000000 --- a/config/ars_nouveau/glyph_dispel +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_duration_down b/config/ars_nouveau/glyph_duration_down deleted file mode 100644 index 4376d57b..00000000 --- a/config/ars_nouveau/glyph_duration_down +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 15 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_ender_inventory b/config/ars_nouveau/glyph_ender_inventory deleted file mode 100644 index 2a87c27d..00000000 --- a/config/ars_nouveau/glyph_ender_inventory +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_evaporate b/config/ars_nouveau/glyph_evaporate deleted file mode 100644 index e8753fe2..00000000 --- a/config/ars_nouveau/glyph_evaporate +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_exchange b/config/ars_nouveau/glyph_exchange deleted file mode 100644 index 2a87c27d..00000000 --- a/config/ars_nouveau/glyph_exchange +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_explosion b/config/ars_nouveau/glyph_explosion deleted file mode 100644 index 9c4fe66a..00000000 --- a/config/ars_nouveau/glyph_explosion +++ /dev/null @@ -1,37 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 200 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - amplify = 0.5 - #Explosion base intensity - #Range: 0.0 ~ 100.0 - base = 0.75 - #AOE intensity bonus - #Range: 0.0 ~ 100.0 - aoe_bonus = 1.5 - #Range: 0.0 ~ 2.147483647E9 - damage = 6.0 - #Additional damage per amplify - #Range: 0.0 ~ 2.147483647E9 - amp_damage = 2.5 diff --git a/config/ars_nouveau/glyph_extend_time b/config/ars_nouveau/glyph_extend_time deleted file mode 100644 index f2332d9d..00000000 --- a/config/ars_nouveau/glyph_extend_time +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_extract b/config/ars_nouveau/glyph_extract deleted file mode 100644 index 3574a378..00000000 --- a/config/ars_nouveau/glyph_extract +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_fangs b/config/ars_nouveau/glyph_fangs deleted file mode 100644 index 3e18d263..00000000 --- a/config/ars_nouveau/glyph_fangs +++ /dev/null @@ -1,28 +0,0 @@ -#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 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 6.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 3.0 diff --git a/config/ars_nouveau/glyph_fell b/config/ars_nouveau/glyph_fell deleted file mode 100644 index d45f6864..00000000 --- a/config/ars_nouveau/glyph_fell +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 150 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base amount of harvested blocks - #Range: > 0 - base_harvest = 50 - #Additional max blocks per AOE - #Range: > 0 - aoe_bonus = 50 diff --git a/config/ars_nouveau/glyph_fell.toml b/config/ars_nouveau/glyph_fell.toml index d45f6864..7dcf74f9 100644 --- a/config/ars_nouveau/glyph_fell.toml +++ b/config/ars_nouveau/glyph_fell.toml @@ -6,7 +6,7 @@ #Range: > -2147483648 cost = 150 #Is Starter Glyph? - starter = false + starter = true #The maximum number of times this glyph may appear in a single spell #Range: > 1 per_spell_limit = 2147483647 diff --git a/config/ars_nouveau/glyph_firework b/config/ars_nouveau/glyph_firework deleted file mode 100644 index 0d6ddff4..00000000 --- a/config/ars_nouveau/glyph_firework +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_flare b/config/ars_nouveau/glyph_flare deleted file mode 100644 index d470e1c8..00000000 --- a/config/ars_nouveau/glyph_flare +++ /dev/null @@ -1,31 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 40 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 7.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 3.0 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 1 diff --git a/config/ars_nouveau/glyph_fortune b/config/ars_nouveau/glyph_fortune deleted file mode 100644 index 4a4611e6..00000000 --- a/config/ars_nouveau/glyph_fortune +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 80 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_freeze b/config/ars_nouveau/glyph_freeze deleted file mode 100644 index a3d421c6..00000000 --- a/config/ars_nouveau/glyph_freeze +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 15 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_sensitive=1"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 10 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 5 diff --git a/config/ars_nouveau/glyph_glide b/config/ars_nouveau/glyph_glide deleted file mode 100644 index 886a427b..00000000 --- a/config/ars_nouveau/glyph_glide +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 180 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 120 diff --git a/config/ars_nouveau/glyph_gravity b/config/ars_nouveau/glyph_gravity deleted file mode 100644 index cf76e6bb..00000000 --- a/config/ars_nouveau/glyph_gravity +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 15 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 30 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 8 diff --git a/config/ars_nouveau/glyph_gust b/config/ars_nouveau/glyph_gust deleted file mode 100644 index f0c37387..00000000 --- a/config/ars_nouveau/glyph_gust +++ /dev/null @@ -1,29 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 15 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base knockback value - #Range: 0.0 ~ 1.7976931348623157E308 - base_value = 1.5 - #Range: 0.0 ~ 2.147483647E9 - amplify = 1.0 diff --git a/config/ars_nouveau/glyph_harm b/config/ars_nouveau/glyph_harm deleted file mode 100644 index 16c9a59b..00000000 --- a/config/ars_nouveau/glyph_harm +++ /dev/null @@ -1,34 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 15 - #Is Starter Glyph? - starter = true - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 5.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 2.0 - #Potion duration, in seconds - #Range: > 0 - potion_time = 5 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 5 diff --git a/config/ars_nouveau/glyph_harvest b/config/ars_nouveau/glyph_harvest deleted file mode 100644 index 44e59562..00000000 --- a/config/ars_nouveau/glyph_harvest +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_heal b/config/ars_nouveau/glyph_heal deleted file mode 100644 index 8e04ee16..00000000 --- a/config/ars_nouveau/glyph_heal +++ /dev/null @@ -1,29 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base heal amount - #Range: 0.0 ~ 1.7976931348623157E308 - base_heal = 3.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 3.0 diff --git a/config/ars_nouveau/glyph_hex b/config/ars_nouveau/glyph_hex deleted file mode 100644 index ec8d1985..00000000 --- a/config/ars_nouveau/glyph_hex +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=4"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 30 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 8 diff --git a/config/ars_nouveau/glyph_ignite b/config/ars_nouveau/glyph_ignite deleted file mode 100644 index 5e8d5a56..00000000 --- a/config/ars_nouveau/glyph_ignite +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 15 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Extend time duration, in seconds - #Range: > 0 - extend_time = 2 - #Potion duration, in seconds - #Range: > 0 - potion_time = 3 diff --git a/config/ars_nouveau/glyph_infuse b/config/ars_nouveau/glyph_infuse deleted file mode 100644 index bbbaa1af..00000000 --- a/config/ars_nouveau/glyph_infuse +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = ["ars_nouveau:glyph_aoe=1", "ars_nouveau:glyph_extend_time=1"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_intangible b/config/ars_nouveau/glyph_intangible deleted file mode 100644 index 36a41b72..00000000 --- a/config/ars_nouveau/glyph_intangible +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base duration, in seconds - #Range: > 0 - base = 3 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 1 diff --git a/config/ars_nouveau/glyph_interact b/config/ars_nouveau/glyph_interact deleted file mode 100644 index 44e59562..00000000 --- a/config/ars_nouveau/glyph_interact +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_invisibility b/config/ars_nouveau/glyph_invisibility deleted file mode 100644 index b5ec34ba..00000000 --- a/config/ars_nouveau/glyph_invisibility +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 30 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 8 diff --git a/config/ars_nouveau/glyph_launch b/config/ars_nouveau/glyph_launch deleted file mode 100644 index 8bbb00e0..00000000 --- a/config/ars_nouveau/glyph_launch +++ /dev/null @@ -1,29 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base knockup amount - #Range: 0.0 ~ 1.7976931348623157E308 - knockup = 0.8 - #Range: 0.0 ~ 2.147483647E9 - amplify = 0.25 diff --git a/config/ars_nouveau/glyph_leap b/config/ars_nouveau/glyph_leap deleted file mode 100644 index 2323bce9..00000000 --- a/config/ars_nouveau/glyph_leap +++ /dev/null @@ -1,31 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 25 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #If true, will not launch the caster if they are not on the ground. - force_ground = false - #Base knockup amount - #Range: 0.0 ~ 1.7976931348623157E308 - knock_up = 1.5 - #Range: 0.0 ~ 2.147483647E9 - amplify = 1.0 diff --git a/config/ars_nouveau/glyph_light b/config/ars_nouveau/glyph_light deleted file mode 100644 index 7b7e1b1a..00000000 --- a/config/ars_nouveau/glyph_light +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 25 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=1"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 30 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 8 diff --git a/config/ars_nouveau/glyph_lightning b/config/ars_nouveau/glyph_lightning deleted file mode 100644 index 4c7d8eb8..00000000 --- a/config/ars_nouveau/glyph_lightning +++ /dev/null @@ -1,31 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 5.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 3.0 - #Bonus damage for wet entities - #Range: 0.0 ~ 1.7976931348623157E308 - wet_bonus = 2.0 diff --git a/config/ars_nouveau/glyph_name b/config/ars_nouveau/glyph_name deleted file mode 100644 index 33191ce3..00000000 --- a/config/ars_nouveau/glyph_name +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 25 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_orbit b/config/ars_nouveau/glyph_orbit deleted file mode 100644 index 1e7d5a40..00000000 --- a/config/ars_nouveau/glyph_orbit +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_phantom_block b/config/ars_nouveau/glyph_phantom_block deleted file mode 100644 index ba70a95a..00000000 --- a/config/ars_nouveau/glyph_phantom_block +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 5 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=1"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_pickup b/config/ars_nouveau/glyph_pickup deleted file mode 100644 index 44e59562..00000000 --- a/config/ars_nouveau/glyph_pickup +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_pierce b/config/ars_nouveau/glyph_pierce deleted file mode 100644 index 3b9b638d..00000000 --- a/config/ars_nouveau/glyph_pierce +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 40 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 2 diff --git a/config/ars_nouveau/glyph_place_block b/config/ars_nouveau/glyph_place_block deleted file mode 100644 index 44e59562..00000000 --- a/config/ars_nouveau/glyph_place_block +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_projectile b/config/ars_nouveau/glyph_projectile deleted file mode 100644 index ba9a31be..00000000 --- a/config/ars_nouveau/glyph_projectile +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = true - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Max lifespan of the projectile, in seconds. - #Range: > 0 - max_lifespan = 60 diff --git a/config/ars_nouveau/glyph_pull b/config/ars_nouveau/glyph_pull deleted file mode 100644 index ae68d473..00000000 --- a/config/ars_nouveau/glyph_pull +++ /dev/null @@ -1,29 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 15 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base movement velocity - #Range: 0.0 ~ 1.7976931348623157E308 - base_value = 1.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 0.5 diff --git a/config/ars_nouveau/glyph_randomize b/config/ars_nouveau/glyph_randomize deleted file mode 100644 index 101c07b7..00000000 --- a/config/ars_nouveau/glyph_randomize +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 0 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 diff --git a/config/ars_nouveau/glyph_redstone_signal b/config/ars_nouveau/glyph_redstone_signal deleted file mode 100644 index b2de0d21..00000000 --- a/config/ars_nouveau/glyph_redstone_signal +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 0 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base time in ticks - #Range: > 0 - base_duration = 5 - #Extend time bonus, in ticks - #Range: > 0 - extend_time = 10 diff --git a/config/ars_nouveau/glyph_rotate b/config/ars_nouveau/glyph_rotate deleted file mode 100644 index 44e59562..00000000 --- a/config/ars_nouveau/glyph_rotate +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_rune b/config/ars_nouveau/glyph_rune deleted file mode 100644 index bdee3f11..00000000 --- a/config/ars_nouveau/glyph_rune +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_self b/config/ars_nouveau/glyph_self deleted file mode 100644 index 6e3c30d4..00000000 --- a/config/ars_nouveau/glyph_self +++ /dev/null @@ -1,21 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = true - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] diff --git a/config/ars_nouveau/glyph_sense_magic b/config/ars_nouveau/glyph_sense_magic deleted file mode 100644 index de7daaa0..00000000 --- a/config/ars_nouveau/glyph_sense_magic +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 60 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 15 diff --git a/config/ars_nouveau/glyph_sensitive b/config/ars_nouveau/glyph_sensitive deleted file mode 100644 index 1ce1f6e7..00000000 --- a/config/ars_nouveau/glyph_sensitive +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 diff --git a/config/ars_nouveau/glyph_slowfall b/config/ars_nouveau/glyph_slowfall deleted file mode 100644 index b5ec34ba..00000000 --- a/config/ars_nouveau/glyph_slowfall +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 30 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 8 diff --git a/config/ars_nouveau/glyph_snare b/config/ars_nouveau/glyph_snare deleted file mode 100644 index 74be013c..00000000 --- a/config/ars_nouveau/glyph_snare +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 8 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 1 diff --git a/config/ars_nouveau/glyph_split b/config/ars_nouveau/glyph_split deleted file mode 100644 index 7d1695ad..00000000 --- a/config/ars_nouveau/glyph_split +++ /dev/null @@ -1,15 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 20 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 diff --git a/config/ars_nouveau/glyph_summon_decoy b/config/ars_nouveau/glyph_summon_decoy deleted file mode 100644 index 9d8a4c35..00000000 --- a/config/ars_nouveau/glyph_summon_decoy +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 200 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Extend time duration, in seconds - #Range: > 0 - extend_time = 15 - #Base duration in seconds - #Range: > 0 - duration = 30 diff --git a/config/ars_nouveau/glyph_summon_steed b/config/ars_nouveau/glyph_summon_steed deleted file mode 100644 index e341b1a0..00000000 --- a/config/ars_nouveau/glyph_summon_steed +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Extend time duration, in seconds - #Range: > 0 - extend_time = 120 - #Base duration in seconds - #Range: > 0 - duration = 300 diff --git a/config/ars_nouveau/glyph_summon_undead b/config/ars_nouveau/glyph_summon_undead deleted file mode 100644 index 0a255bb1..00000000 --- a/config/ars_nouveau/glyph_summon_undead +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 150 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base duration in seconds - #Range: > 0 - duration = 15 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 10 diff --git a/config/ars_nouveau/glyph_summon_vex b/config/ars_nouveau/glyph_summon_vex deleted file mode 100644 index 0a255bb1..00000000 --- a/config/ars_nouveau/glyph_summon_vex +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 150 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base duration in seconds - #Range: > 0 - duration = 15 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 10 diff --git a/config/ars_nouveau/glyph_summon_wolves b/config/ars_nouveau/glyph_summon_wolves deleted file mode 100644 index d7bc904d..00000000 --- a/config/ars_nouveau/glyph_summon_wolves +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Base duration in seconds - #Range: > 0 - duration = 60 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 60 diff --git a/config/ars_nouveau/glyph_toss b/config/ars_nouveau/glyph_toss deleted file mode 100644 index 44e59562..00000000 --- a/config/ars_nouveau/glyph_toss +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 10 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_wall b/config/ars_nouveau/glyph_wall deleted file mode 100644 index 905cc50a..00000000 --- a/config/ars_nouveau/glyph_wall +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 500 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: 1 ~ 1 - per_spell_limit = 1 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = ["ars_nouveau:glyph_linger"] diff --git a/config/ars_nouveau/glyph_wind_shear b/config/ars_nouveau/glyph_wind_shear deleted file mode 100644 index 7bed6d4d..00000000 --- a/config/ars_nouveau/glyph_wind_shear +++ /dev/null @@ -1,31 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 50 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 5.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 2.5 - #Damage per block in the air - #Range: 0.0 ~ 1.7976931348623157E308 - airDamage = 0.75 diff --git a/config/ars_nouveau/glyph_wither b/config/ars_nouveau/glyph_wither deleted file mode 100644 index ec8d1985..00000000 --- a/config/ars_nouveau/glyph_wither +++ /dev/null @@ -1,30 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = ["ars_nouveau:glyph_amplify=4"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Potion duration, in seconds - #Range: > 0 - potion_time = 30 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 8 diff --git a/config/ars_nouveau/reset b/config/ars_nouveau/reset deleted file mode 100644 index 7ad5a15a..00000000 --- a/config/ars_nouveau/reset +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 0 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/rewind b/config/ars_nouveau/rewind deleted file mode 100644 index c043e787..00000000 --- a/config/ars_nouveau/rewind +++ /dev/null @@ -1,36 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 3 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Max ticks entities should track for motion and health, etc. Note: Entities ANYWHERE are tracking this, setting this to a high value is not recommended for low-spec machines. - #Range: > 0 - entityRewindTracking = 60 - #How many ticks should be rewound before augments - #Range: 1 ~ 60 - baseRewindTime = 40 - #Extend time duration, in seconds - #Range: > 0 - extend_time = 20 - #Duration down time, in ticks - #Range: > 0 - duration_down_time = 10 diff --git a/config/ars_nouveau/wololo b/config/ars_nouveau/wololo deleted file mode 100644 index bdee3f11..00000000 --- a/config/ars_nouveau/wololo +++ /dev/null @@ -1,24 +0,0 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - glyph_tier = 1 - #Limits the number of times a given augment may be applied to a given effect - #Example entry: "glyph_amplify=5" - augment_limits = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] diff --git a/config/ars_nouveau/glyph_crush b/config/arsomega/glyph_flatten.toml similarity index 96% rename from config/ars_nouveau/glyph_crush rename to config/arsomega/glyph_flatten.toml index 29f81116..38bd423c 100644 --- a/config/ars_nouveau/glyph_crush +++ b/config/arsomega/glyph_flatten.toml @@ -1,28 +1,28 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 30 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = ["ars_nouveau:glyph_amplify=2"] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] - #Range: 0.0 ~ 2.147483647E9 - damage = 3.0 - #Range: 0.0 ~ 2.147483647E9 - amplify = 1.0 +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 30 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = ["ars_nouveau:glyph_amplify=2"] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] + #Range: 0.0 ~ 2.147483647E9 + damage = 3.0 + #Range: 0.0 ~ 2.147483647E9 + amplify = 1.0 diff --git a/config/ars_nouveau/glyph_smelt b/config/arsomega/glyph_propagate_projectile.toml similarity index 96% rename from config/ars_nouveau/glyph_smelt rename to config/arsomega/glyph_propagate_projectile.toml index 6ce6d211..e9ff8eae 100644 --- a/config/ars_nouveau/glyph_smelt +++ b/config/arsomega/glyph_propagate_projectile.toml @@ -1,24 +1,24 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 100 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 100 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/ars_nouveau/glyph_conjure_water b/config/arsomega/glyph_propagate_self.toml similarity index 95% rename from config/ars_nouveau/glyph_conjure_water rename to config/arsomega/glyph_propagate_self.toml index 133b4c2a..e9ff8eae 100644 --- a/config/ars_nouveau/glyph_conjure_water +++ b/config/arsomega/glyph_propagate_self.toml @@ -1,24 +1,24 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 80 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 100 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/ars_nouveau/glyph_grow b/config/arsomega/glyph_propagate_underfoot.toml similarity index 95% rename from config/ars_nouveau/glyph_grow rename to config/arsomega/glyph_propagate_underfoot.toml index 05e19666..e9ff8eae 100644 --- a/config/ars_nouveau/glyph_grow +++ b/config/arsomega/glyph_propagate_underfoot.toml @@ -1,24 +1,24 @@ -#General settings -[general] - #Is Enabled? - enabled = true - #Cost - #Range: > -2147483648 - cost = 70 - #Is Starter Glyph? - starter = false - #The maximum number of times this glyph may appear in a single spell - #Range: > 1 - per_spell_limit = 2147483647 - #The tier of the glyph - #Range: 1 ~ 99 - 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 = [] - #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. - #Example entry: "glyph_amplify=50" - augment_cost_overrides = [] - #Prevents the given glyph from being used in the same spell as the given glyph - #Example entry: "glyph_burst" - invalid_combos = [] +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 100 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 177c2b12..5e840a4e 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -136,7 +136,7 @@ { dependencies: ["41614A924E5556EE"] id: "08E99B65ABE19047" - min_width: 250 + min_width: 300 rewards: [ { id: "3638FD77A8101CA8" @@ -312,5 +312,44 @@ x: 5.0d y: -2.0d } + { + dependencies: ["309083107758B10C"] + id: "4C5D3AE08ACA9836" + rewards: [{ + exclude_from_claim_all: true + id: "24DFF6F00AFC0E91" + table_id: 7158856082002081942L + type: "loot" + }] + tasks: [{ + id: "1B0DB10288723806" + item: { count: 1, id: "ars_nouveau:apprentice_spell_book" } + type: "item" + }] + x: 3.5d + y: 0.0d + } + { + dependencies: ["4C5D3AE08ACA9836"] + id: "14CC5EDC04D6BAC7" + tasks: [{ + id: "5B40918396BB221F" + item: { count: 1, id: "ars_nouveau:wilden_tribute" } + type: "item" + }] + x: 4.5d + y: 0.0d + } + { + dependencies: ["14CC5EDC04D6BAC7"] + id: "602E1E149A49D056" + tasks: [{ + id: "045965B973CBB9F7" + item: { count: 1, id: "ars_nouveau:archmage_spell_book" } + type: "item" + }] + x: 5.5d + y: 0.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 42f56cfa..8d7b31b3 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -123,10 +123,17 @@ "If you did, take that GM Cell back to the DNA Extractor and proceed from there as you would with any Cell. By the end of the process, you’ll have a blood sample with your fancy new upgraded trait." ] quest.08E99B65ABE19047.quest_desc: [ - "Spellcraft is important to any practitioner of the arcane arts. Doubly so in Ars Nouveau where spells can be used both directly from the Spell Book or imbued into a Spell Turret to fire automatically. " + "Spellcraft is important to any practitioner of the arcane arts. Doubly so in Ars Nouveau where spells can be used both directly from the Spell Book, imbued into a Spell Turret to fire automatically, or even enchanted directly onto equipement to trigger on a condition. " "" "Begin by making yourself the Novice Spell Book. It comes with a few glyphs that you’ll be able to put together, but you’ll soon want to explore more glyphs to pull off ever more impressive feats." "" + "&6&nUseful Keybinds&r" + "" + "[\"• Open Book (\",{\"color\":\"gold\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Open Book\"}]},\"keybind\":\"key.ars_nouveau.open_book\"},\")\"]" + "[\"• Selection HUD (\",{\"color\":\"gold\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Selection HUD\"}]},\"keybind\":\"key.ars_nouveau.selection_hud\"},\")\"]" + "[\"• Next Slot (\",{\"color\":\"gold\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Next Slot\"}]},\"keybind\":\"key.ars_nouveau.next_slot\"},\")\"]" + "[\"• Previous Slot (\",{\"color\":\"gold\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Previous Slot\"}]},\"keybind\":\"key.ars_nouveau.previous_slot\"},\")\"]" + "" "If you're feeling a little daunted by spellcraft, that's normal. It's a huge and very powerful system. We'll try to point out useful spells to know throughout the quests, however. " "" "The guidebook also has a section that explains the rules, such as placing &5Form&r before &aEffect&r or where &6Augments&r are allowed. " @@ -1883,6 +1890,15 @@ "" "They can also be inserted into an Ender Cell to increase it's capacity." ] + quest.4C5D3AE08ACA9836.quest_desc: [ + "A quick jaunt into The Nether should get you everything you need for an upgrade to your Spell Book. " + "" + "This will unlock Tier 2 Glyphs for you and really open up some wild possibilities for spells." + "" + "&6⚠ Note: Any spells you’ve crafted will " + "&6 be transferred forward when " + "&6 upgrading. " + ] quest.4C745779C30B48A6.quest_desc: [ "With the Liquefaction Cauldron, we’ll use our solvent, Sal Ammoniac, to dissolve our ore into a purified Sulfur. " "&n &r" @@ -2563,8 +2579,8 @@ "" "Use a Dominion Wand to link Relays to other Relays or Source Jars. First Right-Click the origin, then Right-Click the destination." "" - "&a🛈 Tip: Relays may be linked to each" - "&a other in a broad network!" + "&a🛈 Tip: You can recolor the beams shot " + "&a by a Relay using the Wololo Glyph!" ] quest.692EDEAEC3F4A2AD.quest_desc: [ "The Swapper is a powerful teleportation device that swaps the blocks or entities in front of it with its linked partner. " diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 7a5b73c6..671bf928 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } From 2acdb7b00c2046b40a8eaeafef0dce26ac23865f Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 14:30:25 -0400 Subject: [PATCH 12/37] more glyph configs --- .../quests/chapters/ars_nouveau.snbt | 23 ++++++--- config/ftbquests/quests/lang/en_us.snbt | 7 +++ config/not_enough_glyphs/glyph_plow.toml | 24 ++++++++++ .../glyph_propagate_plane.toml | 24 ++++++++++ config/not_enough_glyphs/glyph_trail.toml | 24 ++++++++++ config/toomanyglyphs/glyph_chaining.toml | 48 +++++++++++++++++++ config/toomanyglyphs/glyph_filter_animal.toml | 24 ++++++++++ config/toomanyglyphs/glyph_filter_block.toml | 24 ++++++++++ config/toomanyglyphs/glyph_filter_entity.toml | 24 ++++++++++ .../toomanyglyphs/glyph_filter_is_baby.toml | 24 ++++++++++ .../toomanyglyphs/glyph_filter_is_mature.toml | 24 ++++++++++ config/toomanyglyphs/glyph_filter_item.toml | 24 ++++++++++ config/toomanyglyphs/glyph_filter_living.toml | 24 ++++++++++ .../glyph_filter_living_not_monster.toml | 24 ++++++++++ .../glyph_filter_living_not_player.toml | 24 ++++++++++ .../toomanyglyphs/glyph_filter_monster.toml | 24 ++++++++++ config/toomanyglyphs/glyph_filter_player.toml | 24 ++++++++++ config/toomanyglyphs/glyph_ray.toml | 27 +++++++++++ .../glyph_reverse_direction.toml | 24 ++++++++++ 19 files changed, 459 insertions(+), 6 deletions(-) create mode 100644 config/not_enough_glyphs/glyph_plow.toml create mode 100644 config/not_enough_glyphs/glyph_propagate_plane.toml create mode 100644 config/not_enough_glyphs/glyph_trail.toml create mode 100644 config/toomanyglyphs/glyph_chaining.toml create mode 100644 config/toomanyglyphs/glyph_filter_animal.toml create mode 100644 config/toomanyglyphs/glyph_filter_block.toml create mode 100644 config/toomanyglyphs/glyph_filter_entity.toml create mode 100644 config/toomanyglyphs/glyph_filter_is_baby.toml create mode 100644 config/toomanyglyphs/glyph_filter_is_mature.toml create mode 100644 config/toomanyglyphs/glyph_filter_item.toml create mode 100644 config/toomanyglyphs/glyph_filter_living.toml create mode 100644 config/toomanyglyphs/glyph_filter_living_not_monster.toml create mode 100644 config/toomanyglyphs/glyph_filter_living_not_player.toml create mode 100644 config/toomanyglyphs/glyph_filter_monster.toml create mode 100644 config/toomanyglyphs/glyph_filter_player.toml create mode 100644 config/toomanyglyphs/glyph_ray.toml create mode 100644 config/toomanyglyphs/glyph_reverse_direction.toml diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 5e840a4e..ff004fff 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -315,12 +315,23 @@ { dependencies: ["309083107758B10C"] id: "4C5D3AE08ACA9836" - rewards: [{ - exclude_from_claim_all: true - id: "24DFF6F00AFC0E91" - table_id: 7158856082002081942L - type: "loot" - }] + min_width: 250 + rewards: [ + { + id: "709B3EE33B2F9C27" + item: { + count: 1 + id: "ars_additions:lost_codex_entry" + } + type: "item" + } + { + exclude_from_claim_all: true + id: "165ACF7418D084A9" + table_id: 7158856082002081942L + type: "loot" + } + ] tasks: [{ id: "1B0DB10288723806" item: { count: 1, id: "ars_nouveau:apprentice_spell_book" } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 8d7b31b3..d1014e0e 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1895,6 +1895,13 @@ "" "This will unlock Tier 2 Glyphs for you and really open up some wild possibilities for spells." "" + "&6&nExample Spell&r" + "" + "&7Frostbite&r" + " &5Touch&r > &aFreeze&r > &aCold Snap x2&r > &6Amplify&r" + " > &aDelay&r > &aCold Snap&r > &6Amplify&r" + " " + "" "&6⚠ Note: Any spells you’ve crafted will " "&6 be transferred forward when " "&6 upgrading. " diff --git a/config/not_enough_glyphs/glyph_plow.toml b/config/not_enough_glyphs/glyph_plow.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/not_enough_glyphs/glyph_plow.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/not_enough_glyphs/glyph_propagate_plane.toml b/config/not_enough_glyphs/glyph_propagate_plane.toml new file mode 100644 index 00000000..5f5f6d95 --- /dev/null +++ b/config/not_enough_glyphs/glyph_propagate_plane.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 200 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: 1 ~ 1 + per_spell_limit = 1 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = ["ars_nouveau:glyph_sensitive=100"] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = ["ars_nouveau:glyph_wall", "toomanyglyphs:glyph_chaining", "ars_nouveau:glyph_burst", "ars_nouveau:glyph_linger"] diff --git a/config/not_enough_glyphs/glyph_trail.toml b/config/not_enough_glyphs/glyph_trail.toml new file mode 100644 index 00000000..7f3f0079 --- /dev/null +++ b/config/not_enough_glyphs/glyph_trail.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 200 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 3 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Max lifespan of the projectile, in seconds. + #Range: > 0 + max_lifespan = 60 diff --git a/config/toomanyglyphs/glyph_chaining.toml b/config/toomanyglyphs/glyph_chaining.toml new file mode 100644 index 00000000..2240135f --- /dev/null +++ b/config/toomanyglyphs/glyph_chaining.toml @@ -0,0 +1,48 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 300 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 1 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = ["ars_nouveau:glyph_wall", "ars_nouveau:glyph_linger"] + #Base maximum number of blocks struck when targeting blocks + #Range: > 1 + base_max_blocks = 16 + #Bonus to maximum blocks per augment + #Range: > 1 + bonus_blocks = 16 + #Base search distance around each target block + #Range: 1.0 ~ 2.147483647E9 + base_block_search_distance_euclidean = 1.75 + #Bonus search distance around each target block per augment + #Range: 1.0 ~ 2.147483647E9 + bonus_block_distance_euclidean = 1.0 + #Base maximum number of entities struck when targeting entities + #Range: > 1 + base_max_entities = 8 + #Bonus to maximum entities per augment + #Range: > 1 + bonus_entities = 16 + #Base search distance around each target entity + #Range: 0.0 ~ 1.7976931348623157E308 + base_entity_distance = 8.0 + #Bonus search distance around each target entity per augment + #Range: 0.0 ~ 1.7976931348623157E308 + bonus_entity_distance = 4.0 diff --git a/config/toomanyglyphs/glyph_filter_animal.toml b/config/toomanyglyphs/glyph_filter_animal.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_animal.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_block.toml b/config/toomanyglyphs/glyph_filter_block.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_block.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_entity.toml b/config/toomanyglyphs/glyph_filter_entity.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_entity.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_is_baby.toml b/config/toomanyglyphs/glyph_filter_is_baby.toml new file mode 100644 index 00000000..ec173a5a --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_is_baby.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_is_mature.toml b/config/toomanyglyphs/glyph_filter_is_mature.toml new file mode 100644 index 00000000..ec173a5a --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_is_mature.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_item.toml b/config/toomanyglyphs/glyph_filter_item.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_item.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_living.toml b/config/toomanyglyphs/glyph_filter_living.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_living.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_living_not_monster.toml b/config/toomanyglyphs/glyph_filter_living_not_monster.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_living_not_monster.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_living_not_player.toml b/config/toomanyglyphs/glyph_filter_living_not_player.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_living_not_player.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_monster.toml b/config/toomanyglyphs/glyph_filter_monster.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_monster.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_filter_player.toml b/config/toomanyglyphs/glyph_filter_player.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_filter_player.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/toomanyglyphs/glyph_ray.toml b/config/toomanyglyphs/glyph_ray.toml new file mode 100644 index 00000000..05c49964 --- /dev/null +++ b/config/toomanyglyphs/glyph_ray.toml @@ -0,0 +1,27 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 15 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = ["ars_nouveau:glyph_sensitive=2"] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Base range in blocks + #Range: 0.0 ~ 1.7976931348623157E308 + base_range = 16.0 + #Bonus range per augment + #Range: 0.0 ~ 1.7976931348623157E308 + bonus_range_per_augment = 16.0 diff --git a/config/toomanyglyphs/glyph_reverse_direction.toml b/config/toomanyglyphs/glyph_reverse_direction.toml new file mode 100644 index 00000000..4b49037c --- /dev/null +++ b/config/toomanyglyphs/glyph_reverse_direction.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 0 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] From 138b66debf4c7a45e5d78aa1b4f0bed1817e24c2 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 15:04:11 -0400 Subject: [PATCH 13/37] quest --- .../ftbquests/quests/chapters/ars_nouveau.snbt | 17 +++++++++++++++++ config/ftbquests/quests/lang/en_us.snbt | 12 ++++++++++++ 2 files changed, 29 insertions(+) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index ff004fff..75b282ed 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -362,5 +362,22 @@ x: 5.5d y: 0.0d } + { + dependencies: ["08E99B65ABE19047"] + id: "3895E1D9DE518B3F" + rewards: [{ + exclude_from_claim_all: true + id: "7623E5E6149A9F98" + table_id: 8645512365595340409L + type: "loot" + }] + tasks: [{ + id: "302DABE036FB801F" + item: { count: 1, id: "ars_nouveau:void_jar" } + type: "item" + }] + x: 2.0d + y: 1.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index d1014e0e..2acf90af 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1134,6 +1134,18 @@ "Perfect for spare tools, wrenches, and other odd equipment you find always taking up too much room in your inventory." ] quest.3840097BB3E09C9D.quest_desc: ["Equivalent to Stone Tools, Kaleidite Tools can be handy in a pinch if you happen to find yourself in a rift without your normal tools. "] + quest.3895E1D9DE518B3F.quest_desc: [ + "Casting all these spells will take its toll on your mana bar, especially if you’re trying to use a Spell Book as your primary mining tool" + "" + "To help replenish your mana faster, consider crafting a Jar of Voiding. These handy devices will eat items you pick up and convert them directly into mana. " + "" + "To set an item it is allowed to eat, place that item in your offhand and Right-Click with the Jar. " + "" + "Consider adding things like Cobble and other Stones to it." + "" + "&a🛈 Tip: The Jar can be toggled at any " + "&a time by Sneak + Right-Clicking with it. " + ] quest.3954AC8D791145CE.quest_desc: ["Wandering Trader keeps ding-dong-ditching your house? Let this say hello instead!"] quest.397D4765002935F2.quest_desc: [ "Above all else, Mekanism requires power. Getting started with the mod, therefore will require some form of FE generator. " From dc19cbe4a703a02a59613db849db9c75b6861c85 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 15:05:11 -0400 Subject: [PATCH 14/37] quest --- config/ftbquests/quests/chapters/ars_nouveau.snbt | 12 ++++++++++++ config/ftbquests/quests/lang/en_us.snbt | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 75b282ed..63a7cf25 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -343,6 +343,12 @@ { dependencies: ["4C5D3AE08ACA9836"] id: "14CC5EDC04D6BAC7" + rewards: [{ + exclude_from_claim_all: true + id: "04D960CC4E538D07" + table_id: 1097567509703228045L + type: "loot" + }] tasks: [{ id: "5B40918396BB221F" item: { count: 1, id: "ars_nouveau:wilden_tribute" } @@ -354,6 +360,12 @@ { dependencies: ["14CC5EDC04D6BAC7"] id: "602E1E149A49D056" + rewards: [{ + exclude_from_claim_all: true + id: "2C3F075EDC190D73" + table_id: 1097567509703228045L + type: "loot" + }] tasks: [{ id: "045965B973CBB9F7" item: { count: 1, id: "ars_nouveau:archmage_spell_book" } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 2acf90af..aec859ea 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1914,9 +1914,8 @@ " > &aDelay&r > &aCold Snap&r > &6Amplify&r" " " "" - "&6⚠ Note: Any spells you’ve crafted will " - "&6 be transferred forward when " - "&6 upgrading. " + "&6⚠ Note: Any spells you’ve crafted will be " + "&6 transferred forward when upgrading. " ] quest.4C745779C30B48A6.quest_desc: [ "With the Liquefaction Cauldron, we’ll use our solvent, Sal Ammoniac, to dissolve our ore into a purified Sulfur. " From 533a6fc26b186da85d7741157646a833caeea374 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 15:21:55 -0400 Subject: [PATCH 15/37] quests --- .../quests/chapters/ars_nouveau.snbt | 40 ++++++++++++++++--- config/ftbquests/quests/lang/en_us.snbt | 22 ++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 63a7cf25..7469825e 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -342,6 +342,9 @@ } { dependencies: ["4C5D3AE08ACA9836"] + icon: { + id: "ars_nouveau:wilden_tribute" + } id: "14CC5EDC04D6BAC7" rewards: [{ exclude_from_claim_all: true @@ -349,11 +352,38 @@ table_id: 1097567509703228045L type: "loot" }] - tasks: [{ - id: "5B40918396BB221F" - item: { count: 1, id: "ars_nouveau:wilden_tribute" } - type: "item" - }] + tasks: [ + { + id: "38AAF86F70CC665C" + item: { count: 1, id: "ars_nouveau:ritual_brazier" } + type: "item" + } + { + id: "7E8FF207815FDC57" + item: { count: 1, id: "ars_nouveau:ritual_wilden_summon" } + type: "item" + } + { + id: "2727FAB827F986ED" + item: { count: 1, id: "ars_nouveau:wilden_spike" } + type: "item" + } + { + id: "2C1746F7DA0F5525" + item: { count: 1, id: "ars_nouveau:wilden_horn" } + type: "item" + } + { + id: "450D71C731B557CD" + item: { count: 1, id: "ars_nouveau:wilden_wing" } + type: "item" + } + { + id: "681210D829304C0B" + item: { count: 1, id: "ars_nouveau:wilden_tribute" } + type: "item" + } + ] x: 4.5d y: 0.0d } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index aec859ea..9fd63119 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -476,6 +476,28 @@ "&a🛈 Tip: Install a Dimensional Binding Card" "&a for chargin in any dimension." ] + quest.14CC5EDC04D6BAC7.quest_desc: [ + "Unlocking Tier 3 Glyphs will require a fight with the Wilden Chimera. " + "" + "The Tribute you obtain from defeating it will be used not only to upgrade your Spell Book but can also be used to upgrade Ars Nouveau’s armors to a higher tier." + "" + "This fight is not easy. Come prepared." + "&n &r" + "" + "To summon the Chimera, you’ll need to first place the Ritual Brazier, then Right-Click it with the Tablet of Summon Wilden." + "" + "Next, throw a Wilden Spike, Wilden Horn, and Wilden Wing on the Brazier to augment it." + "" + "Finally, Right-Click the brazier again and stand back. " + "" + "&a🛈 Tip: If you’re missing one or more of " + "&a these Wilden pieces, just use the " + "&a Tablet un-augmented to summon " + "&a regular Wilden." + "" + "&c⚠ Warning: The Chimera breaks blocks." + ] + quest.14CC5EDC04D6BAC7.title: "Summoning the Wilden" quest.14D5764532C5EEB0.quest_desc: [ "The QIO System is a massive storage and routing system built on the same technology as the Quantum Entangloporter. Essentially, it acts as a very large chest." "" From 678f826492a74930063bd4811289e3614a2b2ec4 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Thu, 29 Aug 2024 22:09:58 -0400 Subject: [PATCH 16/37] This is breaking Ars Nouveau book updates --- kubejs/startup_scripts/jsconfig.json | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 kubejs/startup_scripts/jsconfig.json diff --git a/kubejs/startup_scripts/jsconfig.json b/kubejs/startup_scripts/jsconfig.json deleted file mode 100644 index 4271b381..00000000 --- a/kubejs/startup_scripts/jsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "target": "ES2015", - "lib": [ - "ES5", - "ES2015" - ], - "rootDir": ".", - "typeRoots": [ - "../../.probe/startup/probe-types" - ], - "baseUrl": "../../.probe/startup/probe-types", - "skipLibCheck": true - }, - "include": [ - "./**/*.js", - "./**/*.ts", - null - ] -} \ No newline at end of file From 9511e0697ee2c69ac72409e7f9a2aef01d9b54f5 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 09:12:32 -0400 Subject: [PATCH 17/37] quests and tags and structures --- .../quests/chapters/ars_nouveau.snbt | 78 ++++++++++++------- config/ftbquests/quests/lang/en_us.snbt | 24 ++++++ .../reward_tables/4C3908A1EDE782F7.snbt | 4 +- .../reward_tables/63595DAD65E0F896.snbt | 1 + .../recipes/ars_additions/locate_structure.js | 31 ++++++++ .../tags/item/ars_nouveau/golem.js | 2 +- .../tags/item/ars_nouveau/ritual_tablet.js | 5 ++ 7 files changed, 112 insertions(+), 33 deletions(-) create mode 100644 kubejs/server_scripts/recipes/ars_additions/locate_structure.js create mode 100644 kubejs/server_scripts/tags/item/ars_nouveau/ritual_tablet.js diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 7469825e..4c6ad36b 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -49,8 +49,8 @@ item: { count: 1, id: "minecraft:gold_ingot" } type: "item" }] - x: 0.5d - y: -0.5d + x: 4.0d + y: 1.0d } { dependencies: ["41614A924E5556EE"] @@ -76,8 +76,8 @@ type: "item" } ] - x: 1.5d - y: -1.0d + x: 5.0d + y: 0.5d } { dependencies: ["69A9A6E9B7CB34B4"] @@ -103,8 +103,8 @@ type: "item" } ] - x: 2.5d - y: -1.0d + x: 6.0d + y: 0.5d } { dependencies: ["7750C6E87B1EBF43"] @@ -130,8 +130,8 @@ type: "item" } ] - x: 3.0d - y: -2.0d + x: 6.5d + y: -0.5d } { dependencies: ["41614A924E5556EE"] @@ -158,8 +158,8 @@ item: { count: 1, id: "ars_nouveau:novice_spell_book" } type: "item" }] - x: 1.5d - y: 0.0d + x: 5.0d + y: 1.5d } { dependencies: ["08E99B65ABE19047"] @@ -196,8 +196,8 @@ type: "item" } ] - x: 2.5d - y: 0.0d + x: 6.0d + y: 1.5d } { dependencies: ["309083107758B10C"] @@ -213,8 +213,8 @@ item: { count: 1, id: "ars_nouveau:annotated_codex" } type: "item" }] - x: 3.0d - y: 1.0d + x: 6.5d + y: 2.5d } { dependencies: ["7750C6E87B1EBF43"] @@ -245,8 +245,8 @@ type: "item" } ] - x: 3.5d - y: -1.0d + x: 7.0d + y: 0.5d } { dependencies: ["09B6773CDA5A7565"] @@ -265,8 +265,8 @@ item: { components: { "ftbfiltersystem:filter": "or(item(ars_nouveau:agronomic_sourcelink)item(ars_nouveau:volcanic_sourcelink)item(ars_nouveau:alchemical_sourcelink)item(ars_nouveau:vitalic_sourcelink)item(ars_nouveau:mycelial_sourcelink))" }, count: 1, id: "ftbfiltersystem:smart_filter" } type: "item" }] - x: 4.5d - y: -1.0d + x: 8.0d + y: 0.5d } { dependencies: ["5AD1A273F3714FAF"] @@ -292,8 +292,8 @@ item: { count: 1, id: "ars_nouveau:relay" } type: "item" }] - x: 5.5d - y: -1.0d + x: 9.0d + y: 0.5d } { dependencies: ["5AD1A273F3714FAF"] @@ -309,8 +309,8 @@ item: { count: 1, id: "ars_additions:ender_source_jar" } type: "item" }] - x: 5.0d - y: -2.0d + x: 8.5d + y: -0.5d } { dependencies: ["309083107758B10C"] @@ -337,8 +337,8 @@ item: { count: 1, id: "ars_nouveau:apprentice_spell_book" } type: "item" }] - x: 3.5d - y: 0.0d + x: 7.0d + y: 1.5d } { dependencies: ["4C5D3AE08ACA9836"] @@ -384,8 +384,8 @@ type: "item" } ] - x: 4.5d - y: 0.0d + x: 8.0d + y: 1.5d } { dependencies: ["14CC5EDC04D6BAC7"] @@ -401,8 +401,8 @@ item: { count: 1, id: "ars_nouveau:archmage_spell_book" } type: "item" }] - x: 5.5d - y: 0.0d + x: 9.0d + y: 1.5d } { dependencies: ["08E99B65ABE19047"] @@ -418,8 +418,26 @@ item: { count: 1, id: "ars_nouveau:void_jar" } type: "item" }] - x: 2.0d - y: 1.0d + x: 5.5d + y: 2.5d + } + { + dependencies: ["14CC5EDC04D6BAC7"] + dependency_requirement: "one_started" + id: "4CE65730937AB775" + rewards: [{ + exclude_from_claim_all: true + id: "19D3C827131D5436" + table_id: 8645512365595340409L + type: "loot" + }] + tasks: [{ + id: "75934726B8EC6FC8" + item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(ars_nouveau:ritual_tablet)" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + }] + x: 8.5d + y: 2.5d } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 9fd63119..4cc36d3d 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1965,6 +1965,22 @@ "&a structure or valid places for " "&a hatches." ] + quest.4CE65730937AB775.quest_desc: [ + "The Ritual Brazier opens numerous possibilities, such as permanent area effects, transformations, time adjustments, and more." + "" + "You’ll almost certainly find something of use among all these tablets, but here are a few highlights:" + "" + " • Wide Area of Creative Flight" + " • Locate specific structures" + " • Hastened crop growth" + " • Automatic crop harvesting" + " • Weather shaping" + " • Time manipulation" + "" + "&a🛈 Tip: Check the Tablet Tooltips for " + "&a more information!" + ] + quest.4CE65730937AB775.title: "Ritual Magic" quest.4CE66DC7BB1AC84B.quest_desc: [ "Plasma Turbines are used to convert the Helium Plasma created by the Fusion Reactor into useful EU. " "" @@ -2420,6 +2436,13 @@ "Occultism has an excellent in-game guide with far more information than we can put here, so be sure to refer to it for more in-depth explanations. " ] quest.5DF2A3E977D4C11B.title: "Occultism" + quest.602E1E149A49D056.quest_desc: [ + "With the Chimera dead, the rest of the ingredients for the Archmage Spell Book should be within your grasp. " + "" + "Summoning the Wither is the same as Vanilla, but you can craft a containment chamber for it with Reinforced Deepslate to simplify the fight." + "" + "Finding an Evoker for a Totem of Undying can be a little more challenging, but you can force an Illager Raid with a Tablet of Challenge. Or you can summon a Possessed Evoker with Occultism. " + ] quest.60EECBF540C75C09.quest_desc: ["Modern Industrialization offers a variety of tanks of all sizes to fit your needs. "] quest.60EECBF540C75C09.title: "Tanks" quest.6118F241A056954F.quest_desc: [ @@ -3305,6 +3328,7 @@ task.73D7073169A23821.title: "WIP" task.741114ACD8AABEF6.title: "Demon's Dream" task.75050C1ED68FA527.title: "Building Gadgets" + task.75934726B8EC6FC8.title: "Ritual Tablets" task.76ED4221C1C27A27.title: "Logistical Transporters" task.7866B09190F4EA23.title: "Observe a Villager" task.7A9E6782E73FF106.title: "Batteries" diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 671bf928..7a5b73c6 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } diff --git a/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt index c88464c6..df7a6197 100644 --- a/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt +++ b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt @@ -19,6 +19,7 @@ random_bonus: 2 } { item: { count: 1, id: "ars_nouveau:stable_warp_scroll" } } + { item: { count: 1, id: "ars_additions:exploration_warp_scroll" } } ] use_title: true } diff --git a/kubejs/server_scripts/recipes/ars_additions/locate_structure.js b/kubejs/server_scripts/recipes/ars_additions/locate_structure.js new file mode 100644 index 00000000..b574a813 --- /dev/null +++ b/kubejs/server_scripts/recipes/ars_additions/locate_structure.js @@ -0,0 +1,31 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:ars_additions/locate_structure/'; + + const recipes = [ + { + augments: [{ key: 'minecraft:ender_eye' }], + structure: { tag: 'minecraft:stronghold' }, + id: `${id_prefix}stronghold` + }, + { + augments: [{ key: 'evilcraft:dark_gem' }], + structure: { key: 'evilcraft:dark_temple' }, + id: `${id_prefix}dark_temple` + }, + { + augments: [{ key: 'farmersdelight:potato_crate' }], + structure: { key: 'underground_villages:underground_village' }, + id: `${id_prefix}underground_village` + }, + { + augments: [{ key: 'minecraft:hay_block' }], + structure: { tag: 'minecraft:village' }, + id: `${id_prefix}village` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'ars_additions:locate_structure'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/tags/item/ars_nouveau/golem.js b/kubejs/server_scripts/tags/item/ars_nouveau/golem.js index f74c7ab0..12943a44 100644 --- a/kubejs/server_scripts/tags/item/ars_nouveau/golem.js +++ b/kubejs/server_scripts/tags/item/ars_nouveau/golem.js @@ -1,4 +1,4 @@ ServerEvents.tags('item', (event) => { // Items golems can pick up - event.add('ars_nouveau:golem/shard', ['#c:gems']); + event.get('ars_nouveau:golem/shard').add(['#c:gems']); }); diff --git a/kubejs/server_scripts/tags/item/ars_nouveau/ritual_tablet.js b/kubejs/server_scripts/tags/item/ars_nouveau/ritual_tablet.js new file mode 100644 index 00000000..35b4ffab --- /dev/null +++ b/kubejs/server_scripts/tags/item/ars_nouveau/ritual_tablet.js @@ -0,0 +1,5 @@ +ServerEvents.tags('item', (event) => { + let additions = [/ars_.*ritual/]; + let exclusions = ['ars_nouveau:ritual_brazier']; + event.get('ars_nouveau:ritual_tablet').add(additions).remove(exclusions); +}); From c5ec191ef834afc9cc62e1b597a793ca90e89300 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 10:15:28 -0400 Subject: [PATCH 18/37] revert world interactions move. it wasn't working --- .../quests/chapters/ars_nouveau.snbt | 125 +++++++++++++++--- config/ftbquests/quests/lang/en_us.snbt | 15 +++ .../client_scripts/emi/world_interactions.js | 120 ++++++++++++++++- .../recipe_viewer/world_interactions.js | 83 ------------ 4 files changed, 244 insertions(+), 99 deletions(-) delete mode 100644 kubejs/server_scripts/recipe_viewer/world_interactions.js diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 4c6ad36b..a9dfae86 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -1,4 +1,5 @@ { + autofocus_id: "41614A924E5556EE" default_hide_dependency_lines: false default_quest_shape: "" filename: "ars_nouveau" @@ -77,7 +78,7 @@ } ] x: 5.0d - y: 0.5d + y: 1.5d } { dependencies: ["69A9A6E9B7CB34B4"] @@ -104,7 +105,7 @@ } ] x: 6.0d - y: 0.5d + y: 1.5d } { dependencies: ["7750C6E87B1EBF43"] @@ -131,7 +132,7 @@ } ] x: 6.5d - y: -0.5d + y: 2.5d } { dependencies: ["41614A924E5556EE"] @@ -158,7 +159,7 @@ item: { count: 1, id: "ars_nouveau:novice_spell_book" } type: "item" }] - x: 5.0d + x: 3.0d y: 1.5d } { @@ -196,7 +197,7 @@ type: "item" } ] - x: 6.0d + x: 2.0d y: 1.5d } { @@ -213,7 +214,7 @@ item: { count: 1, id: "ars_nouveau:annotated_codex" } type: "item" }] - x: 6.5d + x: 1.5d y: 2.5d } { @@ -246,7 +247,7 @@ } ] x: 7.0d - y: 0.5d + y: 1.5d } { dependencies: ["09B6773CDA5A7565"] @@ -266,7 +267,7 @@ type: "item" }] x: 8.0d - y: 0.5d + y: 1.5d } { dependencies: ["5AD1A273F3714FAF"] @@ -293,7 +294,7 @@ type: "item" }] x: 9.0d - y: 0.5d + y: 1.5d } { dependencies: ["5AD1A273F3714FAF"] @@ -310,7 +311,7 @@ type: "item" }] x: 8.5d - y: -0.5d + y: 2.5d } { dependencies: ["309083107758B10C"] @@ -337,7 +338,7 @@ item: { count: 1, id: "ars_nouveau:apprentice_spell_book" } type: "item" }] - x: 7.0d + x: 1.0d y: 1.5d } { @@ -384,7 +385,7 @@ type: "item" } ] - x: 8.0d + x: 0.0d y: 1.5d } { @@ -401,7 +402,7 @@ item: { count: 1, id: "ars_nouveau:archmage_spell_book" } type: "item" }] - x: 9.0d + x: -1.0d y: 1.5d } { @@ -418,7 +419,7 @@ item: { count: 1, id: "ars_nouveau:void_jar" } type: "item" }] - x: 5.5d + x: 2.5d y: 2.5d } { @@ -436,8 +437,102 @@ item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(ars_nouveau:ritual_tablet)" }, count: 1, id: "ftbfiltersystem:smart_filter" } type: "item" }] - x: 8.5d + x: -0.5d y: 2.5d } + { + dependencies: ["41614A924E5556EE"] + id: "1DA29F3B45DEFB4B" + rewards: [{ + exclude_from_claim_all: true + id: "38B8418B09EF5031" + table_id: 8645512365595340409L + type: "loot" + }] + tasks: [{ + id: "01BD7546106B0EB9" + item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(ars_nouveau:magic_shards)" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" + }] + x: 4.0d + y: 3.0d + } + { + dependencies: ["1DA29F3B45DEFB4B"] + id: "03DFAA759B4E653E" + tasks: [{ + id: "5B3DA9B869EA2AB2" + item: { count: 1, id: "ars_nouveau:ritual_awakening" } + type: "item" + }] + x: 4.0d + y: 4.5d + } + { + dependencies: ["03DFAA759B4E653E"] + id: "65FDD18E441E2E6E" + tasks: [{ + id: "5CC4BD10F5609461" + item: { count: 1, id: "ars_nouveau:bookwyrm_charm" } + type: "item" + }] + x: 4.5d + y: 6.0d + } + { + dependencies: ["03DFAA759B4E653E"] + id: "4537806144939A6B" + tasks: [{ + id: "0D44B8977ADBDCAD" + item: { count: 1, id: "ars_nouveau:amethyst_golem_charm" } + type: "item" + }] + x: 3.5d + y: 6.0d + } + { + dependencies: ["1DA29F3B45DEFB4B"] + id: "7FAC3A637F82BFED" + tasks: [{ + id: "45783D692FC983F8" + item: { count: 1, id: "ars_nouveau:wixie_charm" } + type: "item" + }] + x: 3.0d + y: 5.0d + } + { + dependencies: ["1DA29F3B45DEFB4B"] + id: "72C1A824063BAFA3" + tasks: [{ + id: "3C73314B02A122DB" + item: { count: 1, id: "ars_nouveau:drygmy_charm" } + type: "item" + }] + x: 5.0d + y: 5.0d + } + { + dependencies: ["1DA29F3B45DEFB4B"] + id: "064F6355185A51D4" + tasks: [{ + id: "416967782C0611FE" + item: { count: 1, id: "ars_nouveau:starbuncle_charm" } + type: "item" + }] + x: 2.5d + y: 4.0d + } + { + dependencies: ["1DA29F3B45DEFB4B"] + id: "66DAC6EC4232C44A" + tasks: [{ + id: "0FA326DBD17DFE04" + item: { count: 1, id: "ars_elemental:siren_charm" } + type: "item" + }] + x: 5.5d + y: 4.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 4cc36d3d..8e5cb3de 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -696,6 +696,14 @@ "&a discover more." ] quest.1D5E773A3A547A2C.title: "Handcrafted" + quest.1DA29F3B45DEFB4B.quest_desc: [ + "Magic can be a lonely profession. Everyone always asks, “What can you do?”, but never “How are you doing?”." + "" + "And while it’s useful to have spells being cast for you by a Turret, they’re cold… lifeless. " + "" + "But what if you could make your own friends? Cute, lovable, huggable friends that would spark joy just by being around? " + ] + quest.1DA29F3B45DEFB4B.title: "Magical Friends" quest.1E2327FB6801D209.quest_desc: [ "Early on, the Electrolytic Separator and Pressurized Reaction Chamber can be used to produce Ethene. This is a fairly simple process to set up and can produce a fair bit more energy from Biofuel than burning it outright." "" @@ -3208,6 +3216,12 @@ "&a discover more." ] quest.7F237202A5D7EFBD.title: "Vanilla Plus Tools" + quest.7FAC3A637F82BFED.quest_desc: [ + "" + "" + "&7Witch to Wixie&r" + " &5Projectile&r > &aHarm&r > &6Amplify&r > &aDispel&r " + ] quest.7FEA11A88316FE0C.quest_desc: ["Simple energy storage with built in item charging capabilities."] reward.34CE01457EC3BF54.title: "Bed" reward_table.00540CF744EBCDCA.title: "Farmer's Delight" @@ -3233,6 +3247,7 @@ reward_table.73BCB0998B70644B.title: "MI Lootbox: Bronze Tier" reward_table.77FB07B0CC8EAE79.title: "Ars Nouveau Lootbox: Rare" task.0164AF75B5EA3F49.title: "Fluid Tanks" + task.01BD7546106B0EB9.title: "Magical Shards" task.0219421FBD8DB647.title: "Just Dire Upgrades" task.0459BF27966A67E4.title: "Iron Chests" task.04A7890742B7519E.title: "Observe: Spirit Fire" diff --git a/kubejs/client_scripts/emi/world_interactions.js b/kubejs/client_scripts/emi/world_interactions.js index ebbefdf6..4b1dbd42 100644 --- a/kubejs/client_scripts/emi/world_interactions.js +++ b/kubejs/client_scripts/emi/world_interactions.js @@ -1 +1,119 @@ -// TODO: Delete next breaking update. Moved to Server. +ClientEvents.generateAssets('before_mods', (event) => { + // https://github.com/emilyploszaj/emi/wiki/Adding-Recipes#adding-info-recipes + + const descriptions = [ + { + left: 'item:justdirethings:raw_coal_t1_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:coal_t1', + amount: 3 + } + }, + { + left: 'item:justdirethings:raw_coal_t2_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:coal_t2', + amount: 3 + } + }, + { + left: 'item:justdirethings:raw_coal_t3_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:coal_t3', + amount: 3 + } + }, + { + left: 'item:justdirethings:raw_coal_t4_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:coal_t4', + amount: 3 + } + }, + { + left: 'item:justdirethings:raw_ferricore_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:raw_ferricore', + amount: 3 + } + }, + { + left: 'item:justdirethings:raw_blazegold_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:raw_blazegold', + amount: 3 + } + }, + { + left: 'item:justdirethings:raw_celestigem_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:celestigem', + amount: 3 + } + }, + { + left: 'item:justdirethings:raw_eclipsealloy_ore', + right: '#item:minecraft:pickaxes', + output: { + type: 'item', + id: 'justdirethings:raw_eclipsealloy', + amount: 3 + } + }, + { + left: 'item:ars_nouveau:wixie_charm', + right: 'item:minecraft:cauldron', + output: { + type: 'item', + id: 'ars_nouveau:wixie_cauldron', + amount: 1 + } + }, + { + left: 'item:ars_nouveau:drygmy_charm', + right: 'item:minecraft:mossy_cobblestone', + output: { + type: 'item', + id: 'ars_nouveau:drygmy_stone', + amount: 1 + } + }, + { + left: 'item:ars_elemental:siren_charm', + right: 'item:minecraft:prismarine', + output: { + type: 'item', + id: 'ars_elemental:mermaid_rock', + amount: 1 + } + }, + { + left: 'item:ars_nouveau:whirlisprig_charm', + right: '#item:minecraft:flowers', + output: { + type: 'item', + id: 'ars_nouveau:whirlisprig_flower', + amount: 1 + } + } + ]; + + descriptions.forEach((description) => { + description.type = 'emi:world_interaction'; + event.json(`emi:recipe/additions/${description.output.id.replace(/\:/g, '_')}`, description); + }); +}); diff --git a/kubejs/server_scripts/recipe_viewer/world_interactions.js b/kubejs/server_scripts/recipe_viewer/world_interactions.js deleted file mode 100644 index 970eea81..00000000 --- a/kubejs/server_scripts/recipe_viewer/world_interactions.js +++ /dev/null @@ -1,83 +0,0 @@ -ServerEvents.generateData('before_mods', (event) => { - // https://github.com/emilyploszaj/emi/wiki/Adding-Recipes#adding-info-recipes - - const descriptions = [ - { - left: 'item:justdirethings:raw_coal_t1_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:coal_t1', - amount: 3 - } - }, - { - left: 'item:justdirethings:raw_coal_t2_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:coal_t2', - amount: 3 - } - }, - { - left: 'item:justdirethings:raw_coal_t3_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:coal_t3', - amount: 3 - } - }, - { - left: 'item:justdirethings:raw_coal_t4_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:coal_t4', - amount: 3 - } - }, - { - left: 'item:justdirethings:raw_ferricore_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:raw_ferricore', - amount: 3 - } - }, - { - left: 'item:justdirethings:raw_blazegold_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:raw_blazegold', - amount: 3 - } - }, - { - left: 'item:justdirethings:raw_celestigem_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:celestigem', - amount: 3 - } - }, - { - left: 'item:justdirethings:raw_eclipsealloy_ore', - right: '#item:minecraft:pickaxes', - output: { - type: 'item', - id: 'justdirethings:raw_eclipsealloy', - amount: 3 - } - } - ]; - - descriptions.forEach((description) => { - description.type = 'emi:world_interaction'; - event.json(`emi:recipe/additions/${description.output.id.replace(/\:/g, '_')}`, description); - }); -}); From 2d6ece3d8987a605766a7ed065f30225b2d9b505 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 10:21:52 -0400 Subject: [PATCH 19/37] Update world_interactions.js --- kubejs/client_scripts/emi/world_interactions.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kubejs/client_scripts/emi/world_interactions.js b/kubejs/client_scripts/emi/world_interactions.js index 4b1dbd42..4559a52f 100644 --- a/kubejs/client_scripts/emi/world_interactions.js +++ b/kubejs/client_scripts/emi/world_interactions.js @@ -83,6 +83,15 @@ ClientEvents.generateAssets('before_mods', (event) => { amount: 1 } }, + { + left: 'item:ars_nouveau:wixie_charm', + right: 'item:ars_nouveau:enchanting_apparatus', + output: { + type: 'item', + id: 'ars_additions:enchanting_wixie_cauldron', + amount: 1 + } + }, { left: 'item:ars_nouveau:drygmy_charm', right: 'item:minecraft:mossy_cobblestone', From 48f50d015ea851c6acc9a15283e595031f6ca2b8 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 10:49:34 -0400 Subject: [PATCH 20/37] quests --- .../quests/chapters/ars_nouveau.snbt | 80 +++++++++++++++++-- config/ftbquests/quests/lang/en_us.snbt | 18 +++++ .../reward_tables/4C3908A1EDE782F7.snbt | 4 +- 3 files changed, 93 insertions(+), 9 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index a9dfae86..83e8c37a 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -455,7 +455,7 @@ type: "item" }] x: 4.0d - y: 3.0d + y: 3.5d } { dependencies: ["1DA29F3B45DEFB4B"] @@ -477,7 +477,7 @@ type: "item" }] x: 4.5d - y: 6.0d + y: 5.5d } { dependencies: ["03DFAA759B4E653E"] @@ -488,18 +488,24 @@ type: "item" }] x: 3.5d - y: 6.0d + y: 5.5d } { dependencies: ["1DA29F3B45DEFB4B"] id: "7FAC3A637F82BFED" + rewards: [{ + exclude_from_claim_all: true + id: "01A5AE45AD522A26" + table_id: 7158856082002081942L + type: "loot" + }] tasks: [{ id: "45783D692FC983F8" item: { count: 1, id: "ars_nouveau:wixie_charm" } type: "item" }] - x: 3.0d - y: 5.0d + x: 1.5d + y: 4.0d } { dependencies: ["1DA29F3B45DEFB4B"] @@ -509,12 +515,28 @@ item: { count: 1, id: "ars_nouveau:drygmy_charm" } type: "item" }] - x: 5.0d - y: 5.0d + x: 6.5d + y: 4.0d } { dependencies: ["1DA29F3B45DEFB4B"] id: "064F6355185A51D4" + rewards: [ + { + exclude_from_claim_all: true + id: "242CF1BD35F9458F" + table_id: 8645512365595340409L + type: "loot" + } + { + id: "4D43E971AA1C9C24" + item: { + count: 1 + id: "ars_nouveau:purple_sbed" + } + type: "item" + } + ] tasks: [{ id: "416967782C0611FE" item: { count: 1, id: "ars_nouveau:starbuncle_charm" } @@ -534,5 +556,49 @@ x: 5.5d y: 4.0d } + { + dependencies: ["7FAC3A637F82BFED"] + id: "20C038E5D70CDB52" + rewards: [{ + exclude_from_claim_all: true + id: "7B1EE509BC93CCB6" + table_id: 7158856082002081942L + type: "loot" + }] + tasks: [{ + icon: { + id: "ars_nouveau:wixie_cauldron" + } + id: "5314260DF92C1856" + observe_type: 0 + timer: 0L + to_observe: "ars_nouveau:wixie_cauldron" + type: "observation" + }] + x: 1.0d + y: 5.0d + } + { + dependencies: ["7FAC3A637F82BFED"] + id: "6242CD0203DCBDC7" + rewards: [{ + exclude_from_claim_all: true + id: "2AD9040F3253B5E8" + table_id: 7158856082002081942L + type: "loot" + }] + tasks: [{ + icon: { + id: "ars_additions:enchanting_wixie_cauldron" + } + id: "7618EFB44BB18F63" + observe_type: 0 + timer: 0L + to_observe: "ars_additions:enchanting_wixie_cauldron" + type: "observation" + }] + x: 2.0d + y: 5.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 8e5cb3de..ad9d8f41 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -112,6 +112,16 @@ "[\"Additionally, the author has a number of helpful \",{\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://www.youtube.com/playlist?list=PLvGYM7MCieIomj0tKtO9T5DUhvaYFjSxA\"},\"color\":\"blue\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\":\"video guides\",\"underlined\":true},\" on YouTube. Check them out if you need a little extra help.\"]" ] quest.062BB5F675CF9F45.title: "Just Dire Things" + quest.064F6355185A51D4.quest_desc: [ + "These adorable gold-loving critters can be a huge help in keeping your home tidy. " + "" + "If bound to a chest, they’ll quickly gather all items from the ground and insert them into that chest. " + "" + "They’ll also transfer from one chest to another and can farm Sourceberries without getting pricked by their thorns!" + "" + "&a🛈 Tip: Starbuncles can be filtered with " + "&a Allow/Deny Scrolls!" + ] quest.07684F58521A4D34.quest_desc: [ "Playing with friends? " "" @@ -3217,7 +3227,13 @@ ] quest.7F237202A5D7EFBD.title: "Vanilla Plus Tools" quest.7FAC3A637F82BFED.quest_desc: [ + "These floaty little witch friends can be tasked with automating standard 3x3 Crafting Table crafts, Potion Brewing, and even the Enchanting Apparatus. " "" + "Obtaining the Wixie Token to craft the Charm is going to require a little bit of Spellcraft; essentially you must Dispel a Witch that’s at less than half health. " + "" + "The spell provided below should convert a Witch in two quick casts. " + "" + "&6&nExample Spell&r" "" "&7Witch to Wixie&r" " &5Projectile&r > &aHarm&r > &6Amplify&r > &aDispel&r " @@ -3313,6 +3329,7 @@ task.51472C5BD0C05E09.title: "Kill a Mob" task.51A4E7C2E42561D2.title: "Advanced Compressors" task.52CE5D30CDF0A6FF.title: "Prismatic Tools" + task.5314260DF92C1856.title: "Observe a Wixie's Cauldron" task.53537003380689AB.title: "Universal Cables" task.53EE7D896F7103FA.title: "Any Candle" task.576CB5FB3B8A46A6.title: "Smart Cables" @@ -3344,6 +3361,7 @@ task.741114ACD8AABEF6.title: "Demon's Dream" task.75050C1ED68FA527.title: "Building Gadgets" task.75934726B8EC6FC8.title: "Ritual Tablets" + task.7618EFB44BB18F63.title: "Observe a Wixie's Enchanting Apparatus" task.76ED4221C1C27A27.title: "Logistical Transporters" task.7866B09190F4EA23.title: "Observe a Villager" task.7A9E6782E73FF106.title: "Batteries" diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 7a5b73c6..671bf928 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } From 5f6f32d00110d2137aff0e3bb559dd1451d53825 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 13:22:29 -0400 Subject: [PATCH 21/37] trades --- .../quests/chapters/ars_nouveau.snbt | 37 +++++++++++++-- config/ftbquests/quests/lang/en_us.snbt | 28 +++++++++++ .../the_bumblezone/bee_queen_trades.js | 47 ++++++++++++------- .../server_scripts/trades/wandering_trader.js | 26 ++++++++++ 4 files changed, 119 insertions(+), 19 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 83e8c37a..6abf3070 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -470,18 +470,49 @@ } { dependencies: ["03DFAA759B4E653E"] + icon: { + id: "ars_nouveau:bookwyrm_charm" + } id: "65FDD18E441E2E6E" - tasks: [{ - id: "5CC4BD10F5609461" - item: { count: 1, id: "ars_nouveau:bookwyrm_charm" } + rewards: [{ + count: 4 + id: "428F394A2C4409D0" + item: { + components: { + "sophisticatedstorage:wood_type": "oak" + } + count: 1 + id: "sophisticatedstorage:diamond_chest" + } type: "item" }] + tasks: [ + { + id: "5CC4BD10F5609461" + item: { count: 1, id: "ars_nouveau:bookwyrm_charm" } + type: "item" + } + { + id: "7400DF542E722CDF" + item: { count: 1, id: "ars_nouveau:storage_lectern" } + type: "item" + } + ] x: 4.5d y: 5.5d } { dependencies: ["03DFAA759B4E653E"] id: "4537806144939A6B" + rewards: [{ + count: 2 + id: "0926B496B21879AD" + item: { + count: 1 + id: "ae2:quartz_block" + } + type: "item" + }] tasks: [{ id: "0D44B8977ADBDCAD" item: { count: 1, id: "ars_nouveau:amethyst_golem_charm" } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index ad9d8f41..c99bdfe9 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -796,6 +796,11 @@ "" "The Pyromantic Brazier primarily burns furnace fuels, which can be provided the same way." ] + quest.20C038E5D70CDB52.quest_desc: [ + "The Wixie Cauldron allows a Wixie to craft either Potions or 3x3 Crafting recipes using Source." + "" + "She’ll automatically pull items from a linked storage to do her crafting and can be instructed what to craft by placing the items on an adjacent Arcane Pedestal. " + ] quest.212EB5AFECD2A6E8.quest_desc: [ "Industry starts at the forge; where a strong arm is as important as a strong mind. " "" @@ -1754,6 +1759,14 @@ ] quest.44BD4C393C59F1CB.title: "Discovering Enigmatica" quest.45121907B7F8DFD1.quest_desc: ["Simple power cables to get energy from one place to another."] + quest.4537806144939A6B.quest_desc: [ + "An animate block of Amethyst, these golems will automatically create, grow, and harves budding blocks. " + "" + "Bind them to an inventory to set the area they’ll work in. Nearby blocks will be converted into budding blocks. As they grow buds, they’ll break them and collect the drops, storing them in their bound inventory." + "" + "&a🛈 Tip: Amethyst Golems works with" + "&a Certus Quartz too!" + ] quest.45896B61EC465279.quest_desc: [ "Though the bane of many with seasonal allergies, Pollen Puff can be quite useful; when used on flowers, both big and small, it will spawn more of those flowers nearby. " "" @@ -2484,6 +2497,13 @@ "&a🛈 Tip: A Scraper enchanted with " "&a Delicate Touch will cause no harm." ] + quest.6242CD0203DCBDC7.quest_desc: [ + "The Wixie Enchanting Apparatus allows a Wixie to craft any Enchanting Apparatus recipes using Source." + "" + "She’ll automatically pull items from a linked storage to do her crafting and can be instructed what to craft by placing the items on an adjacent Arcane Pedestal. " + "" + "Unlike a normal Enchanting Apparatus, the Arcane Pedestals are only used to specify a recipe. She does not need them for ingredients." + ] quest.626E31B97CA1F815.quest_desc: [ "While capable of producing enormous power, the allure of Fission Reactors within Mekanism is mostly to process Uranium into more useful materials, like Plutonium and Polonium. " "&n &r" @@ -2576,6 +2596,14 @@ "" "Enrich some Redstone and Coal before inserting it in a Metallurgic Infuser for a nice boost to efficiency!" ] + quest.65FDD18E441E2E6E.quest_desc: [ + "An animate Book, Bookwyrms are part of a complete storage system built into Ars Nouveau. " + "" + "The guidebook offers a full guide on setting this system up, however as a brief overview use a Bookwyrm Charm on a Storage Lectern to enable that Lectern to be linked to inventories." + "" + "&a🛈 Tip: Adding more Bookwyrms allows " + "&a more connections!" + ] quest.66A24B8817411BBC.quest_desc: [ "Craft up some Impure White Chalk and toss it in the Spirit Fire to have it purified for use. " "" diff --git a/kubejs/server_scripts/recipes/the_bumblezone/bee_queen_trades.js b/kubejs/server_scripts/recipes/the_bumblezone/bee_queen_trades.js index 90a64113..5c77d314 100644 --- a/kubejs/server_scripts/recipes/the_bumblezone/bee_queen_trades.js +++ b/kubejs/server_scripts/recipes/the_bumblezone/bee_queen_trades.js @@ -4,30 +4,45 @@ ServerEvents.generateData('before_mods', (event) => { id: 'relics_for_music', wants: [{ id: '#c:music_discs', required: true }], possible_rewards: [ - { item: { id: 'relics:reflection_necklace', count: 1 }, xp_reward: 10, weight: 10, required: true }, + // Feet { item: { id: 'relics:magma_walker', count: 1 }, xp_reward: 10, weight: 10, required: true }, { item: { id: 'relics:aqua_walker', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:midnight_robe', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:ice_skates', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:ice_breaker', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:roller_skates', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:amphibian_boot', count: 1 }, xp_reward: 10, weight: 10, required: true }, + + // Belt { item: { id: 'relics:drowned_belt', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:jellyfish_necklace', count: 1 }, xp_reward: 10, weight: 10, required: true }, { item: { id: 'relics:hunter_belt', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:rage_glove', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:ice_skates', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:bastion_ring', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:chorus_inhibitor', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:leather_belt', count: 1 }, xp_reward: 10, weight: 10, required: true }, + + // // Hand + // { item: { id: 'relics:rage_glove', count: 1 }, xp_reward: 10, weight: 10, required: true }, + // { item: { id: 'relics:enders_hand', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:wool_mitten', count: 1 }, xp_reward: 10, weight: 10, required: true }, + + // Necklace + { item: { id: 'relics:reflection_necklace', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:jellyfish_necklace', count: 1 }, xp_reward: 10, weight: 10, required: true }, { item: { id: 'relics:holy_locket', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:enders_hand', count: 1 }, xp_reward: 10, weight: 10, required: true }, + + // Back + // { item: { id: 'relics:midnight_robe', count: 1 }, xp_reward: 10, weight: 10, required: true }, { item: { id: 'relics:elytra_booster', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:magic_mirror', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:ice_breaker', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:blazing_flask', count: 1 }, xp_reward: 10, weight: 10, required: true }, + + // Ring + { item: { id: 'relics:bastion_ring', count: 1 }, xp_reward: 10, weight: 10, required: true }, + { item: { id: 'relics:chorus_inhibitor', count: 1 }, xp_reward: 10, weight: 10, required: true }, + + // Charm { item: { id: 'relics:spore_sack', count: 1 }, xp_reward: 10, weight: 10, required: true }, + + // Other + { item: { id: 'relics:magic_mirror', count: 1 }, xp_reward: 10, weight: 10, required: true }, + // { item: { id: 'relics:blazing_flask', count: 1 }, xp_reward: 10, weight: 10, required: true }, { item: { id: 'relics:shadow_glaive', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:roller_skates', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:infinity_ham', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:leather_belt', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:wool_mitten', count: 1 }, xp_reward: 10, weight: 10, required: true }, - { item: { id: 'relics:amphibian_boot', count: 1 }, xp_reward: 10, weight: 10, required: true } + { item: { id: 'relics:infinity_ham', count: 1 }, xp_reward: 10, weight: 10, required: true } ] } ]; diff --git a/kubejs/server_scripts/trades/wandering_trader.js b/kubejs/server_scripts/trades/wandering_trader.js index 2454ffab..1b1b03dd 100644 --- a/kubejs/server_scripts/trades/wandering_trader.js +++ b/kubejs/server_scripts/trades/wandering_trader.js @@ -5,4 +5,30 @@ MoreJS.wandererTrades((event) => { // addTrade(level: number, input: Item | Item[], output: Item) event.addTrade(2, Item.of('minecraft:emerald', 32), 'artifacts:helium_flamingo'); event.addTrade(2, Item.of('minecraft:emerald', 48), 'chococraft:black_chocobo_spawn_egg'); + + // Feet + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:magma_walker'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:aqua_walker'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:ice_skates'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:ice_breaker'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:roller_skates'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:amphibian_boot'); + + // Belt + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:drowned_belt'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:hunter_belt'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:leather_belt'); + + // Hand + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:wool_mitten'); + + // Necklace + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:reflection_necklace'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:jellyfish_necklace'); + // Charm + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:spore_sack'); + + // Other + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:magic_mirror'); + event.addTrade(2, Item.of('minecraft:emerald', 32), 'relics:shadow_glaive'); }); From c0fc5502a740979d68e50b6f69a383c467a809ce Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 14:07:37 -0400 Subject: [PATCH 22/37] quests --- .../quests/chapters/ars_nouveau.snbt | 133 +++++++++++++----- config/ftbquests/quests/lang/en_us.snbt | 32 +++++ 2 files changed, 133 insertions(+), 32 deletions(-) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 6abf3070..244b8a80 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -460,13 +460,19 @@ { dependencies: ["1DA29F3B45DEFB4B"] id: "03DFAA759B4E653E" + rewards: [{ + exclude_from_claim_all: true + id: "42623A163229A1A6" + table_id: 8645512365595340409L + type: "loot" + }] tasks: [{ id: "5B3DA9B869EA2AB2" item: { count: 1, id: "ars_nouveau:ritual_awakening" } type: "item" }] - x: 4.0d - y: 4.5d + x: 6.0d + y: 4.0d } { dependencies: ["03DFAA759B4E653E"] @@ -474,18 +480,26 @@ id: "ars_nouveau:bookwyrm_charm" } id: "65FDD18E441E2E6E" - rewards: [{ - count: 4 - id: "428F394A2C4409D0" - item: { - components: { - "sophisticatedstorage:wood_type": "oak" + rewards: [ + { + count: 4 + id: "428F394A2C4409D0" + item: { + components: { + "sophisticatedstorage:wood_type": "oak" + } + count: 1 + id: "sophisticatedstorage:diamond_chest" } - count: 1 - id: "sophisticatedstorage:diamond_chest" + type: "item" } - type: "item" - }] + { + exclude_from_claim_all: true + id: "45B20F68B6AFE055" + table_id: 7158856082002081942L + type: "loot" + } + ] tasks: [ { id: "5CC4BD10F5609461" @@ -498,28 +512,36 @@ type: "item" } ] - x: 4.5d - y: 5.5d + x: 7.0d + y: 4.5d } { dependencies: ["03DFAA759B4E653E"] id: "4537806144939A6B" - rewards: [{ - count: 2 - id: "0926B496B21879AD" - item: { - count: 1 - id: "ae2:quartz_block" + rewards: [ + { + count: 2 + id: "0926B496B21879AD" + item: { + count: 1 + id: "ae2:quartz_block" + } + type: "item" } - type: "item" - }] + { + exclude_from_claim_all: true + id: "115A6E21C0E73203" + table_id: 7158856082002081942L + type: "loot" + } + ] tasks: [{ id: "0D44B8977ADBDCAD" item: { count: 1, id: "ars_nouveau:amethyst_golem_charm" } type: "item" }] - x: 3.5d - y: 5.5d + x: 6.0d + y: 5.0d } { dependencies: ["1DA29F3B45DEFB4B"] @@ -535,19 +557,43 @@ item: { count: 1, id: "ars_nouveau:wixie_charm" } type: "item" }] - x: 1.5d + x: 2.0d y: 4.0d } { dependencies: ["1DA29F3B45DEFB4B"] id: "72C1A824063BAFA3" + rewards: [ + { + id: "721928D9E38329A8" + item: { + count: 1 + id: "ars_nouveau:ritual_containment" + } + type: "item" + } + { + id: "657115051FBF99C5" + item: { + count: 1 + id: "ars_nouveau:mob_jar" + } + type: "item" + } + { + exclude_from_claim_all: true + id: "637B7E4E72BD0870" + table_id: 8645512365595340409L + type: "loot" + } + ] tasks: [{ id: "3C73314B02A122DB" item: { count: 1, id: "ars_nouveau:drygmy_charm" } type: "item" }] - x: 6.5d - y: 4.0d + x: 5.0d + y: 4.5d } { dependencies: ["1DA29F3B45DEFB4B"] @@ -573,19 +619,25 @@ item: { count: 1, id: "ars_nouveau:starbuncle_charm" } type: "item" }] - x: 2.5d - y: 4.0d + x: 3.5d + y: 5.5d } { dependencies: ["1DA29F3B45DEFB4B"] id: "66DAC6EC4232C44A" + rewards: [{ + exclude_from_claim_all: true + id: "6AF54BB37820657B" + table_id: 8645512365595340409L + type: "loot" + }] tasks: [{ id: "0FA326DBD17DFE04" item: { count: 1, id: "ars_elemental:siren_charm" } type: "item" }] - x: 5.5d - y: 4.0d + x: 4.5d + y: 5.5d } { dependencies: ["7FAC3A637F82BFED"] @@ -607,7 +659,7 @@ type: "observation" }] x: 1.0d - y: 5.0d + y: 4.5d } { dependencies: ["7FAC3A637F82BFED"] @@ -631,5 +683,22 @@ x: 2.0d y: 5.0d } + { + dependencies: ["1DA29F3B45DEFB4B"] + id: "3A0F43654CE474DA" + rewards: [{ + exclude_from_claim_all: true + id: "76DF87E04ECFE3CD" + table_id: 8645512365595340409L + type: "loot" + }] + tasks: [{ + id: "7DCF4801D7D66269" + item: { count: 1, id: "ars_nouveau:whirlisprig_charm" } + type: "item" + }] + x: 3.0d + y: 4.5d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index c99bdfe9..7696437f 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -75,6 +75,11 @@ "These are capable of handling the mighty Djinni whose control over time and weather is unrivaled." ] quest.036036EA25034BE8.title: "Purple Chalk" + quest.03DFAA759B4E653E.quest_desc: [ + "The Tablet of Awakening can infuse inanimate objects with Source, bringing them to some semblance of life. " + "" + "There are several uses for this, but when it comes to making Charms, there are two that are our focus; Amethyst Golems and Bookwyrms. The creation of both of these is detailed in the Tablet’s tooltip." + ] quest.042650AE25DAC4CA.quest_desc: [ "With your Turbine upgraded, you’ll likely also need to upgrade your Steam Production. " "" @@ -1205,6 +1210,14 @@ "" "They can be filtered and accept Motors as upgrades to speed them up." ] + quest.3A0F43654CE474DA.quest_desc: [ + "Tree-hugging woodland spirits, Whirlisprigs will gladly join your menagerie if you show them some love and plant a tree nearby. " + "" + "In exchange, the Whirlisprig will help you grow and farm plants. " + "&n &r" + "" + "Right-Click any flower with her charm to create their home. Placing more plants and a greater variety of plants in their home will make them happier and more productive. " + ] quest.3A347A9576A5D514.quest_desc: [ "Quantum Upgrades unlock the greatest potential of your machines, with a single upgrade allowing it to reach its maximum potential." "" @@ -2632,6 +2645,14 @@ "&a🛈 Tip: Demon’s Dream fruit will heal" "&a Spirits!" ] + quest.66DAC6EC4232C44A.quest_desc: [ + "Fun-loving denizens of the deeps, Sirens live in warm oceans and will happily join your menagerie if you give them a Sea Pickle. " + "" + "In exchange, the Siren will help you automatically obtain fishing loot. " + "&n &r" + "" + "Right-Click a block of Prismarine with her charm to create her home. Placing more aquatic plants and animals in their home will make them happier and more productive." + ] quest.673C6861CC3A781C.quest_desc: [ "[\"Having obtained the Rare Metal Niter we were after, we can \",{ \"text\": \"Reform\", \"underlined\": true, \"clickEvent\": { \"action\": \"change_page\", \"value\": \"1E2BA13C53664E50\" },\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]} },\" it into any Rare Metal Sulfur we want, like Gold Sulfur.\"]" "" @@ -2948,6 +2969,17 @@ "&a🛈 Tip: The Inscriber can be powered directly " "&a from any source of FE or EU." ] + quest.72C1A824063BAFA3.quest_desc: [ + "Caretakers of natural spaces, Drygmies roam the lands tending to animals to maintain balance. They’ll willingly join your menagerie if you give them a Wilden Horn, thus showing your commitment to maintaining order." + "" + "In exchange, the Drygmy will help you harvest drops from animals and monsters alike. " + "&n &r" + "" + "Right-Click a Mossy Cobblestone with their charm to create their home. Placing many different creatures in their home will make them happier and more productive. " + "" + "&a🛈 Tip: Drygmies will work with mobs " + "&a in Containment Jars!" + ] quest.730D1F506B88FEEF.quest_desc: [ "Steam is likely in short supply again with a Quarry running and will soon be in even shorter supply running turbines for power. Upgrading to a Large Steam Boiler now will save headaches down the road." "" From a4711ad730104ed926288cef2568c50149bc85cf Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 14:19:08 -0400 Subject: [PATCH 23/37] quests! --- .../ftbquests/quests/chapters/ars_nouveau.snbt | 17 +++++++++++++++++ config/ftbquests/quests/lang/en_us.snbt | 11 +++++++++++ 2 files changed, 28 insertions(+) diff --git a/config/ftbquests/quests/chapters/ars_nouveau.snbt b/config/ftbquests/quests/chapters/ars_nouveau.snbt index 244b8a80..564604ad 100644 --- a/config/ftbquests/quests/chapters/ars_nouveau.snbt +++ b/config/ftbquests/quests/chapters/ars_nouveau.snbt @@ -700,5 +700,22 @@ x: 3.0d y: 4.5d } + { + dependencies: ["1DA29F3B45DEFB4B"] + id: "159F7020B1DE875D" + rewards: [{ + exclude_from_claim_all: true + id: "5F19D9891490831B" + table_id: 7158856082002081942L + type: "loot" + }] + tasks: [{ + id: "0D268078F69F7B82" + item: { count: 1, id: "ars_nouveau:ritual_binding" } + type: "item" + }] + x: 4.0d + y: 4.5d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 7696437f..71635358 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -550,6 +550,17 @@ " slot to choose the look." ] quest.15829059DE275E47.title: "Aesthetic Upgrades" + quest.159F7020B1DE875D.quest_desc: [ + "Want to bring your new friends with you? " + "" + "By bringing them close to a Ritual of Binding, you’ll obtain a Bound Script which may be learned by Right-Clicking it in the air. " + "" + "Once learned, a new entry will appear in your Spell Book under the Familiars tab. From there, you’ll be able to instantly summon one familiar at a time to grant you benefits. " + "" + "These benefits range from increased spell damage and higher looting rates, to buffed speed and item collection. " + "" + "Check the tooltips on each Bound Script to see what it has to offer you!" + ] quest.15CECF38FB6CEADE.quest_desc: [ "Looking for something with a little more oomph? Mining Gadgets are an all in one modular tool system." "" From 2f9594ae5fd4e879560427748c8e948a9c94e846 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 14:49:54 -0400 Subject: [PATCH 24/37] loot --- .../reward_tables/63595DAD65E0F896.snbt | 6 ++++-- .../reward_tables/77FB07B0CC8EAE79.snbt | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt index df7a6197..500cf723 100644 --- a/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt +++ b/config/ftbquests/quests/reward_tables/63595DAD65E0F896.snbt @@ -17,9 +17,11 @@ id: "ars_additions:lost_codex_entry" } random_bonus: 2 + weight: 50.0f } - { item: { count: 1, id: "ars_nouveau:stable_warp_scroll" } } - { item: { count: 1, id: "ars_additions:exploration_warp_scroll" } } + { item: { count: 1, id: "ars_additions:exploration_warp_scroll" }, weight: 30.0f } + { item: { count: 1, id: "ars_nouveau:drygmy_charm" }, weight: 10.0f } + { item: { count: 1, id: "ars_nouveau:wixie_shards" }, weight: 10.0f } ] use_title: true } diff --git a/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt index d6b72f89..240ae09b 100644 --- a/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt +++ b/config/ftbquests/quests/reward_tables/77FB07B0CC8EAE79.snbt @@ -17,12 +17,11 @@ id: "ars_additions:codex_entry" } random_bonus: 2 + weight: 50.0f } - { item: { count: 1, id: "ars_nouveau:starbuncle_shards" }, weight: 0.2f } - { item: { count: 1, id: "ars_nouveau:whirlisprig_shards" }, weight: 0.2f } - { item: { count: 1, id: "ars_nouveau:wixie_shards" }, weight: 0.2f } - { item: { count: 1, id: "ars_nouveau:drygmy_shard" }, weight: 0.2f } - { item: { count: 1, id: "ars_elemental:siren_shards" }, weight: 0.2f } + { item: { count: 1, id: "ars_nouveau:starbuncle_shards" }, weight: 5.0f } + { item: { count: 1, id: "ars_nouveau:whirlisprig_shards" }, weight: 5.0f } + { item: { count: 1, id: "ars_elemental:siren_shards" }, weight: 5.0f } { count: 2 item: { @@ -30,6 +29,16 @@ id: "ars_nouveau:warp_scroll" } random_bonus: 2 + weight: 15.0f + } + { + count: 8 + item: { + count: 1 + id: "ars_nouveau:sourcestone" + } + random_bonus: 8 + weight: 20.0f } ] use_title: true From 97ad777e133a2e921dc223264dafa10e92fc0a85 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 17:53:55 -0400 Subject: [PATCH 25/37] interactions --- .../ftbquests/quests/chapters/evilcraft.snbt | 142 +++++++++++++++--- config/ftbquests/quests/lang/en_us.snbt | 9 ++ .../client_scripts/emi/world_interactions.js | 116 ++++++++++++-- 3 files changed, 235 insertions(+), 32 deletions(-) diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index 00ce3a4f..d8abc059 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -10,27 +10,125 @@ id: "603B06098A07350C" order_index: 3 quest_links: [ ] - quests: [{ - icon: { - components: { - "ftbquests:icon": "evilcraft:block/blood_infuser_north_on" + quests: [ + { + icon: { + components: { + "ftbquests:icon": "evilcraft:block/blood_infuser_north_on" + } + id: "ftbquests:custom_icon" } - id: "ftbquests:custom_icon" - } - id: "717CCCD239144E0B" - rewards: [{ - id: "38A53B82EA047D18" - item: { - count: 1 - id: "evilcraft:origins_of_darkness" - } - type: "item" - }] - tasks: [{ - id: "3C64E92DFA608339" - type: "checkmark" - }] - x: 0.5d - y: 0.5d - }] + id: "717CCCD239144E0B" + rewards: [{ + id: "38A53B82EA047D18" + item: { + count: 1 + id: "evilcraft:origins_of_darkness" + } + type: "item" + }] + tasks: [{ + id: "3C64E92DFA608339" + type: "checkmark" + }] + x: 0.5d + y: 0.5d + } + { + dependencies: ["717CCCD239144E0B"] + id: "3FA7963385E35E27" + rewards: [{ + id: "27A5C20DB89FA7A4" + item: { + count: 1 + id: "minecraft:apple" + } + type: "item" + }] + tasks: [{ + id: "0C96286549AD0DD2" + item: { count: 1, id: "evilcraft:dark_gem" } + type: "item" + }] + x: -0.5d + y: 1.5d + } + { + dependencies: ["3FA7963385E35E27"] + id: "48E87B06B04CA4C1" + tasks: [{ + id: "45B84C1C25D27CB5" + item: { count: 1, id: "evilcraft:darkened_apple" } + type: "item" + }] + x: -1.5d + y: 2.5d + } + { + dependencies: ["1DD5BC5F0F5B996A"] + id: "0C1DCD8850E6857C" + tasks: [{ + id: "5E0A44ED0D2E3AAD" + item: { count: 1, id: "evilcraft:blood_chest" } + type: "item" + }] + x: 4.5d + y: 0.5d + } + { + dependencies: ["0C1DCD8850E6857C"] + id: "23C86F86A1A4B1E9" + tasks: [{ + id: "72DAB99E1982A79B" + item: { count: 1, id: "evilcraft:colossal_blood_chest" } + type: "item" + }] + x: 5.5d + y: 0.5d + } + { + dependencies: ["717CCCD239144E0B"] + id: "48271478CA0D3F6B" + tasks: [{ + id: "18AE9263A3F9B02A" + item: { count: 1, id: "evilcraft:blood_extractor" } + type: "item" + }] + x: 1.5d + y: 0.5d + } + { + dependencies: ["48271478CA0D3F6B"] + id: "4ACCED64D436209E" + tasks: [{ + id: "3FA72699ABD972E8" + item: { count: 1, id: "evilcraft:dark_power_gem" } + type: "item" + }] + x: 2.5d + y: 0.5d + } + { + dependencies: ["3FA7963385E35E27"] + id: "64C8F99FC610CED2" + tasks: [{ + id: "3267B5205D761889" + item: { count: 1, id: "evilcraft:dark_gem_crushed" } + type: "item" + }] + x: -1.5d + y: 1.5d + } + { + dependencies: ["4ACCED64D436209E"] + id: "1DD5BC5F0F5B996A" + tasks: [{ + id: "7E31F075AA877754" + item: { count: 1, id: "evilcraft:blood_infusion_core" } + type: "item" + }] + x: 3.5d + y: 0.5d + } + ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 71635358..8c9e0df4 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1584,6 +1584,7 @@ "&a Electric Pump to produce" "&a Heavy Water." ] + quest.3FA7963385E35E27.quest_desc: ["dark ore"] quest.3FF6566453299DC1.quest_desc: [ "Applied Energistics is the ultimate storage and logistics solution. Not only does it store items and fluids, but it acts as a controller for external machines by way of its auto crafting system. " "" @@ -1871,6 +1872,11 @@ "&c⚠ Warning: Fission Reactors will " "&c explode if improperly cooled!" ] + quest.48271478CA0D3F6B.quest_desc: [ + "kill mobs with it in inventory to collect" + "" + "right click to put blood in world" + ] quest.4840F7361DF70516.quest_desc: [ "The QIO System is a massive storage and routing system built on the same technology as the Quantum Entangloporter. Essentially, it acts as a very large chest." "" @@ -1903,6 +1909,7 @@ "&a than their Bronze counterparts." ] quest.487C1E9850772F38.title: "Steel Upgrades" + quest.48E87B06B04CA4C1.quest_desc: ["feed to animal to get anomoly. only used to make the book?"] quest.48F901DB80482CAA.quest_desc: [ "The most basic alchemical processes involve the purification of materials. When simply smelting ore in a furnace, some of the material simply cannot be recovered as it is locked up in minerals that the furnace can’t break down." "" @@ -1960,6 +1967,7 @@ "" "Our end goal here will be Rare Metal Niter." ] + quest.4ACCED64D436209E.quest_desc: ["throw dark gem in to get "] quest.4B35B8DACEE56913.quest_desc: [ "The Biometric Identifier is used in conjunction with Identification Cards to grant player permissions on a frequency. This can grant them the ability to pass through a forcefield or be unaffected by an Interdiction Matrix. " "" @@ -2591,6 +2599,7 @@ "Be sure to grab a mating pair! Males and Females are distinguished by their tail feathers, with Males having more colorful plumage than Females." ] quest.642CDBB28337670C.title: "Finding and Taming" + quest.64C8F99FC610CED2.quest_desc: ["only from using fortune on dark ore"] quest.6538BD86D9419DD4.quest_desc: [ "Welcome to Theurgy! " "" diff --git a/kubejs/client_scripts/emi/world_interactions.js b/kubejs/client_scripts/emi/world_interactions.js index 4559a52f..819e4b45 100644 --- a/kubejs/client_scripts/emi/world_interactions.js +++ b/kubejs/client_scripts/emi/world_interactions.js @@ -75,8 +75,8 @@ ClientEvents.generateAssets('before_mods', (event) => { } }, { - left: 'item:ars_nouveau:wixie_charm', - right: 'item:minecraft:cauldron', + left: 'item:minecraft:cauldron', + right: 'item:ars_nouveau:wixie_charm', output: { type: 'item', id: 'ars_nouveau:wixie_cauldron', @@ -84,8 +84,8 @@ ClientEvents.generateAssets('before_mods', (event) => { } }, { - left: 'item:ars_nouveau:wixie_charm', - right: 'item:ars_nouveau:enchanting_apparatus', + left: 'item:ars_nouveau:enchanting_apparatus', + right: 'item:ars_nouveau:wixie_charm', output: { type: 'item', id: 'ars_additions:enchanting_wixie_cauldron', @@ -93,8 +93,8 @@ ClientEvents.generateAssets('before_mods', (event) => { } }, { - left: 'item:ars_nouveau:drygmy_charm', - right: 'item:minecraft:mossy_cobblestone', + left: 'item:minecraft:mossy_cobblestone', + right: 'item:ars_nouveau:drygmy_charm', output: { type: 'item', id: 'ars_nouveau:drygmy_stone', @@ -102,8 +102,8 @@ ClientEvents.generateAssets('before_mods', (event) => { } }, { - left: 'item:ars_elemental:siren_charm', - right: 'item:minecraft:prismarine', + left: 'item:minecraft:prismarine', + right: 'item:ars_elemental:siren_charm', output: { type: 'item', id: 'ars_elemental:mermaid_rock', @@ -111,13 +111,109 @@ ClientEvents.generateAssets('before_mods', (event) => { } }, { - left: 'item:ars_nouveau:whirlisprig_charm', - right: '#item:minecraft:flowers', + left: '#item:minecraft:flowers', + right: 'item:ars_nouveau:whirlisprig_charm', output: { type: 'item', id: 'ars_nouveau:whirlisprig_flower', amount: 1 } + }, + { + left: { + type: 'fluid', + id: 'evilcraft:blood', + amount: 1000 + }, + right: { + type: 'item', + id: 'evilcraft:dark_gem', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Throw in fluid"}\u0027]}', + amount: 1 + }, + output: { + type: 'item', + id: 'evilcraft:dark_power_gem', + amount: 1 + } + }, + { + left: { + type: 'item', + id: 'evilcraft:hardened_blood', + amount: 1 + }, + right: { + type: 'item', + id: 'minecraft:flint_and_steel', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Break block with item"}\u0027]}', + amount: 1 + }, + output: { + type: 'item', + id: 'evilcraft:hardened_blood_shard', + amount: 7 + } + }, + { + left: { + type: 'fluid', + id: 'evilcraft:blood', + amount: 1000 + }, + right: { + type: 'item', + id: 'minecraft:clock', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Converts over time"}\u0027]}', + amount: 1 + }, + output: { + type: 'item', + id: 'evilcraft:hardened_blood', + amount: 1 + } + }, + { + left: 'item:minecraft:amethyst_block', + right: { + type: 'item', + id: 'ars_nouveau:amethyst_golem_charm', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Amethyst Golems convert to budding!"}\u0027]}', + amount: 1 + }, + output: { + type: 'item', + id: 'minecraft:budding_amethyst', + amount: 1 + } + }, + { + left: 'item:ae2:quartz_block', + right: { + type: 'item', + id: 'ars_nouveau:amethyst_golem_charm', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Amethyst Golems convert to budding!"}\u0027]}', + amount: 1 + }, + output: { + type: 'item', + id: 'ae2:flawed_budding_quartz', + amount: 1 + } + }, + { + left: 'item:justdirethings:time_crystal_block', + right: { + type: 'item', + id: 'ars_nouveau:amethyst_golem_charm', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Amethyst Golems convert to budding!"}\u0027]}', + amount: 1 + }, + output: { + type: 'item', + id: 'justdirethings:time_crystal_budding_block', + amount: 1 + } } ]; From 264194797a449517ed75bb859182b79583ed7a4d Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 18:26:05 -0400 Subject: [PATCH 26/37] Update world_interactions.js --- .../client_scripts/emi/world_interactions.js | 77 ++++++++++++++----- 1 file changed, 57 insertions(+), 20 deletions(-) diff --git a/kubejs/client_scripts/emi/world_interactions.js b/kubejs/client_scripts/emi/world_interactions.js index 819e4b45..7d58721c 100644 --- a/kubejs/client_scripts/emi/world_interactions.js +++ b/kubejs/client_scripts/emi/world_interactions.js @@ -9,7 +9,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:coal_t1', amount: 3 - } + }, + id: 'justdirethings:coal_t1' }, { left: 'item:justdirethings:raw_coal_t2_ore', @@ -18,7 +19,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:coal_t2', amount: 3 - } + }, + id: 'justdirethings:coal_t2' }, { left: 'item:justdirethings:raw_coal_t3_ore', @@ -27,7 +29,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:coal_t3', amount: 3 - } + }, + id: 'justdirethings:coal_t3' }, { left: 'item:justdirethings:raw_coal_t4_ore', @@ -36,7 +39,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:coal_t4', amount: 3 - } + }, + id: 'justdirethings:coal_t4' }, { left: 'item:justdirethings:raw_ferricore_ore', @@ -45,7 +49,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:raw_ferricore', amount: 3 - } + }, + id: 'justdirethings:raw_ferricore' }, { left: 'item:justdirethings:raw_blazegold_ore', @@ -54,7 +59,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:raw_blazegold', amount: 3 - } + }, + id: 'justdirethings:raw_blazegold' }, { left: 'item:justdirethings:raw_celestigem_ore', @@ -63,7 +69,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:celestigem', amount: 3 - } + }, + id: 'justdirethings:celestigem' }, { left: 'item:justdirethings:raw_eclipsealloy_ore', @@ -72,7 +79,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:raw_eclipsealloy', amount: 3 - } + }, + id: 'justdirethings:raw_eclipsealloy' }, { left: 'item:minecraft:cauldron', @@ -81,7 +89,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'ars_nouveau:wixie_cauldron', amount: 1 - } + }, + id: 'ars_nouveau:wixie_cauldron' }, { left: 'item:ars_nouveau:enchanting_apparatus', @@ -90,7 +99,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'ars_additions:enchanting_wixie_cauldron', amount: 1 - } + }, + id: 'ars_additions:enchanting_wixie_cauldron' }, { left: 'item:minecraft:mossy_cobblestone', @@ -99,7 +109,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'ars_nouveau:drygmy_stone', amount: 1 - } + }, + id: 'ars_nouveau:drygmy_stone' }, { left: 'item:minecraft:prismarine', @@ -108,7 +119,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'ars_elemental:mermaid_rock', amount: 1 - } + }, + id: 'ars_elemental:mermaid_rock' }, { left: '#item:minecraft:flowers', @@ -117,7 +129,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'ars_nouveau:whirlisprig_flower', amount: 1 - } + }, + id: 'ars_nouveau:whirlisprig_flower' }, { left: { @@ -135,7 +148,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'evilcraft:dark_power_gem', amount: 1 - } + }, + id: 'evilcraft:dark_power_gem' }, { left: { @@ -153,7 +167,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'evilcraft:hardened_blood_shard', amount: 7 - } + }, + id: 'evilcraft:hardened_blood_shard' }, { left: { @@ -171,7 +186,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'evilcraft:hardened_blood', amount: 1 - } + }, + id: 'evilcraft:hardened_blood' }, { left: 'item:minecraft:amethyst_block', @@ -185,7 +201,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'minecraft:budding_amethyst', amount: 1 - } + }, + id: 'minecraft:budding_amethyst' }, { left: 'item:ae2:quartz_block', @@ -199,7 +216,8 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'ae2:flawed_budding_quartz', amount: 1 - } + }, + id: 'ae2:flawed_budding_quartz' }, { left: 'item:justdirethings:time_crystal_block', @@ -213,12 +231,31 @@ ClientEvents.generateAssets('before_mods', (event) => { type: 'item', id: 'justdirethings:time_crystal_budding_block', amount: 1 - } + }, + id: 'justdirethings:time_crystal_budding_block' + }, + { + left: '#item:c:ores/dark_gem', + right: '#item:minecraft:pickaxes', + output: [ + { + type: 'item', + id: 'evilcraft:dark_gem', + amount: 1 + }, + { + type: 'item', + id: 'evilcraft:dark_gem_crushed', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Requires Fortune"}\u0027]}', + amount: 1 + } + ], + id: 'evilcraft:dark_gem_crushed' } ]; descriptions.forEach((description) => { description.type = 'emi:world_interaction'; - event.json(`emi:recipe/additions/${description.output.id.replace(/\:/g, '_')}`, description); + event.json(`emi:recipe/additions/${description.id.replace(/\:/g, '_')}`, description); }); }); From 781ac056f3583e9fc3c56fe78b0cc48d3607bd11 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 20:32:54 -0400 Subject: [PATCH 27/37] evilcraft quest outline --- .../ftbquests/quests/chapters/evilcraft.snbt | 218 +++++++++++++++++- config/ftbquests/quests/lang/en_us.snbt | 27 ++- .../client_scripts/emi/world_interactions.js | 2 +- .../recipes/enigmatica/replace_input.js | 5 +- .../recipes/enigmatica/shapeless.js | 5 + ...ng_shaped_custom_output_dark_tank_large.js | 20 ++ 6 files changed, 264 insertions(+), 13 deletions(-) create mode 100644 kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index d8abc059..1be6c448 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -72,8 +72,8 @@ item: { count: 1, id: "evilcraft:blood_chest" } type: "item" }] - x: 4.5d - y: 0.5d + x: 3.5d + y: 2.5d } { dependencies: ["0C1DCD8850E6857C"] @@ -83,8 +83,8 @@ item: { count: 1, id: "evilcraft:colossal_blood_chest" } type: "item" }] - x: 5.5d - y: 0.5d + x: 3.5d + y: 4.0d } { dependencies: ["717CCCD239144E0B"] @@ -105,7 +105,7 @@ item: { count: 1, id: "evilcraft:dark_power_gem" } type: "item" }] - x: 2.5d + x: 3.5d y: 0.5d } { @@ -116,19 +116,219 @@ item: { count: 1, id: "evilcraft:dark_gem_crushed" } type: "item" }] - x: -1.5d - y: 1.5d + x: 0.5d + y: 2.5d } { - dependencies: ["4ACCED64D436209E"] + dependencies: [ + "4ACCED64D436209E" + "77B7679AFE090140" + ] id: "1DD5BC5F0F5B996A" tasks: [{ id: "7E31F075AA877754" item: { count: 1, id: "evilcraft:blood_infusion_core" } type: "item" }] + x: 5.0d + y: 1.0d + } + { + dependencies: ["1DD5BC5F0F5B996A"] + id: "0751B009795D7889" + tasks: [{ + id: "3D4070B43CEF452C" + item: { count: 1, id: "evilcraft:spirit_furnace" } + type: "item" + }] + x: 9.0d + y: 0.0d + } + { + dependencies: ["1DD5BC5F0F5B996A"] + id: "73A71BBB9D9168B0" + tasks: [{ + id: "4ADB8982A8F6B9CC" + item: { count: 1, id: "evilcraft:spirit_reanimator" } + type: "item" + }] + x: 8.5d + y: 1.0d + } + { + dependencies: ["0C1DCD8850E6857C"] + id: "0988DC06DD5A6935" + tasks: [{ + id: "02ACBA14ED31AF33" + item: { count: 1, id: "evilcraft:purifier" } + type: "item" + }] + x: 2.5d + y: 3.0d + } + { + dependencies: ["1DD5BC5F0F5B996A"] + id: "14DEE45EA9666015" + tasks: [{ + id: "43370AFFD4EBAF48" + item: { count: 1, id: "evilcraft:sanguinary_environmental_accumulator" } + type: "item" + }] + x: 9.5d + y: 2.0d + } + { + dependencies: ["64C8F99FC610CED2"] + id: "3202466CAE3744A9" + tasks: [{ + id: "595FF126B994B9DD" + item: { count: 1, id: "evilcraft:vengeance_ring" } + type: "item" + }] + x: 0.5d + y: 3.5d + } + { + dependencies: ["3202466CAE3744A9"] + id: "2C7977E4AE6B627B" + tasks: [ + { + id: "2905810324E3003D" + item: { count: 1, id: "evilcraft:vengeance_focus" } + type: "item" + } + { + id: "5BDF23701F770421" + item: { count: 1, id: "evilcraft:box_of_eternal_closure" } + type: "item" + } + ] + x: 0.5d + y: 4.5d + } + { + dependencies: ["2C7977E4AE6B627B"] + id: "31B6AE7706264320" + tasks: [{ + id: "3142A06E8E16C922" + item: { count: 1, id: "evilcraft:burning_gem_stone" } + type: "item" + }] + x: 1.5d + y: 4.0d + } + { + dependencies: ["2C7977E4AE6B627B"] + id: "0AEF5FB6530F4D65" + tasks: [{ + id: "2E3A222E226F1ECE" + item: { count: 1, id: "evilcraft:spectral_glasses" } + type: "item" + }] + x: 1.5d + y: 5.0d + } + { + dependencies: ["48271478CA0D3F6B"] + id: "46195E73798357D2" + tasks: [{ + id: "30536BF69330FA83" + item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" } + type: "item" + }] + x: 1.5d + y: 1.5d + } + { + dependencies: ["48271478CA0D3F6B"] + id: "77B7679AFE090140" + tasks: [{ + id: "1E3CC0EDCD950B3A" + item: { count: 1, id: "evilcraft:hardened_blood_shard" } + type: "item" + }] x: 3.5d - y: 0.5d + y: 1.5d + } + { + dependencies: ["1DD5BC5F0F5B996A"] + id: "492DA63DEC9663F2" + tasks: [{ + id: "7D02DAD836B3B3B1" + item: { count: 1, id: "evilcraft:blood_infuser" } + type: "item" + }] + x: 5.0d + y: 2.5d + } + { + dependencies: ["492DA63DEC9663F2"] + id: "2FB39BF76836FA47" + tasks: [{ + id: "0D965E2BAFD1520E" + item: { count: 1, id: "evilcraft:undead_sapling" } + type: "item" + }] + x: 6.0d + y: 3.5d + } + { + dependencies: ["2FB39BF76836FA47"] + id: "4DE1B1045507C72C" + tasks: [{ + id: "102B6984636C38E5" + item: { count: 1, id: "evilcraft:dark_stick" } + type: "item" + }] + x: 6.0d + y: 4.5d + } + { + dependencies: ["492DA63DEC9663F2"] + id: "621BA38E3E50B91E" + tasks: [{ + id: "6C8A4080C2D7A111" + item: { count: 1, id: "evilcraft:promise_tier_1" } + type: "item" + }] + x: 5.0d + y: 4.0d + } + { + dependencies: ["621BA38E3E50B91E"] + id: "4F480CF26AB0F3CD" + tasks: [ + { + id: "2C0CD473FF75BDE1" + item: { count: 1, id: "evilcraft:promise_speed_0" } + type: "item" + } + { + id: "001F1F41EE3DC0F7" + item: { count: 1, id: "evilcraft:promise_efficiency_0" } + type: "item" + } + ] + x: 4.0d + y: 5.0d + } + { + dependencies: ["492DA63DEC9663F2"] + id: "6303A7113DE954DD" + tasks: [ + { + id: "78D54A3DA95B9DD8" + item: { count: 1, id: "evilcraft:sanguinary_pedestal_0" } + type: "item" + } + { + id: "167D0146A622937B" + item: { count: 1, id: "evilcraft:spiked_plate" } + type: "item" + } + ] + x: 6.0d + y: 2.5d } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 8c9e0df4..552cb0da 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -167,6 +167,7 @@ "" "&6⚠ Note: Spells may contain up to thirty glyphs." ] + quest.0988DC06DD5A6935.quest_desc: ["removes curses from equipement corrupted by the blood chest"] quest.09B6773CDA5A7565.quest_desc: [ "The Enchanting Apparatus will likely be the next device you’ll wish to set up as it’s used for many more advanced crafts, upgrading equipment, and applying enchantments!" "" @@ -216,6 +217,7 @@ "" "If you inserted the Sulfurs already, the process should begin immediately and light effects will flow from the Emitter through each Pedestal." ] + quest.0AEF5FB6530F4D65.quest_desc: ["causes spirits to ignore you"] quest.0B04BC5F88746182.quest_desc: ["The following are full-blown storage systems that hold many types of items and present them in a single easy-to-browse and searchable interface. "] quest.0B04BC5F88746182.title: "Storage Systems" quest.0B05FA716D7335D2.quest_desc: [ @@ -254,6 +256,7 @@ "&a Helix in EMI to see what mobs it " "&a comes from!" ] + quest.0C1DCD8850E6857C.quest_desc: ["repairs items but sometimes curses them"] quest.0CBCE3A0D149AED0.quest_desc: [ "Where prior tiers have primarily focused on bootstrapping technology, the EV Tier is where we’ll get into the nuclear sciences, both for material processing and for power production. " "&n &r" @@ -1075,6 +1078,11 @@ "&a some or all of the material has " "&a processed." ] + quest.2C7977E4AE6B627B.quest_desc: [ + "kill mob with vengeance ring" + "place box and open" + "shoot with vengeance focus to get it ghost busted into the box" + ] quest.2C84374CBB186FE2.quest_desc: [ "With Creosote comes the ability to make Lubricant, and Lubricant allows running a Cutting Machine to make Rods and Bolts. Yes, now you can set aside your Forge Hammer for good!" "" @@ -1133,6 +1141,8 @@ "&6 knowledge." ] quest.31129C8D75EFD8E9.quest_desc: ["The Gas-Burning Generator can burn Ethene to produce even more energy. A couple of these combined with some sort of automated crop farm should cover power needs for a good while to come."] + quest.31B6AE7706264320.quest_desc: ["causes spirits to do hunger damage instead of physical"] + quest.3202466CAE3744A9.quest_desc: ["activate and kill mobs. Gives crazy freaking buffs permanently!"] quest.3263757C9A240C70.quest_desc: [ "Chipped offers a multitude of block variants to fit your every decorative need. The Workbenches themselves are equally lovely and can spruce up your interiors quite easily." "" @@ -1817,6 +1827,11 @@ "&6 that, if not met, will cause the " "&6 injection to fail. Refer to EMI." ] + quest.46195E73798357D2.quest_desc: [ + "craft together to combine capacity" + "" + "craft with blood extractor to increase blood extractor capacity" + ] quest.4660608EBEE31784.quest_desc: [ "A special trade obtained from the Queen, Windy Air can be used to create updrafts that will lift you into the air. These can make an excellent elevator by stacking one atop the other. " "" @@ -1967,7 +1982,7 @@ "" "Our end goal here will be Rare Metal Niter." ] - quest.4ACCED64D436209E.quest_desc: ["throw dark gem in to get "] + quest.4ACCED64D436209E.quest_desc: ["throw dark gem in 5 buckets of blood to get "] quest.4B35B8DACEE56913.quest_desc: [ "The Biometric Identifier is used in conjunction with Identification Cards to grant player permissions on a frequency. This can grant them the ability to pass through a forcefield or be unaffected by an Interdiction Matrix. " "" @@ -2067,6 +2082,7 @@ "&a Logistics, such as Mercurial " "&a Item Nodes!" ] + quest.4DE1B1045507C72C.quest_desc: ["points to Dark Temples"] quest.4E175A06927C3A75.quest_desc: [ "A Charging Station is a convenient way to refill the air in your pneumatic tools and equipment. " "" @@ -2096,6 +2112,11 @@ ] quest.4E7DA28C54FB8766.title: "Rare Materials" quest.4EC7DD1B35F0B6B5.quest_desc: ["The Chemical Reactor opens doors to chemical engineering and a whole new world of advanced processing as we prepare for the HV tier of power and material sciences."] + quest.4F480CF26AB0F3CD.quest_desc: [ + "velocity increases processing speed" + "productivity reduces the blood required" + ] + quest.4F480CF26AB0F3CD.title: "Machine Upgrades" quest.4F5E591110C0A372.quest_desc: ["Chemical Cards for LaserIO allow Laser Nodes to transport Mekanism Gases and Chemicals."] quest.4FEA49AD05720ED7.quest_desc: [ "Ah, the simple joys of playing with chalk outside. " @@ -2529,6 +2550,7 @@ "&a🛈 Tip: A Scraper enchanted with " "&a Delicate Touch will cause no harm." ] + quest.621BA38E3E50B91E.quest_desc: ["Enables higher tier crafts, allows more upgrade promises"] quest.6242CD0203DCBDC7.quest_desc: [ "The Wixie Enchanting Apparatus allows a Wixie to craft any Enchanting Apparatus recipes using Source." "" @@ -2561,6 +2583,7 @@ "&a🛈 Tip: Cable Subparts cannot be " "&a placed on Dense Cables." ] + quest.6303A7113DE954DD.quest_desc: ["place spikes on pedestal to auto kill mobs and get blood. blood will auto insert into nearby dark tanks"] quest.631AA5AAA6EF687C.quest_desc: [ "Pattern Providers are the network's means of interfacing with crafting machines. " "" @@ -3203,6 +3226,7 @@ "&a discover more." ] quest.77A66ADAB0845804.title: "Macaw's Mods" + quest.77B7679AFE090140.quest_desc: ["can pick up block with silk touch and cook for 9 "] quest.78D83E33F82D6015.quest_desc: [ "Electric Machines all have an Efficiency rating which goes up the longer they run. This allows them to self balance based on the rate of inputs. " "" @@ -3381,6 +3405,7 @@ task.3745AFEF378D7217.title: "Steel or Energized Steel" task.37CDC8E9B9004A0D.title: "Crafting Storage" task.3898E7E189555B8C.title: "Arcane Platforms" + task.3C64E92DFA608339.title: "wip" task.3C9F8F7D407AC253.title: "Sender Modules" task.3D1A362E43EE4BED.title: "Other Compressors" task.3DED6DAEE4419675.title: "Any Chipped Workbench" diff --git a/kubejs/client_scripts/emi/world_interactions.js b/kubejs/client_scripts/emi/world_interactions.js index 7d58721c..59933662 100644 --- a/kubejs/client_scripts/emi/world_interactions.js +++ b/kubejs/client_scripts/emi/world_interactions.js @@ -136,7 +136,7 @@ ClientEvents.generateAssets('before_mods', (event) => { left: { type: 'fluid', id: 'evilcraft:blood', - amount: 1000 + amount: 5000 }, right: { type: 'item', diff --git a/kubejs/server_scripts/recipes/enigmatica/replace_input.js b/kubejs/server_scripts/recipes/enigmatica/replace_input.js index 6da15f80..f178d6be 100644 --- a/kubejs/server_scripts/recipes/enigmatica/replace_input.js +++ b/kubejs/server_scripts/recipes/enigmatica/replace_input.js @@ -17,13 +17,14 @@ ServerEvents.recipes((event) => { filter: [ { mod: 'ae2', not: { output: 'ae2:cable_anchor' } }, { mod: 'ae2netanalyser' }, - { mod: 'aquaculture', output: /tackle_box/ } + { mod: 'aquaculture', output: /tackle_box/ }, + { mod: 'evilcraft' } ], to_replace: '#c:ingots/iron', replace_with: Ingredient.of(['#c:ingots/iron', '#c:ingots/tin']) }, { - filter: [{ mod: 'aquaculture', output: /tackle_box/ }], + filter: [{ mod: 'aquaculture', output: /tackle_box/ }, { mod: 'evilcraft' }], to_replace: '#c:storage_blocks/iron', replace_with: Ingredient.of(['#c:storage_blocks/iron', '#c:storage_blocks/tin']) }, diff --git a/kubejs/server_scripts/recipes/enigmatica/shapeless.js b/kubejs/server_scripts/recipes/enigmatica/shapeless.js index 780376be..f2bafea4 100644 --- a/kubejs/server_scripts/recipes/enigmatica/shapeless.js +++ b/kubejs/server_scripts/recipes/enigmatica/shapeless.js @@ -57,6 +57,11 @@ ServerEvents.recipes((event) => { output: Item.of('minecraft:name_tag', 2), inputs: ['#c:strings', 'minecraft:paper'], id: `${id_prefix}name_tag` + }, + { + output: 'minecraft:dead_bush', + inputs: ['#minecraft:saplings', 'minecraft:shears'], + id: `${id_prefix}dead_bush` } ]; diff --git a/kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js b/kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js new file mode 100644 index 00000000..9e8372e5 --- /dev/null +++ b/kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js @@ -0,0 +1,20 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:occultism/crushing/'; + + const recipes = [ + { + pattern: [' D ', 'IGI', ' D '], + key: { + D: { item: 'evilcraft:dark_block' }, + I: Ingredient.of(['#c:storage_blocks/iron', '#c:storage_blocks/tin']), + G: { tag: 'c:glass_blocks' } + }, + id: `evilcraft:special/dark_tank_large` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'evilcraft:crafting_shaped_custom_output_dark_tank_large'; + event.custom(recipe).id(recipe.id); + }); +}); From d2949ec1db75b25e6ffb11a9a886e7be5576c0ad Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Fri, 30 Aug 2024 21:12:08 -0400 Subject: [PATCH 28/37] quests, enchants --- .../ftbquests/quests/chapters/evilcraft.snbt | 80 ++++++++++++++++--- config/ftbquests/quests/lang/en_us.snbt | 12 +++ .../recipes/ars_nouveau/enchantment.js | 48 +++++++++++ 3 files changed, 127 insertions(+), 13 deletions(-) diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index 1be6c448..485297ca 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -134,26 +134,26 @@ y: 1.0d } { - dependencies: ["1DD5BC5F0F5B996A"] + dependencies: ["2C7977E4AE6B627B"] id: "0751B009795D7889" tasks: [{ id: "3D4070B43CEF452C" item: { count: 1, id: "evilcraft:spirit_furnace" } type: "item" }] - x: 9.0d - y: 0.0d + x: -0.5d + y: 5.5d } { - dependencies: ["1DD5BC5F0F5B996A"] + dependencies: ["0751B009795D7889"] id: "73A71BBB9D9168B0" tasks: [{ id: "4ADB8982A8F6B9CC" item: { count: 1, id: "evilcraft:spirit_reanimator" } type: "item" }] - x: 8.5d - y: 1.0d + x: -0.5d + y: 6.5d } { dependencies: ["0C1DCD8850E6857C"] @@ -168,13 +168,23 @@ } { dependencies: ["1DD5BC5F0F5B996A"] + icon: { + id: "evilcraft:sanguinary_environmental_accumulator" + } id: "14DEE45EA9666015" - tasks: [{ - id: "43370AFFD4EBAF48" - item: { count: 1, id: "evilcraft:sanguinary_environmental_accumulator" } - type: "item" - }] - x: 9.5d + tasks: [ + { + id: "43370AFFD4EBAF48" + item: { count: 1, id: "evilcraft:sanguinary_environmental_accumulator" } + type: "item" + } + { + id: "7DD57170FE79CA23" + item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" } + type: "item" + } + ] + x: 7.0d y: 2.0d } { @@ -236,7 +246,7 @@ item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" } type: "item" }] - x: 1.5d + x: 1.0d y: 1.5d } { @@ -330,5 +340,49 @@ x: 6.0d y: 2.5d } + { + dependencies: ["6303A7113DE954DD"] + id: "06F1A8F15128C1D9" + tasks: [{ + id: "4EDD731131592044" + item: { count: 1, id: "minecraft:spawner" } + type: "item" + }] + x: 7.0d + y: 3.0d + } + { + dependencies: ["06F1A8F15128C1D9"] + id: "14555CEDF53F68FC" + tasks: [{ + id: "382BDC0A6C24BAF0" + item: { components: { "evilcraft:world_shared_tank_id": "creative" }, count: 1, id: "evilcraft:entangled_chalice" } + type: "item" + }] + x: 8.0d + y: 4.0d + } + { + dependencies: ["48271478CA0D3F6B"] + id: "30D6FE1B0EC82066" + tasks: [{ + id: "09C7F4550E2EFA11" + item: { components: { "minecraft:enchantments": { levels: { "minecraft:looting": 2 } } }, count: 1, id: "evilcraft:vein_sword" } + type: "item" + }] + x: 2.0d + y: 1.5d + } + { + dependencies: ["2C7977E4AE6B627B"] + id: "66BC8A8EB33B0677" + tasks: [{ + id: "276C28694B2C7999" + item: { count: 1, id: "evilcraft:piercing_vengeance_focus" } + type: "item" + }] + x: 0.5d + y: 6.0d + } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 552cb0da..ab643adc 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -127,6 +127,8 @@ "&a🛈 Tip: Starbuncles can be filtered with " "&a Allow/Deny Scrolls!" ] + quest.06F1A8F15128C1D9.quest_desc: ["spawners can be moved with silk touch"] + quest.0751B009795D7889.quest_desc: ["https://evilcraft.rubensworks.net/book/second_age/abusing_spirits/spirit_furnace.html"] quest.07684F58521A4D34.quest_desc: [ "Playing with friends? " "" @@ -486,6 +488,7 @@ ] quest.1447C4568B9A1606.quest_desc: ["[\"From there, the Sulfur will need to be \",{ \"text\": \"Incubated\", \"underlined\": true, \"clickEvent\": { \"action\": \"change_page\", \"value\": \"59A56F3053A30126\" },\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]} },\" back into an ingot.\"]"] quest.1447C4568B9A1606.title: "Incubation" + quest.14555CEDF53F68FC.quest_desc: ["basically ender tanks"] quest.14688BF9C4B5766C.quest_desc: [ "Player Transmitters wirelessly charge FE based items and equipment in your inventory. " "" @@ -523,6 +526,7 @@ "" "[\"Read more about this system in the dedicated \",{\"clickEvent\":{ \"action\": \"change_page\", \"value\": \"4D1E38918B64CD4E\" },\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\": \"Mekanism\",\"underlined\":true},\" chapter. \"]" ] + quest.14DEE45EA9666015.quest_desc: ["This machine requires a hefty amount of Blood to work, that is why you will need 8 Blood tanks of any type spread around the machine as can be seen in the following image. This machine will not work without those tanks, smoke effects can be seen at the locations where the tanks are supposed to be placed."] quest.156DEEC0CB40D7DB.quest_desc: [ "Allows multiple Force Field Projectors to work together to cover a larger area, while allowing free passage between them. " "" @@ -871,6 +875,12 @@ "&a🛈 Tip: It is often easiest to dedicate an" "&a Infuser to an Infuse Material." ] + quest.23C86F86A1A4B1E9.quest_desc: [ + "improved blood chest, no curses, faster, takes promises" + "" + "" + "To build this, make a hollow 3x3x3 structure of Reinforced Undead Planks. For the structure to form, your need exactly one Colossal Blood Chest block somewhere in the structure wall, make sure not to place it in the middle of the structure, as it must remain hollow." + ] quest.23FF0CA316B2CB5D.quest_desc: [ "The Large Tank is a Modern Industrialization multi-block capable of holding massive amounts of fluids." "" @@ -3001,6 +3011,7 @@ "Farmland tilled with a Celestigem Hoe will self-harvest and teleport the drops to a bound storage as well. Handy!" ] quest.7163E7EBDB861D72.title: "Advanced Item Collector?" + quest.717CCCD239144E0B.quest_desc: ["https://evilcraft.rubensworks.net/book"] quest.717CCCD239144E0B.title: "EvilCraft" quest.7220A9770C3E1C6F.quest_desc: [ "The Inscriber will be the primary machine you’ll be working with to produce crafting components; the various Processors are used extensively throughout Applied Energistics." @@ -3033,6 +3044,7 @@ "&a structure or valid places for " "&a hatches." ] + quest.73A71BBB9D9168B0.quest_desc: ["https://evilcraft.rubensworks.net/book/second_age/abusing_spirits/spirit_reanimator.html"] quest.73D70F80C3AE999C.quest_desc: [ "Who doesn’t love yeeting things through the air? " "" diff --git a/kubejs/server_scripts/recipes/ars_nouveau/enchantment.js b/kubejs/server_scripts/recipes/ars_nouveau/enchantment.js index 6b56c66b..7af4efdf 100644 --- a/kubejs/server_scripts/recipes/ars_nouveau/enchantment.js +++ b/kubejs/server_scripts/recipes/ars_nouveau/enchantment.js @@ -17,6 +17,54 @@ ServerEvents.recipes((event) => { ], sourceCost: 9000, id: `${id_prefix}delicate_touch` + }, + { + enchantment: 'apothic_spawners:capturing', + level: 1, + pedestalItems: [ + { tag: 'c:essences/manipulation' }, + { tag: 'c:gems/emerald' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' } + ], + sourceCost: 6000, + id: `${id_prefix}capturing_1` + }, + { + enchantment: 'apothic_spawners:capturing', + level: 2, + pedestalItems: [ + { tag: 'c:essences/manipulation' }, + { tag: 'c:essences/manipulation' }, + { tag: 'c:gems/emerald' }, + { tag: 'c:gems/emerald' }, + { tag: 'c:gems/emerald' }, + { tag: 'c:gems/emerald' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' } + ], + sourceCost: 8000, + id: `${id_prefix}capturing_2` + }, + { + enchantment: 'apothic_spawners:capturing', + level: 3, + pedestalItems: [ + { tag: 'c:essences/manipulation' }, + { tag: 'c:essences/manipulation' }, + { tag: 'c:essences/manipulation' }, + { tag: 'c:storage_blocks/emerald' }, + { tag: 'c:storage_blocks/lapis' }, + { tag: 'c:storage_blocks/lapis' }, + { tag: 'c:storage_blocks/source' }, + { tag: 'c:storage_blocks/source' } + ], + sourceCost: 9000, + id: `${id_prefix}capturing_3` } ]; From c992ae84c3836a2631c34ae9647f7ffc5375596e Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 13:15:52 -0400 Subject: [PATCH 29/37] dark ore miner, more quests --- .../ftbquests/quests/chapters/evilcraft.snbt | 194 ++++++++++-------- config/ftbquests/quests/lang/en_us.snbt | 42 +++- .../client_scripts/emi/world_interactions.js | 6 + .../recipes/enigmatica/shapeless.js | 23 ++- .../server_scripts/recipes/occultism/miner.js | 21 ++ 5 files changed, 186 insertions(+), 100 deletions(-) create mode 100644 kubejs/server_scripts/recipes/occultism/miner.js diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index 485297ca..23fcfdd6 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -19,14 +19,24 @@ id: "ftbquests:custom_icon" } id: "717CCCD239144E0B" - rewards: [{ - id: "38A53B82EA047D18" - item: { - count: 1 - id: "evilcraft:origins_of_darkness" + rewards: [ + { + id: "38A53B82EA047D18" + item: { + count: 1 + id: "evilcraft:origins_of_darkness" + } + type: "item" } - type: "item" - }] + { + id: "6F4A6D93C2DEF3DD" + item: { + count: 1 + id: "minecraft:wet_sponge" + } + type: "item" + } + ] tasks: [{ id: "3C64E92DFA608339" type: "checkmark" @@ -37,32 +47,39 @@ { dependencies: ["717CCCD239144E0B"] id: "3FA7963385E35E27" - rewards: [{ - id: "27A5C20DB89FA7A4" - item: { - count: 1 - id: "minecraft:apple" + rewards: [ + { + id: "7FD03FDAC29E6FA1" + item: { + components: { + "minecraft:stored_enchantments": { + levels: { + "minecraft:fortune": 1 + } + } + } + count: 1 + id: "minecraft:enchanted_book" + } + type: "item" } - type: "item" - }] + { + count: 4 + id: "671BF81CADBB6323" + item: { + count: 1 + id: "evilcraft:dark_gem_crushed" + } + type: "item" + } + ] tasks: [{ id: "0C96286549AD0DD2" item: { count: 1, id: "evilcraft:dark_gem" } type: "item" }] - x: -0.5d - y: 1.5d - } - { - dependencies: ["3FA7963385E35E27"] - id: "48E87B06B04CA4C1" - tasks: [{ - id: "45B84C1C25D27CB5" - item: { count: 1, id: "evilcraft:darkened_apple" } - type: "item" - }] - x: -1.5d - y: 2.5d + x: 2.0d + y: 0.5d } { dependencies: ["1DD5BC5F0F5B996A"] @@ -72,30 +89,52 @@ item: { count: 1, id: "evilcraft:blood_chest" } type: "item" }] - x: 3.5d - y: 2.5d + x: 11.0d + y: 3.0d } { dependencies: ["0C1DCD8850E6857C"] id: "23C86F86A1A4B1E9" - tasks: [{ - id: "72DAB99E1982A79B" - item: { count: 1, id: "evilcraft:colossal_blood_chest" } - type: "item" - }] - x: 3.5d - y: 4.0d + tasks: [ + { + id: "72DAB99E1982A79B" + item: { count: 1, id: "evilcraft:colossal_blood_chest" } + type: "item" + } + { + id: "76F503E41AF60FAF" + item: { count: 1, id: "evilcraft:reinforced_undead_planks" } + type: "item" + } + ] + x: 11.0d + y: 4.5d } { - dependencies: ["717CCCD239144E0B"] + dependencies: ["3FA7963385E35E27"] id: "48271478CA0D3F6B" + rewards: [{ + id: "43E73B7C77DAA598" + item: { + components: { + "cyclopscore:capacity": 16000 + "cyclopscore:fluid_content": { + amount: 10000 + id: "evilcraft:blood" + } + } + count: 1 + id: "evilcraft:dark_tank" + } + type: "item" + }] tasks: [{ id: "18AE9263A3F9B02A" item: { count: 1, id: "evilcraft:blood_extractor" } type: "item" }] - x: 1.5d - y: 0.5d + x: 3.5d + y: -0.5d } { dependencies: ["48271478CA0D3F6B"] @@ -105,19 +144,8 @@ item: { count: 1, id: "evilcraft:dark_power_gem" } type: "item" }] - x: 3.5d - y: 0.5d - } - { - dependencies: ["3FA7963385E35E27"] - id: "64C8F99FC610CED2" - tasks: [{ - id: "3267B5205D761889" - item: { count: 1, id: "evilcraft:dark_gem_crushed" } - type: "item" - }] - x: 0.5d - y: 2.5d + x: 5.5d + y: -0.5d } { dependencies: [ @@ -130,8 +158,8 @@ item: { count: 1, id: "evilcraft:blood_infusion_core" } type: "item" }] - x: 5.0d - y: 1.0d + x: 7.5d + y: 0.0d } { dependencies: ["2C7977E4AE6B627B"] @@ -163,8 +191,8 @@ item: { count: 1, id: "evilcraft:purifier" } type: "item" }] - x: 2.5d - y: 3.0d + x: 10.0d + y: 3.5d } { dependencies: ["1DD5BC5F0F5B996A"] @@ -184,19 +212,19 @@ type: "item" } ] - x: 7.0d - y: 2.0d + x: 14.5d + y: 2.5d } { - dependencies: ["64C8F99FC610CED2"] + dependencies: ["3FA7963385E35E27"] id: "3202466CAE3744A9" tasks: [{ id: "595FF126B994B9DD" item: { count: 1, id: "evilcraft:vengeance_ring" } type: "item" }] - x: 0.5d - y: 3.5d + x: 3.5d + y: 1.5d } { dependencies: ["3202466CAE3744A9"] @@ -246,8 +274,8 @@ item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" } type: "item" }] - x: 1.0d - y: 1.5d + x: 3.5d + y: -1.5d } { dependencies: ["48271478CA0D3F6B"] @@ -257,8 +285,8 @@ item: { count: 1, id: "evilcraft:hardened_blood_shard" } type: "item" }] - x: 3.5d - y: 1.5d + x: 5.5d + y: 0.5d } { dependencies: ["1DD5BC5F0F5B996A"] @@ -268,8 +296,8 @@ item: { count: 1, id: "evilcraft:blood_infuser" } type: "item" }] - x: 5.0d - y: 2.5d + x: 12.5d + y: 3.0d } { dependencies: ["492DA63DEC9663F2"] @@ -279,8 +307,8 @@ item: { count: 1, id: "evilcraft:undead_sapling" } type: "item" }] - x: 6.0d - y: 3.5d + x: 13.5d + y: 4.0d } { dependencies: ["2FB39BF76836FA47"] @@ -290,8 +318,8 @@ item: { count: 1, id: "evilcraft:dark_stick" } type: "item" }] - x: 6.0d - y: 4.5d + x: 13.5d + y: 5.0d } { dependencies: ["492DA63DEC9663F2"] @@ -301,8 +329,8 @@ item: { count: 1, id: "evilcraft:promise_tier_1" } type: "item" }] - x: 5.0d - y: 4.0d + x: 12.5d + y: 4.5d } { dependencies: ["621BA38E3E50B91E"] @@ -319,8 +347,8 @@ type: "item" } ] - x: 4.0d - y: 5.0d + x: 11.5d + y: 5.5d } { dependencies: ["492DA63DEC9663F2"] @@ -337,8 +365,8 @@ type: "item" } ] - x: 6.0d - y: 2.5d + x: 13.5d + y: 3.0d } { dependencies: ["6303A7113DE954DD"] @@ -348,8 +376,8 @@ item: { count: 1, id: "minecraft:spawner" } type: "item" }] - x: 7.0d - y: 3.0d + x: 14.5d + y: 3.5d } { dependencies: ["06F1A8F15128C1D9"] @@ -359,8 +387,8 @@ item: { components: { "evilcraft:world_shared_tank_id": "creative" }, count: 1, id: "evilcraft:entangled_chalice" } type: "item" }] - x: 8.0d - y: 4.0d + x: 15.5d + y: 4.5d } { dependencies: ["48271478CA0D3F6B"] @@ -370,8 +398,8 @@ item: { components: { "minecraft:enchantments": { levels: { "minecraft:looting": 2 } } }, count: 1, id: "evilcraft:vein_sword" } type: "item" }] - x: 2.0d - y: 1.5d + x: 4.5d + y: -1.5d } { dependencies: ["2C7977E4AE6B627B"] diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index ab643adc..71df1ce3 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -1153,6 +1153,7 @@ quest.31129C8D75EFD8E9.quest_desc: ["The Gas-Burning Generator can burn Ethene to produce even more energy. A couple of these combined with some sort of automated crop farm should cover power needs for a good while to come."] quest.31B6AE7706264320.quest_desc: ["causes spirits to do hunger damage instead of physical"] quest.3202466CAE3744A9.quest_desc: ["activate and kill mobs. Gives crazy freaking buffs permanently!"] + quest.3202466CAE3744A9.title: "Spirits" quest.3263757C9A240C70.quest_desc: [ "Chipped offers a multitude of block variants to fit your every decorative need. The Workbenches themselves are equally lovely and can spruce up your interiors quite easily." "" @@ -1604,7 +1605,15 @@ "&a Electric Pump to produce" "&a Heavy Water." ] - quest.3FA7963385E35E27.quest_desc: ["dark ore"] + quest.3FA7963385E35E27.quest_desc: [ + "Getting started with EvilCraft means going mining; quite possibly the evilest activity known. " + "" + "Deep in the bowels of the earth, right around where you’d find Redstone, you’ll find Dark Ore. " + "Breaking it will give you Dark Gems, however you’ll also need Crushed Dark Gems, which only drop if you mine with Fortune." + "" + "&a🛈 Tip: Mining with Fortune drops both " + "&a Dark Gems and Crushed Dark Gems!" + ] quest.3FF6566453299DC1.quest_desc: [ "Applied Energistics is the ultimate storage and logistics solution. Not only does it store items and fluids, but it acts as a controller for external machines by way of its auto crafting system. " "" @@ -1838,9 +1847,9 @@ "&6 injection to fail. Refer to EMI." ] quest.46195E73798357D2.quest_desc: [ - "craft together to combine capacity" + "Dark Tanks have the potential for incredibly dense storage. " "" - "craft with blood extractor to increase blood extractor capacity" + "Each time you craft two together, the total capacity is combined. " ] quest.4660608EBEE31784.quest_desc: [ "A special trade obtained from the Queen, Windy Air can be used to create updrafts that will lift you into the air. These can make an excellent elevator by stacking one atop the other. " @@ -1898,10 +1907,19 @@ "&c explode if improperly cooled!" ] quest.48271478CA0D3F6B.quest_desc: [ - "kill mobs with it in inventory to collect" + "We mentioned the blood, right? Yeah, you’re going to need a lot of it." + "" + "For now, you’ll need to collect it manually, though automated methods are available later." + "" + "Doing so is simple enough; craft a Blood Extractor and keep it in your inventory as you go about your murderous ways. It will slowly fill with blood with each kill." "" - "right click to put blood in world" + "&a🛈 Tip: The capacity of the Blood " + "&a Extractor can be increased by " + "&a crafting it with another Extractor" + "&a or a Dark Tank. " + "&a Do this as much as you like!" ] + quest.48271478CA0D3F6B.title: "Blood" quest.4840F7361DF70516.quest_desc: [ "The QIO System is a massive storage and routing system built on the same technology as the Quantum Entangloporter. Essentially, it acts as a very large chest." "" @@ -1934,7 +1952,6 @@ "&a than their Bronze counterparts." ] quest.487C1E9850772F38.title: "Steel Upgrades" - quest.48E87B06B04CA4C1.quest_desc: ["feed to animal to get anomoly. only used to make the book?"] quest.48F901DB80482CAA.quest_desc: [ "The most basic alchemical processes involve the purification of materials. When simply smelting ore in a furnace, some of the material simply cannot be recovered as it is locked up in minerals that the furnace can’t break down." "" @@ -2632,7 +2649,6 @@ "Be sure to grab a mating pair! Males and Females are distinguished by their tail feathers, with Males having more colorful plumage than Females." ] quest.642CDBB28337670C.title: "Finding and Taming" - quest.64C8F99FC610CED2.quest_desc: ["only from using fortune on dark ore"] quest.6538BD86D9419DD4.quest_desc: [ "Welcome to Theurgy! " "" @@ -3011,7 +3027,17 @@ "Farmland tilled with a Celestigem Hoe will self-harvest and teleport the drops to a bound storage as well. Handy!" ] quest.7163E7EBDB861D72.title: "Advanced Item Collector?" - quest.717CCCD239144E0B.quest_desc: ["https://evilcraft.rubensworks.net/book"] + quest.717CCCD239144E0B.quest_desc: [ + "Welcome to EvilCraft! " + "" + "Here you’ll get to do evil things for the sake of evil. " + "" + "Oh, and there’s a lot of blood. So much blood. " + "" + "No, really, that scene from The Shining has nothing on how much blood there is here." + "" + "[\"The mod comes with a book, however you can also access all pertinent information on their \",{\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://evilcraft.rubensworks.net/book/\"},\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\":\"Wiki\",\"underlined\":true},\".\"]" + ] quest.717CCCD239144E0B.title: "EvilCraft" quest.7220A9770C3E1C6F.quest_desc: [ "The Inscriber will be the primary machine you’ll be working with to produce crafting components; the various Processors are used extensively throughout Applied Energistics." diff --git a/kubejs/client_scripts/emi/world_interactions.js b/kubejs/client_scripts/emi/world_interactions.js index 59933662..b9d8677a 100644 --- a/kubejs/client_scripts/emi/world_interactions.js +++ b/kubejs/client_scripts/emi/world_interactions.js @@ -251,6 +251,12 @@ ClientEvents.generateAssets('before_mods', (event) => { } ], id: 'evilcraft:dark_gem_crushed' + }, + { + left: 'item:evilcraft:environmental_accumulator', + right: '#item:minecraft:pickaxes', + output: 'item:evilcraft:environmental_accumulation_core', + id: 'evilcraft:environmental_accumulation_core' } ]; diff --git a/kubejs/server_scripts/recipes/enigmatica/shapeless.js b/kubejs/server_scripts/recipes/enigmatica/shapeless.js index f2bafea4..cebdd18a 100644 --- a/kubejs/server_scripts/recipes/enigmatica/shapeless.js +++ b/kubejs/server_scripts/recipes/enigmatica/shapeless.js @@ -3,22 +3,22 @@ ServerEvents.recipes((event) => { const recipes = [ { - output: Item.of('minecraft:brown_dye', 2), + output: '2x minecraft:brown_dye', inputs: ['#c:dyes/green', '#c:dyes/red'], id: `${id_prefix}brown_dye_from_green_red` }, { - output: Item.of('minecraft:brown_dye', 3), + output: '2x minecraft:brown_dye', inputs: ['#c:dyes/blue', '#c:dyes/red', '#c:dyes/yellow'], id: `${id_prefix}brown_dye_from_blue_red_yellow` }, { - output: Item.of('minecraft:green_dye', 2), + output: '2x minecraft:green_dye', inputs: ['#c:dyes/blue', '#c:dyes/yellow'], id: `${id_prefix}green_dye_from_blue_yellow` }, { - output: Item.of('minecraft:green_dye', 1), + output: 'minecraft:green_dye', inputs: [ 'minecraft:short_grass', 'minecraft:short_grass', @@ -28,22 +28,22 @@ ServerEvents.recipes((event) => { id: `${id_prefix}green_dye_from_short_grass` }, { - output: Item.of('minecraft:yellow_dye', 2), + output: '2x minecraft:yellow_dye', inputs: ['#c:dusts/sulfur'], id: `${id_prefix}yellow_dye_from_sulfur` }, { - output: Item.of('minecraft:yellow_dye', 1), + output: 'minecraft:yellow_dye', inputs: ['productivetrees:fustic'], id: `${id_prefix}yellow_dye_from_fustic` }, { - output: Item.of('minecraft:red_dye', 1), + output: 'minecraft:red_dye', inputs: ['productivetrees:dracaena_sap'], id: `${id_prefix}red_dye_from_dracaena_sap` }, { - output: Item.of('minecraft:reinforced_deepslate', 1), + output: 'minecraft:reinforced_deepslate', inputs: [ 'minecraft:polished_deepslate', '#c:ingots/iron', @@ -54,7 +54,7 @@ ServerEvents.recipes((event) => { id: `${id_prefix}reinforced_deepslate` }, { - output: Item.of('minecraft:name_tag', 2), + output: '2x minecraft:name_tag', inputs: ['#c:strings', 'minecraft:paper'], id: `${id_prefix}name_tag` }, @@ -62,6 +62,11 @@ ServerEvents.recipes((event) => { output: 'minecraft:dead_bush', inputs: ['#minecraft:saplings', 'minecraft:shears'], id: `${id_prefix}dead_bush` + }, + { + output: '4x minecraft:quartz', + inputs: ['#c:storage_blocks/quartz'], + id: `${id_prefix}quartz` } ]; diff --git a/kubejs/server_scripts/recipes/occultism/miner.js b/kubejs/server_scripts/recipes/occultism/miner.js new file mode 100644 index 00000000..ceede5ca --- /dev/null +++ b/kubejs/server_scripts/recipes/occultism/miner.js @@ -0,0 +1,21 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:occultism/miner/'; + + const recipes = [ + { + ingredient: { tag: 'occultism:miners/ores' }, + result: { + type: 'occultism:weighted_tag', + tag: 'c:ores/dark_gem', + count: 1, + weight: 187 + }, + id: `${id_prefix}dark_gem` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'occultism:miner'; + event.custom(recipe).id(recipe.id); + }); +}); From c0c91830785fa429306c4cfa701c358c554c63ad Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 16:15:55 -0400 Subject: [PATCH 30/37] config updates, quests, and documentation --- config/ars_elemental-common.toml | 171 +++++++------ .../ars_elemental/glyph_nullify_defense.toml | 24 ++ config/arsomega/glyph_missile.toml | 24 ++ config/arsomega/glyph_propagate_missile.toml | 24 ++ .../ftbquests/quests/chapters/evilcraft.snbt | 236 +++++++++++------- config/ftbquests/quests/lang/en_us.snbt | 182 ++++++++++++-- .../reward_tables/4C3908A1EDE782F7.snbt | 4 +- config/not_enough_glyphs/glyph_momentum.toml | 26 ++ .../client_scripts/emi/world_interactions.js | 22 ++ kubejs/server_scripts/recipe_viewer/info.js | 16 ++ .../recipes/evilcraft/blood_infuser.js | 38 +++ ...ng_shaped_custom_output_dark_tank_large.js | 2 +- .../tags/block/minecraft/sword_efficient.js | 4 + .../pneumaticcraft/electrostatic_grid.js | 11 +- .../tags/block/the_bumblezone/biomes.js | 5 + .../block/the_bumblezone/hanging_garden.js | 4 + .../tags/block/the_bumblezone/honitel.js | 4 + .../tags/block/the_bumblezone/pollen_puff.js | 4 + .../tags/block/the_bumblezone/rootmin.js | 5 + .../the_bumblezone/sempiternal_sanctum.js | 4 + .../tags/block/the_bumblezone/tree_dungeon.js | 4 + .../tags/item/cursedearth/spreadable.js | 4 + .../tags/item/minecraft/small_flowers.js | 4 + 23 files changed, 616 insertions(+), 206 deletions(-) create mode 100644 config/ars_elemental/glyph_nullify_defense.toml create mode 100644 config/arsomega/glyph_missile.toml create mode 100644 config/arsomega/glyph_propagate_missile.toml create mode 100644 config/not_enough_glyphs/glyph_momentum.toml create mode 100644 kubejs/server_scripts/recipes/evilcraft/blood_infuser.js create mode 100644 kubejs/server_scripts/tags/block/minecraft/sword_efficient.js create mode 100644 kubejs/server_scripts/tags/block/the_bumblezone/biomes.js create mode 100644 kubejs/server_scripts/tags/block/the_bumblezone/hanging_garden.js create mode 100644 kubejs/server_scripts/tags/block/the_bumblezone/honitel.js create mode 100644 kubejs/server_scripts/tags/block/the_bumblezone/pollen_puff.js create mode 100644 kubejs/server_scripts/tags/block/the_bumblezone/rootmin.js create mode 100644 kubejs/server_scripts/tags/block/the_bumblezone/sempiternal_sanctum.js create mode 100644 kubejs/server_scripts/tags/block/the_bumblezone/tree_dungeon.js create mode 100644 kubejs/server_scripts/tags/item/cursedearth/spreadable.js create mode 100644 kubejs/server_scripts/tags/item/minecraft/small_flowers.js diff --git a/config/ars_elemental-common.toml b/config/ars_elemental-common.toml index f8e0e7d9..6bb5c035 100644 --- a/config/ars_elemental-common.toml +++ b/config/ars_elemental-common.toml @@ -1,89 +1,98 @@ -#Adjust this value to define how much the matching spell cost gets discounted by the greater focus -#Range: 0.0 ~ 0.99 -"Elemental Focus discount" = 0.25 +#Enable iframe skip glyph recipe +frame_skip_recipe = false -#Adjust these values to balance how much a spell gets amplified by the matching spell focus, doubled for major foci. -["Elemental Spell Foci - Amplify"] - "Fire Focus buff" = 1.0 - "Water Focus buff" = 1.0 - "Air Focus buff" = 1.0 - "Earth Focus buff" = 1.0 +#Adjust these values to balance how much the matching spell cost gets discounted by foci. +["Elemental Spell Foci - Discount"] + #Adjust this value to define how much the matching spell cost gets discounted by the lesser focus + #Range: 0.0 ~ 0.99 + elemental_less_focus_discount = 0.15 + #Adjust this value to define how much the matching spell cost gets discounted by the greater focus + #Range: 0.0 ~ 0.99 + elemental_maj_focus_discount = 0.25 -#Adjust these values to balance how much an elemental spell gets dampened by a not-matching lesser spell focus -["Elemental Spell Foci - Dampening"] - "Fire Focus debuff" = -1.0 - "Water Focus debuff" = -1.0 - "Air Focus debuff" = -1.0 - "Earth Focus debuff" = -1.0 + #Adjust these values to balance how much a spell gets amplified by the matching spell focus, doubled for major foci. + ["Elemental Spell Foci - Discount"."Elemental Spell Foci - Amplify"] + fire_focus_buff = 1.0 + water_focus_buff = 1.0 + air_focus_buff = 1.0 + earth_focus_buff = 1.0 -#Enable or disable the passive bonus of the foci -["Elemental Spell Foci - Abilities"] - "Enable glyph empowering" = true - "Enable regen bonus under special conditions" = true - "Enable iframe skip combos" = true + #Adjust these values to balance how much an elemental spell gets dampened by a not-matching lesser spell focus + ["Elemental Spell Foci - Discount"."Elemental Spell Foci - Dampening"] + fire_focus_debuff = -1.0 + water_focus_debuff = -1.0 + air_focus_debuff = -1.0 + earth_focus_debuff = -1.0 -#Adjust Elemental Armor Mana Buffs -["Elemental Armors"] - #Max mana bonus for each elemental armor piece - #Range: 0 ~ 10000 - armorMaxMana = 100 - #Mana regen bonus for each elemental armor piece - #Range: 0 ~ 100 - armorManaRegen = 4 + #Enable or disable the passive bonus of the foci + ["Elemental Spell Foci - Discount"."Elemental Spell Foci - Abilities"] + #Enable glyph empowering + glyph_empower = true + #Enable regen bonus under special conditions + regen_bonus = true -["Mermaid Fishing"] - #How much source mermaids consume per generation - #Range: 0 ~ 10000 - mermaidManaCost = 1000 - #How many channels must occur before a siren produces loot. - #Range: 0 ~ 300 - mermaidMaxProgress = 30 - #Max number of extra item rolls a shrine produces if the mood is high. - #Range: 0 ~ 10 - mermaidScoreBonus = 2 - #Chance multiplier to produce a treasure relative to the siren shrine score. - #Range: 0.0 ~ 1.0 - mermaidTreasureBonus = 0.002 - #Base number of items rolls a shrine produces per cycle. - #Range: 0 ~ 300 - mermaidBaseItems = 1 - #Max number of items a siren shrine can produce per cycle. - #Range: 0 ~ 300 - mermaidQuantityCap = 5 + #Adjust Elemental Armor Mana Buffs + ["Elemental Spell Foci - Discount"."Elemental Armors"] + #Max mana bonus for each elemental armor piece + #Range: 0 ~ 10000 + armorMaxMana = 100 + #Mana regen bonus for each elemental armor piece + #Range: 0 ~ 100 + armorManaRegen = 4 -["Source cost"] - #How much source does the water urn consume. - #Range: 0 ~ 10000 - waterUrnCost = 100 - #How much source does the slipstream elevator consume. - #Range: 0 ~ 1000 - airElevatorCost = 10 - #How much source does the bubble elevator consume. - #Range: 0 ~ 1000 - waterElevatorCost = 0 - #How much source does the magmatic elevator consume. - #Range: 0 ~ 1000 - lavaElevatorCost = 0 + ["Elemental Spell Foci - Discount"."Mermaid Fishing"] + #How much source mermaids consume per generation + #Range: 0 ~ 10000 + mermaidManaCost = 1000 + #How many channels must occur before a siren produces loot. + #Range: 0 ~ 300 + mermaidMaxProgress = 30 + #Max number of extra item rolls a shrine produces if the mood is high. + #Range: 0 ~ 10 + mermaidScoreBonus = 2 + #Chance multiplier to produce a treasure relative to the siren shrine score. + #Range: 0.0 ~ 1.0 + mermaidTreasureBonus = 0.002 + #Base number of items rolls a shrine produces per cycle. + #Range: 0 ~ 300 + mermaidBaseItems = 1 + #Max number of items a siren shrine can produce per cycle. + #Range: 0 ~ 300 + mermaidQuantityCap = 5 -[Misc] - #If enabled, flarecannons will simply die and drop the charm, instead of deactivating, if killed by their owner - flarecannon_owner_kill = true - #Set over 0 to enable archwood forests with specific trees - #Range: 0 ~ 100 - extra_biomes = 0 - #Set to false to disable the lightning crashing often on flashing archwood biome(s). - always_thunder = true - #If enabled, homing will be able to target mobs only if they're glowing - homing_nerf = false - #Define the refresh rate of the Squirrel Ritual buff, in ticks. - #Range: > 1 - squirrelRefreshRate = 600 - #If enabled, soulbound enchantment can appear in randomly enchanted loot chests. - soulbound_loot = true - #Define the maximum number of pierce that a lens can apply to a spell. - #Range: > 1 - pierceLensLimit = 10 + ["Elemental Spell Foci - Discount"."Source cost"] + #How much source does the water urn consume. + #Range: 0 ~ 10000 + waterUrnCost = 100 + #How much source does the slipstream elevator consume. + #Range: 0 ~ 1000 + airElevatorCost = 10 + #How much source does the bubble elevator consume. + #Range: 0 ~ 1000 + waterElevatorCost = 0 + #How much source does the magmatic elevator consume. + #Range: 0 ~ 1000 + lavaElevatorCost = 0 -[Mobs-Disabled] - #If true, the wandering mages will target players too, unless they wear the focus of the same school. - magesAggro = true + ["Elemental Spell Foci - Discount".Misc] + #If enabled, flarecannons will simply die and drop the charm, instead of deactivating, if killed by their owner + flarecannon_owner_kill = true + #Set over 0 to enable archwood forests with specific trees + #Range: 0 ~ 100 + extra_biomes = 0 + #Set to false to disable the lightning crashing often on flashing archwood biome(s). + always_thunder = true + #If enabled, homing will be able to target mobs only if they're glowing + homing_nerf = false + #Define the refresh rate of the Squirrel Ritual buff, in ticks. + #Range: > 1 + squirrelRefreshRate = 600 + #If enabled, soulbound enchantment can appear in randomly enchanted loot chests. + soulbound_loot = true + #Define the maximum number of pierce that a lens can apply to a spell. + #Range: > 1 + pierceLensLimit = 10 + + ["Elemental Spell Foci - Discount".Mobs-Disabled] + #If true, the wandering mages will target players too, unless they wear the focus of the same school. + magesAggro = true diff --git a/config/ars_elemental/glyph_nullify_defense.toml b/config/ars_elemental/glyph_nullify_defense.toml new file mode 100644 index 00000000..b764e9ce --- /dev/null +++ b/config/ars_elemental/glyph_nullify_defense.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = false + #Cost + #Range: > -2147483648 + cost = 1000 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 3 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/arsomega/glyph_missile.toml b/config/arsomega/glyph_missile.toml new file mode 100644 index 00000000..bc6537e0 --- /dev/null +++ b/config/arsomega/glyph_missile.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 20 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Max lifespan of the projectile, in seconds. + #Range: > 0 + max_lifespan = 60 diff --git a/config/arsomega/glyph_propagate_missile.toml b/config/arsomega/glyph_propagate_missile.toml new file mode 100644 index 00000000..5aaa0675 --- /dev/null +++ b/config/arsomega/glyph_propagate_missile.toml @@ -0,0 +1,24 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 200 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + 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 = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = [] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index 23fcfdd6..e48738cc 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -82,15 +82,15 @@ y: 0.5d } { - dependencies: ["1DD5BC5F0F5B996A"] + dependencies: ["492DA63DEC9663F2"] id: "0C1DCD8850E6857C" tasks: [{ id: "5E0A44ED0D2E3AAD" item: { count: 1, id: "evilcraft:blood_chest" } type: "item" }] - x: 11.0d - y: 3.0d + x: 5.5d + y: 1.5d } { dependencies: ["0C1DCD8850E6857C"] @@ -102,13 +102,14 @@ type: "item" } { + count: 25L id: "76F503E41AF60FAF" item: { count: 1, id: "evilcraft:reinforced_undead_planks" } type: "item" } ] - x: 11.0d - y: 4.5d + x: 6.0d + y: 2.5d } { dependencies: ["3FA7963385E35E27"] @@ -133,8 +134,8 @@ item: { count: 1, id: "evilcraft:blood_extractor" } type: "item" }] - x: 3.5d - y: -0.5d + x: 3.0d + y: 0.0d } { dependencies: ["48271478CA0D3F6B"] @@ -144,58 +145,62 @@ item: { count: 1, id: "evilcraft:dark_power_gem" } type: "item" }] - x: 5.5d + x: 4.5d y: -0.5d } - { - dependencies: [ - "4ACCED64D436209E" - "77B7679AFE090140" - ] - id: "1DD5BC5F0F5B996A" - tasks: [{ - id: "7E31F075AA877754" - item: { count: 1, id: "evilcraft:blood_infusion_core" } - type: "item" - }] - x: 7.5d - y: 0.0d - } { dependencies: ["2C7977E4AE6B627B"] id: "0751B009795D7889" - tasks: [{ - id: "3D4070B43CEF452C" - item: { count: 1, id: "evilcraft:spirit_furnace" } - type: "item" - }] - x: -0.5d - y: 5.5d + tasks: [ + { + id: "3D4070B43CEF452C" + item: { count: 1, id: "evilcraft:spirit_furnace" } + type: "item" + } + { + count: 25L + id: "4FAB6D115849A2D7" + item: { count: 25, id: "evilcraft:dark_blood_brick" } + type: "item" + } + ] + x: 2.0d + y: 3.0d } { - dependencies: ["0751B009795D7889"] + dependencies: ["6303A7113DE954DD"] id: "73A71BBB9D9168B0" tasks: [{ id: "4ADB8982A8F6B9CC" item: { count: 1, id: "evilcraft:spirit_reanimator" } type: "item" }] - x: -0.5d - y: 6.5d + x: 8.5d + y: -1.0d } { dependencies: ["0C1DCD8850E6857C"] + icon: { + id: "evilcraft:purifier" + } id: "0988DC06DD5A6935" - tasks: [{ - id: "02ACBA14ED31AF33" - item: { count: 1, id: "evilcraft:purifier" } - type: "item" - }] - x: 10.0d - y: 3.5d + tasks: [ + { + id: "02ACBA14ED31AF33" + item: { count: 1, id: "evilcraft:purifier" } + type: "item" + } + { + id: "39FB4ABE44E04998" + item: { count: 1, id: "evilcraft:blook" } + type: "item" + } + ] + x: 5.0d + y: 2.5d } { - dependencies: ["1DD5BC5F0F5B996A"] + dependencies: ["4DE1B1045507C72C"] icon: { id: "evilcraft:sanguinary_environmental_accumulator" } @@ -207,13 +212,14 @@ type: "item" } { + count: 8L id: "7DD57170FE79CA23" item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" } type: "item" } ] - x: 14.5d - y: 2.5d + x: 9.5d + y: 1.0d } { dependencies: ["3FA7963385E35E27"] @@ -223,8 +229,8 @@ item: { count: 1, id: "evilcraft:vengeance_ring" } type: "item" }] - x: 3.5d - y: 1.5d + x: 3.0d + y: 1.0d } { dependencies: ["3202466CAE3744A9"] @@ -241,8 +247,8 @@ type: "item" } ] - x: 0.5d - y: 4.5d + x: 3.0d + y: 2.0d } { dependencies: ["2C7977E4AE6B627B"] @@ -252,19 +258,19 @@ item: { count: 1, id: "evilcraft:burning_gem_stone" } type: "item" }] - x: 1.5d - y: 4.0d + x: 4.0d + y: 3.0d } { - dependencies: ["2C7977E4AE6B627B"] + dependencies: ["66BC8A8EB33B0677"] id: "0AEF5FB6530F4D65" tasks: [{ id: "2E3A222E226F1ECE" item: { count: 1, id: "evilcraft:spectral_glasses" } type: "item" }] - x: 1.5d - y: 5.0d + x: 3.0d + y: 4.5d } { dependencies: ["48271478CA0D3F6B"] @@ -274,30 +280,34 @@ item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" } type: "item" }] - x: 3.5d - y: -1.5d + x: 3.0d + y: -1.0d } { dependencies: ["48271478CA0D3F6B"] id: "77B7679AFE090140" tasks: [{ + count: 8L id: "1E3CC0EDCD950B3A" item: { count: 1, id: "evilcraft:hardened_blood_shard" } type: "item" }] - x: 5.5d + x: 4.5d y: 0.5d } { - dependencies: ["1DD5BC5F0F5B996A"] + dependencies: [ + "4ACCED64D436209E" + "77B7679AFE090140" + ] id: "492DA63DEC9663F2" tasks: [{ id: "7D02DAD836B3B3B1" item: { count: 1, id: "evilcraft:blood_infuser" } type: "item" }] - x: 12.5d - y: 3.0d + x: 5.5d + y: 0.0d } { dependencies: ["492DA63DEC9663F2"] @@ -307,19 +317,34 @@ item: { count: 1, id: "evilcraft:undead_sapling" } type: "item" }] - x: 13.5d - y: 4.0d + x: 6.5d + y: 1.0d } { dependencies: ["2FB39BF76836FA47"] + icon: { + id: "evilcraft:environmental_accumulator" + } id: "4DE1B1045507C72C" - tasks: [{ - id: "102B6984636C38E5" - item: { count: 1, id: "evilcraft:dark_stick" } - type: "item" - }] - x: 13.5d - y: 5.0d + tasks: [ + { + id: "102B6984636C38E5" + item: { count: 1, id: "evilcraft:dark_stick" } + type: "item" + } + { + icon: { + id: "evilcraft:environmental_accumulator" + } + id: "14C031FA14C3CD89" + observe_type: 0 + timer: 0L + to_observe: "evilcraft:environmental_accumulator" + type: "observation" + } + ] + x: 7.5d + y: 1.0d } { dependencies: ["492DA63DEC9663F2"] @@ -329,12 +354,13 @@ item: { count: 1, id: "evilcraft:promise_tier_1" } type: "item" }] - x: 12.5d - y: 4.5d + x: 6.5d + y: 0.0d } { dependencies: ["621BA38E3E50B91E"] id: "4F480CF26AB0F3CD" + min_width: 250 tasks: [ { id: "2C0CD473FF75BDE1" @@ -347,12 +373,23 @@ type: "item" } ] - x: 11.5d - y: 5.5d + x: 7.5d + y: 0.0d } { dependencies: ["492DA63DEC9663F2"] + icon: { + id: "evilcraft:spiked_plate" + } id: "6303A7113DE954DD" + rewards: [{ + id: "11878B23BEE0008F" + item: { + count: 1 + id: "minecraft:wither_rose" + } + type: "item" + }] tasks: [ { id: "78D54A3DA95B9DD8" @@ -365,8 +402,8 @@ type: "item" } ] - x: 13.5d - y: 3.0d + x: 6.5d + y: -1.0d } { dependencies: ["6303A7113DE954DD"] @@ -376,41 +413,62 @@ item: { count: 1, id: "minecraft:spawner" } type: "item" }] - x: 14.5d - y: 3.5d + x: 7.5d + y: -1.0d } { - dependencies: ["06F1A8F15128C1D9"] + dependencies: ["46195E73798357D2"] id: "14555CEDF53F68FC" tasks: [{ id: "382BDC0A6C24BAF0" item: { components: { "evilcraft:world_shared_tank_id": "creative" }, count: 1, id: "evilcraft:entangled_chalice" } type: "item" }] - x: 15.5d - y: 4.5d + x: 4.0d + y: -1.5d } { - dependencies: ["48271478CA0D3F6B"] - id: "30D6FE1B0EC82066" + dependencies: ["2C7977E4AE6B627B"] + icon: { + id: "evilcraft:vengeance_essence" + } + id: "66BC8A8EB33B0677" + tasks: [ + { + id: "276C28694B2C7999" + item: { count: 1, id: "evilcraft:piercing_vengeance_focus" } + type: "item" + } + { + id: "6312FF28AB988EA4" + item: { count: 1, id: "evilcraft:vengeance_essence" } + type: "item" + } + ] + x: 3.0d + y: 3.5d + } + { + dependencies: ["4DE1B1045507C72C"] + id: "64B786FE65505D75" tasks: [{ - id: "09C7F4550E2EFA11" - item: { components: { "minecraft:enchantments": { levels: { "minecraft:looting": 2 } } }, count: 1, id: "evilcraft:vein_sword" } + id: "216635D2BAD048E1" + item: { count: 1, id: "evilcraft:biome_extract" } type: "item" }] - x: 4.5d - y: -1.5d + x: 8.5d + y: 0.5d } { - dependencies: ["2C7977E4AE6B627B"] - id: "66BC8A8EB33B0677" + dependencies: ["4DE1B1045507C72C"] + id: "5F0523F799DA720C" tasks: [{ - id: "276C28694B2C7999" - item: { count: 1, id: "evilcraft:piercing_vengeance_focus" } + id: "51B800771C0A3ACB" + item: { components: { "evilcraft:weather_container_type": "EMPTY" }, count: 1, id: "evilcraft:weather_container" } type: "item" }] - x: 0.5d - y: 6.0d + x: 8.5d + y: 1.5d } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 71df1ce3..6045b8a8 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -127,8 +127,21 @@ "&a🛈 Tip: Starbuncles can be filtered with " "&a Allow/Deny Scrolls!" ] - quest.06F1A8F15128C1D9.quest_desc: ["spawners can be moved with silk touch"] - quest.0751B009795D7889.quest_desc: ["https://evilcraft.rubensworks.net/book/second_age/abusing_spirits/spirit_furnace.html"] + quest.06F1A8F15128C1D9.quest_desc: [ + "While not part of EvilCraft, it’s worth a mention here that Mob Spawners can be moved with Silk Touch and even upgraded! " + "" + "Check out the Uses on Mob Spawners in EMI to find what items add which augments." + ] + quest.0751B009795D7889.quest_desc: [ + "The Spirit Furnace is a large multiblock structure used to endlessly extract loot drops from a Spirit you’ve stored in a Box of Eternal Closure. " + "" + "The structure itself should minimally be a hollow 3x3x3 rectangular prism of Dark Blood Bricks. The Spirit Furnace block can be installed in any wall." + "" + "Larger mobs will require a larger structure, as if the mob itself were inside the structure. So, a Ghast will need considerably more room than a Pig!" + "" + "&a🛈 Tip: The Spirit Furnace built as large" + "&a as a 9x9x9 rectangular prism." + ] quest.07684F58521A4D34.quest_desc: [ "Playing with friends? " "" @@ -169,7 +182,13 @@ "" "&6⚠ Note: Spells may contain up to thirty glyphs." ] - quest.0988DC06DD5A6935.quest_desc: ["removes curses from equipement corrupted by the blood chest"] + quest.0988DC06DD5A6935.quest_desc: [ + "Have a curse you’d like to remove from your tool? Toss it in the Purifier with some Blood to get it cleansed away." + "" + "The Purifier can also be used to transfer Enchantments from one item to another. " + "" + "Simply insert the item and a Blook into the Purifier and it’ll transfer one random Enchantment to the Blook which can then be re-applied to another tool in an Anvil." + ] quest.09B6773CDA5A7565.quest_desc: [ "The Enchanting Apparatus will likely be the next device you’ll wish to set up as it’s used for many more advanced crafts, upgrading equipment, and applying enchantments!" "" @@ -219,7 +238,7 @@ "" "If you inserted the Sulfurs already, the process should begin immediately and light effects will flow from the Emitter through each Pedestal." ] - quest.0AEF5FB6530F4D65.quest_desc: ["causes spirits to ignore you"] + quest.0AEF5FB6530F4D65.quest_desc: ["With Spectral Glasses equipped, non-hostile Spirits will completely ignore your presence, so long as you remain polite."] quest.0B04BC5F88746182.quest_desc: ["The following are full-blown storage systems that hold many types of items and present them in a single easy-to-browse and searchable interface. "] quest.0B04BC5F88746182.title: "Storage Systems" quest.0B05FA716D7335D2.quest_desc: [ @@ -258,7 +277,11 @@ "&a Helix in EMI to see what mobs it " "&a comes from!" ] - quest.0C1DCD8850E6857C.quest_desc: ["repairs items but sometimes curses them"] + quest.0C1DCD8850E6857C.quest_desc: [ + "The Blood Chest is an excellent tool to have around any home. Supply it with Blood and bathe your worn-out tools in it to slowly mend them back to their original state." + "" + "This process has been known to Curse the items during the process! " + ] quest.0CBCE3A0D149AED0.quest_desc: [ "Where prior tiers have primarily focused on bootstrapping technology, the EV Tier is where we’ll get into the nuclear sciences, both for material processing and for power production. " "&n &r" @@ -488,7 +511,15 @@ ] quest.1447C4568B9A1606.quest_desc: ["[\"From there, the Sulfur will need to be \",{ \"text\": \"Incubated\", \"underlined\": true, \"clickEvent\": { \"action\": \"change_page\", \"value\": \"59A56F3053A30126\" },\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]} },\" back into an ingot.\"]"] quest.1447C4568B9A1606.title: "Incubation" - quest.14555CEDF53F68FC.quest_desc: ["basically ender tanks"] + quest.14555CEDF53F68FC.quest_desc: [ + "The Entangled Chalice allows Blood or other fluids to be shared, with each pair of Chalices sharing the same inventory." + "" + "Chalices are always crafted in linked pairs. However, if you wish to add another Chalice to a network, use one of the Chalices from that network in the center of the craft. " + "" + "&a🛈 Tip: A Chalice in your inventory can " + "&a be used to autofill other containers " + "&a in your inventory!" + ] quest.14688BF9C4B5766C.quest_desc: [ "Player Transmitters wirelessly charge FE based items and equipment in your inventory. " "" @@ -526,7 +557,15 @@ "" "[\"Read more about this system in the dedicated \",{\"clickEvent\":{ \"action\": \"change_page\", \"value\": \"4D1E38918B64CD4E\" },\"color\":\"green\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":[{\"text\":\"Click Here\"}]},\"text\": \"Mekanism\",\"underlined\":true},\" chapter. \"]" ] - quest.14DEE45EA9666015.quest_desc: ["This machine requires a hefty amount of Blood to work, that is why you will need 8 Blood tanks of any type spread around the machine as can be seen in the following image. This machine will not work without those tanks, smoke effects can be seen at the locations where the tanks are supposed to be placed."] + quest.14DEE45EA9666015.quest_desc: [ + "Prefer having an Environmental Accumulator at home? Or perhaps you'd like to collect the essence of a particular biome instead?" + "" + "Breaking the Environmental Accumulator found in a Dark Temple will not give you the block, but it will give you an item you can use to craft this Blood fueled alternative." + "" + "This device uses an impressive amount of Blood to do its job, and it must be supplied through 8 tanks placed in a ring around the device." + "" + "Once you've placed the Accumulator, look for Smoke Particles which highlight the expected placement of Dark Tanks." + ] quest.156DEEC0CB40D7DB.quest_desc: [ "Allows multiple Force Field Projectors to work together to cover a larger area, while allowing free passage between them. " "" @@ -876,10 +915,9 @@ "&a Infuser to an Infuse Material." ] quest.23C86F86A1A4B1E9.quest_desc: [ - "improved blood chest, no curses, faster, takes promises" + "The Colossal Blood Chest is an improved version of the Blood Chest with none of the side effects. Not only does it work faster by default, but it also accepts Promises as upgrades." "" - "" - "To build this, make a hollow 3x3x3 structure of Reinforced Undead Planks. For the structure to form, your need exactly one Colossal Blood Chest block somewhere in the structure wall, make sure not to place it in the middle of the structure, as it must remain hollow." + "To construct the Colossal Blood Chest multiblock, you’ll need to build a 3x3x3 hollow cube of Reinforced Undead Planks with the Colossal Blood Chest installed in any wall. " ] quest.23FF0CA316B2CB5D.quest_desc: [ "The Large Tank is a Modern Industrialization multi-block capable of holding massive amounts of fluids." @@ -1089,9 +1127,13 @@ "&a processed." ] quest.2C7977E4AE6B627B.quest_desc: [ - "kill mob with vengeance ring" - "place box and open" - "shoot with vengeance focus to get it ghost busted into the box" + "Before you go on a killing spree, you’ll want to make a few more tools. " + "" + "First, you’ll want a Box of Eternal Closure. This acts as a trap for the Spirit you’ll unleash, allowing it to be used within certain machinery." + "" + "Next, you’ll want a Vengeance Focus. This tool is used to guide a Spirit into your Box of Eternal Closure, trapping them." + "" + "To use the Focus, simply press and hold Right-Click. You’ll see a stream of particles that you’ll want to aim at the Spirit. Hold it long enough and the Spirit will be absorbed by the Box." ] quest.2C84374CBB186FE2.quest_desc: [ "With Creosote comes the ability to make Lubricant, and Lubricant allows running a Cutting Machine to make Rods and Bolts. Yes, now you can set aside your Forge Hammer for good!" @@ -1122,6 +1164,11 @@ ] quest.2F898C0C2DF380AE.quest_desc: ["The following are bulk energy storage units."] quest.2F898C0C2DF380AE.title: "Bulk Energy Storage" + quest.2FB39BF76836FA47.quest_desc: [ + "With all these Zombies and Skeletons walking around, is it really a surprise that Undeath has spread to the foliage as well?" + "" + "Craft an Undead Sapling in your Blood Infuser and grow it to obtain Undead Wood. This special wood is an important resource for other crafts." + ] quest.309083107758B10C.quest_desc: [ "Now that you’ve got your first Spell Book, let’s see about adding some extra glyphs to spice things up." "" @@ -1151,8 +1198,16 @@ "&6 knowledge." ] quest.31129C8D75EFD8E9.quest_desc: ["The Gas-Burning Generator can burn Ethene to produce even more energy. A couple of these combined with some sort of automated crop farm should cover power needs for a good while to come."] - quest.31B6AE7706264320.quest_desc: ["causes spirits to do hunger damage instead of physical"] - quest.3202466CAE3744A9.quest_desc: ["activate and kill mobs. Gives crazy freaking buffs permanently!"] + quest.31B6AE7706264320.quest_desc: [ + "Spirits aren’t particularly strong, but they can cause a small amount of damage if you come into direct contact with one. " + "" + "A Burning GemStone can absorb that damage, instead causing you to lose some hunger. " + ] + quest.3202466CAE3744A9.quest_desc: [ + "The manipulation of Spirits is an important part of being Evil. You’ll need some tools to interact with them, however." + "" + "To begin, you’ll need to craft a Vengeance Ring. Sneak + Right-Click it to activate it, granting you several potent buffs and the ability to see the Spirits of the creatures you kill. " + ] quest.3202466CAE3744A9.title: "Spirits" quest.3263757C9A240C70.quest_desc: [ "Chipped offers a multitude of block variants to fit your every decorative need. The Workbenches themselves are equally lovely and can spruce up your interiors quite easily." @@ -1916,8 +1971,7 @@ "&a🛈 Tip: The capacity of the Blood " "&a Extractor can be increased by " "&a crafting it with another Extractor" - "&a or a Dark Tank. " - "&a Do this as much as you like!" + "&a or a Dark Tank." ] quest.48271478CA0D3F6B.title: "Blood" quest.4840F7361DF70516.quest_desc: [ @@ -1968,6 +2022,11 @@ "" "So, if you’ve set up a crazy mob spawner in The End, maybe consider using this and a Vitalic Sourcelink to bring back all that delicious Source." ] + quest.492DA63DEC9663F2.quest_desc: [ + "With your dark powers combined, you’ll finally be able to craft a Blood Infuser. " + "" + "This’ll make the previous process a little less messy, and a considerable amount cheaper. " + ] quest.49878D1219A63A4E.quest_desc: [ "Just another solar panel. It produces power during daylight hours and works best if paired with an Energy Cube or other power storage device." "" @@ -2009,7 +2068,16 @@ "" "Our end goal here will be Rare Metal Niter." ] - quest.4ACCED64D436209E.quest_desc: ["throw dark gem in 5 buckets of blood to get "] + quest.4ACCED64D436209E.quest_desc: [ + "Obtaining Dark Gems is, for now, a very bloody mess. " + "" + "Dump out five buckets of Blood on the ground and toss in a Dark Gem. " + "" + "You’ll need to be somewhat quick about this process, as Blood will slowly coagulate into Hardened Blood. Worry not, if this happens just punch it to get it good and liquified again. " + "" + "&a🛈 Tip: Right-Click a Blood Extractor on " + "&a the ground to dump out a bucket." + ] quest.4B35B8DACEE56913.quest_desc: [ "The Biometric Identifier is used in conjunction with Identification Cards to grant player permissions on a frequency. This can grant them the ability to pass through a forcefield or be unaffected by an Interdiction Matrix. " "" @@ -2109,7 +2177,14 @@ "&a Logistics, such as Mercurial " "&a Item Nodes!" ] - quest.4DE1B1045507C72C.quest_desc: ["points to Dark Temples"] + quest.4DE1B1045507C72C.quest_desc: [ + "Dark Sticks, apart from being a useful crafting component, also serve to point the way to a special type of structure, the Dark Temple. " + "" + "Drop a stick on the ground and watch which way the white tip points. Follow along in that direction until you find a raised platform with a beacon glowing atop it." + "" + "Once you've found the structure, climb atop and locate the Environmental Accumulator. This device will let you charge items with local weather and biome patterns." + ] + quest.4DE1B1045507C72C.title: "Dark Temple" quest.4E175A06927C3A75.quest_desc: [ "A Charging Station is a convenient way to refill the air in your pneumatic tools and equipment. " "" @@ -2140,8 +2215,12 @@ quest.4E7DA28C54FB8766.title: "Rare Materials" quest.4EC7DD1B35F0B6B5.quest_desc: ["The Chemical Reactor opens doors to chemical engineering and a whole new world of advanced processing as we prepare for the HV tier of power and material sciences."] quest.4F480CF26AB0F3CD.quest_desc: [ - "velocity increases processing speed" - "productivity reduces the blood required" + "Just as Promises of Tenacity can enable greater functionality, these promises boost machines in unique ways." + "" + "At Tier 1, you’ll only be able to fit one or the other. Considering Blood is still a manual affair, Productivity is looking pretty good right now!" + "" + "• &7Velocity&r – Speed up the crafting." + "• &7Productivity&r – Chance to reduce blood cost." ] quest.4F480CF26AB0F3CD.title: "Machine Upgrades" quest.4F5E591110C0A372.quest_desc: ["Chemical Cards for LaserIO allow Laser Nodes to transport Mekanism Gases and Chemicals."] @@ -2547,6 +2626,11 @@ "Occultism has an excellent in-game guide with far more information than we can put here, so be sure to refer to it for more in-depth explanations. " ] quest.5DF2A3E977D4C11B.title: "Occultism" + quest.5F0523F799DA720C.quest_desc: [ + "When used at an Environmental Accumulator, the Weather Container will be filled with a sample of the local weather. " + "" + "The bottle may then be thrown to release that weather wherever you like, changing it instantly. " + ] quest.602E1E149A49D056.quest_desc: [ "With the Chimera dead, the rest of the ingredients for the Archmage Spell Book should be within your grasp. " "" @@ -2577,7 +2661,14 @@ "&a🛈 Tip: A Scraper enchanted with " "&a Delicate Touch will cause no harm." ] - quest.621BA38E3E50B91E.quest_desc: ["Enables higher tier crafts, allows more upgrade promises"] + quest.621BA38E3E50B91E.quest_desc: [ + "Promises of Tenacity act as a sort of Tier system for machines. Not only do they allow the installation of Upgrades, but they also unlock features of the machine. " + "" + "For example, certain recipes will require a Tier 2 Promise of Tenacity to work at all. " + "" + "&a🛈 Tip: Higher tier Promises work for " + "&a lower tier recipes!" + ] quest.6242CD0203DCBDC7.quest_desc: [ "The Wixie Enchanting Apparatus allows a Wixie to craft any Enchanting Apparatus recipes using Source." "" @@ -2610,7 +2701,19 @@ "&a🛈 Tip: Cable Subparts cannot be " "&a placed on Dense Cables." ] - quest.6303A7113DE954DD.quest_desc: ["place spikes on pedestal to auto kill mobs and get blood. blood will auto insert into nearby dark tanks"] + quest.6303A7113DE954DD.quest_desc: [ + "That stabbing arm of yours is probably getting a bit worn out by now and you’re undoubtedly looking for a way to get some Blood automatically. " + "" + "A Spiked Plate and Sanguinary Pedestal are the answer. " + "" + "Place the Spiked Plate on top of the Pedestal and put a Dark Tank adjacent. Any mob that steps on the plate will be damaged and their blood will be automatically transferred to the Tank. " + "" + "You will, of course, need to build some sort of mob farm as well… maybe some form of Curse could help?" + "" + "&a🛈 Tip: Sneak + Right-Click a Wither Rose" + "&a on Dirt to make Cursed Earth." + ] + quest.6303A7113DE954DD.title: "Blood Automation" quest.631AA5AAA6EF687C.quest_desc: [ "Pattern Providers are the network's means of interfacing with crafting machines. " "" @@ -2649,6 +2752,11 @@ "Be sure to grab a mating pair! Males and Females are distinguished by their tail feathers, with Males having more colorful plumage than Females." ] quest.642CDBB28337670C.title: "Finding and Taming" + quest.64B786FE65505D75.quest_desc: [ + "When used at an Environmental Accumulator, the Biome Extract Bottle will be filled with a sample of the local biome. " + "" + "The bottle may then be thrown to release that biome wherever you like, changing it permanently. " + ] quest.6538BD86D9419DD4.quest_desc: [ "Welcome to Theurgy! " "" @@ -2714,6 +2822,12 @@ "&a🛈 Tip: Demon’s Dream fruit will heal" "&a Spirits!" ] + quest.66BC8A8EB33B0677.quest_desc: [ + "A Piercing Vengeance Focus is a more powerful form of your normal Focus. Rather than trapping a Spirit in a box, however, it completely obliterates it." + "" + "By killing a Spirit in this way, you’ll obtain some Vengeance Essence." + ] + quest.66BC8A8EB33B0677.title: "Vengeance Essence" quest.66DAC6EC4232C44A.quest_desc: [ "Fun-loving denizens of the deeps, Sirens live in warm oceans and will happily join your menagerie if you give them a Sea Pickle. " "" @@ -3070,7 +3184,17 @@ "&a structure or valid places for " "&a hatches." ] - quest.73A71BBB9D9168B0.quest_desc: ["https://evilcraft.rubensworks.net/book/second_age/abusing_spirits/spirit_reanimator.html"] + quest.73A71BBB9D9168B0.quest_desc: [ + "Pairing nicely with Apothic Spawners, the Spirit Reanimator can be used to produce Spawn Eggs for various mobs." + "" + "First, capture the mob’s spirit in a Box of Eternal Closure. " + "" + "Next, insert it in the Reanimator with a Chicken’s Egg. " + "" + "Finally, supply Blood and wait. " + "" + "Once the Spawn Egg has been procured, you can Right-Click it on a Spawner to set the spawn type. " + ] quest.73D70F80C3AE999C.quest_desc: [ "Who doesn’t love yeeting things through the air? " "" @@ -3264,7 +3388,14 @@ "&a discover more." ] quest.77A66ADAB0845804.title: "Macaw's Mods" - quest.77B7679AFE090140.quest_desc: ["can pick up block with silk touch and cook for 9 "] + quest.77B7679AFE090140.quest_desc: [ + "Hardened Blood Shards come from Blood you’ve let sit out a little too long. " + "" + "Place a bucket of Blood in the world and wait for it to coagulate. Once it has, you can break it while holding a Flint and Steel to obtain a few Blood Shards." + "" + "&a🛈 Tip: Break the block with Silk Touch" + "&a and smelt it for a better yield!" + ] quest.78D83E33F82D6015.quest_desc: [ "Electric Machines all have an Efficiency rating which goes up the longer they run. This allows them to self balance based on the rate of inputs. " "" @@ -3419,6 +3550,7 @@ task.0DE0A9A5505F1850.title: "Discovering Enigmatica" task.116CBCF6CA77E71A.title: "Syringe" task.12BDDFD0C2267B6C.title: "Pressure Mechanic" + task.14C031FA14C3CD89.title: "Environmentla Accumulator" task.15BDBEA7237CBB17.title: "Summon: Possessed Endermite" task.1B81285E0D45A226.title: "Any Tool" task.1B9EA0EB538823C6.title: "Observe a Chocobo!" diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 671bf928..7a5b73c6 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } diff --git a/config/not_enough_glyphs/glyph_momentum.toml b/config/not_enough_glyphs/glyph_momentum.toml new file mode 100644 index 00000000..724591a0 --- /dev/null +++ b/config/not_enough_glyphs/glyph_momentum.toml @@ -0,0 +1,26 @@ +#General settings +[general] + #Is Enabled? + enabled = true + #Cost + #Range: > -2147483648 + cost = 100 + #Is Starter Glyph? + starter = false + #The maximum number of times this glyph may appear in a single spell + #Range: > 1 + per_spell_limit = 2147483647 + #The tier of the glyph + #Range: 1 ~ 99 + glyph_tier = 1 + #Limits the number of times a given augment may be applied to a given effect + #Example entry: "glyph_amplify=5" + augment_limits = [] + #How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config. + #Example entry: "glyph_amplify=50" + augment_cost_overrides = ["ars_nouveau:glyph_amplify=50", "ars_nouveau:glyph_dampen=50"] + #Prevents the given glyph from being used in the same spell as the given glyph + #Example entry: "glyph_burst" + invalid_combos = [] + #Range: 0.0 ~ 2.147483647E9 + amplify = 1.5 diff --git a/kubejs/client_scripts/emi/world_interactions.js b/kubejs/client_scripts/emi/world_interactions.js index b9d8677a..235f7d4e 100644 --- a/kubejs/client_scripts/emi/world_interactions.js +++ b/kubejs/client_scripts/emi/world_interactions.js @@ -257,6 +257,28 @@ ClientEvents.generateAssets('before_mods', (event) => { right: '#item:minecraft:pickaxes', output: 'item:evilcraft:environmental_accumulation_core', id: 'evilcraft:environmental_accumulation_core' + }, + { + left: '#item:cursedearth:spreadable', + right: { + type: 'item', + id: 'minecraft:wither_rose', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Sneak + Right-Click"}\u0027]}', + amount: 1 + }, + output: 'item:cursedearth:cursed_earth', + id: 'cursedearth:cursed_earth' + }, + { + left: '#item:cursedearth:spreadable', + right: { + type: 'item', + id: 'cursedearth:blessed_flower', + nbt: '{"minecraft:lore":[\u0027{"color":"green","text":"Sneak + Right-Click"}\u0027]}', + amount: 1 + }, + output: 'item:cursedearth:blessed_earth', + id: 'cursedearth:blessed_earth' } ]; diff --git a/kubejs/server_scripts/recipe_viewer/info.js b/kubejs/server_scripts/recipe_viewer/info.js index 5ed51c48..1dfeb9e7 100644 --- a/kubejs/server_scripts/recipe_viewer/info.js +++ b/kubejs/server_scripts/recipe_viewer/info.js @@ -61,6 +61,22 @@ RecipeViewerEvents.addInformation('item', (event) => { ' ', 'Fully Charged Budding Time Crystal Blocks will slowly decay, at which point they must be transferred back to the Overworld to repeat the cycle.' ] + }, + { + filter: ['cursedearth:blessed_earth'], + text: [ + 'Rapidly spawns Passive mobs that would otherwise spawn in the area.', + '', + 'Can spread to adjacent dirt blocks.' + ] + }, + { + filter: ['cursedearth:cursed_earth'], + text: [ + 'Rapidly spawns Hostile mobs that would otherwise spawn in the area.', + '', + 'Can spread to adjacent dirt blocks. Burns when exposed to daylight.' + ] } ]; diff --git a/kubejs/server_scripts/recipes/evilcraft/blood_infuser.js b/kubejs/server_scripts/recipes/evilcraft/blood_infuser.js new file mode 100644 index 00000000..a6b6f39f --- /dev/null +++ b/kubejs/server_scripts/recipes/evilcraft/blood_infuser.js @@ -0,0 +1,38 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:evilcraft/blood_infuser/'; + + const recipes = [ + { + input_item: { item: 'minecraft:emerald_ore' }, + input_fluid: { id: 'evilcraft:blood', amount: 10000 }, + output_item: { id: 'evilcraft:dark_ore' }, + duration: 150, + xp: 0.1, + tier: 1, + id: `${id_prefix}dark_ore` + }, + { + input_item: { item: 'minecraft:deepslate_emerald_ore' }, + input_fluid: { id: 'evilcraft:blood', amount: 10000 }, + output_item: { id: 'evilcraft:dark_ore_deepslate' }, + duration: 150, + xp: 0.1, + tier: 1, + id: `${id_prefix}dark_ore_deepslate` + }, + { + input_item: { item: 'cursedearth:blessed_flower' }, + input_fluid: { id: 'evilcraft:blood', amount: 10000 }, + output_item: { id: 'minecraft:wither_rose' }, + duration: 150, + xp: 0.1, + tier: 1, + id: `${id_prefix}wither_rose` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'evilcraft:blood_infuser'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js b/kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js index 9e8372e5..d6ca6a86 100644 --- a/kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js +++ b/kubejs/server_scripts/recipes/evilcraft/crafting_shaped_custom_output_dark_tank_large.js @@ -1,5 +1,5 @@ ServerEvents.recipes((event) => { - const id_prefix = 'enigmatica:occultism/crushing/'; + const id_prefix = 'enigmatica:evilcraft/crafting_shaped_custom_output_dark_tank_large/'; const recipes = [ { diff --git a/kubejs/server_scripts/tags/block/minecraft/sword_efficient.js b/kubejs/server_scripts/tags/block/minecraft/sword_efficient.js new file mode 100644 index 00000000..74eb4d96 --- /dev/null +++ b/kubejs/server_scripts/tags/block/minecraft/sword_efficient.js @@ -0,0 +1,4 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('minecraft:sword_efficient').add(additions); +}); diff --git a/kubejs/server_scripts/tags/block/pneumaticcraft/electrostatic_grid.js b/kubejs/server_scripts/tags/block/pneumaticcraft/electrostatic_grid.js index 6e26b414..2faf56bd 100644 --- a/kubejs/server_scripts/tags/block/pneumaticcraft/electrostatic_grid.js +++ b/kubejs/server_scripts/tags/block/pneumaticcraft/electrostatic_grid.js @@ -1,10 +1,5 @@ ServerEvents.tags('block', (event) => { - event - .add('pneumaticcraft:electrostatic_grid', [ - '#chipped:iron_bars', - 'minecraft:lightning_rod', - /chipped:.*copper/, - /minecraft:.*copper/ - ]) - .remove(/_ore$/, /raw_copper/, /_door/, /_trapdoor/, /_barrel/); + let additions = ['#chipped:iron_bars', 'minecraft:lightning_rod', /chipped:.*copper/, /minecraft:.*copper/]; + let exclusions = [/_ore$/, /raw_copper/, /_door/, /_trapdoor/, /_barrel/]; + event.get('pneumaticcraft:electrostatic_grid').add(additions).remove(exclusions); }); diff --git a/kubejs/server_scripts/tags/block/the_bumblezone/biomes.js b/kubejs/server_scripts/tags/block/the_bumblezone/biomes.js new file mode 100644 index 00000000..20b0dd6e --- /dev/null +++ b/kubejs/server_scripts/tags/block/the_bumblezone/biomes.js @@ -0,0 +1,5 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('the_bumblezone:biomes/floral_meadow_rootmin_flowers').add(additions); + event.get('the_bumblezone:biomes/floral_meadow_flowers').add(additions); +}); diff --git a/kubejs/server_scripts/tags/block/the_bumblezone/hanging_garden.js b/kubejs/server_scripts/tags/block/the_bumblezone/hanging_garden.js new file mode 100644 index 00000000..25704f93 --- /dev/null +++ b/kubejs/server_scripts/tags/block/the_bumblezone/hanging_garden.js @@ -0,0 +1,4 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('the_bumblezone:hanging_garden/allowed_flowers').add(additions); +}); diff --git a/kubejs/server_scripts/tags/block/the_bumblezone/honitel.js b/kubejs/server_scripts/tags/block/the_bumblezone/honitel.js new file mode 100644 index 00000000..b66ddc20 --- /dev/null +++ b/kubejs/server_scripts/tags/block/the_bumblezone/honitel.js @@ -0,0 +1,4 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('the_bumblezone:honitel/allowed_flowers').add(additions); +}); diff --git a/kubejs/server_scripts/tags/block/the_bumblezone/pollen_puff.js b/kubejs/server_scripts/tags/block/the_bumblezone/pollen_puff.js new file mode 100644 index 00000000..1082e41e --- /dev/null +++ b/kubejs/server_scripts/tags/block/the_bumblezone/pollen_puff.js @@ -0,0 +1,4 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('the_bumblezone:pollen_puff/multiplying_allowed_flowers').add(additions); +}); diff --git a/kubejs/server_scripts/tags/block/the_bumblezone/rootmin.js b/kubejs/server_scripts/tags/block/the_bumblezone/rootmin.js new file mode 100644 index 00000000..7801a229 --- /dev/null +++ b/kubejs/server_scripts/tags/block/the_bumblezone/rootmin.js @@ -0,0 +1,5 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('the_bumblezone:rootmin/allowed_flowers').add(additions); + event.get('the_bumblezone:rootmin/default_flowers').add(additions); +}); diff --git a/kubejs/server_scripts/tags/block/the_bumblezone/sempiternal_sanctum.js b/kubejs/server_scripts/tags/block/the_bumblezone/sempiternal_sanctum.js new file mode 100644 index 00000000..1b89cad3 --- /dev/null +++ b/kubejs/server_scripts/tags/block/the_bumblezone/sempiternal_sanctum.js @@ -0,0 +1,4 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('the_bumblezone:sempiternal_sanctum/allowed_white_flowers').add(additions); +}); diff --git a/kubejs/server_scripts/tags/block/the_bumblezone/tree_dungeon.js b/kubejs/server_scripts/tags/block/the_bumblezone/tree_dungeon.js new file mode 100644 index 00000000..0c3ca9ff --- /dev/null +++ b/kubejs/server_scripts/tags/block/the_bumblezone/tree_dungeon.js @@ -0,0 +1,4 @@ +ServerEvents.tags('block', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('the_bumblezone:tree_dungeon/allowed_flowers').add(additions); +}); diff --git a/kubejs/server_scripts/tags/item/cursedearth/spreadable.js b/kubejs/server_scripts/tags/item/cursedearth/spreadable.js new file mode 100644 index 00000000..95029ac0 --- /dev/null +++ b/kubejs/server_scripts/tags/item/cursedearth/spreadable.js @@ -0,0 +1,4 @@ +ServerEvents.tags('item', (event) => { + let additions = ['minecraft:dirt_path', 'minecraft:dirt', 'minecraft:coarse_dirt', 'minecraft:rooted_dirt']; + event.get('cursedearth:spreadable').add(additions); +}); diff --git a/kubejs/server_scripts/tags/item/minecraft/small_flowers.js b/kubejs/server_scripts/tags/item/minecraft/small_flowers.js new file mode 100644 index 00000000..283101b1 --- /dev/null +++ b/kubejs/server_scripts/tags/item/minecraft/small_flowers.js @@ -0,0 +1,4 @@ +ServerEvents.tags('item', (event) => { + let additions = ['cursedearth:blessed_flower']; + event.get('minecraft:small_flowers').add(additions); +}); From f57c1205de048d5fe29b120598884b2eda1beb21 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 16:25:13 -0400 Subject: [PATCH 31/37] loot start --- .../ftbquests/quests/chapters/evilcraft.snbt | 68 +++++++++++-------- config/ftbquests/quests/lang/en_us.snbt | 6 +- .../reward_tables/0B6BCA25CDDB6DFA.snbt | 14 ++++ 3 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index e48738cc..370691f2 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -38,8 +38,9 @@ } ] tasks: [{ - id: "3C64E92DFA608339" - type: "checkmark" + id: "7B8A280C515F168E" + item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(minecraft:pickaxes)" }, count: 1, id: "ftbfiltersystem:smart_filter" } + type: "item" }] x: 0.5d y: 0.5d @@ -89,8 +90,8 @@ item: { count: 1, id: "evilcraft:blood_chest" } type: "item" }] - x: 5.5d - y: 1.5d + x: 6.0d + y: 0.0d } { dependencies: ["0C1DCD8850E6857C"] @@ -108,8 +109,8 @@ type: "item" } ] - x: 6.0d - y: 2.5d + x: 8.0d + y: 0.0d } { dependencies: ["3FA7963385E35E27"] @@ -145,7 +146,7 @@ item: { count: 1, id: "evilcraft:dark_power_gem" } type: "item" }] - x: 4.5d + x: 4.0d y: -0.5d } { @@ -170,12 +171,19 @@ { dependencies: ["6303A7113DE954DD"] id: "73A71BBB9D9168B0" - tasks: [{ - id: "4ADB8982A8F6B9CC" - item: { count: 1, id: "evilcraft:spirit_reanimator" } - type: "item" - }] - x: 8.5d + tasks: [ + { + id: "4ADB8982A8F6B9CC" + item: { count: 1, id: "evilcraft:spirit_reanimator" } + type: "item" + } + { + id: "3B0128205BDBC420" + item: { count: 1, id: "minecraft:egg" } + type: "item" + } + ] + x: 8.0d y: -1.0d } { @@ -196,8 +204,8 @@ type: "item" } ] - x: 5.0d - y: 2.5d + x: 7.0d + y: 0.0d } { dependencies: ["4DE1B1045507C72C"] @@ -218,7 +226,7 @@ type: "item" } ] - x: 9.5d + x: 8.0d y: 1.0d } { @@ -292,7 +300,7 @@ item: { count: 1, id: "evilcraft:hardened_blood_shard" } type: "item" }] - x: 4.5d + x: 4.0d y: 0.5d } { @@ -306,7 +314,7 @@ item: { count: 1, id: "evilcraft:blood_infuser" } type: "item" }] - x: 5.5d + x: 5.0d y: 0.0d } { @@ -317,7 +325,7 @@ item: { count: 1, id: "evilcraft:undead_sapling" } type: "item" }] - x: 6.5d + x: 6.0d y: 1.0d } { @@ -343,7 +351,7 @@ type: "observation" } ] - x: 7.5d + x: 7.0d y: 1.0d } { @@ -354,8 +362,8 @@ item: { count: 1, id: "evilcraft:promise_tier_1" } type: "item" }] - x: 6.5d - y: 0.0d + x: 5.0d + y: 1.0d } { dependencies: ["621BA38E3E50B91E"] @@ -373,8 +381,8 @@ type: "item" } ] - x: 7.5d - y: 0.0d + x: 5.0d + y: 2.0d } { dependencies: ["492DA63DEC9663F2"] @@ -402,7 +410,7 @@ type: "item" } ] - x: 6.5d + x: 6.0d y: -1.0d } { @@ -413,7 +421,7 @@ item: { count: 1, id: "minecraft:spawner" } type: "item" }] - x: 7.5d + x: 7.0d y: -1.0d } { @@ -456,8 +464,8 @@ item: { count: 1, id: "evilcraft:biome_extract" } type: "item" }] - x: 8.5d - y: 0.5d + x: 6.5d + y: 2.0d } { dependencies: ["4DE1B1045507C72C"] @@ -467,8 +475,8 @@ item: { components: { "evilcraft:weather_container_type": "EMPTY" }, count: 1, id: "evilcraft:weather_container" } type: "item" }] - x: 8.5d - y: 1.5d + x: 7.5d + y: 2.0d } ] } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 6045b8a8..c8911df9 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -282,6 +282,7 @@ "" "This process has been known to Curse the items during the process! " ] + quest.0C1DCD8850E6857C.title: "Repairs" quest.0CBCE3A0D149AED0.quest_desc: [ "Where prior tiers have primarily focused on bootstrapping technology, the EV Tier is where we’ll get into the nuclear sciences, both for material processing and for power production. " "&n &r" @@ -2025,7 +2026,7 @@ quest.492DA63DEC9663F2.quest_desc: [ "With your dark powers combined, you’ll finally be able to craft a Blood Infuser. " "" - "This’ll make the previous process a little less messy, and a considerable amount cheaper. " + "This’ll make the previous process a little less messy, and considerably cheaper. " ] quest.49878D1219A63A4E.quest_desc: [ "Just another solar panel. It produces power during daylight hours and works best if paired with an Energy Cube or other power storage device." @@ -3518,6 +3519,7 @@ reward_table.044F2F65D540C024.title: "Miner's Delight" reward_table.0765A447BA2E5EDF.title: "MI Lootbox: Quantum Tier" reward_table.09B745401897355C.title: "PneumaticCraft Lootbox: Epic" + reward_table.0B6BCA25CDDB6DFA.title: "EvilCraft LootBox" reward_table.0D9287B7A88E2255.title: "MI Lootbox: HV Tier" reward_table.0F3B57D5BCDEFA8D.title: "Ars Nouveau Lootbox: Legendary" reward_table.1FB94504FC4F0807.title: "MI Lootbox: EV Tier" @@ -3575,7 +3577,6 @@ task.3745AFEF378D7217.title: "Steel or Energized Steel" task.37CDC8E9B9004A0D.title: "Crafting Storage" task.3898E7E189555B8C.title: "Arcane Platforms" - task.3C64E92DFA608339.title: "wip" task.3C9F8F7D407AC253.title: "Sender Modules" task.3D1A362E43EE4BED.title: "Other Compressors" task.3DED6DAEE4419675.title: "Any Chipped Workbench" @@ -3640,6 +3641,7 @@ task.76ED4221C1C27A27.title: "Logistical Transporters" task.7866B09190F4EA23.title: "Observe a Villager" task.7A9E6782E73FF106.title: "Batteries" + task.7B8A280C515F168E.title: "Any Pickaxe" task.7C0E5A805AE1132B.title: "Learning Mods" task.7D4421F5BDC35DFE.title: "Any Pickaxe" task.7E422D4A867340A6.title: "Any Functional Storage Drawer" diff --git a/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt b/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt new file mode 100644 index 00000000..1f1f235b --- /dev/null +++ b/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt @@ -0,0 +1,14 @@ +{ + hide_tooltip: true + icon: { + components: { + "ftbquests:icon": "kubejs:item/lootbox/epic" + } + id: "ftbquests:custom_icon" + } + id: "0B6BCA25CDDB6DFA" + loot_size: 1 + order_index: 22 + rewards: [{ item: { count: 1, id: "evilcraft:condensed_blood" } }] + use_title: true +} From 4978b05947caf4c529d6ce7f3d9c70b1b3f87898 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 16:40:06 -0400 Subject: [PATCH 32/37] Update evilcraft-common.toml --- config/evilcraft-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/evilcraft-common.toml b/config/evilcraft-common.toml index fa46a241..50925816 100644 --- a/config/evilcraft-common.toml +++ b/config/evilcraft-common.toml @@ -100,7 +100,7 @@ #If the fluid should be rendered statically. Fluids won't be shown fluently, but more efficiently. staticBlockRendering = false #If creative versions for all fluids should be added to the creative tab. - creativeTabFluids = true + creativeTabFluids = false [machine.spirit_reanimator] #The required amount of ticks for each reanimation. From 0b25af9351540e5b166fbbc35d2109fb812575b9 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 16:46:03 -0400 Subject: [PATCH 33/37] loots --- .../ftbquests/quests/chapters/evilcraft.snbt | 198 ++++++++++++++++-- .../reward_tables/0B6BCA25CDDB6DFA.snbt | 72 ++++++- .../reward_tables/4C3908A1EDE782F7.snbt | 4 +- 3 files changed, 252 insertions(+), 22 deletions(-) diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index 370691f2..78f8da38 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -73,6 +73,12 @@ } type: "item" } + { + exclude_from_claim_all: true + id: "3E330C3E94CE2C96" + table_id: 310519013727846436L + type: "loot" + } ] tasks: [{ id: "0C96286549AD0DD2" @@ -85,6 +91,12 @@ { dependencies: ["492DA63DEC9663F2"] id: "0C1DCD8850E6857C" + rewards: [{ + exclude_from_claim_all: true + id: "701940D4DB2D55D2" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "5E0A44ED0D2E3AAD" item: { count: 1, id: "evilcraft:blood_chest" } @@ -96,6 +108,12 @@ { dependencies: ["0C1DCD8850E6857C"] id: "23C86F86A1A4B1E9" + rewards: [{ + exclude_from_claim_all: true + id: "3405C1C7D23546DC" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "72DAB99E1982A79B" @@ -115,21 +133,29 @@ { dependencies: ["3FA7963385E35E27"] id: "48271478CA0D3F6B" - rewards: [{ - id: "43E73B7C77DAA598" - item: { - components: { - "cyclopscore:capacity": 16000 - "cyclopscore:fluid_content": { - amount: 10000 - id: "evilcraft:blood" + rewards: [ + { + id: "43E73B7C77DAA598" + item: { + components: { + "cyclopscore:capacity": 16000 + "cyclopscore:fluid_content": { + amount: 10000 + id: "evilcraft:blood" + } } + count: 1 + id: "evilcraft:dark_tank" } - count: 1 - id: "evilcraft:dark_tank" + type: "item" } - type: "item" - }] + { + exclude_from_claim_all: true + id: "373CC58BDC79FB43" + table_id: 822973620641558010L + type: "loot" + } + ] tasks: [{ id: "18AE9263A3F9B02A" item: { count: 1, id: "evilcraft:blood_extractor" } @@ -141,6 +167,12 @@ { dependencies: ["48271478CA0D3F6B"] id: "4ACCED64D436209E" + rewards: [{ + exclude_from_claim_all: true + id: "5DFFB094D92B3E19" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "3FA72699ABD972E8" item: { count: 1, id: "evilcraft:dark_power_gem" } @@ -152,6 +184,12 @@ { dependencies: ["2C7977E4AE6B627B"] id: "0751B009795D7889" + rewards: [{ + exclude_from_claim_all: true + id: "26C9E38AAC31AD6F" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "3D4070B43CEF452C" @@ -171,6 +209,12 @@ { dependencies: ["6303A7113DE954DD"] id: "73A71BBB9D9168B0" + rewards: [{ + exclude_from_claim_all: true + id: "7DE70FF55D03511D" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "4ADB8982A8F6B9CC" @@ -192,6 +236,12 @@ id: "evilcraft:purifier" } id: "0988DC06DD5A6935" + rewards: [{ + exclude_from_claim_all: true + id: "7ABD346C3AC3DEEB" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "02ACBA14ED31AF33" @@ -213,6 +263,12 @@ id: "evilcraft:sanguinary_environmental_accumulator" } id: "14DEE45EA9666015" + rewards: [{ + exclude_from_claim_all: true + id: "265F3E1DC43AB1FE" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "43370AFFD4EBAF48" @@ -232,6 +288,12 @@ { dependencies: ["3FA7963385E35E27"] id: "3202466CAE3744A9" + rewards: [{ + exclude_from_claim_all: true + id: "45CA139146A71847" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "595FF126B994B9DD" item: { count: 1, id: "evilcraft:vengeance_ring" } @@ -243,6 +305,12 @@ { dependencies: ["3202466CAE3744A9"] id: "2C7977E4AE6B627B" + rewards: [{ + exclude_from_claim_all: true + id: "3914435C5E34E950" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "2905810324E3003D" @@ -261,6 +329,12 @@ { dependencies: ["2C7977E4AE6B627B"] id: "31B6AE7706264320" + rewards: [{ + exclude_from_claim_all: true + id: "43E4E5F281D1483E" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "3142A06E8E16C922" item: { count: 1, id: "evilcraft:burning_gem_stone" } @@ -272,6 +346,12 @@ { dependencies: ["66BC8A8EB33B0677"] id: "0AEF5FB6530F4D65" + rewards: [{ + exclude_from_claim_all: true + id: "1390DCFCC7B4B962" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "2E3A222E226F1ECE" item: { count: 1, id: "evilcraft:spectral_glasses" } @@ -283,6 +363,12 @@ { dependencies: ["48271478CA0D3F6B"] id: "46195E73798357D2" + rewards: [{ + exclude_from_claim_all: true + id: "378F38365FC505EF" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "30536BF69330FA83" item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" } @@ -294,6 +380,12 @@ { dependencies: ["48271478CA0D3F6B"] id: "77B7679AFE090140" + rewards: [{ + exclude_from_claim_all: true + id: "770D52F9BB636B07" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ count: 8L id: "1E3CC0EDCD950B3A" @@ -309,6 +401,12 @@ "77B7679AFE090140" ] id: "492DA63DEC9663F2" + rewards: [{ + exclude_from_claim_all: true + id: "78F406D40778980E" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "7D02DAD836B3B3B1" item: { count: 1, id: "evilcraft:blood_infuser" } @@ -320,6 +418,12 @@ { dependencies: ["492DA63DEC9663F2"] id: "2FB39BF76836FA47" + rewards: [{ + exclude_from_claim_all: true + id: "5C1732775E04E094" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "0D965E2BAFD1520E" item: { count: 1, id: "evilcraft:undead_sapling" } @@ -334,6 +438,12 @@ id: "evilcraft:environmental_accumulator" } id: "4DE1B1045507C72C" + rewards: [{ + exclude_from_claim_all: true + id: "314155408F32208E" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "102B6984636C38E5" @@ -357,6 +467,12 @@ { dependencies: ["492DA63DEC9663F2"] id: "621BA38E3E50B91E" + rewards: [{ + exclude_from_claim_all: true + id: "7DCA7E9D9D3FB79E" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "6C8A4080C2D7A111" item: { count: 1, id: "evilcraft:promise_tier_1" } @@ -369,6 +485,12 @@ dependencies: ["621BA38E3E50B91E"] id: "4F480CF26AB0F3CD" min_width: 250 + rewards: [{ + exclude_from_claim_all: true + id: "680B1FAA50C718C7" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "2C0CD473FF75BDE1" @@ -390,14 +512,22 @@ id: "evilcraft:spiked_plate" } id: "6303A7113DE954DD" - rewards: [{ - id: "11878B23BEE0008F" - item: { - count: 1 - id: "minecraft:wither_rose" + rewards: [ + { + id: "11878B23BEE0008F" + item: { + count: 1 + id: "minecraft:wither_rose" + } + type: "item" } - type: "item" - }] + { + exclude_from_claim_all: true + id: "548AB55AEAB434B1" + table_id: 822973620641558010L + type: "loot" + } + ] tasks: [ { id: "78D54A3DA95B9DD8" @@ -416,6 +546,12 @@ { dependencies: ["6303A7113DE954DD"] id: "06F1A8F15128C1D9" + rewards: [{ + exclude_from_claim_all: true + id: "7F4C84E072B1AC71" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "4EDD731131592044" item: { count: 1, id: "minecraft:spawner" } @@ -427,6 +563,12 @@ { dependencies: ["46195E73798357D2"] id: "14555CEDF53F68FC" + rewards: [{ + exclude_from_claim_all: true + id: "1139F4F6B3EF7D50" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "382BDC0A6C24BAF0" item: { components: { "evilcraft:world_shared_tank_id": "creative" }, count: 1, id: "evilcraft:entangled_chalice" } @@ -441,6 +583,12 @@ id: "evilcraft:vengeance_essence" } id: "66BC8A8EB33B0677" + rewards: [{ + exclude_from_claim_all: true + id: "20AFC04D21403F09" + table_id: 822973620641558010L + type: "loot" + }] tasks: [ { id: "276C28694B2C7999" @@ -459,6 +607,12 @@ { dependencies: ["4DE1B1045507C72C"] id: "64B786FE65505D75" + rewards: [{ + exclude_from_claim_all: true + id: "7FA693A652BD27FB" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "216635D2BAD048E1" item: { count: 1, id: "evilcraft:biome_extract" } @@ -470,6 +624,12 @@ { dependencies: ["4DE1B1045507C72C"] id: "5F0523F799DA720C" + rewards: [{ + exclude_from_claim_all: true + id: "1A5FA3649654527A" + table_id: 822973620641558010L + type: "loot" + }] tasks: [{ id: "51B800771C0A3ACB" item: { components: { "evilcraft:weather_container_type": "EMPTY" }, count: 1, id: "evilcraft:weather_container" } diff --git a/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt b/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt index 1f1f235b..cc1eb68c 100644 --- a/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt +++ b/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt @@ -9,6 +9,76 @@ id: "0B6BCA25CDDB6DFA" loot_size: 1 order_index: 22 - rewards: [{ item: { count: 1, id: "evilcraft:condensed_blood" } }] + rewards: [ + { + count: 4 + item: { + count: 1 + id: "evilcraft:condensed_blood" + } + random_bonus: 4 + } + { + count: 4 + item: { + components: { + "evilcraft:weather_container_type": "CLEAR" + "minecraft:rarity": "uncommon" + } + count: 1 + id: "evilcraft:weather_container" + } + random_bonus: 4 + } + { + count: 4 + item: { + components: { + "evilcraft:weather_container_type": "RAIN" + "minecraft:rarity": "uncommon" + } + count: 1 + id: "evilcraft:weather_container" + } + random_bonus: 4 + } + { + count: 4 + item: { + components: { + "evilcraft:weather_container_type": "LIGHTNING" + "minecraft:rarity": "rare" + } + count: 1 + id: "evilcraft:weather_container" + } + random_bonus: 4 + } + { item: { components: { "cyclopscore:capacity": 16000 }, count: 1, id: "evilcraft:dark_tank" }, random_bonus: 1 } + { + count: 2 + item: { + count: 1 + id: "evilcraft:potentia_sphere" + } + random_bonus: 2 + } + { + count: 2 + item: { + count: 1 + id: "evilcraft:ender_tear" + } + random_bonus: 2 + } + { + count: 8 + item: { + count: 1 + id: "evilcraft:dark_ore" + } + random_bonus: 8 + } + ] use_title: true } diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 7a5b73c6..671bf928 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } From bec19052156e123d5b5661c4e28c4c5a1d37302e Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 16:50:26 -0400 Subject: [PATCH 34/37] loot, spawner blacklist --- config/evilcraft-common.toml | 4 ++-- config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/evilcraft-common.toml b/config/evilcraft-common.toml index 50925816..9d04d8a2 100644 --- a/config/evilcraft-common.toml +++ b/config/evilcraft-common.toml @@ -272,7 +272,7 @@ #A list of biome names for which no Biome Extracts may be created. craftingBlacklist = [] #If creative versions for all variants should be added to the creative tab. - creativeTabVariants = true + creativeTabVariants = false [mob.kineticator] #The blacklisted items which should not be influenced by the Kineticator, by unique item/blockState name. @@ -296,7 +296,7 @@ #The area in which the spawn limit will be checked on each spawn attempt. spawnLimitArea = 32 #The blacklisted entity spirits, by entity name. Regular expressions are allowed. - entityBlacklist = ["evilcraft:vengeance_spirit", "evilcraft:controlled_zombie", "evilcraft:werewolf", "minecraft:ender_dragon", "farmingforblockheads:merchant"] + entityBlacklist = ["evilcraft:vengeance_spirit", "evilcraft:controlled_zombie", "evilcraft:werewolf", "minecraft:ender_dragon", "farmingforblockheads:merchant", "artifacts:mimic"] #Whether vengeance spirits should always be visible in creative mode. alwaysVisibleInCreative = false #The maximum amount of vengeance spirits naturally spawnable in the spawnLimitArea. diff --git a/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt b/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt index cc1eb68c..a4976a29 100644 --- a/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt +++ b/config/ftbquests/quests/reward_tables/0B6BCA25CDDB6DFA.snbt @@ -7,7 +7,7 @@ id: "ftbquests:custom_icon" } id: "0B6BCA25CDDB6DFA" - loot_size: 1 + loot_size: 2 order_index: 22 rewards: [ { From 758f5fbcbb285ff8b5e6526e34f4743659b3808f Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 16:54:31 -0400 Subject: [PATCH 35/37] Update evilcraft-common.toml --- config/evilcraft-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/evilcraft-common.toml b/config/evilcraft-common.toml index 9d04d8a2..996623b6 100644 --- a/config/evilcraft-common.toml +++ b/config/evilcraft-common.toml @@ -4,7 +4,7 @@ #The position to render the blood gui overlay at. (0=NE, 1=SE, 2=SW,3=NW) bloodGuiOverlayPosition = 1 #If farting is enabled on this server; Client-side: If farting can be seen at your client. - farting = true + farting = false #The X offset for the blood gui overlay. bloodGuiOverlayPositionOffsetX = -5 #The amount of mB that can flow per tick out of machines and items. From b801fbe26af9d62983673a0b9c4c0730b4433c40 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 23:42:32 -0400 Subject: [PATCH 36/37] unhide evilcraft quests --- config/ftbquests/quests/chapters/evilcraft.snbt | 2 +- config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index 78f8da38..152306ff 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -1,5 +1,5 @@ { - always_invisible: true + autofocus_id: "77B7679AFE090140" default_hide_dependency_lines: false default_quest_shape: "" filename: "evilcraft" diff --git a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt index 671bf928..7a5b73c6 100644 --- a/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt +++ b/config/ftbquests/quests/reward_tables/4C3908A1EDE782F7.snbt @@ -70,8 +70,8 @@ random_bonus: 8 weight: 0.25f } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } - { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "milk", "protected_by_totem" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "ars_nouveau:spell_damage", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_mana_regen" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } + { item: { components: { "ars_nouveau:multi_potion": { charges: 8, contents: { custom_effects: [{ amplifier: 3b, duration: 3600, id: "minecraft:regeneration", "neoforge:cures": [ "protected_by_totem", "milk" ], show_icon: 1b }], potion: "kubejs:greater_strength" }, maxUses: 8 } }, count: 1, id: "ars_nouveau:potion_flask_extend_time" } } ] use_title: true } From ae272bc59adfb60fb0e533c5154bbf0e1bee3872 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Sat, 31 Aug 2024 23:44:21 -0400 Subject: [PATCH 37/37] Update evilcraft.snbt --- config/ftbquests/quests/chapters/evilcraft.snbt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/ftbquests/quests/chapters/evilcraft.snbt b/config/ftbquests/quests/chapters/evilcraft.snbt index 152306ff..1014d97f 100644 --- a/config/ftbquests/quests/chapters/evilcraft.snbt +++ b/config/ftbquests/quests/chapters/evilcraft.snbt @@ -107,6 +107,9 @@ } { dependencies: ["0C1DCD8850E6857C"] + icon: { + id: "evilcraft:colossal_blood_chest" + } id: "23C86F86A1A4B1E9" rewards: [{ exclude_from_claim_all: true @@ -208,6 +211,9 @@ } { dependencies: ["6303A7113DE954DD"] + icon: { + id: "evilcraft:spirit_reanimator" + } id: "73A71BBB9D9168B0" rewards: [{ exclude_from_claim_all: true