fixed charging ability

FFATroop · Feb 1, 2024 · 85b1c95 · 85b1c95
1 parent 8cd40dd
commit 85b1c95
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -107,7 +107,8 @@
         blacklist:
           tags:
           - PotatoBattery
-
+          - PlasmaMagazine
+
 - type: entity
   parent: [ BaseItemRecharger, ConstructibleMachine ]
   id: PowerCageRecharger
@@ -167,6 +168,9 @@
           - HitscanBatteryAmmoProvider
           - ProjectileBatteryAmmoProvider
           - Stunbaton
+        blacklist:
+          tags:
+          - PlasmaMagazine
 
 - type: entity
   parent: BaseItemRecharger
@@ -193,6 +197,7 @@
         blacklist:
           tags:
           - PotatoBattery
+          - PlasmaMagazine
 
 - type: entity
   parent: BaseItemRecharger
@@ -219,6 +224,9 @@
           - HitscanBatteryAmmoProvider
           - ProjectileBatteryAmmoProvider
           - Stunbaton
+        blacklist:
+          tags:
+          - PlasmaMagazine
 
 - type: entity
   parent: BaseRecharger

diff --git a/Resources/Prototypes/TS/Entities/Objects/Weapons/Ammunition/gas_magazines.yml b/Resources/Prototypes/TS/Entities/Objects/Weapons/Ammunition/gas_magazines.yml
@@ -6,7 +6,7 @@
   components:
   - type: Tag
     tags:
-    - PotatoBattery     # For ignore chargers
+    - PlasmaMagazine
     - LightPlasmaMagazine
   - type: Item
     size: Small
@@ -56,7 +56,7 @@
   components:
   - type: Tag
     tags:
-    - PotatoBattery     # For ignore chargers
+    - PlasmaMagazine
     - HeavyPlasmaMagazine
   - type: Item
     size: Large

diff --git a/Resources/Prototypes/TS/Entities/Objects/Weapons/TroopWeapon.yml b/Resources/Prototypes/TS/Entities/Objects/Weapons/TroopWeapon.yml
@@ -42,7 +42,7 @@
   - type: MagazineVisuals
     magState: mag
     steps: 4
-    zeroVisible: true
+    zeroVisible: false
   - type: ItemSlots
     slots:
       gun_magazine:

diff --git a/Resources/Prototypes/TS/Entities/Objects/Weapons/projectiles.yml b/Resources/Prototypes/TS/Entities/Objects/Weapons/projectiles.yml
@@ -10,7 +10,8 @@
   - type: Projectile
     damage:
       types:
-        Heat: 19
+        Heat: 12
+        Brute: 7
 
 - type: entity
   id: GreenPlasmaBullet
@@ -24,7 +25,8 @@
   - type: Projectile
     damage:
       types:
-        Heat: 29
+        Heat: 19
+        Brute: 11
 
 - type: entity
   id: RedPlasmaBullet
@@ -38,4 +40,5 @@
   - type: Projectile
     damage:
       types:
-        Heat: 9
+        Heat: 5
+        Brute: 4
diff --git a/Resources/Prototypes/TS/tags.yml b/Resources/Prototypes/TS/tags.yml
@@ -3,3 +3,6 @@
 
 - type: Tag
   id: HeavyPlasmaMagazine
+
+- type: Tag
+  id: PlasmaMagazine