Всякое (#96)

* - tweak: Pull eaxe from uplink.

* - tweak: Nerf spear.

* - tweak: Give sec hardsuits heat resist.

* - tweak: Revert mistakes.

* - tweak: No discounts for nukies.

* - tweak: Nerf hardsuit prices.

* - fix: Fix cult chat whisper.

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1311,7 +1311,7 @@
   description: uplink-hardsuit-syndieelite-desc
   productEntity: ClothingOuterHardsuitSyndieElite
   cost:
-    Telecrystal: 10
+    Telecrystal: 12
   categories:
   - UplinkArmor
   saleLimit: 1
@@ -1322,7 +1322,7 @@
   description: uplink-clothing-outer-hardsuit-juggernaut-desc
   productEntity: ClothingOuterHardsuitJuggernaut
   cost:
-    Telecrystal: 12
+    Telecrystal: 20
   categories:
   - UplinkArmor
   saleLimit: 1

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -210,6 +210,7 @@
         Slash: 0.6
         Piercing: 0.6
         Caustic: 0.7
+        Heat: 0.7
   - type: ClothingSpeedModifier
     walkModifier: 0.85
     sprintModifier: 0.85
@@ -234,6 +235,7 @@
         Blunt: 0.8
         Slash: 0.8
         Piercing: 0.7
+        Heat: 0.9
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic
 
@@ -252,12 +254,10 @@
     modifiers:
       coefficients:
         Blunt: 0.55
-        Slash: 0.65
-        Piercing: 0.65
-        Caustic: 0.75
-  - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
+        Slash: 0.55
+        Piercing: 0.55
+        Caustic: 0.65
+        Heat: 0.65
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWarden
 
@@ -285,6 +285,7 @@
         Piercing: 0.5
         Radiation: 0.5
         Caustic: 0.6
+        Heat: 0.6
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed
 

Resources/Prototypes/Entities/Objects/Specific/syndicate.yml

@@ -105,7 +105,7 @@
   suffix: 40 TC, NukeOps
   components:
   - type: Store
-    preset: StorePresetUplink
+    preset: StorePresetUplinkNukeOps
     balance:
       Telecrystal: 40
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -85,8 +85,8 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 4
-        Slash: 4 #remember, it's metal shrapnel!
+        Piercing: 3
+        Slash: 3 #remember, it's metal shrapnel!
 
 - type: entity
   id: PelletShotgunTranquilizer

Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml

@@ -28,7 +28,6 @@
         Blunt: 0
   - type: Stunprod
   - type: MeleeWeapon
-    attackRate: 1.25
     canHeavyAttack: false
     wideAnimationRotation: -135
     damage:

Resources/Prototypes/Store/presets.yml

@@ -24,6 +24,23 @@
     maxItems: 10
     salesCategory: UplinkSales
 
+- type: storePreset
+  id: StorePresetUplinkNukeOps
+  storeName: Uplink
+  categories:
+  - UplinkWeapons
+  - UplinkAmmo
+  - UplinkExplosives
+  - UplinkMisc
+  - UplinkBundles
+  - UplinkTools
+  - UplinkUtility
+  - UplinkImplants
+  - UplinkArmor
+  - UplinkPointless
+  currencyWhitelist:
+  - Telecrystal
+
 - type: storePreset
   id: StorePresetChangeling
   storeName: Evolution Shop

Resources/Prototypes/White/Actions/types.yml

@@ -20,7 +20,7 @@
   noSpawn: true
   components:
   - type: InstantAction
-    useDelay: 2
+    useDelay: 1.5
     itemIconStyle: BigAction
     priority: -20
     icon:

Resources/Prototypes/White/Catalog/uplink.yml

@@ -100,14 +100,14 @@
   categories:
   - UplinkArmor
 
-- type: listing
-  id: UplinkBattleAxe
-  name: Энергетической боевой топор
-  description: Мощный боевой топор, способный повалить с одного удара любую незащищенную цель.
-  icon: { sprite: /Textures/White/Objects/Weapons/energy_axe.rsi, state: icon }
-  productEntity: EnergyBattleAxe
-  cost:
-    Telecrystal: 20
-  categories:
-  - UplinkWeapons
-  saleLimit: 1
+#- type: listing
+#  id: UplinkBattleAxe
+#  name: Энергетической боевой топор
+#  description: Мощный боевой топор, способный повалить с одного удара любую незащищенную цель.
+#  icon: { sprite: /Textures/White/Objects/Weapons/energy_axe.rsi, state: icon }
+#  productEntity: EnergyBattleAxe
+#  cost:
+#    Telecrystal: 20
+#  categories:
+#  - UplinkWeapons
+#  saleLimit: 1

Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml

@@ -18,8 +18,8 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 30
-        Heat: 30
+        Piercing: 20
+        Heat: 20
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
@@ -43,7 +43,7 @@
     energy: 2
     color: yellow
   - type: ChangeThrowForce
-    throwForce: 20
+    throwForce: 15
   - type: Fixtures
     fixtures:
       fix1:

Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml

@@ -27,7 +27,6 @@
       types:
         Blunt: 0
   - type: MeleeWeapon
-    attackRate: 1.25
     canHeavyAttack: false
     wideAnimationRotation: -135
     damage: