Skip to content

Commit

Permalink
feat: 👛Numishaul balance changes and [Lapidary Calibration] overhaul
Browse files Browse the repository at this point in the history
Tweaks:
* Changed the amount of Mirion coins from 3 to 1
* Updated RF values for coins with new data
* Removed emerald from coin numismatic list
* Added gem block trick into English and Russian questbooks

Description:
- values now uses formulas, making it more accurate and flexible
- some of alloys now might give less energy due to their components giving less value (especially gems)
- changed "mechanic" for rewarding harder alloys from +15%/+25%/+35%/+45% to +20%/+30%/+50%/+65%
- stellar alloy now uses nuggets for its coins

**Lapidary calibration overhaul**

- now supports ~3x more gems from all stages of the game
- rebalanced existing values to account for their actual availability in the world
- added a "mechanic" with being able to feed gem blocks to dynamo, with them giving more energy then gems used to make the block, like coal block
- this boost doesn't work for every gem block

**New villager profession, `Stock Trader`**

- has custom yellow-ish robe and smile in its texture
- lvl 1-2 trades allow you to buy basic metal and alloy coins for emeralds
- lvl 3-4 trades make you exchange 6 basic and 6 more advanced coins for 9 upgraded coins
- lvl 5-6 trades allow to exchange large quantity of 2 types of coins into 1 high-end coin

https://i.imgur.com/QZY6eDg.png

https://i.imgur.com/ExC5r8P.png
  • Loading branch information
