Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Balance] Альфа must die #972

Merged
merged 3 commits into from
Dec 2, 2024
Merged

[Balance] Альфа must die #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80fc5fc
balance
nomad0260 Dec 2, 2024
62c0f60
дизаблер это доминатор
nomad0260 Dec 2, 2024
80cc866
Update belts.yml
nomad0260 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/adminbuse/centcomm_officers.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ ent-MobHumanCentComOperatorCorvax = Оператор ЦК
.desc = { ent-MobHuman.desc }
ent-StunbatonSuper = дубинка-шокер спецсил
.desc = Электрошоковая дубинка для обездвиживания людей. Слишком усердное причинение вреда с помощью этого предмета считается дурным тоном.
ent-WeaponDisablerSuper = станнер спецсил
.desc = Оружие для самозащиты, которое изнуряет органические цели, пока они не свалятся с ног.
ent-ClothingBeltSecuritySuper = пояс охраны спецсил
.desc = Может вмещать различное снаряжение службы безопасности, такое как наручники и вспышки.
ent-MobHumanCentComOfficerSesurityGavna = Начальник Безопасности ЦК
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@
- type: Storage
grid:
- 0,0,20,3
- type: ExplosionResistance
damageCoefficient: 0.1

- type: entity
parent: ClothingBackpackERTLeader
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/_Backmen/Catalog/Fills/Backpacks/backpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
amount: 2
- id: BattleMedipen
amount: 2
- id: WeaponDisabler
- id: WeaponDominatorNT
- id: WeaponPistolG23
- id: MagazinePistol
amount: 2
Expand Down Expand Up @@ -80,7 +80,7 @@
amount: 2
- id: BattleMedipen
amount: 2
- id: WeaponDisabler
- id: WeaponDominatorNT
- id: WeaponPistolG23
- id: MagazinePistol
amount: 2
Expand Down Expand Up @@ -168,7 +168,7 @@
- type: StorageFill
contents:
- id: MedkitAdvancedRXBZZ
- id: WeaponDisabler
- id: WeaponDominatorNT
- id: BoxFlare
- id: ArmySetLoadouts

Expand Down Expand Up @@ -243,7 +243,7 @@
amount: 2
- id: SpetsnazMedipen
amount: 3
- id: WeaponDisabler
- id: WeaponDominatorNT
- id: WeaponPistolDivet2
- id: MagazinePistol345
amount: 3
Expand All @@ -267,7 +267,7 @@
amount: 2
- id: SpetsnazMedipen
amount: 3
- id: WeaponDisabler
- id: WeaponDominatorNT
- id: WeaponPistolDivet2
- id: MagazinePistol345
amount: 3
Expand All @@ -291,7 +291,7 @@
amount: 2
- id: CombatMedipen
amount: 3
- id: WeaponDisabler
- id: WeaponDominatorNT
- id: WeaponPulseSMGTritonM3
- id: WeaponPulseShotgunHellHammer
- id: MedkitCombatFilled
Expand Down Expand Up @@ -333,7 +333,7 @@
amount: 2
- id: CombatMedipen
amount: 3
- id: WeaponDisabler
- id: WeaponDominatorNT
- id: WeaponPulseSMGTritonM3
- id: MedkitAdvancedFilled
amount: 3
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Backmen/Catalog/Fills/Items/Belts/belts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
- 0,0,5,4
- type: StorageFill
contents:
- id: WeaponDisablerSuper
- id: WeaponDominatorNT
- id: StunbatonSuper
- id: GrenadeFlashBang
- id: GrenadeFlashBang
Expand Down
15 changes: 6 additions & 9 deletions Resources/Prototypes/_Backmen/Catalog/uplink_nomad.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledAKSU
cost:
Telecrystal: 17
Telecrystal: 15
categories:
- UplinkBundles

Expand All @@ -95,7 +95,7 @@
icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/stg44/big.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledStG44
cost:
Telecrystal: 17
Telecrystal: 18
categories:
- UplinkBundles

