diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv index 6901f0cd3..2aae5f10b 100644 --- a/assets/mods/basegame/items/itemid.csv +++ b/assets/mods/basegame/items/itemid.csv @@ -15,10 +15,15 @@ id;classname 14;net.torvald.terrarum.modulebasegame.gameitems.PickaxeWood 15;net.torvald.terrarum.modulebasegame.gameitems.SledgehammerWood 16;net.torvald.terrarum.modulebasegame.gameitems.ItemWorkbench +17;net.torvald.terrarum.modulebasegame.gameitems.ItemCoalCoke 128;net.torvald.terrarum.modulebasegame.gameitems.OreCopper 129;net.torvald.terrarum.modulebasegame.gameitems.OreIron 130;net.torvald.terrarum.modulebasegame.gameitems.OreCoal +131;net.torvald.terrarum.modulebasegame.gameitems.OreZinc +132;net.torvald.terrarum.modulebasegame.gameitems.OreTin +133;net.torvald.terrarum.modulebasegame.gameitems.OreGold +134;net.torvald.terrarum.modulebasegame.gameitems.OreSilver 256;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorOak 257;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorEbony diff --git a/assets/mods/basegame/ores/ores.csv b/assets/mods/basegame/ores/ores.csv index 9e65d2a97..b2d9b4f9d 100644 --- a/assets/mods/basegame/ores/ores.csv +++ b/assets/mods/basegame/ores/ores.csv @@ -2,19 +2,19 @@ "1";"item@basegame:128";"COPPER,MALACHITE" "2";"item@basegame:129";"IRON,HAEMATITE" "3";"item@basegame:130";"COAL,CARBON" -# "4";"item@basegame:132";"ZINC,SPHALERITE" -# "5";"item@basegame:133";"TIN,CASSITERITE" -# "6";"item@basegame:131";"GOLD,NATURAL_GOLD" -# "7";"item@basegame:131";"SILVER,NATURAL_SILVER" -# "8";"item@basegame:134";"GEM,RUBY" -# "9";"item@basegame:135";"GEM,EMERALD" -#"10";"item@basegame:136";"GEM,SAPPHIRE" -#"11";"item@basegame:137";"GEM,TOPAZ" -#"12";"item@basegame:138";"GEM,DIAMOND" -#"13";"item@basegame:139";"GEM,SIO2,AMETHYST" -#"14";"item@basegame:140";"GEM,SIO2,QUARTZ" -#"15";"item@basegame:141";"LEAD,GALENA" -#"16";"item@basegame:142";"TITANIUM,RUTILE" + "4";"item@basegame:131";"ZINC,SPHALERITE" + "5";"item@basegame:132";"TIN,CASSITERITE" + "6";"item@basegame:133";"GOLD,NATURAL_GOLD" + "7";"item@basegame:134";"SILVER,NATURAL_SILVER" +# "8";"item@basegame:135";"GEM,RUBY" +# "9";"item@basegame:136";"GEM,EMERALD" +#"10";"item@basegame:137";"GEM,SAPPHIRE" +#"11";"item@basegame:138";"GEM,TOPAZ" +#"12";"item@basegame:139";"GEM,DIAMOND" +#"13";"item@basegame:140";"GEM,SIO2,AMETHYST" +#"14";"item@basegame:141";"GEM,SIO2,QUARTZ" +#"15";"item@basegame:142";"LEAD,GALENA" +#"16";"item@basegame:143";"TITANIUM,RUTILE" #"256";"macro@BASETILE";"GRASS" #"257";"macro@BASETILE";"MOSS" \ 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 06dd152ea..4e6e13083 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt @@ -56,4 +56,31 @@ class OreCoal(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_ORE_COAL" override val itemImage: TextureRegion get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,6) +} +class OreZinc(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_ORE_SPHALERITE" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,6) +} +class OreTin(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_ORE_CASSITERITE" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,6) +} +class OreGold(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_ORE_NATURAL_GOLD" + override val materialId: String = "AURM" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7, 6) +} +class OreSilver(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_ORE_NATURAL_SILVER" + override val materialId: String = "ARGN" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6) +} +class ItemCoalCoke(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_COAL_COKE" + override val itemImage: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6) } \ No newline at end of file