illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Фикс: не правильные значения уровня у металлов в ковке

Browse source
This commit is contained in:
SpeeeDCraft 2023-11-17 10:32:25 +07:00
parent 6e899486b3
commit bbc7f04fbd
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
kubejs/server_scripts/tfc/constants.js
View file

@ -357,7 +357,7 @@ const ItemHeats = {
const Metals = {
"bismuth": { forging_temp: 162, welding_temp: 216, melt_temp: 270, fluidName: "gtceu:bismuth", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) },
"brass": { forging_temp: 558, welding_temp: 744, melt_temp: 930, fluidName: "gtceu:brass", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) },
"brass": { forging_temp: 558, welding_temp: 744, melt_temp: 930, fluidName: "gtceu:brass", tier: 2, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) },
"gold": { forging_temp: 636, welding_temp: 848, melt_temp: 1060, fluidName: "gtceu:gold", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) },
"nickel": { forging_temp: 872, welding_temp: 1162, melt_temp: 1453, fluidName: "gtceu:nickel", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) },
"rose_gold": { forging_temp: 576, welding_temp: 768, melt_temp: 960, fluidName: "gtceu:rose_gold", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) },
@ -366,31 +366,32 @@ const Metals = {
"zinc": { forging_temp: 252, welding_temp: 336, melt_temp: 420, fluidName: "gtceu:zinc", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) },
"sterling_silver": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:sterling_silver", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) },
"copper": { forging_temp: 648, welding_temp: 864, melt_temp: 1080, fluidName: "gtceu:copper", tier: 1, canBeUnmolded: true, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"bismuth_bronze": { forging_temp: 591, welding_temp: 788, melt_temp: 985, fluidName: "gtceu:bismuth_bronze", tier: 1, canBeUnmolded: true, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"bismuth_bronze": { forging_temp: 591, welding_temp: 788, melt_temp: 985, fluidName: "gtceu:bismuth_bronze", tier: 2, canBeUnmolded: true, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"bronze": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:bronze", tier: 1, canBeUnmolded: true, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"black_bronze": { forging_temp: 642, welding_temp: 856, melt_temp: 1070, fluidName: "gtceu:black_bronze", tier: 1, canBeUnmolded: true, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"wrought_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:wrought_iron", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: [].concat(/*ingotGen,*/ doubleIngotGen, dustGen, oreGen, /*gtToolGen,*/ /*partGen*/) },
"black_bronze": { forging_temp: 642, welding_temp: 856, melt_temp: 1070, fluidName: "gtceu:black_bronze", tier: 2, canBeUnmolded: true, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"wrought_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:wrought_iron", tier: 3, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, props: [].concat(/*ingotGen,*/ doubleIngotGen, dustGen, oreGen, /*gtToolGen,*/ /*partGen*/) },
// "cast_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: doubleIngotGen },
"pig_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "tfc:metal/pig_iron", tier: 1, props: ingotGen},
"steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:steel", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"high_carbon_black_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_black_steel", tier: 1, props: ingotGen },
"high_carbon_red_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_red_steel", tier: 1, props: ingotGen },
"high_carbon_blue_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_blue_steel", tier: 1, props: ingotGen },
"weak_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_steel", tier: 1, props: ingotGen },
"weak_red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_red_steel", tier: 1, props: ingotGen },
"weak_blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_blue_steel", tier: 1, props: ingotGen },
"black_steel": { forging_temp: 891, welding_temp: 1188, melt_temp: 1485, fluidName: "gtceu:black_steel", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:red_steel", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:blue_steel", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"pig_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "tfc:metal/pig_iron", tier: 3, props: ingotGen},
"steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:steel", tier: 4, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"high_carbon_black_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_black_steel", tier: 5, props: ingotGen },
"high_carbon_red_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_red_steel", tier: 5, props: ingotGen },
"high_carbon_blue_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_blue_steel", tier: 4, props: ingotGen },
"high_carbon_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_steel", tier: 3, props: ingotGen },
"weak_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_steel", tier: 4, props: ingotGen },
"weak_red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_red_steel", tier: 5, props: ingotGen },
"weak_blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_blue_steel", tier: 5, props: ingotGen },
"black_steel": { forging_temp: 891, welding_temp: 1188, melt_temp: 1485, fluidName: "gtceu:black_steel", tier: 5, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:red_steel", tier: 6, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:blue_steel", tier: 6, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) },
"unknown": { forging_temp: 240, welding_temp: 320, melt_temp: 400, fluidName: "tfc:metal/unknown", tier: 1, props: ingotGen },
"cassiterite": { forging_temp: 138, welding_temp: 184, melt_temp: 230, fluidName: "gtceu:zinc", tier: 1, props: [].concat(dustGen, oreGen) },
"garnierite": { forging_temp: 138, welding_temp: 184, melt_temp: 1453, fluidName: "gtceu:nickel", tier: 1, props: [].concat(dustGen, oreGen) },
"hematite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: [].concat(dustGen, oreGen) },
"yellow_limonite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: [].concat(dustGen, oreGen) },
"magnetite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: [].concat(dustGen, oreGen) },
"hematite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, props: [].concat(dustGen, oreGen) },
"yellow_limonite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, props: [].concat(dustGen, oreGen) },
"magnetite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, props: [].concat(dustGen, oreGen) },
"malachite": { forging_temp: 138, welding_temp: 184, melt_temp: 1080, fluidName: "gtceu:copper", tier: 1, props: [].concat(dustGen, oreGen) },
"pyrite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: [].concat(dustGen, oreGen) },
"pyrite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, props: [].concat(dustGen, oreGen) },
"sphalerite": { forging_temp: 138, welding_temp: 184, melt_temp: 420, fluidName: "gtceu:zinc", tier: 1, props: [].concat(dustGen, oreGen) },
"tetrahedrite": { forging_temp: 138, welding_temp: 184, melt_temp: 1080, fluidName: "gtceu:copper", tier: 1, props: [].concat(dustGen, oreGen) }
}

2
kubejs/server_scripts/tfc/tags.js
View file

@ -16,7 +16,7 @@ const registerTFCTags = (event) => {
event.add('forge:ingots/double/rose_gold', 'tfc:metal/double_ingot/rose_gold')
event.add('forge:ingots/double/silver', 'tfc:metal/double_ingot/silver')
event.add('forge:ingots/double/tin', 'tfc:metal/double_ingot/tin')
event.add('forge:ingots/double/irzincon', 'tfc:metal/double_ingot/zinc')
event.add('forge:ingots/double/zinc', 'tfc:metal/double_ingot/zinc')
event.add('forge:ingots/double/sterling_silver', 'tfc:metal/double_ingot/sterling_silver')
event.add('forge:ingots/double/iron', 'tfc:metal/double_ingot/cast_iron')
event.add('forge:ingots/double/wrought_iron', 'tfc:metal/double_ingot/wrought_iron')