Implement Tungsten

Simple-Station · Feb 1, 2025 · cdac44f · cdac44f
1 parent 53c309f
commit cdac44f
Show file tree

Hide file tree

Showing 18 changed files with 144 additions and 33 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
@@ -115,3 +115,40 @@
     state: silver
   - type: Stack
     count: 1
+
+- type: entity
+  parent: IngotBase
+  id: IngotTungsten
+  name: tungsten-carbide bar
+  suffix: Full
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      TungstenCarbide: 100
+  - type: Stack
+    stackType: Tungsten
+    baseLayer: base
+    layerStates:
+    - tungsten_1
+    - tungsten_2
+    - tungsten_3
+  - type: Sprite
+    state: tungsten_3
+    layers:
+    - state: tungsten_3
+      map: ["base"]
+  - type: Item
+    heldPrefix: tungsten
+  - type: Appearance
+
+- type: entity
+  parent: IngotTungsten
+  id: IngotTungsten1
+  name: tungsten-carbide bar
+  suffix: Single
+  components:
+  - type: Sprite
+    state: tungsten_1
+  - type: Stack
+    count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -424,3 +424,26 @@
   components:
   - type: Stack
     count: 1
+
+- type: entity
+  parent: OreBase
+  id: TungstenOre
+  name: wolframite
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: TungstenOre
+  - type: Sprite
+    state: tungsten
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      RawTungsten: 500
+
+- type: entity
+  parent: TungstenOre
+  id: TungstenOre1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1486,6 +1486,7 @@
     - N14IngotLead1
     - N14IngotCopper1
     - N14IngotAluminium1
+    - IngotTungsten1
   - type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
     magnetEnabled: True
     range: 0.30 # Delta V - End Magnet Pull

diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -917,6 +917,9 @@
           state: rock_wall_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_wall_west
+    - type: OreVein
+      oreChance: 0.33
+      oreRarityPrototypeId: RandomOreDistributionBasalt
 
 - type: entity
   id: WallRockBasaltCoal

diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml
@@ -4,7 +4,6 @@
   entityMask:
     AsteroidRock: AsteroidRockTin
     WallRock: WallRockTin
-    WallRockBasalt: WallRockBasaltTin
     WallRockChromite: WallRockChromiteTin
     WallRockSand: WallRockSandTin
     WallRockSnow: WallRockSnowTin
@@ -18,7 +17,6 @@
   entityMask:
     AsteroidRock: AsteroidRockAluminium
     WallRock: WallRockAluminium
-    WallRockBasalt: WallRockBasaltAluminium
     WallRockChromite: WallRockChromiteAluminium
     WallRockSand: WallRockSandAluminium
     WallRockSnow: WallRockSnowAluminium
@@ -32,7 +30,6 @@
   entityMask:
     AsteroidRock: AsteroidRockCopper
     WallRock: WallRockCopper
-    WallRockBasalt: WallRockBasaltCopper
     WallRockChromite: WallRockChromiteCopper
     WallRockSand: WallRockSandCopper
     WallRockSnow: WallRockSnowCopper
@@ -46,7 +43,6 @@
   entityMask:
     AsteroidRock: AsteroidRockLead
     WallRock: WallRockLead
-    WallRockBasalt: WallRockBasaltLead
     WallRockChromite: WallRockChromiteLead
     WallRockSand: WallRockSandLead
     WallRockSnow: WallRockSnowLead
@@ -60,7 +56,6 @@
   entityMask:
     AsteroidRock: AsteroidRockQuartz
     WallRock: WallRockQuartz
-    WallRockBasalt: WallRockBasaltQuartz
     WallRockChromite: WallRockChromiteQuartz
     WallRockSnow: WallRockSnowQuartz
   maxCount: 30
@@ -73,7 +68,6 @@
   entityMask:
     AsteroidRock: AsteroidRockCoal
     WallRock: WallRockCoal
-    WallRockBasalt: WallRockBasaltCoal
     WallRockChromite: WallRockChromiteCoal
     WallRockSand: WallRockSandCoal
     WallRockSnow: WallRockSnowCoal
@@ -87,7 +81,6 @@
   entityMask:
     AsteroidRock: AsteroidRockSalt
     WallRock: WallRockSalt
