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.

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

Балансировка Мехов и их вооружения в Аплинке #1298

Merged
merged 3 commits into from
Feb 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 12 additions & 15 deletions Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
path: "/Audio/Items/drill_use.ogg"
- type: MovementSpeedModifier
baseWalkSpeed: 2
baseSprintSpeed: 3
baseSprintSpeed: 2.75
- type: CanMoveInAir
- type: MovementAlwaysTouching
- type: Reflect
Expand Down Expand Up @@ -723,7 +723,7 @@
Structural: 190
- type: MovementSpeedModifier
baseWalkSpeed: 2
baseSprintSpeed: 3.5
baseSprintSpeed: 3
- type: Reflect
reflectProb: 0.20
spread: 180
Expand Down Expand Up @@ -789,7 +789,7 @@
Structural: 250
- type: MovementSpeedModifier
baseWalkSpeed: 1.5
baseSprintSpeed: 2.2
baseSprintSpeed: 2
- type: Damageable
damageModifierSet: MediumArmorNT
- type: CanMoveInAir
Expand Down Expand Up @@ -930,8 +930,8 @@
Blunt: 35
Structural: 250
- type: MovementSpeedModifier
baseWalkSpeed: 2.4
baseSprintSpeed: 3.6
baseWalkSpeed: 2
baseSprintSpeed: 3
- type: Reflect
reflectProb: 0.20
spread: 180
Expand Down Expand Up @@ -1095,8 +1095,8 @@
Blunt: 60
Structural: 400
- type: MovementSpeedModifier
baseWalkSpeed: 1.5
baseSprintSpeed: 1.9
baseWalkSpeed: 1
baseSprintSpeed: 1.5
- type: Damageable
damageModifierSet: HeavyArmorNT
- type: CanMoveInAir
Expand Down Expand Up @@ -1178,8 +1178,8 @@
Blunt: 35
Structural: 280
- type: MovementSpeedModifier
baseWalkSpeed: 2.2
baseSprintSpeed: 3.8
baseWalkSpeed: 2
baseSprintSpeed: 3
- type: Damageable
damageModifierSet: MediumArmorSyndi
- type: CanMoveInAir
Expand Down Expand Up @@ -1222,7 +1222,6 @@
components:
- type: Mech
startingEquipment:
- WeaponMechChainSword
- WeaponMechCombatMissileRack8

# Rover
Expand Down Expand Up @@ -1261,8 +1260,8 @@
Blunt: 50
Structural: 360
- type: MovementSpeedModifier
baseWalkSpeed: 2
baseSprintSpeed: 2.3
baseWalkSpeed: 1.5
baseSprintSpeed: 2
- type: Damageable
damageModifierSet: MediumArmorSyndi
- type: CanMoveInAir
Expand Down Expand Up @@ -1300,7 +1299,6 @@
components:
- type: Mech
startingEquipment:
- WeaponMechChainSword
- WeaponMechCombatMissileRack8

# Mauler
Expand Down Expand Up @@ -1340,7 +1338,7 @@
Structural: 390
- type: MovementSpeedModifier
baseWalkSpeed: 1
baseSprintSpeed: 1.6
baseSprintSpeed: 1.5
- type: Damageable
damageModifierSet: HeavyArmorSyndi
- type: CanMoveInAir
Expand Down Expand Up @@ -1383,5 +1381,4 @@
components:
- type: Mech
startingEquipment:
- WeaponMechChainSword
- WeaponMechCombatMissileRack6
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
components:
- type: ProjectileSpread
proto: PelletGrapeshot
count: 5
count: 10 #Sunrise-Edit
spread: 40

