From 52dcc540891afbb6790eab0a7ff446d1ab8f17ae Mon Sep 17 00:00:00 2001 From: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com> Date: Mon, 2 Jun 2025 21:45:47 +0100 Subject: [PATCH] Add Optional Bacon Quest (#1122) * Add bacon quest * Fix merging issue * Changelog --------- Signed-off-by: Pyritie Co-authored-by: Pyritie --- CHANGELOG.md | 3 +- .../quests/chapters/queststfc_tips.snbt | 108 +++++++++++++++--- kubejs/assets/tfg/lang/en_us.json | 4 + 3 files changed, 99 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 255d22fc6..89f2e7ca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,8 @@ - Added Wine utensils recipes for GT (#1111) @JeanRdS - Fixed kaolin clay duping (#1099) @SpicyNoodle5 - Fixed TFC sugar recipes so they can now use any sugar (#1099) @SpicyNoodle5 -- add the create toolbox to the list of unsortable inventories (#1120) @esotericist +- Added optional quest for bacon (#1122) @SpicyNoodle5 +- Add the create toolbox to the list of unsortable inventories (#1120) @esotericist ## [0.9.9] - 30.05.2025 ### Changes diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 4ee385d49..219a9f019 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1236,7 +1236,7 @@ type: "item" }] title: "{quests.tfg_tips.refrigerator.title}" - x: 8.0d + x: 9.0d y: -17.0d } { @@ -1606,7 +1606,7 @@ type: "checkmark" }] title: "{quests.tfg_tips.passive_preservation.title}" - x: 6.0d + x: 6.5d y: -15.5d } { @@ -1627,7 +1627,7 @@ type: "item" }] title: "{quests.tfg_tips.get_milk.title}" - x: 4.0d + x: 4.5d y: -8.5d } { @@ -1648,7 +1648,7 @@ type: "item" }] title: "{quests.tfg_tips.get_meat.title}" - x: 5.0d + x: 5.5d y: -8.5d } { @@ -1669,7 +1669,7 @@ type: "item" }] title: "{quests.tfg_tips.get_fruit.title}" - x: 7.0d + x: 7.5d y: -8.5d } { @@ -1690,7 +1690,7 @@ type: "item" }] title: "{quests.tfg_tips.get_grain.title}" - x: 8.0d + x: 8.5d y: -8.5d } { @@ -1711,7 +1711,7 @@ type: "item" }] title: "{quests.tfg_tips.get_veggie.title}" - x: 6.0d + x: 6.5d y: -8.5d } { @@ -1746,7 +1746,7 @@ } ] title: "{quests.tfg_tips.process_grain.title}" - x: 8.0d + x: 8.5d y: -12.5d } { @@ -1809,7 +1809,7 @@ } ] title: "{quests.tfg_tips.brine_something.title}" - x: 6.0d + x: 6.5d y: -9.5d } { @@ -1873,7 +1873,7 @@ } ] title: "{quests.tfg_tips.pickle_something.title}" - x: 6.0d + x: 6.5d y: -12.5d } { @@ -1918,7 +1918,7 @@ } ] title: "{quests.tfg_tips.dry_fruit.title}" - x: 7.0d + x: 7.5d y: -11.0d } { @@ -1960,7 +1960,7 @@ } ] title: "{quests.tfg_tips.salt_meat.title}" - x: 5.0d + x: 5.5d y: -10.5d } { @@ -2009,7 +2009,7 @@ } ] title: "{quests.tfg_tips.smoke_meat.title}" - x: 5.0d + x: 5.5d y: -11.5d } { @@ -2049,7 +2049,7 @@ } ] title: "{quests.tfg_tips.cook_meat.title}" - x: 5.0d + x: 5.5d y: -13.5d } { @@ -3626,7 +3626,7 @@ type: "item" }] title: "{quests.tfg_tips.vessel_preservation.title}" - x: 6.0d + x: 6.5d y: -16.5d } { @@ -5225,6 +5225,84 @@ x: -2.5d y: 6.0d } + { + dependencies: ["1FC019B45383695E"] + description: ["{quests.tfg_tips.bacon.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:food": { + creationDate: -2L + traits: [ ] + } + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "firmalife:food/bacon" + } + id: "27FD6D86233B3C8D" + shape: "heart" + subtitle: "{quests.tfg_tips.bacon.subtitle}" + tasks: [ + { + icon: { + Count: 1 + ForgeCaps: { + "tfc:food": { + creationDate: -9223372036854775808L + traits: [ + "tfc:brined" + "firmalife:smoked" + ] + } + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:food/pork" + } + id: "450B578B4B128D69" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)item(tfc:food/pork)" + } + } + title: "{quests.tfg_tips.bacon.task}" + type: "item" + } + { + id: "7B835DA2FEF500F1" + item: "tfc:powder/salt" + type: "item" + } + { + id: "267439967946EA29" + item: { + Count: 1 + ForgeCaps: { + "tfc:food": { + creationDate: -2L + traits: [ ] + } + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "firmalife:food/bacon" + } + type: "item" + } + ] + title: "{quests.tfg_tips.bacon.title}" + x: 4.75d + y: -12.5d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index e221360df..58c2c5d49 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2226,6 +2226,10 @@ "quests.tfg_tips.smoke_meat.subtitle": "Smokey", "quests.tfg_tips.smoke_meat.desc": "You can hang up to 8 slices of &aRaw Meat&r on a &bString&r that's placed over a &cLit Campfire&r to smoke it. Keep in mind that the meat &lmust be brined first.&r \nIt may also be &dsalted&r before smoking.", "quests.tfg_tips.smoke_meat.task": "A hunk of Smoked Meat", + "quests.tfg_tips.bacon.title": "Bacon", + "quests.tfg_tips.bacon.subtitle": "Crispy", + "quests.tfg_tips.bacon.desc": "&aBacon&r can be made from &bSmoked Pork&r and a pinch of salt giving &d4 times&r the amount of meat!\n\nNote that the pork &lhas to be smoked&r before it can be turned into bacon.", + "quests.tfg_tips.bacon.task": "A hunk of Smoked Pork", "quests.tfg_tips.cook_meat.title": "Meat Preservation: Cooking", "quests.tfg_tips.cook_meat.subtitle": "Pretty obvious in hindsight.", "quests.tfg_tips.cook_meat.desc": "Cooking can potentially provide its own preservation traits. You should cook &aMeat&r either in a &bWrought Iron Grill&r or a &bTop Oven!&r\nOther cooking methods may not provide any trait at all or may even give negative traits that lower shelf life.\n\n&3&lTip:&r&o &bWrought Iron Grills&f can be part of the &dOven&f structure.",