-    WallRockBasalt: WallRockBasaltSalt
     WallRockChromite: WallRockChromiteSalt
     WallRockSand: WallRockSandSalt
     WallRockSnow: WallRockSnowSalt
@@ -103,7 +96,6 @@
   entityMask:
     AsteroidRock: AsteroidRockGold
     WallRock: WallRockGold
-    WallRockBasalt: WallRockBasaltGold
     WallRockChromite: WallRockChromiteGold
     WallRockSand: WallRockSandGold
     WallRockSnow: WallRockSnowGold
@@ -118,7 +110,6 @@
   entityMask:
     AsteroidRock: AsteroidRockSilver
     WallRock: WallRockSilver
-    WallRockBasalt: WallRockBasaltSilver
     WallRockChromite: WallRockChromiteSilver
     WallRockSand: WallRockSandSilver
     WallRockSnow: WallRockSnowSilver
@@ -134,7 +125,6 @@
   entityMask:
     AsteroidRock: AsteroidRockPlasma
     WallRock: WallRockPlasma
-    WallRockBasalt: WallRockBasaltPlasma
     WallRockChromite: WallRockChromitePlasma
     WallRockSand: WallRockSandPlasma
     WallRockSnow: WallRockSnowPlasma
@@ -149,7 +139,6 @@
   entityMask:
     AsteroidRock: AsteroidRockUranium
     WallRock: WallRockUranium
-    WallRockBasalt: WallRockBasaltUranium
     WallRockChromite: WallRockChromiteUranium
     WallRockSand: WallRockSandUranium
     WallRockSnow: WallRockSnowUranium
@@ -163,7 +152,6 @@
   entityMask:
     AsteroidRock: AsteroidRockBananium
     WallRock: WallRockBananium
-    WallRockBasalt: WallRockBasaltBananium
     WallRockChromite: WallRockChromiteBananium
     WallRockSand: WallRockSandBananium
     WallRockSnow: WallRockSnowBananium
@@ -177,7 +165,6 @@
   entityMask:
     AsteroidRock: AsteroidRockDiamond
     WallRock: WallRockDiamond
-    WallRockBasalt: WallRockBasaltDiamond
     WallRockChromite: WallRockChromiteDiamond
     WallRockSand: WallRockSandDiamond
     WallRockSnow: WallRockSnowDiamond
@@ -192,7 +179,6 @@
   entityMask:
     AsteroidRock: AsteroidRockArtifactFragment
     WallRock: WallRockArtifactFragment
-    WallRockBasalt: WallRockBasaltArtifactFragment
     WallRockChromite: WallRockChromiteArtifactFragment
     WallRockSand: WallRockSandArtifactFragment
     WallRockSnow: WallRockSnowArtifactFragment
@@ -207,7 +193,6 @@
   entityMask:
     AsteroidRock: AsteroidRockBluespace
     WallRock: WallRockBluespace
-    WallRockBasalt: WallRockBasaltBluespace
     WallRockChromite: WallRockChromiteBluespace
     WallRockSand: WallRockSandBluespace
     WallRockSnow: WallRockSnowBluespace
@@ -221,7 +206,6 @@
   entityMask:
     AsteroidRock: AsteroidRockNormality
     WallRock: WallRockNormality
-    WallRockBasalt: WallRockBasaltNormality
     WallRockChromite: WallRockChromiteNormality
     WallRockSand: WallRockSandNormality
     WallRockSnow: WallRockSnowNormality

diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml
@@ -38,3 +38,11 @@
   icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel }
   color: "#696969" #Okay, this is epic
   price: 0.28 # 1-1 mix of plasma and steel.
+
+- type: material
+  id: Tungsten
+  stackEntity: IngotTungsten1
+  name: materials-tungsten
+  unit: materials-unit-bar
+  icon: { sprite: Objects/Materials/ingots.rsi, state: tungsten_1 }
+  price: 0.5
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -95,3 +95,12 @@
   icon: { sprite: Objects/Materials/ore.rsi, state: normality }
   color: "#53a9ff"
   price: 7.5
+
+- type: material
+  id: RawTungsten
+  stackEntity: TungstenOre1
+  name: materials-raw-tungsten
+  unit: materials-unit-chunk
+  icon: { sprite: Objects/Materials/ore.rsi, state: tungsten }
+  color: "#FFD700"
+  price: 0.5
diff --git a/Resources/Prototypes/Recipes/Lathes/hardsuits.yml b/Resources/Prototypes/Recipes/Lathes/hardsuits.yml
@@ -11,7 +11,7 @@
   category: Tacsuits
   completetime: 60
   materials:
