diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/cooling.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/cooling.json index 1cfa7acda..4d36255dd 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/cooling.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/cooling.json @@ -5,7 +5,7 @@ "pages": [ { "type": "patchouli:text", - "text": "The Beneath is hot! The temperature starts at 15C at the very top, and only gets hotter as you descend.$(br2)$(item)Burlap$() and $(item)Silk$() clothing will help, but here are some other ways to stay cool!" + "text": "The Beneath is hot! The temperature starts at 15°C at the very top, and only gets hotter as you descend.$(br2)$(item)Burlap$() and $(item)Silk$() clothing will help, but here are some other ways to stay cool!" }, { "type": "patchouli:spotlight", @@ -19,6 +19,12 @@ "item": "minecraft:packed_ice", "text": "Bring along some $(thing)Ice$()! Standing near it will lower the ambient temperature. Ice can be harvested on the surface using a $(item)Saw$(), and $(thing)Packed$() and $(thing)Blue$() ice won't melt." }, + { + "type": "patchouli:spotlight", + "item": "gtceu:ice_bucket", + "title": "Liquid Ice Slush", + "text": "Ahhhh, so refreshing! Cools you down by 4°C." + }, { "type": "patchouli:spotlight", "title": "Blue Steel Equipment", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json index 068854311..38c1e6cb9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json @@ -37,7 +37,7 @@ { "type": "patchouli:spotlight", "title": "Teas", - "text": "$(thing)Teas$() can be brewed using dried versions of certain plants.$(br2)They provide short but useful buffs and warm your body temperature by 4 degrees. Perfect for winters!", + "text": "$(thing)Teas$() can be brewed using dried versions of certain plants.$(br2)They provide short but useful buffs and warm your body temperature by 4°C. Perfect for winters!", "item": "tfc_gurman:tea_mint_bucket,tfc_gurman:tea_chamomile_bucket,tfc_gurman:tea_rosehip_bucket,tfc_gurman:tea_nettle_bucket" }, { @@ -52,7 +52,7 @@ }, { "type": "patchouli:text", - "text": "$(li)Cocoa: Haste (0:30), warms you by 4 degrees$(li)Coffee: Speed (0:30), warms you by 4 degrees$(li)Lemonade: Haste (0:30), cools you by 2 degrees$(li)Nalivka: Strength (2:40), cools you by 2 degrees$(li)Kvass: Strength (1:20), cools you by 2 degrees$(li)Compote: Jump Boost II (0:30)" + "text": "$(li)Cocoa: Haste (0:30), warms you up by 4°C$(li)Coffee: Speed (0:30), warms you up by 4°C$(li)Lemonade: Haste (0:30), cools you down by 2°C$(li)Nalivka: Strength (2:40), cools you down by 2°C$(li)Kvass: Strength (1:20), cools you down by 2°C$(li)Compote: Jump Boost II (0:30)" }, { "type": "patchouli:spotlight", @@ -62,7 +62,7 @@ }, { "title": "Spring Water", - "text": "Drinking $(thing)Spring Water$() warms you up by 4 degrees and applies a small regeneration effect while standing in it, as well as warming you.", + "text": "Drinking $(thing)Spring Water$() warms you up by 4°C and applies a small regeneration effect while standing in it, as well as warming you.", "item": "tfc:bucket/spring_water", "type": "patchouli:spotlight" }, @@ -71,6 +71,12 @@ "text": "Drinking $(thing)Sea Water$() does not hydrate you and will make you more thirsty instead. A hot body temperature can also make you more thirsty. Lost at sea? Look upwards when it's raining for some easy hydration!", "type": "patchouli:spotlight", "item": "tfc:bucket/salt_water" + }, + { + "title": "Liquid Ice Slush", + "text": "Drinking $(thing)Ice Slush$() cools you down by 4°C, perfect for summer! Also handy for traversing the beneath.", + "type": "patchouli:spotlight", + "item": "gtceu:ice_bucket" } ] } diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 5e7cce12d..2d1e903d3 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -4843,7 +4843,7 @@ "quests.tfg_tips.beneath_prep.desc": "&4The Beneath&r is a very hostile environment. Due to it being very deep underground, the average temperature is always &cabove 15°C&r, going higher the deeper you go. This is not to mention the amount of hostile creatures crawling these caves.\nThe quests linked with this one provide some basic preparations for your adventure.", "quests.tfg_tips.beneath_temp_management.title": "Temperature Management: Active", "quests.tfg_tips.beneath_temp_management.subtitle": "Things to cool off quickly", - "quests.tfg_tips.beneath_temp_management.desc": "In &4The Beneath&r, with the temperature being relatively high, you should bring some &aWater&r to cool off on demand, or some &bPacked Ice&r mined from polar regions if you plan to make a temporary base.", + "quests.tfg_tips.beneath_temp_management.desc": "In &4The Beneath&r, with the temperature being relatively high, you should bring some &aWater&r or &aLiquid Ice Slush&r to cool off on demand, or some &bPacked Ice&r mined from polar regions if you plan to make a temporary base.", "quests.tfg_tips.beneath_clothes.title": "Temperature Management: Passive", "quests.tfg_tips.beneath_clothes.subtitle": "Things to passively cool off", "quests.tfg_tips.beneath_clothes.desc": "&bClothes&r also play an important role in cooling off. The easiest to craft before going to &4The Beneath&r are &dBurlap Clothes.&r\n\n&dSilk Clothes&r require &aString&r, which can be found in large quantities inside the beneath biome called the &cWebbed Lair.&r\n\nThere is a better alternative if you have access to &9Blue Steel&r however...", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 5ad3d0e91..2c9b63075 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -4928,7 +4928,7 @@ "quests.tfg_tips.beneath_prep.desc": "&4幽冥之地&r是一片危机四伏的凶险之地。由于地处极深的地下,这里的环境温度始终&c高于15°C&r,并且会随着深入而不断攀升。更不用说还有大量敌对生物在这些洞窟中潜伏爬行。\n与此关联的任务将为你此次探险提供一些基础准备。", "quests.tfg_tips.beneath_temp_management.title": "体温管理:主动", "quests.tfg_tips.beneath_temp_management.subtitle": "快速降温之物", - "quests.tfg_tips.beneath_temp_management.desc": "在&4幽冥之地&r,由于环境温度较高,你应当随身携带一些&a水&r以便随时降温。若计划建立临时基地,最好也准备一些从极地区域开采的&b浮冰&r。", + "quests.tfg_tips.beneath_temp_management.desc": "在&4幽冥之地&r,由于环境温度较高,你应当随身携带一些&a水&r或者&a冰泥%r以便随时降温。若计划建立临时基地,最好也准备一些从极地区域开采的&b浮冰&r。", "quests.tfg_tips.beneath_clothes.title": "体温管理:被动", "quests.tfg_tips.beneath_clothes.subtitle": "被动降温之物", "quests.tfg_tips.beneath_clothes.desc": "&b衣物&r在降温方面同样扮演着重要角色。在前往&4幽冥之地&r前,最容易制作的当属&d粗麻布衣物&r。\n\n&d丝绸衣物&r需要&a线&r,你可以在幽冥之地的&c蛛网巢穴&r生物群系中找到大量这种材料。\n\n不过,如果你能获取&9蓝钢&r,还将有更好的选择……", diff --git a/kubejs/data/gtceu/tfc/drinkables/ice_slush.json b/kubejs/data/gtceu/tfc/drinkables/ice_slush.json new file mode 100644 index 000000000..1f05cb9c9 --- /dev/null +++ b/kubejs/data/gtceu/tfc/drinkables/ice_slush.json @@ -0,0 +1,11 @@ +{ + "ingredient": "gtceu:ice", + "thirst": 10, + "effects": [ + { + "type": "tfg:cooling", + "duration": 20, + "amplifier": 0 + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index c083d0293..b6d93a48f 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -181,6 +181,9 @@ const registerTFGFluidTags = (event) => { event.add('tfc:any_drinkables', 'gtceu:ethanol') event.add('tfc:drinkables', 'gtceu:methanol') event.add('tfc:any_drinkables', 'gtceu:methanol') + + event.add('tfc:drinkables', 'gtceu:ice') + event.add('tfc:any_drinkables', 'gtceu:ice') global.BREATHABLE_COMPRESSED_AIRS.forEach(x => { event.add('tfg:breathable_compressed_air', x)