- type: entity
Expand Down
30 changes: 15 additions & 15 deletions Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
productEntity: WeaponMachineGunMG42
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg42 }
cost:
Bluecrystal: 25
Bluecrystal: 35
categories:
- NTAutoGun
conditions:
Expand All @@ -83,7 +83,7 @@
productEntity: ClothingBackpackDuffelWeaponRifleBR64Filled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: br64 }
cost:
Bluecrystal: 22
Bluecrystal: 34
categories:
- NTAutoGun
conditions:
Expand All @@ -109,7 +109,7 @@
productEntity: ClothingBackpackDuffelWeaponShotgunZauerFilled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: zauer }
cost:
Bluecrystal: 16
Bluecrystal: 15
categories:
- NTAutoGun
conditions:
Expand All @@ -122,7 +122,7 @@
productEntity: ClothingBackpackDuffelWeaponXM1014Filled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: xm1014 }
cost:
Bluecrystal: 8
Bluecrystal: 7
categories:
- NTAutoGun
conditions:
Expand All @@ -135,7 +135,7 @@
productEntity: ClothingBackpackDuffelWeaponShotgun12Filled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: spas12 }
cost:
Bluecrystal: 10
Bluecrystal: 9
categories:
- NTAutoGun
conditions:
Expand All @@ -148,7 +148,7 @@
productEntity: WeaponPulseRifle
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-r }
cost:
Bluecrystal: 25
Bluecrystal: 30
categories:
- NTLasers
conditions:
Expand All @@ -160,7 +160,7 @@
productEntity: WeaponSniperPulseCarbine
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-sc }
cost:
Bluecrystal: 20
Bluecrystal: 25
categories:
- NTLasers
conditions:
Expand All @@ -184,7 +184,7 @@
productEntity: WeaponPulseCarbine
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-c }
cost:
Bluecrystal: 18
Bluecrystal: 24
categories:
- NTLasers
conditions:
Expand All @@ -208,7 +208,7 @@
productEntity: WeaponEnergyGunTactical
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun_tac }
cost:
Bluecrystal: 8
Bluecrystal: 12
categories:
- NTLasers
conditions:
Expand All @@ -234,7 +234,7 @@
productEntity: WeaponSubMachineGunSkorpion
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: skorpion }
cost:
Bluecrystal: 4
Bluecrystal: 6
categories:
- NTPistols
conditions:
Expand All @@ -246,7 +246,7 @@
productEntity: WeaponPulsePistol
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-p }
cost:
Bluecrystal: 5
Bluecrystal: 9
categories:
- NTPistols
conditions:
Expand All @@ -258,7 +258,7 @@
productEntity: WeaponEnergyGunPistolSecurity
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun-psec }
cost:
Bluecrystal: 3
Bluecrystal: 4
categories:
- NTPistols
conditions:
Expand All @@ -271,7 +271,7 @@
productEntity: WeaponPistolN1984
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: n1984 }
cost:
Bluecrystal: 5
Bluecrystal: 8
categories:
- NTPistols
conditions:
Expand Down Expand Up @@ -1159,7 +1159,7 @@
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mech_ntgygax }
productEntity: CrateCommandNTGygaxBundle
cost:
Bluecrystal: 75
Bluecrystal: 85
categories:
- NTMechs
conditions:
Expand All @@ -1173,7 +1173,7 @@
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mech_marauder }
productEntity: CrateCommandMarauderBundle
cost:
Bluecrystal: 95
Bluecrystal: 120
categories:
- NTMechs
conditions:
Expand Down
31 changes: 25 additions & 6 deletions Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@
discountDownTo:
Telecrystal: 60
cost:
Telecrystal: 120
Telecrystal: 125
categories:
- UplinkMechs
conditions:
Expand Down Expand Up @@ -1062,9 +1062,9 @@
productEntity: WeaponMechCombatShotgun
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 3
Telecrystal: 5
cost:
Telecrystal: 11
Telecrystal: 10
categories:
- UplinkMechs
conditions:
Expand All @@ -1081,9 +1081,9 @@
productEntity: WeaponMechCombatShotgunIncendiary
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 7
Telecrystal: 6
cost:
Telecrystal: 14
Telecrystal: 12
categories:
- UplinkMechs
conditions:
Expand Down Expand Up @@ -1130,6 +1130,25 @@
tags:
- NukeOpsUplink

- type: listing
id: UplinkMechChainSword
#name: uplink-mech-equipment-amlg90-name
#description: uplink-mech-equipment-amlg90-desc
icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_chainsword }
productEntity: WeaponMechChainSword
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 8
categories:
- UplinkMechs
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- NukeOpsUplink

- type: listing
id: UplinkMechAMLG90
name: uplink-mech-equipment-amlg90-name
Expand Down Expand Up @@ -1297,4 +1316,4 @@
conditions:
- !type:BuyerJobCondition
whitelist:
- Clown
- Clown
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
- type: Gun
minAngle: -10
maxAngle: 15
fireRate: 0.75
fireRate: 0.35
selectedMode: SemiAuto
availableModes:
- SemiAuto
Expand Down
Loading