diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 316e01471..db26ca11f 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -2503,6 +2503,61 @@ x: -6.0d y: 10.0d } + { + description: ["{quests.tfg_tips.harpoon.desc}"] + id: "78374FC41EFCFD9B" + subtitle: "{quests.tfg_tips.harpoon.subtitle}" + tasks: [{ + id: "0DDF6CE85945464A" + item: { + Count: 1 + id: "species:harpoon" + tag: { + Damage: 0 + } + } + type: "item" + }] + title: "{quests.tfg_tips.harpoon.title}" + x: -8.0d + y: 4.0d + } + { + dependencies: ["78374FC41EFCFD9B"] + description: ["{quests.tfg_tips.coil.desc}"] + id: "3876C12655AE6E3C" + subtitle: "{quests.tfg_tips.coil.subtitle}" + tasks: [{ + id: "0B27949208A80BD9" + item: "species:coil" + type: "item" + }] + title: "{quests.tfg_tips.coil.title}" + x: -9.5d + y: 4.0d + } + { + dependencies: ["72B3EA6588E18CCC"] + description: ["{quests.tfg_tips.self_defense.desc}"] + icon: "species:cranktrap" + id: "104EFD3257F7BA61" + subtitle: "{quests.tfg_tips.self_defense.subtitle}" + tasks: [ + { + id: "227B319F72D2E23C" + item: "species:cranktrap" + type: "item" + } + { + id: "7551326CEF2F9575" + item: "createaddition:barbed_wire" + type: "item" + } + ] + title: "{quests.tfg_tips.self_defense.title}" + x: -2.5d + y: 0.5d + } ] subtitle: ["{quests.tfg_tips.tools_tips.subtitle}"] title: "Tips - Tools" diff --git a/config/ftbquests/quests/chapters/tips__transportation.snbt b/config/ftbquests/quests/chapters/tips__transportation.snbt index 2b22b21c2..0f959f3f6 100644 --- a/config/ftbquests/quests/chapters/tips__transportation.snbt +++ b/config/ftbquests/quests/chapters/tips__transportation.snbt @@ -395,7 +395,12 @@ } ] order_index: 2 - quest_links: [ ] + quest_links: [{ + id: "704C995D4B6CE874" + linked_quest: "46C92B938921A0AC" + x: 4.5d + y: 0.5d + }] quests: [ { dependencies: ["2746958D3D4A0885"] diff --git a/kubejs/assets/createhorsepower/lang/en_us.json b/kubejs/assets/createhorsepower/lang/en_us.json index 5fde3efdf..7f58a1d9a 100644 --- a/kubejs/assets/createhorsepower/lang/en_us.json +++ b/kubejs/assets/createhorsepower/lang/en_us.json @@ -1,4 +1,4 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "blocks.createhorsepower.horse_crank": "Animal Crank" + "block.createhorsepower.horse_crank": "Animal Crank" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 92cd91244..b6f91119a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2774,6 +2774,15 @@ "quests.tfg_tips.photo_frame.title": "Photo Frame", "quests.tfg_tips.photo_frame.subtitle": "For the most astonishing pictures", "quests.tfg_tips.photo_frame.desc": "A &dPhoto Frame&r can be used to display pictures. Unlike Item Frames, Photo Frames can be 1x1, 2x2 or 3x3 in size, allowing you to display particularly beautiful photos at your base!", + "quests.tfg_tips.harpoon.title": "Harpoon", + "quests.tfg_tips.harpoon.subtitle": "Emergency escape", + "quests.tfg_tips.harpoon.desc": "The &dHarpoon&r is similar to the grappling hook, except it always flies straight upwards and can't be upgraded. You can still swing with it though!", + "quests.tfg_tips.coil.title": "Ziplines", + "quests.tfg_tips.coil.subtitle": "Wheeeeee!", + "quests.tfg_tips.coil.desc": "If you right-click two &dFences&r with a &3Coil&r, you'll create a zipline! Build one above you, then shoot your Harpoon into the fence to start schmooving.\n\nRight-click the Coil with an empty hand to change the slack of the line. Each Coil is one-way, indicated by the \"arrows\" on the line itself, so if you want a two-way line you'll need two coils.\n\nYou can also place Coils on other blocks too for decoration, but they must be on fences to work as a zipline.", + "quests.tfg_tips.self_defense.title": "Self-defense", + "quests.tfg_tips.self_defense.subtitle": "Got zombies on your lawn?", + "quests.tfg_tips.self_defense.desc": "Place a &3Cranktrap&r next to a pressure plate, and they'll completely immobilize whatever animal (or monster!) steps on it. Great for catching that elusive animal in the forest, or for defending your home.\n\nBarbed Wire is completely passive and just inflicts damage to anything that walks through it.", "quests.tfg_tips.arborfirmacraft.title": "ArborFirmaCraft", "quests.tfg_tips.arborfirmacraft.subtitle": "Harvesting the Life-blood of Trees", "quests.tfg_tips.arborfirmacraft.desc": "&2ArborFirmaCraft&r is a mod that adds multiple new trees to &3TFG&r: some are variants of existing TFC trees, such as &dAncient Kapok&r, while others are completely new, such as the &aBaobab&r and &aHevea.&r Some of the plank and log textures of these trees may remind you of vanilla tree colors...\n\nThis section will go over &bTree Tapping.&r\nAs a bonus, all &2ArborFirmaCraft&r woods are compatible with &3FirmaLife&r, and &3Firma:Civ&r, we made sure of it!", diff --git a/kubejs/server_scripts/grapplemod/recipes.js b/kubejs/server_scripts/grapplemod/recipes.js index 4eebec1af..409de9be2 100644 --- a/kubejs/server_scripts/grapplemod/recipes.js +++ b/kubejs/server_scripts/grapplemod/recipes.js @@ -277,7 +277,14 @@ function registerGrapplingHookRecipes(event) event.remove({mod: 'grapplemod'}) - event.recipes.kubejs.shapeless('grapplemod:grapplinghook', ['gtceu:wrought_iron_pickaxe_head', 'firmaciv:rope_coil', 'firmaciv:rope_coil', 'firmaciv:rope_coil', 'firmaciv:rope_coil']) + event.recipes.kubejs.shaped('grapplemod:grapplinghook', [ + 'A', + 'B', + 'B' + ], { + A: 'gtceu:wrought_iron_pickaxe_head', + B: 'firmaciv:rope_coil' + }) .modifyResult((craftingGrid, result) => { let grappleCustomization = new $GrappleCustomization(); diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js index b5a109290..fcc33d8c4 100644 --- a/kubejs/server_scripts/species/recipes.js +++ b/kubejs/server_scripts/species/recipes.js @@ -53,7 +53,7 @@ function registerSpeciesRecipes(event) { event.shaped('2x species:coil', [ 'ABA' ], { - A: '#forge:screws/wrought_iron', + A: '#forge:bolts/wrought_iron', B: 'firmaciv:rope_coil' }).id('tfg:shaped/coil')