Another .38 special clean up / balance

Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

@@ -74,6 +74,10 @@
         prob: 0.001
       - id: WeaponRevolverInspector
         prob: 0.001
+      # DeltaV - .38 special revolver - Adds the .38 Special Revolver 'Lucky 37' to the salvage potential loot
+      - id: WeaponRevolverLucky
+        prob: 0.001
+      # End of modified code
       - id: ClothingShoesBootsMagBlinding
         prob: 0.001
         #  - Skub

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

@@ -13,9 +13,11 @@
     MagazineBoxMagnumPractice: 3
     MagazineBoxMagnumRubber: 3
 
-    MagazineBoxSpecial: 3 # DeltaV - .38 Special revolver
-    MagazineBoxSpecialPractice: 3 # DeltaV - .38 Special revolver
-    MagazineBoxSpecialRubber: 3 # DeltaV - .38 Special revolver
+    # DeltaV - .38 special ammo - Add various .38 special ammo to ammovend
+    MagazineBoxSpecial: 3
+    MagazineBoxSpecialPractice: 3
+    MagazineBoxSpecialRubber: 3
+    # End of modified code
 
     MagazineBoxPistol: 3
     MagazineBoxPistolPractice: 3

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml

@@ -67,3 +67,48 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: rubber
+
+- type: entity
+  parent: BaseMagazineBoxSpecial
+  id: MagazineBoxSpecialIncendiary
+  name: ammunition box (.38 special incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
+
+- type: entity
+  parent: BaseMagazineBoxSpecial
+  id: MagazineBoxSpecialUranium
+  name: ammunition box (.38 special uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: uranium
+
+- type: entity
+  parent: BaseMagazineBoxSpecial
+  id: MagazineBoxSpecialMindbreaker
+  name: ammunition box (.38 special mindbreaker)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialMindbreaker
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: mindbreaker

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml

@@ -35,6 +35,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialPractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeSpecialRubber
@@ -43,6 +50,43 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
+
+- type: entity
+  id: CartridgeSpecialIncendiary
+  name: cartridge (.38 special incendiary)
+  parent: BaseCartridgeSpecial
+  components:
+  - type: CartridgeAmmo
+    proto: BulletSpecialIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
+
+- type: entity
+  id: CartridgeSpecialUranium
+  name: cartridge (.38 special uranium)
+  parent: BaseCartridgeSpecial
+  components:
+  - type: CartridgeAmmo
+    proto: BulletSpecialUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
 
 - type: entity
   id: CartridgeSpecialHoly
@@ -51,6 +95,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialHoly
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#fff600"
 
 - type: entity
   id: CartridgeSpecialMindbreaker
@@ -59,6 +110,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialMindbreaker
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#950ea9"
   - type: ChemicalAmmo
   - type: SolutionContainerManager
     solutions:

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml

@@ -31,7 +31,31 @@
       types:
         Blunt: 3
   - type: StaminaDamageOnCollide
-    damage: 35 # 3 hits to stun cuz revolver
+    damage: 30
+
+- type: entity
+  id: BulletSpecialIncendiary
+  name: bullet (.38 special incendiary)
+  parent: BaseBulletIncendiary
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+        Heat: 27
+
+- type: entity
+  id: BulletSpecialUranium
+  name: bullet (.38 special uranium)
+  parent: BaseBulletUranium
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 12
+        Piercing: 18
 
 - type: entity
   id: BulletSpecialHoly
@@ -42,8 +66,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 3
-        Holy: 5
+        Holy: 6
+        Piercing: 25
 
 - type: entity
   id: BulletSpecialMindbreaker

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml

@@ -78,3 +78,63 @@
     steps: 7
     zeroVisible: false
   - type: Appearance
+
+- type: entity
+  id: SpeedLoaderSpecialUranium
+  name: "speed loader (.38 special uranium)"
+  parent: BaseSpeedLoaderSpecial
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialUranium
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: uranium-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: uranium
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderSpecialMindbreaker
+  name: "speed loader (.38 special mindbreaker)"
+  parent: BaseSpeedLoaderSpecial
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialMindbreaker
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: mindbreaker-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: mindbreaker
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderSpecialHoly
+  name: "speed loader (.38 special holy)"
+  parent: BaseSpeedLoaderSpecial
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialHoly
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: holy-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: holy
+    steps: 7
+    zeroVisible: false
+  - type: Appearance

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -81,7 +81,7 @@
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi
   - type: Gun
-    fireRate: 4
+    fireRate: 3.5
     availableModes:
     - SemiAuto
     soundGunshot:

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -34,7 +34,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1.5
+    fireRate: 2
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
@@ -59,7 +59,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1.5
+    fireRate: 1.75
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
@@ -84,7 +84,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1.5
+    fireRate: 2
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
@@ -108,16 +108,17 @@
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
   - type: Clothing
-    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1
+    fireRate: 1.5
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
     whitelist:
       tags:
         - CartridgeSpecial
+        - SpeedLoaderSpecial
     proto: CartridgeSpecialHoly
     capacity: 4
     chambers: [ True, True, True, True ]