From 89c81edb5197f89c85b79712297ebade318c77e7 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 26 Apr 2024 16:08:22 +0700 Subject: [PATCH] steam&rails rails recipes --- CHANGELOG.md | 10 +-- kubejs/server_scripts/railways/recipes.js | 88 ++++++++++++++++------- 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f86261959..fdf733418 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,6 @@ # Changelog -## [0.7.4] - NF*SDfsd7f!3673No0a73 -### Features -- Добавлены рецепты/квесты для MacawTFC (в работе). -- Добавлены рецепты/квесты для CreateDecorations (в работе). -- Добавлены рецепты/квесты для StorageDrawers (в работе). - -## [0.7.3] - 2??????9????????.04.2024 :trollface: +## [0.7.3] - 28.04.2024 ### Features - Теперь Spout может наливать жидкость(металл) в формы TFC. - Теперь при установке пластин, слитков, двойных слитков TFC на землю они будут принимать цвет, который указан в GTCEu. @@ -43,7 +37,7 @@ - Если вы держите в руке щипцы из TFCHotOrNot и у вас в инвентаре горячий слиток GTCEu, то вы не будете получать урон. - Добавлены рецепты/квесты для TFCHotOrNot. - Добавлено больше вариантов удобрений исходящих из GTCEu предметов. -- Изменены рецепты у рельсовых путей create, добавленных в обновлении Steam&Rails (в работе) (Exception). +- Добавлены новые рецепты для рельсовых путей, которые были добавлены в обновлении Steam&Rails. - Добавлены рецепты/квесты для ExtendedAE2 (в работе) (FriendlyCube). - Добавлены рецепты/квесты для MegaCells (в работе) (FriendlyCube). - Добавлены рецепты/квесты для FramedBlocks (в работе) (FriendlyCube). diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 56fda012b..62709ddc9 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -257,39 +257,20 @@ const registerRailWaysRecipes = (event) => { .EUt(32) // Железнодорожное полотно (Узкое) - - // Из стали event.recipes.createSequencedAssembly([ 'railways:track_create_andesite_narrow', ], '#tfg:rock_slabs', [ - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/steel']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/steel']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/steel']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/steel']), + event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), + event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), + event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), + event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), event.recipes.createPressing('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow']), ]).transitionalItem('railways:track_incomplete_create_andesite_narrow').loops(1).id('tfg:railways/sequenced_assembly/track_create_andesite_narrow_from_steel') event.recipes.gtceu.assembler('railways/track_create_andesite_narrow_from_steel') - .itemInputs('#tfg:rock_slabs', '4x #forge:nuggets/steel') + .itemInputs('#tfg:rock_slabs', '4x gtceu:steel_nugget') .itemOutputs('railways:track_create_andesite_narrow') - .duration(100) - .EUt(32) - - // Из ванадиум-стали - event.recipes.createSequencedAssembly([ - '2x railways:track_create_andesite_narrow', - ], '#tfg:rock_slabs', [ - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/vanadium_steel']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/vanadium_steel']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/vanadium_steel']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:nuggets/vanadium_steel']), - event.recipes.createPressing('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow']), - ]).transitionalItem('railways:track_incomplete_create_andesite_narrow').loops(1).id('tfg:railways/sequenced_assembly/track_create_andesite_narrow_from_vanadium_steel') - - event.recipes.gtceu.assembler('railways/track_create_andesite_narrow_from_vanadium_steel') - .itemInputs('#tfg:rock_slabs', '4x #forge:nuggets/vanadium_steel') - .itemOutputs('2x railways:track_create_andesite_narrow') - .duration(100) + .duration(800) .EUt(32) // Железнодорожное полотно (Нормальное) @@ -306,7 +287,7 @@ const registerRailWaysRecipes = (event) => { .itemInputs('railways:track_create_andesite_narrow') .inputFluids(Fluid.of('gtceu:concrete', 144)) .itemOutputs('create:track') - .duration(200) + .duration(800) .EUt(16) // Железнодорожное полотно (Широкое) @@ -323,8 +304,61 @@ const registerRailWaysRecipes = (event) => { .itemInputs('create:track') .inputFluids(Fluid.of('gtceu:concrete', 144)) .itemOutputs('railways:track_create_andesite_wide') - .duration(200) + .duration(800) .EUt(16) + + // Железнодородные полотна из дерева + global.TFC_WOOD_TYPES.forEach(woodType => { + // Узкое + event.recipes.createSequencedAssembly([ + `railways:track_tfc_${woodType}_narrow`, + ], `tfc:wood/planks/${woodType}_slab`, [ + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, '4x #forge:screws']), + event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`]), + ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_narrow`).loops(1).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_narrow`) + + event.recipes.gtceu.assembler(`railways/track_create_${woodType}_narrow`) + .itemInputs(`tfc:wood/planks/${woodType}_slab`, '4x gtceu:steel_nugget', '4x #forge:screws') + .itemOutputs(`railways:track_tfc_${woodType}_narrow`) + .duration(800) + .EUt(32) + + // Нормальное + event.recipes.createSequencedAssembly([ + `railways:track_tfc_${woodType}`, + ], `railways:track_tfc_${woodType}_narrow`, [ + event.recipes.createCutting(`railways:track_incomplete_tfc_${woodType}`, `railways:track_incomplete_tfc_${woodType}`).processingTime(100), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, `tfc:wood/planks/${woodType}_slab`]), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, '4x #forge:screws']), + event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`]), + ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}`).loops(1).id(`tfg:railways/sequenced_assembly/track_create_${woodType}`) + + event.recipes.gtceu.assembler(`railways/track_${woodType}`) + .itemInputs(`railways:track_tfc_${woodType}_narrow`, '4x #forge:screws') + .itemOutputs(`railways:track_tfc_${woodType}`) + .duration(800) + .EUt(16) + + // Широкое + event.recipes.createSequencedAssembly([ + `railways:track_tfc_${woodType}_wide`, + ], `railways:track_tfc_${woodType}`, [ + event.recipes.createCutting(`railways:track_incomplete_tfc_${woodType}_wide`, `railways:track_incomplete_tfc_${woodType}_wide`).processingTime(100), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, `tfc:wood/planks/${woodType}_slab`]), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, '4x #forge:screws']), + event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`]), + ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_wide`).loops(1).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_wide`) + + event.recipes.gtceu.assembler(`railways/track_${woodType}_wide`) + .itemInputs(`railways:track_tfc_${woodType}`, '4x #forge:screws') + .itemOutputs(`railways:track_tfc_${woodType}_wide`) + .duration(800) + .EUt(16) + }); }