TrashboxBobylev committed Feb 10, 2024
1 parent 2270b3f commit b4106be
Show file tree
Hide file tree
Showing 10 changed files with 369 additions and 125 deletions.
120 changes: 120 additions & 0 deletions config/vtt/trade_tables/stock_trader.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"Profession": "vtt:stock_trader",
"Career": "stock_trader",
"Offers": {
"Recipes": [
{
"action": "add",
"buy": { "id": "minecraft:emerald", "Count": 1 },
"sell": [
{ "id": "thermalfoundation:coin", "Damage": 0, "Count": { "min": 4, "max": 6 } },
{ "id": "thermalfoundation:coin", "Damage": 1, "Count": { "min": 2, "max": 3 } },
{ "id": "thermalfoundation:coin", "Damage": 64, "Count": { "min": 4, "max": 6 } },
{ "id": "thermalfoundation:coin", "Damage": 65, "Count": { "min": 4, "max": 6 } },
{ "id": "thermalfoundation:coin", "Damage": 68, "Count": { "min": 4, "max": 6 } },
{ "id": "thermalfoundation:coin", "Damage": 67, "Count": { "min": 4, "max": 6 } },
{ "id": "thermalfoundation:coin", "Damage": 69, "Count": { "min": 2, "max": 3 } }
],
"CareerLevel": 1
},
{
"action": "add",
"buy": { "id": "minecraft:emerald", "Count": 1 },
"sell": [
{ "id": "thermalfoundation:coin", "Damage": 96, "Count": { "min": 2, "max": 3 } },
{ "id": "thermalfoundation:coin", "Damage": 98, "Count": { "min": 2, "max": 4 } },
{ "id": "thermalfoundation:coin", "Damage": 99, "Count": { "min": 4, "max": 5 } },
{ "id": "thermalfoundation:coin", "Damage": 100, "Count": { "min": 2, "max": 3 } },
{ "id": "thermalfoundation:coin", "Damage": 97, "Count": { "min": 1, "max": 2 } },
{ "id": "thermalfoundation:coin", "Damage": 67, "Count": { "min": 4, "max": 6 } },
{ "id": "contenttweaker:coin_aluminumbrass", "Damage": 0, "Count": { "min": 4, "max": 6 } }
],
"CareerLevel": 2
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 0, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_advancedalloy", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "contenttweaker:coin_elementium", "Damage": 0, "Count": {"min": 8, "max": 11} },
"CareerLevel": 3
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 1, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_magnesiumdiboride", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "contenttweaker:coin_vibrantalloy", "Damage": 0, "Count": {"min": 8, "max": 11} },
"CareerLevel": 3
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 64, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_soularium", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "thermalfoundation:coin", "Damage": 102, "Count": {"min": 8, "max": 11} },
"CareerLevel": 3
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 67, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_fluxedelectrum", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "thermalfoundation:coin", "Damage": 101, "Count": {"min": 8, "max": 11} },
"CareerLevel": 3
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 97, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_blackiron", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "contenttweaker:coin_niobiumtitanium", "Damage": 0, "Count": {"min": 6, "max": 8} },
"CareerLevel": 4
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 100, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_extremealloy", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "contenttweaker:coin_enhancedender", "Damage": 0, "Count": {"min": 6, "max": 8} },
"CareerLevel": 4
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 99, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_osgloglas", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "contenttweaker:coin_glitchinfused", "Damage": 0, "Count": {"min": 6, "max": 8} },
"CareerLevel": 4
},
{
"action": "add", "chance": 0.5,
"buy": { "id": "thermalfoundation:coin", "Damage": 96, "Count": {"min": 5, "max": 7} },
"buyB": { "id": "contenttweaker:coin_endsteel", "Damage": 0, "Count": {"min": 5, "max": 7} },
"sell": { "id": "contenttweaker:coin_ivorypsimetal", "Damage": 0, "Count": {"min": 6, "max": 8} },
"CareerLevel": 4
},
{
"action": "add", "chance": 0.75,
"buy": { "id": "jaopca:item_coinardite", "Damage": 0, "Count": {"min": 8, "max": 12} },
"buyB": { "id": "contenttweaker:coin_alumite", "Damage": 0, "Count": {"min": 8, "max": 12} },
"sell": { "id": "contenttweaker:coin_primalmetal", "Damage": 0, "Count": {"min": 1, "max": 3} },
"CareerLevel": 5
},
{
"action": "add", "chance": 0.75,
"buy": { "id": "contenttweaker:coin_manyullyn", "Damage": 0, "Count": {"min": 8, "max": 12} },
"buyB": { "id": "contenttweaker:coin_tungstencarbide", "Damage": 0, "Count": {"min": 8, "max": 12} },
"sell": { "id": "contenttweaker:coin_crystallinepinkslimealloy", "Damage": 0, "Count": {"min": 1, "max": 3} },
"CareerLevel": 5
},
{
"action": "add", "chance": 0.75,
"buy": { "id": "thermalfoundation:coin", "Damage": 1, "Count": {"min": 27, "max": 32} },
"buyB": { "id": "jaopca:item_coinlithium", "Damage": 0, "Count": {"min": 27, "max": 32} },
"sell": { "id": "contenttweaker:coin_wyvernmetal", "Damage": 0, "Count": 1 },
"CareerLevel": 6
},
{
"action": "add", "chance": 0.75,
"buy": { "id": "jaopca:item_coinuranium", "Damage": 0, "Count": {"min": 27, "max": 32} },
"buyB": { "id": "contenttweaker:coin_heavymetal", "Damage": 0, "Count": {"min": 27, "max": 32} },
"sell": { "id": "contenttweaker:coin_mithrillium", "Damage": 0, "Count": 2 },
"CareerLevel": 6
}
]
}
}
10 changes: 10 additions & 0 deletions config/vtt/villagers/stock_trader.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"profession": {
"name": "vtt:stock_trader",
"texture": "vtt:textures/entity/villager/stock_trader.png",
"zombieTexture": "vtt:textures/entity/zombie_villager/zombie_stock_trader.png"
},
"careers": [
"stock_trader"
]
}
2 changes: 1 addition & 1 deletion resources/ftbquests/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ q.thermal_expansion.augment_clastic_d.desc=Allows for an igneous extruder to pro
q.thermal_expansion.numismatic_dynamo.name=Numismatic Dynamo
q.thermal_expansion.numismatic_dynamo.desc=This Dynamo produces power from Coins made in the Compactor with a special augment.\n\nCoins exist for almost every ingot and alloy.\nMaking coins from more §acomplicated alloys§r allows for §emore energy§r than making coins from alloy's components.
q.thermal_expansion.lapidary_calibration.name=Lapidary Calibration
q.thermal_expansion.lapidary_calibration.desc=Allows for various gems to be used as fuel. Greatly increases power generation and efficiency.\n\n§cPower generation multiplier was tweaked!§r\nIt is now §b3x§r base power instead of §35x§r.
q.thermal_expansion.lapidary_calibration.desc=Allows for various gems to be used as fuel. Greatly increases power generation and efficiency.\n\n§cPower generation multiplier was tweaked!§r\nIt is now §b3x§r base power instead of §35x§r.\n\n§bCombining§r gems into blocks allows to get §bmore power§r than fueling all gems into dynamo one by one.
q.thermal_expansion.isentropic_reservoir.name=Isentropic Reservoir
q.thermal_expansion.isentropic_reservoir.desc=Greatly increases power generation and efficiency, you will however need to supply coolant.
q.thermal_expansion.ignition_plugs.name=Ignition Plugs
Expand Down
2 changes: 1 addition & 1 deletion resources/ftbquests/lang/ru_ru.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,7 @@ q.thermal_expansion.augment_clastic_d.desc=Позволяет магнизным
q.thermal_expansion.numismatic_dynamo.name=Нумизматическое Динамо
q.thermal_expansion.numismatic_dynamo.desc=Это динамо производит энергию из монет, сделанных в уплотнении со специальным усилением.\n\nМонеты есть почти для каждого полезного металла и сплава.\nСоздавать монеты из §aболее сложных сплавов§r позволяет §eвырабатывать больше энергии§r чем делать монеты из ингредиентов сплава.
q.thermal_expansion.lapidary_calibration.name=Лапидарная калибровка
q.thermal_expansion.lapidary_calibration.desc=Позволяет использовать различные драгоценные камни в качестве топлива. Значительно увеличивает выработку электроэнергии и эффективность.\n\n§cВнимание! Это улучшение теперь вырабатывает меньше энергии!§r\nТеперь оно увеличивает максимальную энергию от динамо только §bв три раза§r вместо §3пяти раз§r.
q.thermal_expansion.lapidary_calibration.desc=Позволяет использовать различные драгоценные камни в качестве топлива. Значительно увеличивает выработку электроэнергии и эффективность.\n\n§cВнимание! Это улучшение теперь вырабатывает меньше энергии!§r\nТеперь оно увеличивает максимальную энергию от динамо только §bв три раза§r вместо §3пяти раз§r.\n\n§bСжатие§r камней в блоки позволяет производить §bбольше энергии§r, чем загрузка камней в динамо по одиночке.
q.thermal_expansion.isentropic_reservoir.name=Изэнтропическое водохранилище
q.thermal_expansion.isentropic_reservoir.desc=Значительно увеличивает выработку электроэнергии и эффективность, однако вам потребуется подача охлаждающей жидкости.
q.thermal_expansion.ignition_plugs.name=Свечи зажигания
Expand Down
1 change: 1 addition & 0 deletions resources/vtt/lang/en_US.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
entity.Villager.stock_trader=Stock Trader
1 change: 1 addition & 0 deletions resources/vtt/lang/ru_RU.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
entity.Villager.stock_trader=Биржевой брокер
1 change: 1 addition & 0 deletions resources/vtt/lang/zh_CN.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
entity.Villager.stock_trader=股票经纪人
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b4106be

Please sign in to comment.