guns and novakid

AdventureTimeSS14 · Dec 21, 2024 · e33eef3 · e33eef3
1 parent 1a8cdc7
commit e33eef3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -213,7 +213,7 @@ public sealed partial class GunComponent : Component
     /// The base value for how fast the projectile moves.
     /// </summary>
     [DataField]
-    public float ProjectileSpeed = 62f;
+    public float ProjectileSpeed = 42f;
 
     /// <summary>
     /// How fast the projectile moves.

diff --git a/Resources/Prototypes/ADT/Catalog/boobr_catalog.yml b/Resources/Prototypes/ADT/Catalog/boobr_catalog.yml
@@ -44,6 +44,7 @@
 
 - type: listing
   id: ADTBoberAntilyingAttachment
+  abstract: true # Убран на доработку
   name: boobr-weapon-attachments-antilying-name
   description: boobr-weapon-attachments-antilying-desc
   icon: { sprite: /Textures/ADT/Objects/Weapons/Guns/Attachments/barrel.rsi, state: antilying }

diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml
@@ -94,6 +94,7 @@
 
 - type: listing
   id: ADTUplinkAntilyingAttachment
+  abstract: true # Убран на доработку
   name: uplink-attachments-antilying-name
   description: uplink-attachments-antilying-description
   icon: { sprite: /Textures/ADT/Objects/Weapons/Guns/Attachments/barrel.rsi, state: antilying }
@@ -601,7 +602,7 @@
     Telecrystal: 6
   categories:
   - UplinkChemicals
-  
+
 - type: listing
   id: ADTUplinkGrenadeLauncherBundle
   name: ADTuplink-grenade-launcher-bundle-name
@@ -625,4 +626,4 @@
     - UplinkPointless
   conditions:
   - !type:ListingLimitedStockCondition
-    stock: 3
+    stock: 3
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml
@@ -122,7 +122,7 @@
         scaleByQuantity: true
         damage:
           types:
-            Сold: 0.12 # Повышенный дамаг от водички и моющего средства. Пшик-пшик
+            Heat: 0.25 # Повышенный дамаг от водички и моющего средства. Пшик-пшик
       - !type:PopupMessage
         type: Local
         visualType: Large

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -2,6 +2,7 @@
   name: china lake
   parent: [BaseWeaponLauncher, BaseGunWieldable, BaseSyndicateContraband, ADTBaseMagneticGun, ADTBasePumpingGun]
   id: ADTWeaponLauncherChinaLake
+  suffix: Actual
   description: PLOOP.
   components:
   - type: Sprite
@@ -17,6 +18,7 @@
   - type: AmmoCounter
   - type: Gun
     fireRate: 1
+    projectileSpeed: 25
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
@@ -36,6 +38,7 @@
   parent: [BaseWeaponLauncher, BaseMajorContraband, ADTBaseMagneticGun, BaseGunWieldable]
   id: ADTWeaponLauncherRocket
   description: A modified ancient rocket-propelled grenade launcher.
+  suffix: Actual
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
@@ -48,6 +51,7 @@
     sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
   - type: Gun
     fireRate: 0.5
+    projectileSpeed: 25
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg
   - type: BallisticAmmoProvider

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -105,6 +105,8 @@
     minAngle: 21
     maxAngle: 32
     shotsPerBurst: 5
+    burstFireRate: 10 # ADT tweak
+    burstCooldown: 0.2 # ADT tweak
     availableModes:
     - SemiAuto
     - Burst
@@ -161,8 +163,8 @@
     - type: Gun
       minAngle: 21
       maxAngle: 32
-      fireRate: 12
-      burstFireRate: 12
+      fireRate: 6 # ADT tweak
+      burstFireRate: 8 # ADT nerf
       selectedMode: FullAuto
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg