Merge branch 'main' into TFC-magma-as-passive-boiler-heater

Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
This commit is contained in:
Dmitry 2025-01-25 23:48:34 +07:00 committed by GitHub
commit 160de3cfa7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
299 changed files with 3853 additions and 158 deletions

View file

@ -1067,11 +1067,6 @@ global.TFC_MILKS = [
{id: 'firmalife:coconut_milk'},
];
global.calcAmountOfMetal = (defaultAmount, percents) => {
const value = defaultAmount / (100 / percents)
return (value % 2 == 0) ? value : Math.round(value) - 1
}
global.TFC_MAGMA_BLOCKS = [
'tfc:rock/magma/granite',
'tfc:rock/magma/diorite',
@ -1081,3 +1076,16 @@ global.TFC_MAGMA_BLOCKS = [
'tfc:rock/magma/andesite',
'tfc:rock/magma/dacite'
];
global.calcAmountOfMetal = (defaultAmount, percents) => {
const value = defaultAmount / (100 / percents)
return (value % 2 == 0) ? value : Math.round(value) - 1
}
// This prevents the "exploit" where Cassiterite dust gives 2x as much from melting as smelting in a furnace
global.calcAmountOfMetalProcessed = (defaultAmount, percents) => {
const percentPerItem = percents / Math.ceil(percents / 100)
const value = defaultAmount * (percentPerItem / 100)
return (value % 2 == 0) ? value : Math.round(value) - 1
}