Skip to content

Commit

Permalink
Slight thermalily buffs
Browse files Browse the repository at this point in the history 
- Increased managen
- Decreased managen cooldown
- Adjusted cooldown_roll_pdf to incentivise optimal usage with comparators

Optimal use should now produce a pool every 1.5h (previously ~2.6h), and lava every 5 mins
produces a pool every 3.4h (previously ~5.3h). If referencing Wormbo's graph, optimal
usage should now sit between Kek and alternating very bad foods with the gourm.

commit message amended by williewillus
  • Loading branch information
@anoomolu @williewillus
anoomolu authored and williewillus committed Oct 1, 2023
1 parent b1706cc commit 4b55137
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Xplat/src/main/java/vazkii/botania/common/block/flower/generating/ThermalilyBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ThermalilyBlockEntity extends FluidGeneratorBlockEntity {
public static final String TAG_COOLDOWN_MAGNITUDE = "cooldownStrength";

private int cooldownStrength = 15;
public static final int[] COOLDOWN_ROLL_PDF = { 10, 5, 3, 2, 1, 1, 4, 8, 3, 2, 1, 1, 1, 2, 3 };
public static final int[] COOLDOWN_ROLL_PDF = { 10, 5, 3, 2, 1, 1, 3, 3, 3, 2, 1, 1, 1, 2, 2 };
public static final int COOLDOWN_ROLL_TOTAL;

static {
Expand All @@ -36,7 +36,7 @@ public class ThermalilyBlockEntity extends FluidGeneratorBlockEntity {
}

public ThermalilyBlockEntity(BlockPos pos, BlockState state) {
super(BotaniaFlowerBlocks.THERMALILY, pos, state, FluidTags.LAVA, 900, 20);
super(BotaniaFlowerBlocks.THERMALILY, pos, state, FluidTags.LAVA, 600, 45);
}

@Override
Expand Down Expand Up @@ -80,7 +80,7 @@ public int getComparatorSignal() {

@Override
public int getMaxMana() {
return 500;
return 750;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion Xplat/src/main/resources/assets/botania/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2303,7 +2303,7 @@

"botania.entry.thermalily": "Thermalily",
"botania.tagline.thermalily": "Mana from lava",
"botania.page.thermalily0": "The $(item)Thermalily$(0) is a $(item)Lava$(0)-flavoured counterpart to the $(l:generating_flowers/hydroangeas)$(item)Hydroangeas$(0)$(/l). The flower absorbs $(item)Lava$(0) around it (at the same altitude) to generate $(thing)Mana$(0).$(p)After absorbing one block of $(item)Lava$(0), the flower will produce $(thing)Mana$(0) continually for around 45 seconds. Afterwards, though, it needs a bit of time to cool down before it can produce any more.",
"botania.page.thermalily0": "The $(item)Thermalily$(0) is a $(item)Lava$(0)-flavoured counterpart to the $(l:generating_flowers/hydroangeas)$(item)Hydroangeas$(0)$(/l). The flower absorbs $(item)Lava$(0) around it (at the same altitude) to generate $(thing)Mana$(0).$(p)After absorbing one block of $(item)Lava$(0), the flower will produce $(thing)Mana$(0) continually for around 30 seconds. Afterwards, though, it needs a bit of time to cool down before it can produce any more.",
"botania.page.thermalily1": "As temperamental as its drink of choice, though, it tends to randomly vary how long a cooldown period lasts-- anywhere from 20 seconds to a full 5 minutes!$(p)You can tell how long its most recent cooldown period lasts with a $(item)Redstone Comparator$(0): twenty seconds for each level of strength.",
"botania.page.thermalily2": "The $(thing)Mana$(0) throughput the $(item)Thermalily$(0) produces during its active phase is extremely high; it's an ideal flower for a quick boost in stores.$(p)However, during its \"cooldown\" period, any adjacent $(thing)Lava$(0) will be absorbed and reset the cooldown without yielding any $(thing)Mana$(0).",
"botania.page.thermalily3": "While placing $(item)Lava$(0) in the world is definitely possible via $(item)Dispensers$(0), automatically gathering it and carrying it from the $(thing)Nether$(0) or deep underground is not.$(p)As such, the $(item)Thermalily$(0) is classified as a \"semi-automatable\" flower.",
Expand Down
4 changes: 2 additions & 2 deletions Xplat/src/main/resources/assets/botania/lang/fr_fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2651,7 +2651,7 @@

"botania.entry.thermalily": "Thermalys",
"botania.tagline.thermalily": "TAGLINE",
"botania.page.thermalily0": "Le $(item)thermalys$(0) est une variante de l'$(l:generating_flowers/hydroangeas)hydroangelle$(/l), mais avec de la $(thing)lave$(0).$(p)Après en avoir ingéré, le $(item)thermalys$(0) produira du $(thing)mana$(0) pendant 45 secondes, puis il aura besoin d'une pause de 5 minutes pour digérer.",
"botania.page.thermalily0": "Le $(item)thermalys$(0) est une variante de l'$(l:generating_flowers/hydroangeas)hydroangelle$(/l), mais avec de la $(thing)lave$(0).$(p)Après en avoir ingéré, le $(item)thermalys$(0) produira du $(thing)mana$(0) pendant 30 secondes, puis il aura besoin d'une pause de 5 minutes pour digérer.",
"botania.page.thermalily2": "Pendant sa phase active le débit de $(thing)mana$(0) est important, pratique pour remplir rapidement un $(l:mana/pool)bassin de mana$(/l).$(p)Néanmoins, il faut respecter sa période de digestion. Toute $(thing)lave$(0) apportée pendant cette période sera gaspillée.",
"botania.page.thermalily3": "Placer automatiquement de la $(thing)lave$(0) est faisable avec un $(item)distributeur$(0). Mais c'est pénible d'aller la ramasser depuis le $(thing)Nether$(0).$(p)C'est pour cela que le $(item)thermalys$(0) est classifié comme une fleur \"$(o)semi-automatisable$()\".",
"botania.page.thermalily4": "$(o)déconseillé aux hémomanciens$()",
Expand Down Expand Up @@ -3980,4 +3980,4 @@
"botania.subtitle.worldSeedTeleport": "Téléportation par graine du monde",

"botania.subtitle.way": "O-oooooooooo AAAAE-A-A-I-A-U-JO-oooooooooooo AAE-O-A-A-U-U-A-E-eee-ee-eee AAAAE-A-E-I-E-A-JO-ooo-oo-oo-oo EEEEO-A-AAA-AAAA O-oooooooooo AAAAE-A-A-I-A-U-JO-oooooooooooo AAE-O-A-A-U-U-A-E-eee-ee-eee AAAAE-A-E-I-E-A-JO-ooo-oo-oo-oo EEEEO-A-AAA-AAAA O-oooooooooo AAAAE-A-A-I-A-U-JO-oooooooooooo AAE-O-A-A-U-U-A-E-eee-ee-eee AAAAE-A-E-I-E-A-JO-ooo-oo-oo-oo EEEEO-A-AAA-AAAA"
}
}
2 changes: 1 addition & 1 deletion Xplat/src/main/resources/assets/botania/lang/ja_jp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@

"botania.entry.thermalily": "サーマリリー",
"botania.tagline.thermalily": "溶岩からマナ",
"botania.page.thermalily0": "$(item)サーマリリー$(0)は、$(l:generating_flowers/hydroangeas)$(item)ハイドロエンゲス$(0)$(/l)と対になる、$(item)溶岩$(0)対応版です。この花は、周囲の同じ高さにある$(item)溶岩$(0)を吸い上げ、$(thing)マナ$(0)に変換します。$(p)$(item)溶岩$(0)を1ブロック吸収すると、約45秒間継続的に$(thing)マナ$(0)を生成しますが、その後、次の吸収までに、約5分の冷却時間が必要です。",
"botania.page.thermalily0": "$(item)サーマリリー$(0)は、$(l:generating_flowers/hydroangeas)$(item)ハイドロエンゲス$(0)$(/l)と対になる、$(item)溶岩$(0)対応版です。この花は、周囲の同じ高さにある$(item)溶岩$(0)を吸い上げ、$(thing)マナ$(0)に変換します。$(p)$(item)溶岩$(0)を1ブロック吸収すると、約30秒間継続的に$(thing)マナ$(0)を生成しますが、その後、次の吸収までに、約5分の冷却時間が必要です。",
"botania.page.thermalily2": "稼働時間中に$(item)サーマリリー$(0)が生成する$(thing)マナ$(0)の量は非常に多く、素早く貯蔵量を増やしたい場合、理想的な花と言えます。$(p)ただし、\"冷却時間\"の間、隣接する$(thing)溶岩$(0)が吸収されても$(thing)マナ$(0)は生成されず、冷却時間もリセットされてしまいます。",
"botania.page.thermalily3": "$(item)溶岩$(0)を$(item)ディスペンサー$(0)を使用して設置することは可能ですが、$(thing)ネザー$(0)や地中深くから運び込むことは難しいでしょう。$(p)その為、$(item)サーマリリー$(0)は\"半自動化可能\"な花として分類されます。",
"botania.page.thermalily4": "$(o)最も難しい花$()。",
Expand Down
2 changes: 1 addition & 1 deletion Xplat/src/main/resources/assets/botania/lang/pt_br.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,7 @@

"botania.entry.thermalily": "Thermalily",
"botania.tagline.thermalily": "Mana pela lava",
"botania.page.thermalily0": "A $(item)Thermalily$(0) age como uma versão de $(item)Lava$(0) das $(item)Hydroangeas$(0). Como esperado, a flor absorve $(item)Lava$(0) ao redor dela, na mesma altura, para gerar $(thing)Mana$(0).$(p)Depois de absorver a $(item)Lava$(0), a flor produz $(thing)Mana$(0) por aproximadamente 45 segundos. Depois que ela acaba, ela precisa de um pouco de tempo para esfriar (em torno de 5 minutos) antes de poder absorver mais $(item)Lava$(0).",
"botania.page.thermalily0": "A $(item)Thermalily$(0) age como uma versão de $(item)Lava$(0) das $(item)Hydroangeas$(0). Como esperado, a flor absorve $(item)Lava$(0) ao redor dela, na mesma altura, para gerar $(thing)Mana$(0).$(p)Depois de absorver a $(item)Lava$(0), a flor produz $(thing)Mana$(0) por aproximadamente 30 segundos. Depois que ela acaba, ela precisa de um pouco de tempo para esfriar (em torno de 5 minutos) antes de poder absorver mais $(item)Lava$(0).",
"botania.page.thermalily2": "A quantidade de $(thing)Mana$(0) que a $(item)Thermalily$(0) produz durante seu período ativo é muito alta, servindo como uma boa flor geradora para quando um impulso é necessário.$(p)Durante o período de \"resfriamento\", se a flor absorver mais $(thing)Lava$(0), ela a consome sem produzir $(thing)Mana$(0) e reseta os 5 minutos de espera.",
"botania.page.thermalily3": "Enquanto colocar $(item)Lava$(0) no mundo é possível usando um $(item)Ejetor$(0), armazenar e carregar ela do $(thing)Nether$(0) ou do fundo da terra é história pra um outro dia.$(p)Com isso, a $(item)Thermalily$(0) é classificada como uma flor \"semi-automatizável\".",
"botania.page.thermalily4": "$(o)A flor mais trabalhosa no jogo$(0).",
Expand Down
2 changes: 1 addition & 1 deletion Xplat/src/main/resources/assets/botania/lang/ru_ru.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@

"botania.entry.thermalily": "Теплолилия",
"botania.tagline.thermalily": "Создаёт ману из лавы",
"botania.page.thermalily0": "$(item)Теплолилия$(0) является аналогом $(item)Водогортензии$(0). Она будет поглощать $(item)Лаву$(0) из площади 3x3 вокруг себя на той же высоте, создавая из неё $(thing)Ману$(0).$(p)После поглощения $(item)Лавы$(0) цветок будет создавать ману около 45 секунд. После этого потребуется немного времени (около 5 минут), чтобы цветок возобновил работу.",
"botania.page.thermalily0": "$(item)Теплолилия$(0) является аналогом $(item)Водогортензии$(0). Она будет поглощать $(item)Лаву$(0) из площади 3x3 вокруг себя на той же высоте, создавая из неё $(thing)Ману$(0).$(p)После поглощения $(item)Лавы$(0) цветок будет создавать ману около 30 секунд. После этого потребуется немного времени (около 5 минут), чтобы цветок возобновил работу.",
"botania.page.thermalily2": "Количество $(thing)Маны$(0), которое производит $(item)Теплолилия$(0) в течение своего активного периода, чрезвычайно велико, что является очень функциональным цветком, когда требуется много маны.",
"botania.page.thermalily3": "Можно также размещать $(item)Лаву$(0) с помощью $(item)Раздатчиков$(0), автоматически собирать и переносить её из $(thing)Нижнего мира$(0) или глубин мира, но это уже совсем другая история...$(p)Таким образом, $(item)Теплолилия$(0) классифицируется как \"полуавтоматизируемый\" цветок.",
"botania.page.thermalily4": "$(o)Самый сложный цветок в игре$(0).",
Expand Down
2 changes: 1 addition & 1 deletion Xplat/src/main/resources/assets/botania/lang/zh_cn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2304,7 +2304,7 @@

"botania.entry.thermalily": "炽玫瑰",
"botania.tagline.thermalily": "岩浆产魔",
"botania.page.thermalily0": "$(item)炽玫瑰$(0)是$(l:generating_flowers/hydroangeas)$(item)水绣球$(0)$(/l)的$(item)熔岩$(0)版本，原理类似$(item)水绣球$(0)，但它吸收的是$(item)熔岩$(0)。它会在消耗$(item)熔岩$(0)后的约45秒内迅速产生大量的$(item)魔力$(0)，但之后则需要花一点时间来冷却。",
"botania.page.thermalily0": "$(item)炽玫瑰$(0)是$(l:generating_flowers/hydroangeas)$(item)水绣球$(0)$(/l)的$(item)熔岩$(0)版本，原理类似$(item)水绣球$(0)，但它吸收的是$(item)熔岩$(0)。它会在消耗$(item)熔岩$(0)后的约30秒内迅速产生大量的$(item)魔力$(0)，但之后则需要花一点时间来冷却。",
"botania.page.thermalily1": "不过，就像它选择的饮料一样喜怒无常，它往往会随机改变冷却时间————从20秒到整整5分钟不等！$(p)你可以用$(item)红石比较器$(0)来测定它的冷却时间：每级强度为20秒。",
"botania.page.thermalily2": "在工作阶段时，$(item)炽玫瑰$(0)产出的$(thing)魔力$(0)的量十分之高，十分适合应对短时间内需要大量消耗魔力的情况。$(p)在它进入“冷却阶段”时，它依旧会消耗熔岩，但不会产出任何$(thing)魔力$(0)，直到冷却期结束后方能继续产出魔力。",
"botania.page.thermalily3": "虽然$(item)发射器$(0)可以胜任自动放置$(item)熔岩$(0)的工作，但自动收集$(thing)下界$(0)或地底深处的熔岩并用来自动产出魔力却完全是另外一回事。$(p)因此，$(item)炽玫瑰$(0)被归类为“半自动化产能花”。",
Expand Down

0 comments on commit 4b55137

Please sign in to comment.