From 94acf80eb995640b9fe1fdb28e546b1f4d0d8569 Mon Sep 17 00:00:00 2001
From: Ripmorld <60119809+UKNOWH@users.noreply.github.com>
Date: Fri, 13 May 2022 09:15:24 +0800
Subject: [PATCH] Laser gun bugfix & damage adjustment (#8069)

---
 .../Entities/Objects/Power/powercells.yml           |  6 +++---
 .../Objects/Weapons/Guns/Battery/battery_guns.yml   | 13 ++++++++-----
 .../Objects/Weapons/Guns/Projectiles/hitscan.yml    | 13 +++++++++++++
 .../Prototypes/Recipes/Construction/weapons.yml     |  3 ++-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 211282e10a..39960dbe4d 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -226,11 +226,11 @@
       layers:
         - state: s_ar
     - type: Battery
-      maxCharge: 60
-      startingCharge: 60
+      maxCharge: 1200
+      startingCharge: 1200
     - type: BatterySelfRecharger
       autoRecharge: true
-      autoRechargeRate: 5
+      autoRechargeRate: 40
     - type: Appearance
       visuals:
         - type: PowerCellVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 42c112d331..2e4e3da138 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -100,7 +100,8 @@
     size: 24
     sprite: Objects/Weapons/Guns/Battery/makeshift.rsi
   - type: BatteryBarrel
-    fireCost: 120
+    fireCost: 240
+
 
 - type: entity
   name: svalinn laser pistol
@@ -172,7 +173,8 @@
     size: 24
     sprite: Objects/Weapons/Guns/Battery/cog.rsi
   - type: BatteryBarrel
-    fireCost: 120
+    fireCost: 140
+    ammoPrototype: RedMediumLaser
 
 - type: entity
   name: nightfall laser rifle
@@ -193,7 +195,8 @@
     size: 24
     sprite: Objects/Weapons/Guns/Battery/nightfall.rsi
   - type: BatteryBarrel
-    fireCost: 6
+    fireCost: 100
+    ammoPrototype: RedMediumLaser
   - type: Appearance
     visuals:
     - type: MagVisualizer
@@ -250,7 +253,7 @@
     size: 24
     sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi
   - type: BatteryBarrel
-    fireCost: 6
+    fireCost: 100
     ammoPrototype: Pulse
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
@@ -391,7 +394,7 @@
     size: 12
     sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
   - type: BatteryBarrel
-    fireCost: 6
+    fireCost: 120
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: RangedWeapon    
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 80c4bfac94..b1d8313dd6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -11,6 +11,19 @@
     muzzleFlash: Objects/Weapons/Guns/Projectiles/laser_muzzle.png
     impactFlash: Objects/Weapons/Guns/Projectiles/laser_impact.png
 
+- type: entity
+  name: red medium laser
+  id: RedMediumLaser
+  noSpawn: true
+  components:
+  - type: Hitscan
+    damage:
+      types:
+        Heat: 20
+    spriteName: Objects/Weapons/Guns/Projectiles/laser.png
+    muzzleFlash: Objects/Weapons/Guns/Projectiles/laser_muzzle.png
+    impactFlash: Objects/Weapons/Guns/Projectiles/laser_impact.png
+
 - type: entity
   name: pulse
   id: Pulse
diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index c97b97e7e7..712d790c2c 100644
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -18,4 +18,5 @@
   category: Weapons
   description: A simple weapon for tripping someone at a distance.
   icon: Objects/Weapons/Throwable/bola.rsi/icon.png
-  objectType: Item
\ No newline at end of file
+  objectType: Item
+