-     Plasteel: 3000
+     Tungsten: 300
      Durathread: 300
      ReinforcedGlass: 1000
      Uranium: 100
@@ -24,7 +24,7 @@
   category: Tacsuits
   completetime: 60
   materials:
-     Plasteel: 3000
+     Tungsten: 300
      Durathread: 300
      ReinforcedGlass: 1000
      Uranium: 100
@@ -38,7 +38,7 @@
   category: Tacsuits
   completetime: 90
   materials:
-     Plasteel: 3500
+     Tungsten: 350
      ReinforcedGlass: 1250
      Durathread: 500
      Plastic: 500
@@ -54,7 +54,7 @@
   category: Tacsuits
   completetime: 120
   materials:
-     Plasteel: 5000
+     Tungsten: 500
      WebSilk: 3000
      ReinforcedGlass: 1500
      Plastic: 1000
@@ -68,7 +68,7 @@
   category: Tacsuits
   completetime: 180
   materials:
-     Plasteel: 8000
+     Tungsten: 800
      WebSilk: 3000
      ReinforcedGlass: 1500
      Plastic: 1500
@@ -82,7 +82,7 @@
   category: Tacsuits
   completetime: 120
   materials:
-     Plasteel: 10000
+     Tungsten: 1000
      WebSilk: 3000
      ReinforcedPlasmaGlass: 1500
      Plastic: 1500
@@ -97,7 +97,7 @@
   category: Tacsuits
   completetime: 300
   materials: # GOOD LUCK.
-     Plasteel: 30000
+     Tungsten: 3000
      ReinforcedPlasmaGlass: 4500
      WebSilk: 3500
      Plastic: 3000

diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -285,3 +285,14 @@
   completetime: 4
   materials:
     RawNormality: 100
+
+- type: latheRecipe
+  id: IngotTungsten1
+  result: IngotTungsten1
+  applyMaterialDiscount: false
+  miningPoints: 5
+  completetime: 4
+  materials:
+    RawTungsten: 100
+    RawIron: 100
+    Coal: 100
diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml
@@ -13,3 +13,11 @@
   spawn: IngotSilver1
   maxCount: 30
   itemSize: 1
+
+- type: stack
+  id: Tungsten
+  name: tungsten-carbide
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: tungsten_1 }
+  spawn: IngotTungsten1
+  maxCount: 30
+  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -4,7 +4,7 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
   maxCount: 30
-  
+
 - type: stack
   id: DiamondOre
   name: rough diamond
@@ -91,3 +91,11 @@
   spawn: NormalityOre1
   maxCount: 30
   itemSize: 2
+
+- type: stack
+  id: TungstenOre
+  name: raw wolframite
+  icon: { sprite: Objects/Materials/ore.rsi, state: tungsten }
+  spawn: TungstenOre1
+  maxCount: 30
+  itemSize: 2
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
@@ -64,6 +64,12 @@
   minOreYield: 1
   maxOreYield: 2
 
+- type: ore
+  id: OreTungsten
+  oreEntity: TungstenOre1
+  minOreYield: 1
+  maxOreYield: 2
+
 - type: ore
   id: OreQuartzCrab
   oreEntity: MobSpawnCrabQuartz
@@ -120,19 +126,20 @@
   id: RandomOreDistributionBasalt
   weights:
     OreSteel: 20
-    OreCoal: .1
-    OreSpaceQuartz: .1
+    OreCoal: 0.1
+    OreSpaceQuartz: 0.1
     OreGold: 10
-    OrePlasma: .4
-    OreSilver: .1
-    OreUranium: .1
+    OrePlasma: 0.4
+    OreSilver: 0.1
+    OreUranium: 0.1
     OreBananium: 0.1
     OreArtifactFragment: 0.1
     OreBluespace: 0.5
     OreNormality: 0.3
     OreAluminium: 8
-    OreLead: .2
-    OreCopper: .2
+    OreLead: 0.2
+    OreCopper: 0.2
+    OreTungsten: 5
 
 - type: weightedRandomOre
   id: OreCrab