From ef4cbb8d38b2d25f75b5b9b312abcb696e6b3560 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 3 Mar 2025 10:50:56 -0500 Subject: [PATCH 1/2] Add EE Specific Ores to Lavaland --- .../Entities/Structures/Walls/asteroid.yml | 138 +++++++++++++++++- .../Procedural/biome_ore_templates.yml | 14 ++ .../Prototypes/Procedural/salvage_loot.yml | 7 + .../_Lavaland/Procedural/lavaland_planets.yml | 7 +- 4 files changed, 162 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index ab71d0b0554..d2662f0e26d 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -496,6 +496,28 @@ state: rock_asteroid_west - state: rock_copper +- type: entity + id: AsteroidRockTungsten + parent: AsteroidRock + description: An ore vein rich with wolframite. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreTungsten + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_copper + # Rocks and ore veins - type: entity @@ -897,6 +919,28 @@ state: rock_west - state: rock_copper +- type: entity + id: WallRockTungsten + parent: WallRock + description: An ore vein rich with wolframite. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreTungsten + - 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_copper + # Basalt variants - type: entity id: WallRockBasalt @@ -1272,6 +1316,28 @@ state: rock_wall_west - state: rock_copper +- type: entity + id: WallRockBasaltTungsten + parent: WallRockBasalt + description: An ore vein rich with wolframite. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreTungsten + - 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_copper + # Snow variants - type: entity id: WallRockSnow @@ -1647,6 +1713,28 @@ state: rock_snow_west - state: rock_copper +- type: entity + id: WallRockSnowTungsten + parent: WallRockSnow + description: An ore vein rich with wolframite. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreTungsten + - 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_copper + # Sand variants - type: entity id: WallRockSand @@ -2021,6 +2109,28 @@ state: rock_sand_west - state: rock_copper +- type: entity + id: WallRockSandTungsten + parent: WallRockSand + description: An ore vein rich with wolframite. + suffix: Tungsten + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreTungsten + - 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_copper + # Chromite variants - type: entity id: WallRockChromite @@ -2375,14 +2485,14 @@ - state: rock_lead - type: entity - id: WallRockChromiteCopper + id: WallRockChromiteTungsten parent: WallRockChromite - description: An ore vein rich with native copper. + description: An ore vein rich with wolframite. suffix: Copper components: - type: OreVein oreChance: 1.0 - currentOre: OreCopper + currentOre: OreTungsten - type: Sprite layers: - state: rock_chromite @@ -2770,3 +2880,25 @@ - map: [ "enum.EdgeLayer.West" ] state: rock_andesite_west - state: rock_copper + +- type: entity + id: WallRockAndesiteTungsten + parent: WallRockAndesite + description: An ore vein rich with wolframite. + suffix: Tungsten + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreTungsten + - 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_copper diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml index 5780f24258a..41f7c862c96 100644 --- a/Resources/Prototypes/Procedural/biome_ore_templates.yml +++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml @@ -186,6 +186,20 @@ maxGroupSize: 2 radius: 4 +- type: biomeMarkerLayer + id: OreTungsten + entityMask: + AsteroidRock: AsteroidRockTungsten + WallRock: WallRockTungsten + WallRockBasalt: WallRockBasaltTungsten + WallRockChromite: WallRockChromiteTungsten + WallRockSand: WallRockSandTungsten + WallRockSnow: WallRockSnowTungsten + maxCount: 6 + minGroupSize: 3 + maxGroupSize: 6 + radius: 4 + # Artifact Fragment - type: biomeMarkerLayer id: OreArtifactFragment diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index b52235ca5a0..6ce13d2c054 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -232,3 +232,10 @@ loots: - !type:BiomeMarkerLoot proto: OreNormality + +- type: salvageLoot + id: OreTungsten + guaranteed: true + loots: + - !type:BiomeMarkerLoot + proto: OreTungsten diff --git a/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml b/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml index 0187214d04b..e52bef36fb0 100644 --- a/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml +++ b/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml @@ -27,7 +27,12 @@ - OreSilver - OrePlasma - OreUranium - #- OreBananium + - OreBananium - OreArtifactFragment - OreDiamond - OreBluespace + - OreAluminium + - OreCopper + - OreTungsten + - OreLead + - OreNormality From bdcb84c2822919c8851b991db226f8dd93ed0b6d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 3 Mar 2025 11:08:24 -0500 Subject: [PATCH 2/2] Update asteroid.yml --- .../Entities/Structures/Walls/asteroid.yml | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index d2662f0e26d..aa0a22f61dc 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -500,7 +500,7 @@ id: AsteroidRockTungsten parent: AsteroidRock description: An ore vein rich with wolframite. - suffix: Copper + suffix: Tungsten components: - type: OreVein oreChance: 1.0 @@ -923,7 +923,7 @@ id: WallRockTungsten parent: WallRock description: An ore vein rich with wolframite. - suffix: Copper + suffix: Tungsten components: - type: OreVein oreChance: 1.0 @@ -1320,7 +1320,7 @@ id: WallRockBasaltTungsten parent: WallRockBasalt description: An ore vein rich with wolframite. - suffix: Copper + suffix: Tungsten components: - type: OreVein oreChance: 1.0 @@ -1717,7 +1717,7 @@ id: WallRockSnowTungsten parent: WallRockSnow description: An ore vein rich with wolframite. - suffix: Copper + suffix: Tungsten components: - type: OreVein oreChance: 1.0 @@ -2484,11 +2484,33 @@ state: rock_chromite_west - state: rock_lead +- type: entity + id: WallRockChromiteCopper + parent: WallRockChromite + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - 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_copper + - type: entity id: WallRockChromiteTungsten parent: WallRockChromite description: An ore vein rich with wolframite. - suffix: Copper + suffix: Tungsten components: - type: OreVein oreChance: 1.0