Rebalances laser/plasma weapons and fixes projectile (Vault-Overseers…

…#304)

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml

@@ -46,11 +46,14 @@
   - type: Sprite
     sprite: _Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi
     layers:
-    - map: [ "enum.PowerCellVisualLayers.Base" ]
-      state: icon
+      - map: [ "enum.PowerCellVisualLayers.Base" ] #TODO: Fix C# script to work with microfusion and lasercell
+        state: empty
+      - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+        state: o2
+        shader: unshaded
   - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
+    maxCharge: 1200
+    startingCharge: 1200
 
 - type: entity
   name: plasma cartridge
@@ -87,8 +90,8 @@
   - type: PowerCellVisuals
   - type: Riggable
   - type: ProjectileBatteryAmmoProvider
-    proto: BulletAcid
-    fireCost: 50
+    proto: BulletPlasma
+    fireCost: 100
 
 - type: entity
   name: plasma cartridge
@@ -100,8 +103,11 @@
   - type: Sprite
     sprite: _Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi
     layers:
-    - map: [ "enum.PowerCellVisualLayers.Base" ]
-      state: icon
+      - map: [ "enum.PowerCellVisualLayers.Base" ]
+        state: empty
+      - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+        state: o2
+        shader: unshaded
   - type: Battery
-    maxCharge: 500
-    startingCharge: 500
+    maxCharge: 1200
+    startingCharge: 1200

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

@@ -11,7 +11,7 @@
     minAngle: 35
     maxAngle: 65
     angleIncrease: 4
-    angleDecay: 16    
+    angleDecay: 16
     fireRate: 1
     selectedMode: SemiAuto
     availableModes:
@@ -63,7 +63,7 @@
     quickEquip: false
     slots:
     - Belt
-
+# MARK: Pistols
 - type: entity
   name: laser pistol
   parent: N14BaseWeaponPowerCellSmall
@@ -94,7 +94,7 @@
         whitelist:
           tags:
             - N14PowerCellHigh
-  - type: Gun 
+  - type: Gun
     fireRate: 1
 
 - type: entity
@@ -130,7 +130,8 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/plasma_cutter.ogg
-
+    fireRate: 1.5
+# MARK: Rifles
 - type: entity
   name: laser rifle
   parent: N14BaseWeaponPowerCellMedium
@@ -169,8 +170,11 @@
         whitelist:
           tags:
             - N14PowerCellHigh
-  - type: Gun 
-    fireRate: 2
+  - type: Gun
+    fireRate: 3
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
 
 - type: entity
   name: plasma rifle
@@ -211,8 +215,12 @@
     steps: 5
     zeroVisible: true
   - type: Gun
+    fireRate: 3
     soundGunshot:
       path: /Audio/Weapons/plasma_cutter.ogg
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
 
 
 - type: entity
@@ -254,9 +262,13 @@
     steps: 5
     zeroVisible: true
   - type: Gun
+    fireRate: 4
     soundGunshot:
       path: /Audio/Weapons/plasma_cutter.ogg
-
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+# MARK: Shotguns
 - type: entity
   name: multiplas
   parent: N14BaseWeaponPowerCellMedium
@@ -296,6 +308,7 @@
     steps: 5
     zeroVisible: true
   - type: Gun
+    fireRate: 2
     soundGunshot:
       path: /Audio/Weapons/plasma_cutter.ogg
 

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Projectiles/energy.yml

@@ -37,7 +37,42 @@
     impactEffect: BulletImpactEffect
     damage:
       types:
-        Heat: 10
-        Radiation: 10
+        Heat: 22
+        Radiation: 8
     soundHit:
-      path: "/Audio/Weapons/Guns/Hits/energy_meat1.ogg"
+      path: "/Audio/Weapons/Guns/Hits/energy_meat1.ogg"
+
+- type: entity #TODO: Finish Projectile Laser
+  name: laser
+  id: BulletLaser
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: omnilaser_greyscale
+      shader: unshaded
+      color: red
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        mask:
+        - Opaque
+      fly-by: *flybyfixture
+  - type: Projectile
+    impactEffect: BulletImpactEffect
+    damage:
+      types:
+        Heat: 20
+    soundHit:
+      collection: MeatLaserImpact

Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi/meta.json

@@ -1,14 +1,20 @@
 {
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by PatoGrone for N14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "empty"
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by PatoGrone for N14",
-    "states": [
-        {
-            "name": "icon"
-        }
-    ]
-}
+    {
+      "name": "o1"
+    },
+    {
+      "name": "o2"
+    }
+  ]
+}

Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi/meta.json

@@ -1,14 +1,20 @@
 {
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by PatoGrone for N14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "empty"
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by PatoGrone for N14",
-    "states": [
-        {
-            "name": "icon"
-        }
-    ]
-}
+    {
+      "name": "o1"
+    },
+    {
+      "name": "o2"
+    }
+  ]
+}