Mining Tweaks (#11468)

Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml

@@ -13,7 +13,7 @@
   - type: GatheringTool
     damage:
       types:
-        Piercing: 25
+        Structural: 50
   - type: ItemCooldown
   - type: MeleeWeapon
     damage:
@@ -39,7 +39,7 @@
   - type: GatheringTool
     damage:
       types:
-        Piercing: 35
+        Structural: 75
     gatheringTime: 0.50
     MaxGatheringEntities: 2
   - type: ItemCooldown

Resources/Prototypes/Entities/Structures/Walls/asteroid.yml

@@ -9,8 +9,6 @@
     whitelist:
       tags:
         - Pickaxe
-    loot:
-      Pickaxe: MiningLootTableLowYield
   - type: Sprite
     sprite: Structures/Walls/asteroid_rock.rsi
     state: full
@@ -42,6 +40,9 @@
   - type: IconSmooth
     key: walls
     base: rock_
+  - type: OreVein
+    oreChance: 0.2
+    oreRarityPrototypeId: RandomOreDistributionStandard
 
 - type: entity
   id: AsteroidRockMining
@@ -54,5 +55,6 @@
     whitelist:
       tags:
         - Pickaxe
-    loot:
-      Pickaxe: MiningLootTable
+  - type: OreVein
+    oreChance: 0.33
+    oreRarityPrototypeId: RandomOreDistributionStandard

Resources/Prototypes/LootTables/mining_loot_table.yml

@@ -1,47 +0,0 @@
-- type: entityLootTable
-  id: MiningLootTable
-  entries:
-  - prob: 0.5 #null value, doesn't drop anything
-    orGroup: Asteroid
-  - id: SteelOre1
-    prob: 0.125
-    orGroup: Asteroid
-  - id: GoldOre1
-    prob: 0.025
-    orGroup: Asteroid
-  - id: SpaceQuartz1
-    prob: 0.10
-    orGroup: Asteroid
-  - id: PlasmaOre1
-    prob: 0.05
-    orGroup: Asteroid
-  - id: SilverOre1
-    prob: 0.0125
-    orGroup: Asteroid
-  - id: UraniumOre1
-    prob: 0.0125
-    orGroup: Asteroid
-    
-- type: entityLootTable
-  id: MiningLootTableLowYield
-  entries:
-  - prob: 0.75 #null value, doesn't drop anything
-    orGroup: Asteroid
-  - id: SteelOre1
-    prob: 0.0125
-    orGroup: Asteroid
-  - id: GoldOre1
-    prob: 0.0025
-    orGroup: Asteroid
-  - id: SpaceQuartz1
-    prob: 0.0125
-    orGroup: Asteroid
-  - id: PlasmaOre1
-    prob: 0.00625
-    orGroup: Asteroid
-  - id: SilverOre1
-    prob: 0.005
-    orGroup: Asteroid
-  - id: UraniumOre1
-    prob: 0.005
-    orGroup: Asteroid

Resources/Prototypes/ore.yml

@@ -0,0 +1,45 @@
+- type: ore
+  id: OreSteel
+  oreEntity: SteelOre1
+  minOreYield: 3
+  maxOreYield: 7
+
+- type: ore
+  id: OreSpaceQuartz
+  oreEntity: SpaceQuartz1
+  minOreYield: 3
+  maxOreYield: 7
+
+- type: ore
+  id: OreGold
+  oreEntity: GoldOre1
+  minOreYield: 2
+  maxOreYield: 5
+
+- type: ore
+  id: OrePlasma
+  oreEntity: PlasmaOre1
+  minOreYield: 2
+  maxOreYield: 5
+
+- type: ore
+  id: OreSilver
+  oreEntity: SilverOre1
+  minOreYield: 1
+  maxOreYield: 3
+
+- type: ore
+  id: OreUranium
+  oreEntity: UraniumOre1
+  minOreYield: 1
+  maxOreYield: 3
+
+- type: weightedRandom
+  id: RandomOreDistributionStandard
+  weights:
+    OreSteel: 10
+    OreSpaceQuartz: 8
+    OreGold: 2
+    OrePlasma: 4
+    OreSilver: 1
+    OreUranium: 1