Laser stuff (#27)

* - tweak: Laser stuff

* - fix: Fix projectile speed

Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml

@@ -14,8 +14,8 @@
     - type: HTN
       rootTask:
         task: SimpleRangedHostileCompound
-    - type: HitscanBatteryAmmoProvider
-      proto: RedLaser
+    - type: ProjectileBatteryAmmoProvider
+      proto: BulletTrailLaserMedium
       fireCost: 62.5
     - type: Battery
       maxCharge: 1000
@@ -24,6 +24,7 @@
       autoRecharge: true
       autoRechargeRate: 40
     - type: Gun
+      projectileSpeed: 48
       fireRate: 0.75
       useKey: false
       selectedMode: SemiAuto

Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml

@@ -175,8 +175,8 @@
     damage:
       types:
         Heat: 5
-  - type: HitscanBatteryAmmoProvider
-    proto: RedLaser
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletTrailLaser
     fireCost: 140
   - type: Battery
     maxCharge: 1000
@@ -185,6 +185,7 @@
     autoRecharge: true
     autoRechargeRate: 50
   - type: Gun
+    projectileSpeed: 48
     fireRate: 0.3
     useKey: false
     showExamineText: false

Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml

@@ -43,8 +43,8 @@
     - type: Tag
       tags:
         - FootstepSound
-    - type: HitscanBatteryAmmoProvider
-      proto: RedLightLaser
+    - type: ProjectileBatteryAmmoProvider
+      proto: BulletTrailLaserLight
       fireCost: 50
     - type: BatterySelfRecharger
       autoRecharge: true
@@ -53,6 +53,7 @@
       maxCharge: 1000
       startingCharge: 1000
     - type: Gun
+      projectileSpeed: 48
       fireRate: 1
       useKey: false
       selectedMode: SemiAuto

Resources/Prototypes/Entities/Objects/Power/powercells.yml

@@ -32,8 +32,8 @@
   - type: Appearance
   - type: PowerCellVisuals
   - type: Riggable
-  - type: HitscanBatteryAmmoProvider
-    proto: RedLightLaser
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletTrailLaserLight
     fireCost: 50
 
 - type: entity
@@ -290,8 +290,8 @@
   - type: Tag
     tags:
       - PowerCage
-  - type: HitscanBatteryAmmoProvider
-    proto: RedShuttleLaser
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletTrailLaserShuttle
     fireCost: 150
   - type: ClothingSpeedModifier
     walkModifier: 0.8
@@ -315,7 +315,7 @@
   - type: Battery
     maxCharge: 1400
     startingCharge: 1400
-    
+
 - type: entity
   id: PowerCageMedium
   parent: BasePowerCage
@@ -333,7 +333,7 @@
   - type: Battery
     maxCharge: 2700
     startingCharge: 2700
-    
+
 - type: entity
   id: PowerCageHigh
   parent: BasePowerCage
@@ -351,7 +351,7 @@
   - type: Battery
     maxCharge: 6200
     startingCharge: 6200
-    
+
 - type: entity
   id: PowerCageSmallEmpty
   parent: PowerCageSmall
@@ -369,7 +369,7 @@
   - type: Battery
     maxCharge: 1400
     startingCharge: 0
-    
+
 - type: entity
   id: PowerCageMediumEmpty
   parent: PowerCageMedium
@@ -386,7 +386,7 @@
       visible: false
   - type: Battery
     startingCharge: 0
-    
+
 - type: entity
   id: PowerCageHighEmpty
   parent: PowerCageHigh
@@ -402,4 +402,4 @@
       shader: unshaded
       visible: false
   - type: Battery
-    startingCharge: 0
+    startingCharge: 0

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -164,10 +164,7 @@
     sprite: Objects/Weapons/Guns/Battery/makeshift.rsi
   - type: ProjectileBatteryAmmoProvider
     proto: BulletTrailLaser
-    fireCost: 62.5
-  - type: Battery
-    maxCharge: 500
-    startingCharge: 500
+    fireCost: 125
 
 - type: entity
   name: tesla gun
@@ -260,10 +257,7 @@
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: PulseBoltProjectile
-    fireCost: 200
-  - type: Battery
-    maxCharge: 2000
-    startingCharge: 2000
+    fireCost: 100
 
 - type: entity
   name: pulse carbine
@@ -291,10 +285,7 @@
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: PulseBoltProjectile
-    fireCost: 200
-  - type: Battery
-    maxCharge: 5000
-    startingCharge: 5000
+    fireCost: 40
 
 - type: entity
   name: pulse rifle
@@ -318,10 +309,7 @@
       path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: PulseBoltProjectile
-    fireCost: 100
-  - type: Battery
-    maxCharge: 40000
-    startingCharge: 40000
+    fireCost: 2.5
 
 - type: entity
   name: laser cannon
@@ -366,6 +354,7 @@
         - state: base
           map: ["enum.GunVisualLayers.Base"]
     - type: Gun
+      projectileSpeed: 25
       fireRate: 0.5
       soundGunshot:
         path: /Audio/Weapons/emitter.ogg
@@ -373,10 +362,7 @@
           pitch: 2
     - type: ProjectileBatteryAmmoProvider
       proto: AntiParticlesProjectile
-      fireCost: 500
-    - type: Battery
-      maxCharge: 10000
-      startingCharge: 10000
+      fireCost: 50
 
 - type: entity
   name: x-ray cannon
@@ -739,8 +725,8 @@
       fireCost: 49
       laserFireCost: 99
       stunFireCost: 49
-      stunProjectileSpeed: 25
-      laserProjectileSpeed: 25
+      stunProjectileSpeed: 48
+      laserProjectileSpeed: 48
       stunSound: "/Audio/Weapons/Guns/Gunshots/taser2.ogg"
       laserSound: "/Audio/Weapons/Guns/Gunshots/laser_cannon.ogg"
     - type: MagazineVisuals

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

@@ -1046,6 +1046,32 @@
     reflective:
     - Energy
 
+- type: entity
+  name: laser bolt
+  id: BulletTrailLaserLight
+  parent: BulletTrailLaser
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Heat: 9
+  - type: Trail
+    scale: 0.03, 0.0
+
+- type: entity
+  name: laser bolt
+  id: BulletTrailLaserShuttle
+  parent: BulletTrailLaser
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Heat: 60
+        Structural: 15
+  - type: Trail
+    scale: 0.15, 0.0
 
 - type: entity
   name: practice laser bolt

Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml

@@ -80,6 +80,7 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
   - type: Gun
+    projectileSpeed: 48
     fireRate: 5
     useKey: false
     selectedMode: SemiAuto
@@ -136,6 +137,7 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
   - type: Gun
+    projectileSpeed: 48
     fireRate: 1
     useKey: false
     selectedMode: SemiAuto