fixed gun + added new one

FFATroop · Mar 4, 2024 · 7c5b57b · 7c5b57b
1 parent 6db1b5c
commit 7c5b57b
Show file tree

Hide file tree

Showing 30 changed files with 271 additions and 52 deletions.
diff --git a/Resources/Prototypes/TS/Entities/Objects/Weapons/Ammunition/gas_magazines.yml b/Resources/Prototypes/TS/Entities/Objects/Weapons/Ammunition/gas_magazines.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: MagazinePlasmaRed
+  id: LightMagazinePlasmaRed
   parent: BaseItem
   name: light plasma mag
   suffix: Red
@@ -15,39 +15,73 @@
     sprite: TS/Objects/Weapons/Ammunition/Magazine/Plasma/light_plasma_mag.rsi
     state: base
   - type: ProjectileBatteryAmmoProvider
-    proto: RedPlasmaBullet
+    proto: LargePlasmaBullet
     fireCost: 1
   - type: Battery
-    maxCharge: 100
-    startingCharge: 100
+    maxCharge: 30
+    startingCharge: 30
   - type: Appearance
 
 - type: entity
-  id: MagazinePlasmaBlue
-  parent: MagazinePlasmaRed
+  id: LightMagazinePlasmaBlue
+  parent: LightMagazinePlasmaRed
   name: light plasma mag
   suffix: Blue
   components:
   - type: ProjectileBatteryAmmoProvider
-    proto: BluePlasmaBullet
-    fireCost: 1
-  - type: Battery
-    maxCharge: 75
-    startingCharge: 75
-
+    proto: LargeBluePlasmaBullet
+
 - type: entity
-  id: MagazinePlasmaGreen
-  parent: MagazinePlasmaRed
+  id: LightMagazinePlasmaGreen
+  parent: LightMagazinePlasmaRed
   name: light plasma mag
   suffix: Green
   components:
   - type: ProjectileBatteryAmmoProvider
-    proto: GreenPlasmaBullet
+    proto: LargeGreenPlasmaBullet
+
+- type: entity
+  id: MediumMagazinePlasmaRed
+  parent: BaseItem
+  name: medium plasma mag
+  suffix: Red
+  components:
+  - type: Tag
+    tags:
+    - PlasmaMagazine
+    - MediumPlasmaMagazine
+  - type: Item
+    size: Large
+    sprite: TS/Objects/Weapons/Ammunition/Magazine/Plasma/medium_plasma_mag.rsi
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Ammunition/Magazine/Plasma/medium_plasma_mag.rsi
+    state: base
+  - type: ProjectileBatteryAmmoProvider
+    proto: MediumRedPlasmaBullet
     fireCost: 1
   - type: Battery
-    maxCharge: 50
-    startingCharge: 50
-
+    maxCharge: 70
+    startingCharge: 70
+  - type: Appearance
+
+- type: entity
+  id: MediumMagazinePlasmaBlue
+  parent: MediumMagazinePlasmaRed
+  name: medium plasma mag
+  suffix: Blue
+  components:
+  - type: ProjectileBatteryAmmoProvider
+    proto: MediumBluePlasmaBullet
+
+- type: entity
+  id: MediumMagazinePlasmaGreen
+  parent: MediumMagazinePlasmaRed
+  name: medium plasma mag
+  suffix: Green
+  components:
+  - type: ProjectileBatteryAmmoProvider
+    proto: MediumGreenPlasmaBullet
+
 - type: entity
   id: HeavyMagazinePlasmaRed
   parent: BaseItem
@@ -65,7 +99,7 @@
     sprite: TS/Objects/Weapons/Ammunition/Magazine/Plasma/heavy_plasma_mag.rsi
     state: base
   - type: ProjectileBatteryAmmoProvider
-    proto: RedPlasmaBullet
+    proto: LightRedPlasmaBullet
     fireCost: 1
   - type: Battery
     maxCharge: 350
@@ -79,21 +113,13 @@
   suffix: Blue
   components:
   - type: ProjectileBatteryAmmoProvider
-    proto: BluePlasmaBullet
-    fireCost: 1
-  - type: Battery
-    maxCharge: 240
-    startingCharge: 240
-
+    proto: LightBluePlasmaBullet
+
 - type: entity
   id: HeavyMagazinePlasmaGreen
   parent: HeavyMagazinePlasmaRed
   name: heavy plasma mag
   suffix: Green
   components:
   - type: ProjectileBatteryAmmoProvider
-    proto: GreenPlasmaBullet
-    fireCost: 1
-  - type: Battery
-    maxCharge: 160
-    startingCharge: 160
+    proto: LightGreenPlasmaBullet
diff --git a/Resources/Prototypes/TS/Entities/Objects/Weapons/projectiles.yml b/Resources/Prototypes/TS/Entities/Objects/Weapons/projectiles.yml
@@ -1,10 +1,27 @@
 - type: entity
-  id: BluePlasmaBullet
+  id: LightBluePlasmaBullet
   parent: BaseBullet
   noSpawn: true
   components:
   - type: Sprite
     sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    scale: 0.7,0.7
