From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 13 Jul 2024 12:15:57 +0000 (+0300)
Subject: Shiny Diamonds (#25750)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1b0c434a9fa12ebdeadc2ace8e3f7b6f1a39651f;p=space-station-14.git

Shiny Diamonds (#25750)

* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
---

diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index a354423d2b..0fc716bda5 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -25,6 +25,7 @@ materials-meat = meat
 materials-web = silk
 materials-bones = bone
 materials-coal = coal
+materials-diamond = diamond
 materials-gunpowder = gunpowder
 
 # Ores
@@ -36,3 +37,4 @@ materials-raw-plasma = raw plasma
 materials-raw-uranium = raw uranium
 materials-raw-bananium = raw bananium
 materials-raw-salt = raw salt
+materials-raw-diamond = raw diamond
diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
index 7ce2a486de..c60bafcc13 100644
--- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -13,6 +13,7 @@ salvage-magnet-resources = {$resource ->
     [OreQuartz] Quartz
     [OreSalt] Salt
     [OreGold] Gold
+    [OreDiamond] Diamond
     [OreSilver] Silver
     [OrePlasma] Plasma
     [OreUranium] Uranium
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index c4de4bb18f..a3fc4a2774 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -350,8 +350,21 @@
   components:
   - type: Stack
     stackType: Diamond
+    baseLayer: base
+    layerStates:
+    - diamond
+    - diamond_2
+    - diamond_3
   - type: Sprite
     state: diamond
+    layers:
+    - state: diamond
+      map: ["base"]
+  - type: StaticPrice
+    price: 0
+  - type: StackPrice
+    price: 500
+  - type: Appearance
   - type: Item
     heldPrefix: diamond
   - type: Extractable
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index bf7dbfad5a..136d20cc81 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -66,6 +66,37 @@
   - type: Stack
     count: 1
 
+- type: entity
+  parent: OreBase
+  id: DiamondOre
+  name: diamond ore
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: DiamondOre
+  - type: Sprite
+    state: diamond
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      RawDiamond: 500
+  - type: Extractable
+    grindableSolutionName: diamondore
+  - type: SolutionContainerManager
+    solutions:
+      diamondore:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 20
+
+- type: entity
+  parent: DiamondOre
+  id: DiamondOre1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+
 - type: entity
   parent: OreBase
   id: SteelOre
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 67cf6f767d..66f4f684e9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1175,6 +1175,7 @@
         - IngotGold30
         - IngotSilver30
         - MaterialBananium10
+        - MaterialDiamond
 
 - type: entity
   parent: OreProcessor
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index e14bf26e0d..c0a30e7669 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -93,6 +93,28 @@
           state: rock_asteroid_west
         - state: rock_gold
 
+- type: entity
+  id: AsteroidRockDiamond
+  parent: AsteroidRock
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: AsteroidRockPlasma
   parent: AsteroidRock
@@ -693,6 +715,28 @@
         state: rock_west
       - state: rock_gold
 
+- type: entity
+  id: WallRockDiamond
+  parent: WallRock
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockPlasma
   parent: WallRock
@@ -993,6 +1037,28 @@
           state: rock_wall_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockBasaltDiamond
+  parent: WallRockBasalt
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockBasaltPlasma
   parent: WallRockBasalt
@@ -1236,6 +1302,28 @@
           state: rock_snow_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockSnowDiamond
+  parent: WallRockSnow
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockSnowPlasma
   parent: WallRockSnow
@@ -1479,6 +1567,28 @@
           state: rock_sand_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockSandDiamond
+  parent: WallRockSand
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockSandPlasma
   parent: WallRockSand
@@ -1589,7 +1699,6 @@
           state: rock_sand_west
         - state: rock_uranium
 
-
 - type: entity
   id: WallRockSandBananium
   parent: WallRockSand
@@ -1722,6 +1831,28 @@
           state: rock_chromite_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockChromiteDiamond
+  parent: WallRockChromite
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockChromitePlasma
   parent: WallRockChromite
@@ -1965,6 +2096,28 @@
           state: rock_andesite_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockAndesiteDiamond
+  parent: WallRockAndesite
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockAndesitePlasma
   parent: WallRockAndesite
diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
index 061288d010..2817b083be 100644
--- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -32,6 +32,9 @@
           - id: WallRockGold
             prob: 0.05
             orGroup: rock
+          - id: WallRockDiamond
+            prob: 0.005
+            orGroup: rock
           - id: WallRockSilver
             prob: 0.05
             orGroup: rock
diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
index c20b80af55..c380dfbc7c 100644
--- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml
+++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
@@ -6,6 +6,7 @@
     OreCoal: 1.0
     OreSalt: 1.0
     OreGold: 0.25
+    OreDiamond: 0.05
     OreSilver: 0.25
     OrePlasma: 0.15
     OreUranium: 0.15
diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml
index 4a60427e30..a6e5fac2d8 100644
--- a/Resources/Prototypes/Procedural/biome_ore_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml
@@ -130,6 +130,20 @@
   maxGroupSize: 10
   radius: 4
 
+- type: biomeMarkerLayer
+  id: OreDiamond
+  entityMask:
+    AsteroidRock: AsteroidRockDiamond
+    WallRock: WallRockDiamond
+    WallRockBasalt: WallRockBasaltDiamond
+    WallRockChromite: WallRockChromiteDiamond
+    WallRockSand: WallRockSandDiamond
+    WallRockSnow: WallRockSnowDiamond
+  maxCount: 6
+  minGroupSize: 1
+  maxGroupSize: 2
+  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 e8783760dd..da99da7c75 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -178,6 +178,13 @@
     - !type:BiomeMarkerLoot
       proto: OreBananium
 
+- type: salvageLoot
+  id: OreDiamond
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreDiamond
+
 - type: salvageLoot
   id: OreArtifactFragment
   guaranteed: true
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 18f1d9ebb3..1555ab9e23 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -24,6 +24,15 @@
   color: "#FFD700"
   price: 0.2
 
+- type: material
+  id: RawDiamond
+  stackEntity: DiamondOre1
+  name: materials-raw-diamond
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Materials/ore.rsi, state: diamond }
+  color: "#C9D8F2"
+  price: 0.5
+
 - type: material
   id: RawSilver
   stackEntity: SilverOre1
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 053715a181..3efaac95a7 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -127,6 +127,13 @@
   materials:
     RawBananium: 3000
 
+- type: latheRecipe
+  id: MaterialDiamond
+  result: MaterialDiamond1
+  completetime: 3
+  materials:
+    RawDiamond: 1000
+
 - type: latheRecipe
   id: SheetUranium1
   result: SheetUranium1
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index 51254b5a7a..3aaa04601a 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -4,6 +4,13 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
   maxCount: 30
+  
+- type: stack
+  id: DiamondOre
+  name: rough diamond
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: diamond }
+  spawn: DiamondOre1
+  maxCount: 30
 
 - type: stack
   id: SteelOre
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index 84d1c66736..146f04b49c 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -58,6 +58,12 @@
   minOreYield: 1
   maxOreYield: 3
 
+- type: ore
+  id: OreDiamond
+  oreEntity: DiamondOre1
+  minOreYield: 1
+  maxOreYield: 2
+
 - type: ore
   id: OreQuartzCrab
   oreEntity: MobSpawnCrabQuartz
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png
index c9b55e9daa..9eae45d039 100644
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png
index 295c2c4eca..3353eb6f7c 100644
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond.png
index 5eb8aabf87..8b39437d0a 100644
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png
new file mode 100644
index 0000000000..410d83f1c2
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png
new file mode 100644
index 0000000000..152da2befe
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 78f497c0cd..3ae12dc14c 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -78,6 +78,12 @@
     {
       "name": "diamond"
     },
+    {
+      "name": "diamond_2"
+    },
+    {
+      "name": "diamond_3"
+    },
     {
       "name": "diamond-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png
new file mode 100644
index 0000000000..b2a3c788d3
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index 98a10750bf..8f1b4533f2 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh",
+  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
   "size": {
     "x": 32,
     "y": 32
@@ -33,6 +33,9 @@
     },
     {
       "name": "salt"
+    },
+    {
+      "name": "diamond"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index aa46326a4b..a29513356c 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -104,7 +104,23 @@
             "name": "rock_copper"
         },
         {
-            "name": "rock_diamond"
+            "name": "rock_diamond",
+            "delays": [
+              [
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2
+              ]
+            ]
         },
         {
             "name": "rock_gold"
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png
index eb05ebd3d1..cc54b642f4 100644
Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png and b/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png differ