From d6a2db23a58715f9cf87c9f86243be9531b15800 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 12 Oct 2024 16:49:32 -0400 Subject: [PATCH 1/2] Bluespace And Normality Ores (#1042) # Description This PR adds new ores in the form of Bluespace and Normality ores, the former being just as rare as artifact fragments, and the latter being even rarer still. These ores can be mined by salvage, will generate on asteroids or expeditions, and can be processed in an ore processor into bluespace or normality crystals, which Epistemics can use to create psionic related objects. Note that the two are currently indistinguishable from the other until you actually mine them. Yes this DOES infact make it easier to make glimmer drains and probers. I need this as an excuse to make psionics even more dangerous.

Media

![image](https://github.com/user-attachments/assets/2c7b38a4-d700-43d6-ad47-a063839f0540) ![image](https://github.com/user-attachments/assets/5da73dff-acca-4395-855d-75a04f369ead) ![image](https://github.com/user-attachments/assets/269e231d-d702-4387-9c89-f8aec7854fb3)

# Changelog :cl: - add: Added Bluespace and Normality ore as very rare ore types. Salvage can occasionally find these ores on Asteroids or on Expedition planets. Bluespace and Normality Ore can be smelted in an Ore Processor into Bluespace and Normality Crystals. Make sure to bring these to Epistemics so that they can do their job. --------- Signed-off-by: VMSolidus Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../Components/GatewayGeneratorComponent.cs | 2 + .../Locale/en-US/materials/materials.ftl | 2 + .../Locale/en-US/salvage/salvage-magnet.ftl | 2 + .../Entities/Objects/Materials/ore.yml | 48 +++ .../Entities/Structures/Machines/lathe.yml | 3 +- .../Entities/Structures/Walls/asteroid.yml | 308 ++++++++++++++++++ .../Objects/Specific/Research/crystals.yml | 57 ++++ .../Reagents/Materials/materials.yml | 8 - .../Graphs/structures/glimmerdevices.yml | 33 +- .../Nyanotrasen/Recipes/Lathes/bluespace.yml | 11 + .../Nyanotrasen/Stacks/materials.yml | 24 +- .../Prototypes/Procedural/Magnet/asteroid.yml | 2 + .../Procedural/biome_ore_templates.yml | 29 ++ .../Prototypes/Procedural/salvage_loot.yml | 14 + .../Prototypes/Reagents/Materials/ores.yml | 20 +- Resources/Prototypes/ore.yml | 14 + .../Objects/Materials/ore.rsi/bluespace.png | Bin 0 -> 248 bytes .../Objects/Materials/ore.rsi/meta.json | 3 + .../Structures/Walls/rock.rsi/meta.json | 3 + .../Walls/rock.rsi/rock_bluespace.png | Bin 0 -> 206 bytes 20 files changed, 542 insertions(+), 41 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Reagents/Materials/materials.yml create mode 100644 Resources/Textures/Objects/Materials/ore.rsi/bluespace.png create mode 100644 Resources/Textures/Structures/Walls/rock.rsi/rock_bluespace.png diff --git a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs index d65760e270..0f948f1b8f 100644 --- a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs +++ b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs @@ -64,6 +64,8 @@ public sealed partial class GatewayGeneratorComponent : Component "OreUranium", "OreBananium", "OreArtifactFragment", + "OreBluespace", + "OreNormality", }; } diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index 5a4413348e..f8d54ee21a 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -35,6 +35,8 @@ materials-raw-plasma = raw plasma materials-raw-uranium = raw uranium materials-raw-bananium = raw bananium materials-raw-salt = raw salt +materials-raw-bluespace = raw bluespace +materials-raw-normality = raw normality # Material Reclaimer material-reclaimer-upgrade-process-rate = process rate diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl index 7ce2a486de..027afffef2 100644 --- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl +++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl @@ -17,6 +17,8 @@ salvage-magnet-resources = {$resource -> [OrePlasma] Plasma [OreUranium] Uranium [OreArtifactFragment] Artifact fragments + [OreBluespace] Bluespace crystals + [OreNormality] Normality crystals *[other] {$resource} } diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml index bf7dbfad5a..503f4707d5 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml @@ -343,5 +343,53 @@ id: Salt1 suffix: Single components: + - type: Stack + count: 1 + +- type: entity + parent: OreBase + id: BluespaceOre + name: bluespace ore + suffix: Full + components: + - type: Stack + stackType: BluespaceOre + - type: Sprite + state: bluespace + - type: Item + - type: Material + - type: PhysicalComposition + materialComposition: + Bluespace: 100 + +- type: entity + parent: BluespaceOre + id: BluespaceOre1 + suffix: Single + components: + - type: Stack + count: 1 + +- type: entity + parent: OreBase + id: NormalityOre + name: normality ore + suffix: Full + components: + - type: Stack + stackType: NormalityOre + - type: Sprite + state: bluespace + - type: Item + - type: Material + - type: PhysicalComposition + materialComposition: + Normality: 100 + +- type: entity + parent: NormalityOre + id: NormalityOre1 + suffix: Single + components: - type: Stack count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 19ab6fcdf1..6342946e98 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1209,7 +1209,8 @@ idleState: icon runningState: building staticRecipes: - - BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here. + - BluespaceCrystal + - NormalityCrystal - SheetSteel30 - SheetGlass30 - SheetRGlass30 diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index a8cb0b1cb8..0728d2a911 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -295,6 +295,50 @@ state: rock_asteroid_west - state: rock_artifact_fragment +- type: entity + id: AsteroidRockBluespace + parent: AsteroidRock + description: A rock wall. What's that sticking out of it? + suffix: Bluespace + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBluespace + - 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_bluespace + +- type: entity + id: AsteroidRockNormality + parent: AsteroidRock + description: A rock wall. What's that sticking out of it? + suffix: Normality + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreNormality + - 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_bluespace + - type: entity id: AsteroidRockMining parent: AsteroidRock @@ -632,6 +676,50 @@ state: rock_west - state: rock_salt +- type: entity + id: WallRockBluespace + parent: WallRock + description: A rock wall. What's that sticking out of it? + suffix: Bluespace + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBluespace + - 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_bluespace + +- type: entity + id: WallRockNormality + parent: WallRock + description: A rock wall. What's that sticking out of it? + suffix: Normality + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreNormality + - 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_bluespace + # Basalt variants - type: entity id: WallRockBasalt @@ -875,6 +963,50 @@ state: rock_wall_west - state: rock_salt +- type: entity + id: WallRockBasaltBluespace + parent: WallRockBluespace + description: A rock wall. What's that sticking out of it? + suffix: Bluespace + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBluespace + - 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_bluespace + +- type: entity + id: WallRockBasaltNormality + parent: WallRockNormality + description: A rock wall. What's that sticking out of it? + suffix: Normality + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreNormality + - 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_bluespace + # Snow variants - type: entity id: WallRockSnow @@ -1118,6 +1250,50 @@ state: rock_snow_west - state: rock_salt +- type: entity + id: WallRockSnowBluespace + parent: WallRockSnow + description: A rock wall. What's that sticking out of it? + suffix: Bluespace + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBluespace + - 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_bluespace + +- type: entity + id: WallRockSnowNormality + parent: WallRockSnow + description: A rock wall. What's that sticking out of it? + suffix: Normality + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreNormality + - 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_bluespace + # Sand variants - type: entity id: WallRockSand @@ -1361,6 +1537,50 @@ state: rock_sand_west - state: rock_salt +- type: entity + id: WallRockSandBluespace + parent: WallRockSand + description: A rock wall. What's that sticking out of it? + suffix: Bluespace + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBluespace + - 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_bluespace + +- type: entity + id: WallRockSandNormality + parent: WallRockSand + description: A rock wall. What's that sticking out of it? + suffix: Normality + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreNormality + - 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_bluespace + # Chromite variants - type: entity id: WallRockChromite @@ -1604,6 +1824,50 @@ state: rock_chromite_west - state: rock_salt +- type: entity + id: WallRockChromiteBluespace + parent: WallRockChromite + description: A rock wall. What's that sticking out of it? + suffix: Bluespace + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBluespace + - 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_bluespace + +- type: entity + id: WallRockChromiteNormality + parent: WallRockChromite + description: A rock wall. What's that sticking out of it? + suffix: Normality + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreNormality + - 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_bluespace + # Andesite variants - type: entity id: WallRockAndesite @@ -1846,3 +2110,47 @@ - map: [ "enum.EdgeLayer.West" ] state: rock_andesite_west - state: rock_salt + +- type: entity + id: WallRockAndesiteBluespace + parent: WallRockAndesite + description: A rock wall. What's that sticking out of it? + suffix: Bluespace + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBluespace + - 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_bluespace + +- type: entity + id: WallRockAndesiteNormality + parent: WallRockAndesite + description: A rock wall. What's that sticking out of it? + suffix: Normality + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreNormality + - 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_bluespace diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml index b4d3ca1abf..3f6539c502 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml @@ -34,3 +34,60 @@ # Quantity: 50 # - type: Extractable # grindableSolutionName: ectoplasm + +- type: entity + parent: MaterialBase + id: MaterialNormality + suffix: Full + name: normality crystal + components: + - type: Sprite + sprite: Nyanotrasen/Objects/Materials/materials.rsi + layers: + - state: bluespace_3 + map: ["base"] + - type: Appearance + - type: Material + - type: PhysicalComposition + materialComposition: + Bluespace: 100 + - type: Tag + tags: + - NormalityCrystal + - RawMaterial + - type: Stack + stackType: Normality + baseLayer: base + layerStates: + - bluespace + - bluespace_2 + - bluespace_3 + count: 5 + - type: Item + size: Small + +- type: entity + parent: MaterialNormality + id: MaterialNormality1 + suffix: 1 + components: + - type: Sprite + state: bluespace + - type: Stack + count: 1 + +- type: entity + parent: MaterialNormality1 + id: MaterialNormality3 + suffix: 3 + components: + - type: Stack + count: 3 + +- type: entity + parent: MaterialNormality1 + id: MaterialNormality5 + suffix: 5 + components: + - type: Stack + count: 5 diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Materials/materials.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Materials/materials.yml deleted file mode 100644 index 9146f29713..0000000000 --- a/Resources/Prototypes/Nyanotrasen/Reagents/Materials/materials.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: material - id: Bluespace - name: bluespace - unit: materials-unit-crystal - icon: /Textures/Nyanotrasen/Objects/Materials/materials.rsi/bluespace.png - color: "#53a9ff" - stackEntity: MaterialBluespace - price: 15 diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml index 1926992b69..a79f93ec0e 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml @@ -30,36 +30,9 @@ conditions: - !type:EntityAnchored {} steps: - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 - - tag: NormalityCrystal - icon: - sprite: Nyanotrasen/Objects/Materials/materials.rsi - state: bluespace - name: a normality crystal - doAfter: 1 + - material: Normality + amount: 5 + doAfter: 10 - tool: Welding doAfter: 5 diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml index 443f2a03f9..094e4f557c 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml @@ -20,3 +20,14 @@ completetime: 4 materials: Bluespace: 100 + +- type: latheRecipe + id: NormalityCrystal + icon: + sprite: Nyanotrasen/Objects/Materials/materials.rsi + state: bluespace + result: MaterialNormality1 + applyMaterialDiscount: false + completetime: 4 + materials: + Normality: 100 diff --git a/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml b/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml index e8c1b98b93..35f50575a5 100644 --- a/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml +++ b/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml @@ -2,6 +2,28 @@ id: Bluespace name: bluespace icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace } - spawn: MaterialBluespace + spawn: MaterialBluespace1 maxCount: 5 itemSize: 1 + +- type: stack + id: BluespaceOre + name: rough bluespace + icon: { sprite: Objects/Materials/ore.rsi, state: bluespace } + spawn: BluespaceOre1 + maxCount: 30 + +- type: stack + id: Normality + name: normality + icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace } + spawn: MaterialNormality1 + maxCount: 5 + itemSize: 1 + +- type: stack + id: NormalityOre + name: rough normality + icon: { sprite: Objects/Materials/ore.rsi, state: bluespace } + spawn: NormalityOre1 + maxCount: 30 \ No newline at end of file diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml index a21b709afa..8fcd265297 100644 --- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml +++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml @@ -10,6 +10,8 @@ OrePlasma: 0.15 OreUranium: 0.15 OreArtifactFragment: 0.15 + OreBluespace: 0.1 + OreNormality: 0.1 # Large asteroids, typically 1 - type: dungeonConfig diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml index 4a60427e30..c0001367d5 100644 --- a/Resources/Prototypes/Procedural/biome_ore_templates.yml +++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml @@ -144,3 +144,32 @@ minGroupSize: 1 maxGroupSize: 2 radius: 4 + +# Bluespace +- type: biomeMarkerLayer + id: OreBluespace + entityMask: + AsteroidRock: AsteroidRockBluespace + WallRock: WallRockBluespace + WallRockBasalt: WallRockBasaltBluespace + WallRockChromite: WallRockChromiteBluespace + WallRockSand: WallRockSandBluespace + WallRockSnow: WallRockSnowBluespace + maxCount: 6 + minGroupSize: 1 + maxGroupSize: 2 + radius: 4 + +- type: biomeMarkerLayer + id: OreNormality + entityMask: + AsteroidRock: AsteroidRockNormality + WallRock: WallRockNormality + WallRockBasalt: WallRockBasaltNormality + WallRockChromite: WallRockChromiteNormality + WallRockSand: WallRockSandNormality + WallRockSnow: WallRockSnowNormality + maxCount: 6 + minGroupSize: 1 + maxGroupSize: 2 + radius: 4 diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index f12e8c7ffd..b256c73dfd 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -185,3 +185,17 @@ loots: - !type:BiomeMarkerLoot proto: OreArtifactFragment + +- type: salvageLoot + id: OreBluespace + guaranteed: true + loots: + - !type:BiomeMarkerLoot + proto: OreBluespace + +- type: salvageLoot + id: OreNormality + guaranteed: true + loots: + - !type:BiomeMarkerLoot + proto: OreNormality diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml index 18f1d9ebb3..efba840639 100644 --- a/Resources/Prototypes/Reagents/Materials/ores.yml +++ b/Resources/Prototypes/Reagents/Materials/ores.yml @@ -67,4 +67,22 @@ unit: materials-unit-chunk icon: { sprite: Objects/Materials/ore.rsi, state: salt } color: "#f5e7d7" - price: 0.075 \ No newline at end of file + price: 0.075 + +- type: material + id: Bluespace + stackEntity: BluespaceOre1 + name: materials-raw-bluespace + unit: materials-unit-piece + icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace } # TODO actual ore sprite + color: "#53a9ff" + price: 7.5 + +- type: material + id: Normality + stackEntity: NormalityOre1 + name: materials-raw-normality + unit: materials-unit-piece + icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace } # TODO actual ore sprite + color: "#53a9ff" + price: 7.5 diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index dde1516c85..d471a3ac96 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -84,6 +84,18 @@ minOreYield: 2 maxOreYield: 4 +- type: ore + id: OreBluespace + oreEntity: BluespaceOre1 + minOreYield: 1 + maxOreYield: 1 + +- type: ore + id: OreNormality + oreEntity: NormalityOre1 + minOreYield: 1 + maxOreYield: 1 + - type: weightedRandomOre id: RandomOreDistributionStandard weights: @@ -96,6 +108,8 @@ OreUranium: 1 OreBananium: 0.5 OreArtifactFragment: 0.5 + OreBluespace: 0.5 + OreNormality: 0.3 - type: weightedRandomOre id: OreCrab diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bluespace.png b/Resources/Textures/Objects/Materials/ore.rsi/bluespace.png new file mode 100644 index 0000000000000000000000000000000000000000..8aa4a335526f267a566f67d7bc53037af2767753 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STHTA4zWi>2ag6;DE&ph)#c;$cNng4;3ze4j}ffPqckYDhB2w=F^ zyf+dk##!JISmdKI;Vst0C06z+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json index 98a10750bf..f7a8bcba0e 100644 --- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json @@ -33,6 +33,9 @@ }, { "name": "salt" + }, + { + "name": "bluespace" } ] } diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json index aa46326a4b..27935ec089 100644 --- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json @@ -198,6 +198,9 @@ }, { "name": "rock_andesite_west" + }, + { + "name": "rock_bluespace" } ] } diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_bluespace.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_bluespace.png new file mode 100644 index 0000000000000000000000000000000000000000..e3368c34d7120e96d6f7541d2e5ff381674ce9f9 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbU?ehQ6Jo7(z<$vRu|AAunULHLOq*zOW{DS`j0mJWYe8E5g&H|6f zVg?4j!ywFfJby(BP|)1d#WBRfKRH2>!A;cRz=Ple2O1VKx;8XU>=cY;UB#r9mZoMR px*}$QXoc?qHjt8nfCGn^7}}lrk6$;>+5t3z!PC{xWt~$(69DAkK Date: Sat, 12 Oct 2024 20:50:01 +0000 Subject: [PATCH 2/2] Automatic Changelog Update (#1042) --- Resources/Changelog/Changelog.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 55a95126d7..0f1bf764b8 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -7153,3 +7153,15 @@ Entries: id: 6438 time: '2024-10-11T16:08:48.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1037 +- author: VMSolidus + changes: + - type: Add + message: >- + Added Bluespace and Normality ore as very rare ore types. Salvage can + occasionally find these ores on Asteroids or on Expedition planets. + Bluespace and Normality Ore can be smelted in an Ore Processor into + Bluespace and Normality Crystals. Make sure to bring these to Epistemics + so that they can do their job. + id: 6439 + time: '2024-10-12T20:49:32.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1042