Expand All @@ -117,7 +117,7 @@
icon: { sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/vector/big.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledVector
cost:
Telecrystal: 17
Telecrystal: 18
categories:
- UplinkBundles

Expand Down Expand Up @@ -240,7 +240,7 @@
icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Launchers/gl-64/big.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledGL79
cost:
Telecrystal: 25
Telecrystal: 55
categories:
- UplinkBundles

Expand All @@ -253,9 +253,9 @@
contents:
- id: WeaponLauncherGL70
- id: GrenadeFrag
amount: 2
amount: 6
- id: GrenadeBlast
amount: 4
amount: 6

#- type: listing
# id: UplinkGrenadeLauncherM81Bundle
Expand Down Expand Up @@ -538,9 +538,6 @@
name: uplink-energy-dome-name
description: uplink-energy-dome-desc
productEntity: EnergyDomeGeneratorPersonalSyndie
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 6
categories:
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/hardsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
damageCoefficient: 0.8

- type: entity
parent: ClothingOuterHardsuitSyndieCommander
parent: ClothingOuterHardsuitSyndie
id: ClothingOuterHardsuitERTOperativeAlpha1
name: ERT alpha hardsuit
description: A protective hardsuit worn by the leader of an emergency response team.
Expand Down Expand Up @@ -224,6 +224,8 @@
Piercing: 0.9
Heat: 0.9
- type: PNV
- type: TinfoilHat
destroyOnFry: false

- type: entity
parent: ClothingOuterHardsuitSyndieElite
Expand Down
9 changes: 5 additions & 4 deletions Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
- type: Item
sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/akms/tiny.rsi
- type: BkmGunWieldBonus
cameraRecoilScalar: -3.5
cameraRecoilScalar: -4
- type: GunWieldBonus
minAngle: -23
maxAngle: 0
angleIncrease: -2
angleIncrease: -3
Comment on lines +20 to +24
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Улучшение управляемости AKMS

Уменьшение отдачи (cameraRecoilScalar: -4, angleIncrease: -3) может сделать оружие слишком точным для его класса.

Предлагаю сбалансировать изменения:

-    cameraRecoilScalar: -4
-    angleIncrease: -3
+    cameraRecoilScalar: -3.75
+    angleIncrease: -2.5
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
cameraRecoilScalar: -4
- type: GunWieldBonus
minAngle: -23
maxAngle: 0
angleIncrease: -2
angleIncrease: -3
cameraRecoilScalar: -3.75
- type: GunWieldBonus
minAngle: -23
maxAngle: 0
angleIncrease: -2.5

- type: Gun
angleDecay: 30
angleIncrease: 5
Expand Down Expand Up @@ -86,7 +86,7 @@
sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu.rsi
size: NormalLarge
- type: BkmGunWieldBonus
cameraRecoilScalar: -3
cameraRecoilScalar: -3.5
- type: GunWieldBonus
minAngle: -23
maxAngle: 0
Expand Down Expand Up @@ -294,6 +294,7 @@
cameraRecoilScalar: 5
minAngle: 24
maxAngle: 45
fireRate: 6
soundGunshot:
path: /Audio/Weapons/Guns64/Rifles/m28.ogg
soundEmpty:
Expand Down Expand Up @@ -831,7 +832,7 @@
cameraRecoilScalar: 5
minAngle: 24
maxAngle: 45
fireRate: 8
fireRate: 5.3
soundGunshot:
path: /Audio/Weapons/Guns64/Rifles/T64.ogg
- type: ItemSlots
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/SMGs/SMGs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
cameraRecoilScalar: 5
minAngle: 24
maxAngle: 45
fireRate: 5
fireRate: 5.5
soundGunshot:
path: /Audio/Weapons/Guns64/SMGs/mp38.ogg
- type: ItemSlots
Expand Down Expand Up @@ -440,18 +440,18 @@
- type: Item
sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90.rsi
- type: BkmGunWieldBonus
cameraRecoilScalar: -4
cameraRecoilScalar: -4.2
- type: GunWieldBonus
minAngle: -22
maxAngle: 0
angleIncrease: -3
- type: Gun
angleDecay: 40
angleIncrease: 8
angleIncrease: 7
cameraRecoilScalar: 5
minAngle: 24
maxAngle: 45
fireRate: 9
fireRate: 7
Comment on lines +443 to +454
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

⚠️ Potential issue

Подтверждаю необходимость пересмотра изменений P-90

Анализ параметров всех ПП в игре показывает, что текущие изменения действительно делают P-90 менее конкурентоспособным:

  • Скорострельность 7 ставит его в нижний диапазон среди ПП (другие имеют 8-12)
  • Увеличение отдачи камеры до -4.2 делает его самым нестабильным среди всех ПП (у остальных -4)
  • Показатель angleIncrease в 7 при высокой отдаче камеры создаёт слишком сильный разброс

Рекомендации:

  • Вернуть скорострельность хотя бы до 8
  • Установить cameraRecoilScalar на уровне других ПП (-4.0)
  • Оставить текущий angleIncrease, так как он компенсируется высоким angleDecay
🔗 Analysis chain

Пересмотрите серьёзное ослабление P-90

Внесённые изменения существенно ослабляют P-90:

  • Уменьшение cameraRecoilScalar с -4 до -4.2
  • Уменьшение angleIncrease с 8 до 7
  • Уменьшение fireRate с 9 до 7

Рекомендуется смягчить некоторые изменения, так как текущие значения могут сделать оружие неконкурентоспособным.

Let me gather more information about the recoil parameters of other SMGs to make a complete comparison.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Поиск других ПП для сравнения характеристик
rg "fireRate: \d+" --glob "**/*SMG*.yml" -A 2

Length of output: 2511

Script:

#!/bin/bash
# Поиск параметров отдачи для всех ПП
rg "angleIncrease: -?\d+\.?\d*|angleDecay: \d+\.?\d*|minAngle: -?\d+\.?\d*|maxAngle: \d+\.?\d*|cameraRecoilScalar: -?\d+\.?\d*" --glob "**/*SMG*.yml" -A 1

Length of output: 7854

soundGunshot:
path: /Audio/Weapons/Guns64/SMGs/p90.ogg
- type: ItemSlots
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
delay: 1.3
- type: GunRequiresWield
- type: Gun
fireRate: 4
fireRate: 3
cameraRecoilScalar: 2
- type: ItemSlots
slots:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/pulse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
- type: Gun
minAngle: 24
maxAngle: 45
fireRate: 8
fireRate: 6
soundEmpty: /Audio/Backmen/Misc/error.ogg
soundGunshot:
path: /Audio/Weapons/Guns64/Pulse/ap12j.ogg
Expand Down Expand Up @@ -285,7 +285,7 @@
damage:
types:
Heat: 5
Piercing: 4
Piercing: 3
soundHit:
path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
- type: Tag
Expand Down
Loading