lead ore

assets/mods/basegame/items/itemid.csv

@@ -24,6 +24,7 @@ id;classname
 132;net.torvald.terrarum.modulebasegame.gameitems.OreTin
 133;net.torvald.terrarum.modulebasegame.gameitems.OreGold
 134;net.torvald.terrarum.modulebasegame.gameitems.OreSilver
+135;net.torvald.terrarum.modulebasegame.gameitems.OreLead
 
 256;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorOak
 257;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorEbony

assets/mods/basegame/locales/en/items.json

@@ -13,6 +13,7 @@
   "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter",
   "ITEM_ORE_CASSITERITE": "Tin Ore",
   "ITEM_ORE_COAL": "Coal",
+  "ITEM_ORE_GALENA": "Lead Ore",
   "ITEM_ORE_HAEMATITE": "Iron Ore",
   "ITEM_ORE_MALACHITE": "Copper Ore",
   "ITEM_ORE_NATURAL_GOLD": "Natural Gold",

assets/mods/basegame/locales/koKR/items.json

@@ -13,6 +13,7 @@
   "ITEM_LOGIC_SIGNAL_EMITTER": "신호발생기",
   "ITEM_ORE_CASSITERITE": "주석석",
   "ITEM_ORE_COAL": "석탄",
+  "ITEM_ORE_GALENA": "납 광석",
   "ITEM_ORE_HAEMATITE": "철광석",
   "ITEM_ORE_MALACHITE": "동광석",
   "ITEM_ORE_NATURAL_GOLD": "금덩이",

assets/mods/basegame/ores/ores.csv

@@ -6,14 +6,14 @@
  "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"
+ "8";"item@basegame:135";"LEAD,GALENA"
+# "8";"item@basegame:136";"GEM,RUBY"
+# "9";"item@basegame:137";"GEM,EMERALD"
+#"10";"item@basegame:138";"GEM,SAPPHIRE"
+#"11";"item@basegame:139";"GEM,TOPAZ"
+#"12";"item@basegame:140";"GEM,DIAMOND"
+#"13";"item@basegame:141";"GEM,SIO2,AMETHYST"
+#"14";"item@basegame:142";"GEM,SIO2,QUARTZ"
 #"16";"item@basegame:143";"TITANIUM,RUTILE"
 
 #"256";"macro@BASETILE";"GRASS"

assets/mods/basegame/ores/worldgen.csv

@@ -3,9 +3,10 @@
 "2";"0.056";"0.011";"0.507";"1.0";"a16x16";"iron (haematite)"
 "3";"0.021";"0.070";"0.501";"3.8";"a16x4";"coal"
 "4";"0.024";"0.011";"0.501";"1.0";"a16x16";"zinc (sphalerite)"
-"5";"0.021";"0.020";"0.501";"1.0";"a16x16";"tin (cassiterite)"
+"5";"0.021";"0.017";"0.501";"1.0";"a16x16";"tin (cassiterite)"
 "6";"0.011";"0.300";"0.465";"1.0";"a16x16";"natural gold"
 "7";"0.016";"0.300";"0.467";"1.0";"a16x16";"natural silver"
+"8";"0.021";"0.020";"0.501";"1.0";"a16x16";"lead (galena)"
 
 ################################################################################
 

src/net/torvald/terrarum/modulebasegame/console/ExportMap.kt

@@ -33,6 +33,7 @@ internal object ExportMap : ConsoleCommand {
         "ores@basegame:5" to Cvec(0xcd8b62ff.toInt()),
         "ores@basegame:6" to Cvec(0xffcc00ff.toInt()),
         "ores@basegame:7" to Cvec(0xd5d9f9ff.toInt()),
+        "ores@basegame:8" to Cvec(0xff9300ff.toInt()),
     )
 
     private val WALL_OVERLAY = Cvec(0.35f, 0.35f, 0.35f, 1f)

src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt

@@ -79,8 +79,13 @@ class OreSilver(originalID: ItemID) : OreItemBase(originalID) {
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6)
 }
+class OreLead(originalID: ItemID) : OreItemBase(originalID) {
+    override var originalName = "ITEM_ORE_GALENA"
+    override val itemImage: TextureRegion
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,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)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,10)
 }

src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt

@@ -367,9 +367,10 @@ internal object TerragenTest : NoiseMaker {
     private val TIN_ORE = 0xcd8b62ff.toInt()
     private val GOLD_ORE = 0xffcc00ff.toInt()
     private val SILVER_ORE = 0xd5d9f9ff.toInt()
+    private val LEAD_ORE = 0xff9300ff.toInt()
 
     private val oreCols = listOf(
-        COPPER_ORE, IRON_ORE, COAL_ORE, ZINC_ORE, TIN_ORE, GOLD_ORE, SILVER_ORE
+        COPPER_ORE, IRON_ORE, COAL_ORE, ZINC_ORE, TIN_ORE, GOLD_ORE, SILVER_ORE, LEAD_ORE
     )
 
     override fun draw(x: Int, y: Int, noiseValue: List<Double>, outTex: Pixmap) {
@@ -697,9 +698,10 @@ internal object TerragenTest : NoiseMaker {
             Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:2", 0.056, 0.011, 0.507, 1.0)),
             Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:3", 0.021, 0.070, 0.501, 3.8)),
             Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:4", 0.024, 0.011, 0.501, 1.0)),
-            Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:5", 0.021, 0.020, 0.501, 1.0)),
+            Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:5", 0.021, 0.017, 0.501, 1.0)),
             Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:6", 0.011, 0.300, 0.465, 1.0)),
             Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:7", 0.016, 0.300, 0.467, 1.0)),
+            Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:8", 0.021, 0.020, 0.501, 1.0)),
         )
     }