From 18f7bc3f3306576bf18aab32d6746e9eab3d7672 Mon Sep 17 00:00:00 2001
From: Leonid <137652177+Gnomeev@users.noreply.github.com>
Date: Fri, 15 Nov 2024 17:14:35 +0300
Subject: [PATCH] TTK Tweaks 2 (#2237)

* gunplayfix

* comeback

* eswords tweak

* modifier sets revert
---
 Resources/Prototypes/Catalog/uplink_catalog.yml        | 10 +++++-----
 .../Entities/Objects/Weapons/Guns/LMGs/lmgs.yml        |  4 ++--
 .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml  |  6 ++++++
 .../Entities/Objects/Weapons/Melee/e_sword.yml         |  8 ++++----
 Resources/Prototypes/Research/arsenal.yml              |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index a77685f3d0e725..54fb65db9d2eec 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -192,7 +192,7 @@
   discountDownTo:
     Telecrystal: 6
   cost:
-    Telecrystal: 12
+    Telecrystal: 14 #ss220TTKUpdate
   categories:
   - UplinkWeaponry
 
@@ -259,9 +259,9 @@
   productEntity: ClothingBackpackDuffelSyndicateFilledLMG
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 24
+    Telecrystal: 30 #ss220TTKUpdate
   cost:
-    Telecrystal: 30
+    Telecrystal: 40 #ss220TTKUpdate
   categories:
   - UplinkWeaponry
   conditions:
@@ -580,7 +580,7 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon }
   productEntity: SpeedLoaderMagnumAP
   cost:
-    Telecrystal: 3
+    Telecrystal: 4 #ss220TTKUpdate
   categories:
   - UplinkAmmo
 
@@ -602,7 +602,7 @@
   description: uplink-sniper-ammo-desc
   productEntity: MagazineBoxAntiMateriel
   cost:
-    Telecrystal: 2
+    Telecrystal: 4 #ss220TTKUpdate
   categories:
   - UplinkAmmo
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index c9db3f6ce1e986..1e39b4ca8f1cf9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -90,8 +90,8 @@
   - type: Appearance
     #ss220lowTTKUpdate btw lmg too OP ^^^^
   - type: HeldSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
+    walkModifier: 0.7
+    sprintModifier: 0.7
     mirrorClothingModifier: false
     #ss220lowTTKUpdate
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 58cb14d052bf3a..a175eee9ea94e9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -68,6 +68,12 @@
       - CartridgeAntiMateriel
     capacity: 5
     proto: CartridgeAntiMateriel
+    #ss220lowTTKUpdate
+  - type: HeldSpeedModifier
+    walkModifier: 0.75
+    sprintModifier: 0.75
+    mirrorClothingModifier: false
+    #ss220lowTTKUpdate
 
 - type: entity
   name: musket
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index c1ced1047959b9..5fc31ac7f87f00 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -110,12 +110,12 @@
     sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
     #ss220lowTTKUpdate
   - type: Reflect
-    reflectProb: 0.75
+    reflectProb: 0.45 #ss220 ttkTweaks
     reflects:
       - NonEnergy
       - Energy #SS220-FixReflects
     spread: 80
-    reflectProbProjectile: 0.60
+    reflectProbProjectile: 0.40 #ss220 ttkTweaks
     spreadProjectile: 180
     #ss220lowTTKUpdate
 
@@ -389,12 +389,12 @@
     sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi
 # ss220 FixESword
   - type: Reflect
-    reflectProb: 0.95
+    reflectProb: 0.80 #ss220 ttkTweaks
     reflects:
       - NonEnergy
       - Energy #SS220-FixReflects
     spread: 45
-    reflectProbProjectile: 0.8 #ss220lowTTKUpdate
+    reflectProbProjectile: 0.70 #ss220lowTTKUpdate
     spreadProjectile: 180
 # ss220 FixESword
 
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 52e230d4cf074a..ced2301dd93aee 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -43,7 +43,7 @@
     state: icon
   discipline: Arsenal
   tier: 1
-  cost: 7500
+  cost: 10000 # ss220ttkUpdate
   recipeUnlocks:
   - WeaponLaserCarbine