+    layers:
+    - state: blue
+  - type: Projectile
+    damage:
+      types:
+        Heat: 9
+        Brute: 6
+
+- type: entity
+  id: MediumBluePlasmaBullet
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    scale: 1.0,1.0
     layers:
     - state: blue
   - type: Projectile
@@ -14,31 +31,77 @@
         Brute: 9
 
 - type: entity
-  id: GreenPlasmaBullet
+  id: LargeBluePlasmaBullet
   parent: BaseBullet
   noSpawn: true
   components:
   - type: Sprite
     sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    scale: 1.6,1.6
     layers:
-    - state: green
+    - state: blue
   - type: Projectile
     damage:
       types:
         Heat: 24
         Brute: 12
-        
+
 - type: entity
-  id: RedPlasmaBullet
-  parent: BaseBullet
+  id: LightGreenPlasmaBullet
+  parent: LightBluePlasmaBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    layers:
+    - state: green
+
+- type: entity
+  id: MediumGreenPlasmaBullet
+  parent: MediumBluePlasmaBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    layers:
+    - state: green
+
+- type: entity
+  id: LargeGreenPlasmaBullet
+  parent: LargeBluePlasmaBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    layers:
+    - state: green
+
+- type: entity
+  id: LightRedPlasmaBullet
+  parent: LightBluePlasmaBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    layers:
+    - state: red
+
+- type: entity
+  id: MediumRedPlasmaBullet
+  parent: MediumBluePlasmaBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
+    layers:
+    - state: red
+
+- type: entity
+  id: LargeRedPlasmaBullet
+  parent: LargeBluePlasmaBullet
   noSpawn: true
   components:
   - type: Sprite
     sprite: TS/Objects/Weapons/Guns/Projectiles/plasma.rsi
     layers:
     - state: red
-  - type: Projectile
-    damage:
-      types:
-        Heat: 9
-        Brute: 6
diff --git a/Resources/Prototypes/TS/Entities/Objects/Weapons/troop_weapon.yml b/Resources/Prototypes/TS/Entities/Objects/Weapons/troop_weapon.yml
@@ -1,11 +1,11 @@
 - type: entity
-  name: APR-01
+  name: GR-12
   parent: BaseWeaponPowerCell
   id: WeaponPlasmaRifle
   description: Combat automatic plasma rifle, version 1.
   components:
   - type: Sprite
-    sprite: TS/Objects/Weapons/Guns/Rifles/apr_01.rsi
+    sprite: TS/Objects/Weapons/Guns/Rifles/gr_12.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -18,20 +18,19 @@
     minAngle: -20
     maxAngle: -35
   - type: Clothing
-    sprite: TS/Objects/Weapons/Guns/Rifles/apr_01.rsi
+    sprite: TS/Objects/Weapons/Guns/Rifles/gr_12.rsi
     quickEquip: false
     slots:
     - Back
     - suitStorage
   - type: Gun
     availableModes:
-    - SemiAuto
     - FullAuto
     selectedMode: FullAuto
     angleDecay: 10
     minAngle: 20
     maxAngle: 35
-    fireRate: 3
+    fireRate: 1.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/warfare-plasma.ogg
   - type: ContainerContainer
@@ -63,6 +62,72 @@
   - type: StaticPrice
     price: 1500
 
+
+- type: entity
+  name: AC-5
+  parent: BaseWeaponPowerCell
+  id: WeaponPlasmaCarabin
+  description: Combat automatic plasma rifle, version 1.
+  components:
+  - type: Sprite
+    sprite: TS/Objects/Weapons/Guns/Rifles/ac_5.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Wieldable
+  - type: AmmoCounter
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -35
+  - type: Clothing
+    sprite: TS/Objects/Weapons/Guns/Rifles/ac_5.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: Gun
+    availableModes:
+    - FullAuto
+    selectedMode: FullAuto
+    angleDecay: 10
+    minAngle: 20
+    maxAngle: 35
+    fireRate: 4.5
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/warfare-plasma.ogg
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      power_magazine: !type:ContainerSlot
+  - type: MagazineAmmoProvider
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: false
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        whitelist:
+          tags:
+            - MediumPlasmaMagazine
+      power_magazine:
+        name: Power
+        startingItem: PowerCellSmall
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        whitelist:
+          components:
+          - PowerCell
+  - type: StaticPrice
+    price: 1500
+
+
 - type: entity
   name: PMGP
   parent: BaseWeaponPowerCell
@@ -80,7 +145,7 @@
   - type: Wieldable
   - type: GunWieldBonus
     minAngle: -20
-    maxAngle: -20
+    maxAngle: -40
   - type: Clothing
     sprite: TS/Objects/Weapons/Guns/Rifles/pmgp.rsi
     quickEquip: false
@@ -92,8 +157,8 @@
     steps: 3
     zeroVisible: false
   - type: ClothingSpeedModifier
-    walkModifier: 0.75
-    sprintModifier: 0.7
+    walkModifier: 0.8
+    sprintModifier: 0.75
   - type: HeldSpeedModifier
   - type: AmmoCounter
   - type: Gun
@@ -120,7 +185,6 @@
         whitelist:
           tags:
             - HeavyPlasmaMagazine
-            - LightPlasmaMagazine
       power_magazine:
         name: Power
         startingItem: PowerCellSmall