[Add] Salvage rebalance (#911)

Resources/Locale/ru-RU/_white/items/apka.ftl

@@ -0,0 +1,4 @@
+ent-WeaponAdvancedProtoKineticAccelerator = продвинутый автоматический протокинетический акселератор
+    .desc = Сокращённо - ПАПА. Обладает повышенной скорострельностью и эффективно добывает породы любых типов. Крайне опасен в бою.
+
+research-technology-industrial-mining = Промышленная добыча

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl

@@ -2,7 +2,7 @@ ent-BaseBlueprint = чертёж
     .desc = Чертёж какого-то устройства. Его можно поместить в автолат.
 ent-BlueprintFulton = чертёж фултона
     .desc = Чертёж со схемой фултона. Его можно поместить в автолат.
-ent-BlueprintSeismicCharge = чертёж сейсмического заряда
-    .desc = Чертеж со схемой сейсмического заряда. Его можно поместить в автолат.
+ent-BlueprintMiningDrillDiamond = чертёж алмазного шахтёрского бура
+    .desc = Чертеж со схемой алмазного бура. Его можно поместить в автолат.
 ent-BlueprintSoapOmega = чертёж омега мыла
     .desc = Чертеж со схемой омега мыла. Его можно поместить в автолат.

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl

@@ -10,3 +10,5 @@ ent-Pickaxe = кирка
     .desc = Зазубренная до совершенства, чтобы вбивать её в камни.
 ent-MiningDrill = шахтёрский бур
     .desc = Мощный инструмент, служащий для быстрого бурения горных пород.
+ent-MiningDrillDiamond = шахтёрский бур с алмазным сверлом
+    .desc = Более эффективная версия шахтёрского бура.

Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml

@@ -1,23 +1,24 @@
 - type: vendingMachineInventory
   id: SalvageEquipmentInventory
   startingInventory:
-    WeaponProtoKineticAccelerator: 2
-    WeaponCrusher: 1
-    WeaponCrusherDagger: 2
-    HandheldGPSBasic: 4
-    Crowbar: 2
-    BoxMRE: 3
+    WeaponProtoKineticAccelerator: 4 # WD start
     Pickaxe: 4
-    SurvivalKnife: 2
     OreBag: 4
+    SeismicCharge: 3
+    SurvivalKnife: 2
+    Crowbar: 2
     Flare: 10
     FlashlightLantern: 3
     Floodlight: 2
-    RadioHandheld: 4
-    InflatableWallStack1: 20
-    InflatableDoorStack1: 10
-    SeismicCharge: 3
+    PowerCellMedium: 3
+    HandheldGPSBasic: 3
+    RadioHandheld: 3
     FultonBeacon: 2
     Fulton: 3
+    BoxInflatable: 2
+    BoxMRE: 2
+    ClothingEyesGlassesMeson: 3
+    ClothingPouchMedical: 2
+    ClothingPouchGrenade: 2 # WD end
   emaggedInventory:
     JetpackBlackFilled: 1

Resources/Prototypes/Entities/Clothing/Pouches/base_clothingpouch.yml

@@ -14,7 +14,7 @@
     materialComposition:
       Cloth: 35
   - type: StaticPrice
-    price: 200
+    price: 50
   - type: EmitSoundOnPickup
     sound:
       path: /Audio/White/Web/walk1.ogg

Resources/Prototypes/Entities/Clothing/Pouches/pouches.yml

@@ -27,7 +27,7 @@
         - Patch
         - Healing
   - type: StaticPrice
-    price: 250
+    price: 75
   - type: Appearance
 
 - type: entity
@@ -50,8 +50,6 @@
         - SmokeOnTrigger
         - ClusterGrenade
         - ExplodeOnTrigger
-  - type: StaticPrice
-    price: 125
   - type: Appearance
 
 - type: entity
@@ -118,7 +116,7 @@
     maxFillLevels: 1
     fillBaseName: fill-
   - type: StaticPrice
-    price: 110
+    price: 40
   - type: Appearance
 
 - type: entity
@@ -165,5 +163,5 @@
     slots: [pocket, belt]
     quickEquip: false
   - type: StaticPrice
-    price: 150
+    price: 70
   - type: Appearance

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -22,7 +22,7 @@
     sprite: Clothing/Shoes/Boots/jackboots.rsi
 
 - type: entity
-  parent: ClothingShoesBaseButcherable
+  parent: ClothingShoesMilitaryBase # WD
   id: ClothingShoesBootsSalvage
   name: salvage boots
   description: Steel-toed salvage boots for salvaging in hazardous environments.
@@ -31,7 +31,6 @@
     sprite: Clothing/Shoes/Boots/explorer.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/explorer.rsi
-  - type: Matchbox
 
 - type: entity
   parent: ClothingShoesBaseButcherable

Resources/Prototypes/Entities/Objects/Tools/blueprint.yml

@@ -30,10 +30,10 @@
 
 - type: entity
   parent: BaseBlueprint
-  id: BlueprintSeismicCharge
-  name: seismic charge blueprint
-  description: A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe.
+  id: BlueprintMiningDrillDiamond # WD start
+  name: diamond mining drill blueprint
+  description: A blueprint with a schematic of a diamond mining drill. It can be inserted into an autolathe.
   components:
   - type: Blueprint
     providedRecipes:
-    - SeismicCharge
+    - MiningDrillDiamond # WD end

Resources/Prototypes/Entities/Objects/Tools/flare.yml

@@ -26,6 +26,8 @@
         loop: true
         volume: -10
         maxDistance: 5
+  - type: StaticPrice # WD
+    price: 5 # WD
 
   - type: Sprite
     sprite: Objects/Misc/flare.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -420,6 +420,7 @@
     layers:
     - state: chronobolt
       shader: unshaded
+  - type: GatheringProjectile # WD
   - type: Projectile
     impactEffect: BulletImpactEffectKinetic
     damage:
@@ -487,9 +488,10 @@
     damage:
       types:
         Blunt: 0
+        Structural: 15 # WD
   # Short lifespan
   - type: TimedDespawn
-    lifetime: 0.4
+    lifetime: 0.2 # WD
 
 - type: entity
   parent: BaseBullet

Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml

@@ -64,3 +64,25 @@
         Brute: 3
       types:
         Structural: 12
+
+- 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

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -381,6 +381,10 @@
       - WeaponForceGun
       - WeaponLaserSvalinn
       - WeaponProtoKineticAccelerator
+      - WeaponAdvancedProtoKineticAccelerator # WD start
+      - SeismicCharge
+      - WeaponCrusherDagger
+      - WeaponCrusher # WD end
       - WeaponTetherGun
       - WeaponGrapplingGun
       - ClothingBackpackHolding

Resources/Prototypes/Recipes/Lathes/devices.yml

@@ -212,6 +212,51 @@
     Glass: 500
     Silver: 100
 
+- type: latheRecipe # WD start
+  id: WeaponAdvancedProtoKineticAccelerator
+  result: WeaponAdvancedProtoKineticAccelerator
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 800
+    Plasma: 400
+    Glass: 200
+    Uranium: 200
+    Silver: 300
+    Gold: 600
+
+- type: latheRecipe
+  id: SeismicCharge
+  result: SeismicCharge
+  category: Weapons
+  completetime: 3
+  materials:
+    Plastic: 800
+    Plasma: 100
+    Glass: 200
+
+- type: latheRecipe
+  id: WeaponCrusherDagger
+  result: WeaponCrusherDagger
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 500
+    Plastic: 200
+    Silver: 100
+
+- type: latheRecipe
+  id: WeaponCrusher
+  result: WeaponCrusher
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 2000
+    Plastic: 400
+    Glass: 300
+    Plasma: 300
+    Silver: 200 # WD end
+
 - type: latheRecipe
   id: WeaponTetherGun
   result: WeaponTetherGun

Resources/Prototypes/Recipes/Lathes/salvage.yml

@@ -18,11 +18,11 @@
     # If they get spammed make it cost silver.
 
 - type: latheRecipe
-  id: SeismicCharge
-  result: SeismicCharge
+  id: MiningDrillDiamond # WD start
+  result: MiningDrillDiamond
   category: Tools
-  completetime: 5 # WD Edit from 1 to 5
+  completetime: 5
   materials:
-    Plastic: 1500
-    Steel: 100
-    Silver: 100
+    Steel: 1500
+    Plastic: 1000
+    Silver: 200 # WD end

Resources/Prototypes/Research/arsenal.yml

@@ -12,6 +12,7 @@
   recipeUnlocks:
   - WeaponProtoKineticAccelerator
   - ShuttleGunKineticCircuitboard
+  - WeaponCrusherDagger # WD
   # These are roundstart but not replenishable for salvage
 
 - type: technology
@@ -109,6 +110,22 @@
 
 # Tier 2
 
+- type: technology # WD start
+  id: IndustrialMining
+  name: research-technology-industrial-mining
+  icon:
+    sprite: Objects/Weapons/Bombs/seismic.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 9500
+  recipeUnlocks:
+  - WeaponAdvancedProtoKineticAccelerator
+  - SeismicCharge
+  - WeaponCrusher
+  technologyPrerequisites:
+  - SalvageWeapons # WD end
+
 - type: technology
   id: LightweightMagnets
   name: research-technology-lightweight-magnets

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/apka.yml

@@ -0,0 +1,59 @@
+- type: entity
+  parent: BaseItem
+  id: WeaponAdvancedProtoKineticAccelerator
+  name: advanced proto-kinetic accelerator
+  description: Apka.
+  components:
+  - type: Sprite
+    sprite: White/Objects/Weapons/advanced_kinetic.rsi
+    layers:
+    - state: icon
+    - state: animation-icon
+      visible: false
+      map: [ "empty-icon" ]
+  - type: Item
+    sprite: White/Objects/Weapons/advanced_kinetic.rsi
+    size: Normal
+  - type: GunWieldBonus
+    minAngle: -43
+    maxAngle: -43
+  - type: Wieldable
+  - type: Gun
+    angleDecay: 45
+    minAngle: 44
+    maxAngle: 45
+    fireRate: 6
+    ShotsPerBurst: 3
+    selectedMode: Burst
+    availableModes:
+    - Burst
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
+  - type: AmmoCounter
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.AmmoVisuals.HasAmmo:
+        empty-icon:
+          True: { visible: False }
+          False: { visible: True }
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 0.7
+    rechargeSound:
+      path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
+      params:
+        volume: -1
+        pitch: 1.2
+        variation: 0.08
+  - type: BasicEntityAmmoProvider
+    proto: BulletKinetic
+    capacity: 3
+    count: 2
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+    quickEquip: false
+    slots:
+    - suitStorage
+    - Belt
+  - type: UseDelay
+    delay: 1

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
+    }
+  ]
+}

Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/meta.json

@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, wield, and belt equip sprites by RiceMar1244. Recolor by keslik",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "animation-icon",
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}