From f43ef3401e62f3366c3409b1fa55d89c7d6d01fe Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 27 Nov 2023 18:28:38 -0500 Subject: [PATCH 1/3] tent! --- changelogs/CHANGELOG.md | 6 ++ .../quests/chapters/chapter_one.snbt | 87 ++++++++++++++++--- .../quests/reward_tables/large_tents.snbt | 53 +++++++++++ 3 files changed, 135 insertions(+), 11 deletions(-) create mode 100644 config/ftbquests/quests/reward_tables/large_tents.snbt diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index ec5d813aa..e22cc8f40 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -1,3 +1,9 @@ +### Enigmatica 9 v1.17.0 + +### 🌟 Improvements + +- [Expert] Early quests now grant a Large Nomadic Tent of one's choosing [\#791](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/791) + ### Enigmatica 9 v1.16.0 ### 🌟 Improvements diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt index 5d3e763d0..2bcc35317 100644 --- a/config/ftbquests/quests/chapters/chapter_one.snbt +++ b/config/ftbquests/quests/chapters/chapter_one.snbt @@ -74,13 +74,21 @@ ] hide: true id: "73CDA6ED2393DE42" - rewards: [{ - command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/aura_leaves/tiny" - icon: "kubejs:aura_leaf" - id: "74F868CAED853121" - title: "Aura Infusion" - type: "command" - }] + rewards: [ + { + command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/aura_leaves/tiny" + icon: "kubejs:aura_leaf" + id: "74F868CAED853121" + title: "Aura Infusion" + type: "command" + } + { + exclude_from_claim_all: true + id: "07FEE1BA2045C7FC" + table_id: 3385184300630852421L + type: "choice" + } + ] shape: "hexagon" subtitle: "Fear is the Mind-Killer" tasks: [{ @@ -152,7 +160,7 @@ type: "item" } ] - x: -4.5d + x: -5.0d y: -6.5d } { @@ -186,7 +194,7 @@ { dependencies: [ "7224985826C6E047" - "73CDA6ED2393DE42" + "00FB8D9041ED6D73" ] description: [ "With the seeds, herbs, and saplings found among the Naga’s remains, its time to take root, so to speak, and lay out a garden. " @@ -1387,7 +1395,7 @@ type: "item" } ] - x: -2.5d + x: -2.0d y: -6.5d } { @@ -1604,7 +1612,11 @@ } } id: "occultism:familiar_ring" - tag: { } + tag: { + familiar: { + hasFamiliar: 0b + } + } } id: "72B2DCE0BDCE548F" min_width: 300 @@ -2718,6 +2730,59 @@ x: -8.0d y: 2.0d } + { + dependencies: ["73CDA6ED2393DE42"] + description: [ + "Life on the road has its ups and downs but a nice warm tent to call home can smooth over many of the rougher parts of such a life-style." + "" + "=================================" + "" + "Nomadic Tents offer a portable home that can make a wonderful base of operations early on. Not only may the be moved with ease, but they may also be upgraded while retaining their contents. Consider setting up a bed, basic storage, and some essential crafting stations inside!" + "" + "● Right-Click and Hold the tent on the " + " ground to place the frame." + "" + "● Right-Click each frame with a mallet " + " to form that section. " + "" + " A Golden Mallet will form the entire " + " tent at once!" + "" + "● Right-Click or walk into the door to " + " enter and exit." + "" + "● Right-Click the door from the outside " + " to pack up the tent as an item." + ] + id: "00FB8D9041ED6D73" + rewards: [{ + id: "4C3A6668078E18B6" + item: { + Count: 1b + id: "nomadictents:mallet" + tag: { + Damage: 0 + } + } + type: "item" + }] + shape: "hexagon" + tasks: [{ + id: "2CE21FBACA8A8DEA" + item: { + Count: 1b + id: "itemfilters:id_regex" + tag: { + value: "^nomadictents:(tiny|small|medium|large|giant|mega)" + } + } + title: "Any Tent" + type: "item" + }] + title: "Nomadic Life" + x: -3.5d + y: -6.5d + } ] title: "Chapter One" } diff --git a/config/ftbquests/quests/reward_tables/large_tents.snbt b/config/ftbquests/quests/reward_tables/large_tents.snbt new file mode 100644 index 000000000..4ccbd3ed8 --- /dev/null +++ b/config/ftbquests/quests/reward_tables/large_tents.snbt @@ -0,0 +1,53 @@ +{ + id: "2EFA972F9A54C345" + loot_size: 1 + order_index: 1 + rewards: [ + { + item: { + Count: 1b + id: "nomadictents:large_yurt" + tag: { + layers: 3L + } + } + } + { + item: { + Count: 1b + id: "nomadictents:large_indlu" + tag: { + layers: 3L + } + } + } + { + item: { + Count: 1b + id: "nomadictents:large_tepee" + tag: { + layers: 3L + } + } + } + { + item: { + Count: 1b + id: "nomadictents:large_bedouin" + tag: { + layers: 3L + } + } + } + { + item: { + Count: 1b + id: "nomadictents:large_shamiyana" + tag: { + layers: 3L + } + } + } + ] + title: "Large Tents" +} From ad8073552809a1b9c322c3ada868629b0bc6e793 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 27 Nov 2023 18:29:52 -0500 Subject: [PATCH 2/3] Update CHANGELOG.md --- changelogs/CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index e22cc8f40..2d75dff93 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -2,7 +2,9 @@ ### 🌟 Improvements -- [Expert] Early quests now grant a Large Nomadic Tent of one's choosing [\#791](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/791) +- [Expert] Early quests now grant a Large Nomadic Tent of one's choosing [\#794](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/794) + +--- ### Enigmatica 9 v1.16.0 From 7b9cafd9f0e6bee1e41e884a8871a36225f62623 Mon Sep 17 00:00:00 2001 From: MuteTiefling Date: Mon, 27 Nov 2023 18:35:41 -0500 Subject: [PATCH 3/3] quests --- config/ftbquests/quests/chapters/chapter_one.snbt | 4 +++- config/ftbquests/quests/chapters/storage.snbt | 2 +- config/ftbquests/quests/chapters/storage_expert.snbt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt index 2bcc35317..25564cd8f 100644 --- a/config/ftbquests/quests/chapters/chapter_one.snbt +++ b/config/ftbquests/quests/chapters/chapter_one.snbt @@ -2737,7 +2737,9 @@ "" "=================================" "" - "Nomadic Tents offer a portable home that can make a wonderful base of operations early on. Not only may the be moved with ease, but they may also be upgraded while retaining their contents. Consider setting up a bed, basic storage, and some essential crafting stations inside!" + "Nomadic Tents offer a portable home that can make a wonderful base of operations early on. Not only may the be moved with ease, but they may also be upgraded while retaining their contents. " + "" + "Consider setting up a bed, basic storage, and some essential crafting stations inside!" "" "● Right-Click and Hold the tent on the " " ground to place the frame." diff --git a/config/ftbquests/quests/chapters/storage.snbt b/config/ftbquests/quests/chapters/storage.snbt index 18106be2d..7b5915d91 100644 --- a/config/ftbquests/quests/chapters/storage.snbt +++ b/config/ftbquests/quests/chapters/storage.snbt @@ -1460,7 +1460,7 @@ Count: 1b id: "itemfilters:id_regex" tag: { - value: "nomadictents:.*(yurt|tepee|bedouin|indlu|shamiyana)$" + value: "^nomadictents:(tiny|small|medium|large|giant|mega)" } } title: "Nomadic Tents" diff --git a/config/ftbquests/quests/chapters/storage_expert.snbt b/config/ftbquests/quests/chapters/storage_expert.snbt index a28ce8c7d..4b704669c 100644 --- a/config/ftbquests/quests/chapters/storage_expert.snbt +++ b/config/ftbquests/quests/chapters/storage_expert.snbt @@ -1311,7 +1311,7 @@ Count: 1b id: "itemfilters:id_regex" tag: { - value: "nomadictents:.*(yurt|tepee|bedouin|indlu|shamiyana)$" + value: "^nomadictents:(tiny|small|medium|large|giant|mega)" } } title: "Nomadic Tents"