From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Wed, 20 Dec 2023 23:46:20 +0000 (-0600) Subject: Add coal distribution to progen (#22755) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3cf058f9f4ffa4be3c13c6fe9b22ca9651f75f6f;p=space-station-14.git Add coal distribution to progen (#22755) * Add coal distribution to progen * Add sprite --------- Co-authored-by: Jeff --- diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 0e57907e91..4dbc096a2f 100644 --- 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 f662953edb..6cb0c35ef5 100644 --- 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 9dc3fef286..517d52de8a 100644 --- 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 523fab4425..8c3b2c697f 100644 --- 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 d9e72a5055..0cdbae8978 100644 --- 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 index 0000000000..a6249ef045 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_coal.png differ