diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv index baab7e31c..0bf0356bb 100644 --- a/assets/mods/basegame/items/itemid.csv +++ b/assets/mods/basegame/items/itemid.csv @@ -25,7 +25,7 @@ id;classname 24;net.torvald.terrarum.modulebasegame.gameitems.AxeStone 25;net.torvald.terrarum.modulebasegame.gameitems.ItemClayBall 26;net.torvald.terrarum.modulebasegame.gameitems.IngotSteel -27;net.torvald.terrarum.modulebasegame.gameitems.ItemMetalworkingStation +27;net.torvald.terrarum.modulebasegame.gameitems.ItemFurnaceAndAnvil # ingots 112;net.torvald.terrarum.modulebasegame.gameitems.IngotCopper diff --git a/assets/mods/basegame/locales/en/blocks.json b/assets/mods/basegame/locales/en/blocks.json index 5505316c4..d2096c5c5 100644 --- a/assets/mods/basegame/locales/en/blocks.json +++ b/assets/mods/basegame/locales/en/blocks.json @@ -14,6 +14,7 @@ "BLOCK_DIRT": "Dirt", "BLOCK_GRASS": "Grass", "BLOCK_GRASSWALL": "Grass", + "BLOCK_CLAY": "Clay", "BLOCK_PLANK_NORMAL": "Wooden Planks", "BLOCK_PLANK_EBONY": "Ebony Planks", diff --git a/assets/mods/basegame/locales/en/items.json b/assets/mods/basegame/locales/en/items.json index 59295c9c4..aaf3ec109 100644 --- a/assets/mods/basegame/locales/en/items.json +++ b/assets/mods/basegame/locales/en/items.json @@ -5,6 +5,7 @@ "ITEM_DOOR_EBONY": "Ebony Door", "ITEM_DOOR_BIRCH": "Birch Door", "ITEM_DOOR_ROSEWOOD": "Rosewood Door", + "ITEM_FURNACE_AND_ANVIL": "Furnace and Anvil", "ITEM_GEM_RUBY": "Raw Ruby", "ITEM_GEM_EMERALD": "Raw Emerald", "ITEM_GEM_SAPPHIRE": "Raw Sapphire", @@ -16,6 +17,20 @@ "ITEM_HATCHET_STEEL": "Steel Axe", "ITEM_HATCHET_STONE": "Stone Axe", "ITEM_HATCHET_WOODEN": "Wooden Axe", + "ITEM_INGOT_BRASS": "Brass Ingot", + "ITEM_INGOT_BRONZE": "Bronze Ingot", + "ITEM_INGOT_COPPER": "Copper Ingot", + "ITEM_INGOT_ELECTRUM": "Electrum Ingot", + "ITEM_INGOT_GOLD": "Gold Ingot", + "ITEM_INGOT_IRON": "Iron Ingot", + "ITEM_INGOT_LEAD": "Lead Ingot", + "ITEM_INGOT_ROSEGOLD": "Rosegold Ingot", + "ITEM_INGOT_SILVER": "Silver Ingot", + "ITEM_INGOT_SILVER_BILLON": "Silver Billon Ingot", + "ITEM_INGOT_SOLDER": "Solder Bar", + "ITEM_INGOT_STEEL": "Steel Ingot", + "ITEM_INGOT_TIN": "Tin Ingot", + "ITEM_INGOT_ZINC": "Zinc Ingot", "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter", "ITEM_LOGS_BIRCH": "Birch Logs", "ITEM_LOGS_EBONY": "Ebony Logs", @@ -41,6 +56,7 @@ "ITEM_SLEDGEHAMMER_COPPER": "Copper Sledgehammer", "ITEM_SLEDGEHAMMER_IRON": "Iron Sledgehammer", "ITEM_SLEDGEHAMMER_STEEL": "Steel Sledgehammer", + "ITEM_SMELTER_SMALL": "Small Smelter", "ITEM_STORAGE_CHEST": "Storage Chest", "ITEM_TIKI_TORCH": "Tiki Torch", "ITEM_TYPEWRITER": "Typewriter", diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMetalworkingStation.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureFurnaceAndAnvil.kt similarity index 97% rename from src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMetalworkingStation.kt rename to src/net/torvald/terrarum/modulebasegame/gameactors/FixtureFurnaceAndAnvil.kt index faf6b1b23..0e2062b4c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMetalworkingStation.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureFurnaceAndAnvil.kt @@ -17,14 +17,14 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack /** * Created by minjaesong on 2023-12-05. */ -class FixtureMetalworkingStation : FixtureBase, CraftingStation { +class FixtureFurnaceAndAnvil : FixtureBase, CraftingStation { @Transient override val spawnNeedsFloor = true @Transient override val tags = listOf("metalworking") constructor() : super( BlockBox(BlockBox.NO_COLLISION, 3, 2), // temporary value, will be overwritten by spawn() - nameFun = { Lang["ITEM_SMELTER_BASIC"] } + nameFun = { Lang["ITEM_FURNACE_AND_ANVIL"] } ) { CommonResourcePool.addToLoadingList("particles-tiki_smoke.tga") { TextureRegionPack(ModMgr.getGdxFile("basegame", "particles/bigger_smoke.tga"), 16, 16) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSmelterBasic.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSmelterBasic.kt index d137b9784..730326a2c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSmelterBasic.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSmelterBasic.kt @@ -27,7 +27,7 @@ class FixtureSmelterBasic : FixtureBase, CraftingStation { constructor() : super( BlockBox(BlockBox.NO_COLLISION, 3, 4), // temporary value, will be overwritten by spawn() - nameFun = { Lang["ITEM_SMELTER_BASIC"] } + nameFun = { Lang["ITEM_SMELTER_SMALL"] } ) { CommonResourcePool.addToLoadingList("particles-tiki_smoke.tga") { TextureRegionPack(ModMgr.getGdxFile("basegame", "particles/bigger_smoke.tga"), 16, 16) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMetalworkingStation.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt similarity index 69% rename from src/net/torvald/terrarum/modulebasegame/gameitems/ItemMetalworkingStation.kt rename to src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt index e43632cff..0dae70214 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMetalworkingStation.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt @@ -6,7 +6,7 @@ import net.torvald.terrarum.gameitems.ItemID /** * Created by minjaesong on 2023-12-05. */ -class ItemMetalworkingStation(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.FixtureMetalworkingStation") { +class ItemFurnaceAndAnvil(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.FixtureFurnaceAndAnvil") { override var baseMass = 100.0 @@ -16,6 +16,6 @@ class ItemMetalworkingStation(originalID: ItemID) : FixtureItemBase(originalID, get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/metalworking_furnace_and_anvil.tga") override var baseToolSize: Double? = baseMass - override var originalName = "ITEM_METALWORKING_STATION" + override var originalName = "ITEM_FURNACE_AND_ANVIL" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt index fc9f1bb1d..ba5933e42 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt @@ -16,6 +16,6 @@ class ItemSmelterBasic(originalID: ItemID) : FixtureItemBase(originalID, "net.to get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/smelter_tall.tga") override var baseToolSize: Double? = baseMass - override var originalName = "ITEM_SMELTER_BASIC" + override var originalName = "ITEM_SMELTER_SMALL" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt index 2c4ed2819..5d43f72e9 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt @@ -153,10 +153,10 @@ class OreLead(originalID: ItemID) : OreItemBase(originalID) { get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6) } -class IngotSteel(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_IRON" +class ItemCoalCoke(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_COAL_COKE" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,5) + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6) } class IngotCopper(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_COPPER" @@ -168,10 +168,10 @@ class IngotIron(originalID: ItemID) : OreItemBase(originalID) { override val itemImage: TextureRegion get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,5) } -class ItemCoalCoke(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_COAL_COKE" +class IngotSteel(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_STEEL" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6) + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,5) } class IngotZinc(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_ZINC" @@ -200,6 +200,36 @@ class IngotLead(originalID: ItemID) : OreItemBase(originalID) { override val itemImage: TextureRegion get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,5) } +class IngotBronze(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_BRONZE" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,5) +} +class IngotBrass(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_BRASS" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,5) +} +class IngotElectrum(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_ELECTRUM" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,5) +} +class IngotSilverBillon(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_SILVER_BILLON" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(12,5) +} +class IngotRosegold(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_ROSEGOLD" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13,5) +} +class IngotSolder(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_SOLDER" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14,5) +} class ItemClayBall(originalID: ItemID) : OreItemBase(originalID) { diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index 87ebedb7c..880bdf9c4 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -7,6 +7,7 @@ import com.jme3.math.FastMath import net.torvald.terrarum.* import net.torvald.terrarum.App.* import net.torvald.terrarum.audio.AudioMixer +import net.torvald.terrarum.audio.decibelsToFullscale import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid import net.torvald.terrarum.ui.Toolkit @@ -360,7 +361,7 @@ class UIInventoryFull( INGAME.setTooltipMessage(null) AudioMixer.requestLowpassIn(0.25) - AudioMixer.requestFadeOut(AudioMixer.fadeBus, 0.25, 0.5) + AudioMixer.requestFadeOut(AudioMixer.fadeBus, 0.25, decibelsToFullscale(-3.0)) } override fun doClosing(delta: Float) {