From 115603da8627113ffe610b0036f56e8bbe16f517 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Thu, 6 Feb 2025 18:39:10 +0000 Subject: [PATCH 1/2] Balance Mechs --- .../Entities/Objects/Specific/Mech/mechs.yml | 27 +++++++--------- .../Guns/Ammunition/Projectiles/shotgun.yml | 2 +- .../_Sunrise/Catalog/uplink_catalog.yml | 31 +++++++++++++++---- .../Specific/Mech/Weapons/Gun/combat.yml | 2 +- 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 9e0ef07f585..685340adab0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -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 @@ -723,7 +723,7 @@ Structural: 190 - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 3.5 + baseSprintSpeed: 3 - type: Reflect reflectProb: 0.20 spread: 180 @@ -789,7 +789,7 @@ Structural: 250 - type: MovementSpeedModifier baseWalkSpeed: 1.5 - baseSprintSpeed: 2.2 + baseSprintSpeed: 2 - type: Damageable damageModifierSet: MediumArmorNT - type: CanMoveInAir @@ -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 @@ -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 @@ -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 @@ -1222,7 +1222,6 @@ components: - type: Mech startingEquipment: - - WeaponMechChainSword - WeaponMechCombatMissileRack8 # Rover @@ -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 @@ -1300,7 +1299,6 @@ components: - type: Mech startingEquipment: - - WeaponMechChainSword - WeaponMechCombatMissileRack8 # Mauler @@ -1340,7 +1338,7 @@ Structural: 390 - type: MovementSpeedModifier baseWalkSpeed: 1 - baseSprintSpeed: 1.6 + baseSprintSpeed: 1.5 - type: Damageable damageModifierSet: HeavyArmorSyndi - type: CanMoveInAir @@ -1383,5 +1381,4 @@ components: - type: Mech startingEquipment: - - WeaponMechChainSword - WeaponMechCombatMissileRack6 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index af8674ac2a6..bcbef975c9d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -263,7 +263,7 @@ components: - type: ProjectileSpread proto: PelletGrapeshot - count: 5 + count: 10 #Sunrise-Edit spread: 40 - type: entity diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index ad0f3e47dd1..b7b024faa72 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -1003,7 +1003,7 @@ discountDownTo: Telecrystal: 60 cost: - Telecrystal: 120 + Telecrystal: 125 categories: - UplinkMechs conditions: @@ -1062,9 +1062,9 @@ productEntity: WeaponMechCombatShotgun discountCategory: rareDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 5 cost: - Telecrystal: 11 + Telecrystal: 10 categories: - UplinkMechs conditions: @@ -1081,9 +1081,9 @@ productEntity: WeaponMechCombatShotgunIncendiary discountCategory: rareDiscounts discountDownTo: - Telecrystal: 7 + Telecrystal: 6 cost: - Telecrystal: 14 + Telecrystal: 12 categories: - UplinkMechs conditions: @@ -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 @@ -1297,4 +1316,4 @@ conditions: - !type:BuyerJobCondition whitelist: - - Clown \ No newline at end of file + - Clown diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index 362037c00d8..5cef5d07bf5 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -139,7 +139,7 @@ - type: Gun minAngle: -10 maxAngle: 15 - fireRate: 0.75 + fireRate: 0.35 selectedMode: SemiAuto availableModes: - SemiAuto From a95ef494021c01fa0967766c4081b661b69d507f Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sat, 8 Feb 2025 22:27:38 +0000 Subject: [PATCH 2/2] ERT --- .../_Sunrise/Catalog/ert_uplink_catalog.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index e7504419595..f34c42e3386 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -70,7 +70,7 @@ productEntity: WeaponMachineGunMG42 icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg42 } cost: - Bluecrystal: 25 + Bluecrystal: 35 categories: - NTAutoGun conditions: @@ -83,7 +83,7 @@ productEntity: ClothingBackpackDuffelWeaponRifleBR64Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: br64 } cost: - Bluecrystal: 22 + Bluecrystal: 34 categories: - NTAutoGun conditions: @@ -109,7 +109,7 @@ productEntity: ClothingBackpackDuffelWeaponShotgunZauerFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: zauer } cost: - Bluecrystal: 16 + Bluecrystal: 15 categories: - NTAutoGun conditions: @@ -122,7 +122,7 @@ productEntity: ClothingBackpackDuffelWeaponXM1014Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: xm1014 } cost: - Bluecrystal: 8 + Bluecrystal: 7 categories: - NTAutoGun conditions: @@ -135,7 +135,7 @@ productEntity: ClothingBackpackDuffelWeaponShotgun12Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: spas12 } cost: - Bluecrystal: 10 + Bluecrystal: 9 categories: - NTAutoGun conditions: @@ -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: @@ -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: @@ -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: @@ -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: @@ -234,7 +234,7 @@ productEntity: WeaponSubMachineGunSkorpion icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: skorpion } cost: - Bluecrystal: 4 + Bluecrystal: 6 categories: - NTPistols conditions: @@ -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: @@ -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: @@ -271,7 +271,7 @@ productEntity: WeaponPistolN1984 icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: n1984 } cost: - Bluecrystal: 5 + Bluecrystal: 8 categories: - NTPistols conditions: @@ -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: @@ -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: