Add coal distribution to progen (#22755)

* Add coal distribution to progen

* Add sprite

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 0e57907e91ca0733306157a0990aae5b5c7ed95b..4dbc096a2fda660c659184c20a3a211998261648 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -204,6 +204,28 @@
       resistance: 2
 
 # Ore veins
+- type: entity
+  id: WallRockCoal
+  parent: WallRock
+  description: An ore vein rich with coal.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoal
+    - type: Sprite
+      layers:
+        - state: rock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_west
+        - state: rock_coal
+
 - type: entity
   id: WallRockGold
   parent: WallRock
@@ -401,6 +423,28 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_wall_west
 
+- type: entity
+  id: WallRockBasaltCoal
+  parent: WallRockBasalt
+  description: An ore vein rich with coal.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoal
+    - type: Sprite
+      layers:
+        - state: rock_wall
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_wall_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_wall_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_wall_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_wall_west
+        - state: rock_coal
+
 - type: entity
   id: WallRockBasaltGold
   parent: WallRockBasalt
@@ -597,6 +641,28 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_snow_west
 
+- type: entity
+  id: WallRockSnowCoal
+  parent: WallRockSnow
+  description: An ore vein rich with coal.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoal
+    - type: Sprite
+      layers:
+        - state: rock_snow
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_snow_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_snow_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_snow_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_snow_west
+        - state: rock_coal
+
 - type: entity
   id: WallRockSnowGold
   parent: WallRockSnow
@@ -794,6 +860,28 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_sand_west
 
+- type: entity
+  id: WallRockSandCoal
+  parent: WallRockSand
+  description: An ore vein rich with coal.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoal
+    - type: Sprite
+      layers:
+        - state: rock_sand
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_sand_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_sand_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_sand_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_sand_west
+        - state: rock_coal
+
 - type: entity
   id: WallRockSandGold
   parent: WallRockSand
@@ -990,6 +1078,28 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_chromite_west
 
+- type: entity
+  id: WallRockChromiteCoal
+  parent: WallRockChromite
+  description: An ore vein rich with coal.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoal
+    - type: Sprite
+      layers:
+        - state: rock_chromite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_chromite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_chromite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_chromite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_chromite_west
+        - state: rock_coal
+
 - type: entity
   id: WallRockChromiteGold
   parent: WallRockChromite
@@ -1186,6 +1296,28 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_andesite_west
 
+- type: entity
+  id: WallRockAndesiteCoal
+  parent: WallRockAndesite
+  description: An ore vein rich with coal.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoal
+    - type: Sprite
+      layers:
+        - state: rock_andesite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_andesite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_andesite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_andesite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_andesite_west
+        - state: rock_coal
+
 - type: entity
   id: WallRockAndesiteGold
   parent: WallRockAndesite

diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
index f662953edb88e24890c8075ec8d2d2ec069ba120..6cb0c35ef54bc5b2eeda9b3603039113d539c156 100644 (file)
--- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -17,6 +17,9 @@
           - id: WallRock
             prob: 0.5
             orGroup: rock
+          - id: WallRockCoal
+            prob: 0.15
+            orGroup: rock
           - id: WallRockTin
             prob: 0.15
             orGroup: rock

diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml
index 9dc3fef286a221d2686894b38c932cbfcd0eb78f..517d52de8a1a21c7dbe37d30078ae06cd4211ba7 100644 (file)
--- a/Resources/Prototypes/Procedural/biome_ore_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml
@@ -24,6 +24,19 @@
   maxGroupSize: 20
   radius: 4
 
+- type: biomeMarkerLayer
+  id: OreCoal
+  entityMask:
+    WallRock: WallRockCoal
+    WallRockBasalt: WallRockBasaltCoal
+    WallRockChromite: WallRockChromiteCoal
+    WallRockSand: WallRockSandCoal
+    WallRockSnow: WallRockSnowCoal
+  maxCount: 30
+  minGroupSize: 10
+  maxGroupSize: 20
+  radius: 4
+
 # Medium value
 # Gold
 - type: biomeMarkerLayer

diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index 523fab44252a5d67df8f05a5bceec3e96981c865..8c3b2c697f947591a7f675848ed5890011613322 100644 (file)
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -125,6 +125,13 @@
     - !type:BiomeMarkerLoot
       proto: OreTin
 
+- type: salvageLoot
+  id: OreCoal
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreCoal
+
 - type: salvageLoot
   id: OreQuartz
   guaranteed: true

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index d9e72a5055e6d2530b6cbb6a009b11a3f65aa4b4..0cdbae89786bfc0f004d5583d9ac771de26891cd 100644 (file)
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -97,6 +97,9 @@
         {
             "name": "rock_carbon"
         },
+        {
+            "name": "rock_coal"
+        },
         {
             "name": "rock_copper"
         },

diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_coal.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_coal.png
new file mode 100644 (file)
index 0000000..a6249ef
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_coal.png differ