change shuttle gun values

new-frontiers-14 · Mar 4, 2024 · d251019 · d251019
1 parent 5155cc5
commit d251019
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -414,7 +414,7 @@
     impactEffect: BulletImpactEffectKinetic
     damage:
       types:
-        Blunt: 25
+        Blunt: 20
         Structural: 30
   # Short lifespan
   - type: TimedDespawn
@@ -435,7 +435,7 @@
     impactEffect: BulletImpactEffectKinetic
     damage:
       types:
-        Blunt: 30
+        Blunt: 7
         Structural: 35
   - type: Ammo
     muzzleFlash: HitscanEffect
@@ -679,9 +679,9 @@
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
-    totalIntensity: 150 # a ~2 tile radius
+    totalIntensity: 140 # a ~2 tile radius
     intensitySlope: 5
-    maxIntensity: 10
+    maxIntensity: 8
 
 - type: entity
   id: BulletGrenadeFlash
@@ -694,7 +694,7 @@
     layers:
       - state: grenade
   - type: FlashOnTrigger
-    range: 7
+    range: 9
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
   - type: ActiveTimerTrigger
@@ -828,8 +828,8 @@
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: DemolitionCharge
-    maxIntensity: 9
-    intensitySlope: 6
+    maxIntensity: 7
+    intensitySlope: 4
     totalIntensity: 60
     maxTileBreak: 0
   - type: PointLight

diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -83,7 +83,7 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
   - type: Gun
-    fireRate: 5
+    fireRate: 3
     useKey: false
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ship_svalinn.ogg
@@ -351,15 +351,15 @@
       params:
         variation: 0.12
   - type: RechargeBasicEntityAmmo
-    rechargeCooldown: 2
+    rechargeCooldown: 3
     rechargeSound:
       path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
       params:
         pitch: 1.2
         variation: 0.08
   - type: BasicEntityAmmoProvider
     proto: BulletKineticShuttle
-    capacity: 5
-    count: 5
+    capacity: 10
+    count: 10
   - type: Machine
     board: ShuttleGunKineticCircuitboard
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -71,6 +71,7 @@
     SpesosTreeSeeds: 0.5
     CrateMedicalSupplies: 0.5
     VendingMachineArcadia: 0.5
+    ShuttleGunSvalinnMachineGunCircuitboard: 0.5
 
 - type: weightedRandomEntity
   id: SalvageRewardEpic
@@ -101,3 +102,4 @@
     #EnergyCutlass: 0.5
     Claymore: 0.5
     WeaponLauncherRocket: 0.5
+    ShuttleGunSvalinnMachineGunCircuitboard: 0.75
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml
@@ -2,6 +2,7 @@
   id: CircuitVendInventory
   startingInventory:
 ##    SalvageExpeditionsComputerCircuitboard: 8
+    ShuttleGunKineticCircuitboard: 10
     TilePrinterNFMachineCircuitboard: 8
     ComputerIFFCircuitboard: 4
     CrewMonitoringComputerCircuitboard: 6