Add diamond mining drills, buff regular mining drills (#30814)

* why do I have to change so much just to add drills

* diamon

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 70ca8d018ac1ad786390767cf4ff6ac04e9e28f0..4fbb0e1bd3718c3ccea9269b560e62dbdaa64d03 100644 (file)
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -20,6 +20,7 @@ research-technology-super-powercells = Super Powercells
 research-technology-bluespace-storage = Bluespace Storage
 research-technology-portable-fission = Portable Fission
 research-technology-space-scanning = Space Scanning
+research-technology-excavation = Mass Excavation
 
 research-technology-salvage-weapons = Salvage Weapons
 research-technology-draconic-munitions = Draconic Munitions
@@ -43,7 +44,6 @@ research-technology-alternative-research = Alternative Research
 research-technology-magnets-tech = Localized Magnetism
 research-technology-advanced-parts = Advanced Parts
 research-technology-anomaly-harnessing = Anomaly Core Harnessing
-research-technology-grappling = Grappling
 research-technology-abnormal-artifact-manipulation = Artifact Recycling
 research-technology-gravity-manipulation = Gravity Manipulation
 research-technology-quantum-leaping = Quantum Leaping

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index e8d4094400ff1b0917bd2f3f2278b7ef6475a88c..e00f3e65d3508f21fc9603130cf052d89dc7dcef 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -360,10 +360,6 @@
     layers:
     - state: diamond
       map: ["base"]
-  - type: StaticPrice
-    price: 0
-  - type: StackPrice
-    price: 500
   - type: Appearance
   - type: Item
     heldPrefix: diamond
@@ -375,6 +371,10 @@
         reagents:
         - ReagentId: Carbon
           Quantity: 20
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Diamond: 100
 
 - type: entity
   parent: MaterialDiamond

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 4eec90584c812d5f0719ae03c4fc0a444ac14cee..87826aa8f06f93d8ed00d22dc73312db06009624 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -1,3 +1,91 @@
+- type: entity
+  name: pickaxe
+  parent: BaseItem
+  id: Pickaxe
+  description: Notched to perfection, for jamming it into rocks.
+  components:
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/pickaxe.rsi
+    state: pickaxe
+  - type: MeleeWeapon
+    attackRate: 0.7
+    wideAnimationRotation: -135
+    soundHit:
+      path: "/Audio/Weapons/smash.ogg"
+      params:
+        volume: -3
+    damage:
+      groups:
+        Brute: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      groups:
+        Brute: 10
+      types:
+        Structural: 30
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,2
+    sprite: Objects/Weapons/Melee/pickaxe.rsi
+    storedRotation: -45
+  - type: UseDelay
+
+- type: entity
+  name: mining drill
+  parent: BaseItem
+  id: MiningDrill
+  description: Powerful tool used to quickly drill through rocks.
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: Objects/Tools/handdrill.rsi
+    state: handdrill
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 4
+    damage:
+      groups:
+        Brute: 3
+      types:
+        Structural: 15
+
+- type: entity
+  name: diamond tipped mining drill
+  parent: MiningDrill
+  id: MiningDrillDiamond
+  description: A significantly more efficient mining drill tipped with diamond.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/handdrilldiamond.rsi
+    state: handdrill
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 4
+    damage:
+      groups:
+        Brute: 6
+      types:
+        Structural: 30
+
+
 - type: entity
   abstract: true
   parent: BaseItem

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
deleted file mode 100644 (file)
index e1c98f4..0000000
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-- type: entity
-  name: pickaxe
-  parent: BaseItem
-  id: Pickaxe
-  description: Notched to perfection, for jamming it into rocks.
-  components:
-  - type: Tag
-    tags:
-    - Pickaxe
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    state: pickaxe
-  - type: MeleeWeapon
-    attackRate: 0.7
-    wideAnimationRotation: -135
-    soundHit:
-      path: "/Audio/Weapons/smash.ogg"
-      params:
-        volume: -3
-    damage:
-      groups:
-        Brute: 5
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      groups:
-        Brute: 10
-      types:
-        Structural: 30
-  - type: Item
-    size: Normal
-    shape:
-    - 0,0,2,0
-    - 1,1,1,2
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    storedRotation: -45
-  - type: UseDelay
-
-- type: entity
-  name: mining drill
-  parent: BaseItem
-  id: MiningDrill
-  description: Powerful tool used to quickly drill through rocks.
-  components:
-  - type: Item
-    storedRotation: -90
-  - type: Tag
-    tags:
-    - Pickaxe
-  - type: Sprite
-    sprite: Objects/Tools/handdrill.rsi
-    state: handdrill
-  - type: MeleeWeapon
-    autoAttack: true
-    angle: 0
-    wideAnimationRotation: -90
-    soundHit:
-      path: "/Audio/Items/drill_hit.ogg"
-    attackRate: 3.5
-    damage:
-      groups:
-        Brute: 3
-      types:
-        Structural: 12

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 38d287cce1a1f3649c69a5738f3c0f2743906cf3..8f6fb16f046da4e58e0b0ffac7957674f3a0d387 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -16,7 +16,7 @@
         mask:
         - MachineMask
         layer:
-          - MachineLayer
+          - MachineLayer  
   - type: Lathe
   - type: MaterialStorage
   - type: Destructible
@@ -277,6 +277,7 @@
     dynamicRecipes:
       - PowerDrill
       - MiningDrill
+      - MiningDrillDiamond
       - AnomalyScanner
       - AnomalyLocator
       - AnomalyLocatorWide

diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index 9446b9d27fc3d7f4d6bc14f5583eb22c2ea40d86..829ae46b93d71785958b360001aee484bc1e488a 100644 (file)
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -123,4 +123,12 @@
   unit: materials-unit-piece
   icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
   color: "#A9A9A9"
-  price: 0
\ No newline at end of file
+  price: 0
+
+- type: material
+  id: Diamond
+  name: materials-diamond
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Materials/materials.rsi, state: diamond }
+  color: "#80ffff"
+  price: 20 # big diamond gaslit us so hard diamonds actually became extremely rare

diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml
index 9b3cb086433edbc5d1b118b5b156312b36da1c31..84047ae75d847c210c925f0e4aa212a8371c3ec2 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/salvage.yml
+++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml
@@ -14,3 +14,23 @@
     Steel: 1000
     Glass: 500
     # If they get spammed make it cost silver.
+
+- type: latheRecipe
+  id: MiningDrill
+  result: MiningDrill
+  category: Tools
+  completetime: 3
+  materials:
+    Steel: 500
+    Plastic: 100
+
+- type: latheRecipe
+  id: MiningDrillDiamond
+  result: MiningDrillDiamond
+  category: Tools
+  completetime: 3
+  materials:
+    Steel: 600
+    Plastic: 200
+    Silver: 200
+    Diamond: 100

diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
index 67d412b57107d3e4183666b637ca8bb80db5088e..3f5003d909b93dfeddd7e405a511618872ae4a57 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -197,15 +197,6 @@
     Glass: 50
     Plastic: 50
 
-- type: latheRecipe
-  id: MiningDrill
-  result: MiningDrill
-  category: Tools
-  completetime: 3
-  materials:
-    Steel: 500
-    Plastic: 100
-
 - type: latheRecipe
   id: WelderExperimental
   result: WelderExperimental

diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 4dc60314c474576f61939f70211ccecc3bfe5544..373333ad43fc7bf1fac68e3e310c1dc88ba8a691 100644 (file)
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -11,9 +11,10 @@
   cost: 7500
   recipeUnlocks:
   - MiningDrill
+  - WeaponGrapplingGun
   - BorgModuleMining
+  - BorgModuleGrapplingGun
   - OreProcessorIndustrialMachineCircuitboard
-  - OreBagOfHolding
   - ClothingMaskWeldingGas
 
 - type: technology
@@ -106,19 +107,6 @@
   - RipleyPeripheralsElectronics
   - MechEquipmentGrabber
 
-- type: technology
-  id: Grappling
-  name: research-technology-grappling
-  icon:
-    sprite: Objects/Weapons/Guns/Launchers/grappling_gun.rsi
-    state: base
-  discipline: Industrial
-  tier: 1
-  cost: 5000
-  recipeUnlocks:
-  - WeaponGrapplingGun
-  - BorgModuleGrapplingGun
-
 # Tier 2
 
 - type: technology
@@ -180,6 +168,19 @@
     - BorgModuleAdvancedTool
     - BorgModuleRCD
 
+- type: technology
+  id: MassExcavation
+  name: research-technology-excavation
+  icon:
+    sprite: Objects/Tools/handdrilldiamond.rsi
+    state: handdrill
+  discipline: Industrial
+  tier: 2
+  cost: 12500
+  recipeUnlocks:
+    - OreBagOfHolding
+    - MiningDrillDiamond
+
 # Tier 3
 
 - type: technology

diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png
new file mode 100644 (file)
index 0000000..8b913e2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png differ

diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..db6873b
Binary files /dev/null and b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..37f9d3f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json
new file mode 100644 (file)
index 0000000..e9341a7
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8fdee6e4e3dacdb7a12efaac132933dc0fc649b4 and modified by alzore_",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "handdrill"
+    },
+       {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}