From 4d825838e6565e32a217039144e035f7327fda1a Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 1 Dec 2024 12:23:51 +0000 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=81=D0=B8=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=9C=D0=B5=D1=85=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Specific/Mech/Weapons/Gun/combat.yml | 58 +++++++++--------- .../Specific/Mech/Weapons/Gun/industrial.yml | 4 +- .../Entities/Objects/Specific/Mech/mechs.yml | 60 +++++++++---------- .../_Sunrise/Catalog/uplink_catalog.yml | 20 +++---- .../Specific/Mech/Weapons/Gun/combat.yml | 10 ++-- .../Weapons/Guns/Battery/battery_guns.yml | 33 +++++----- 6 files changed, 93 insertions(+), 92 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index 3c0c84bbb4e..f1a6ddf690b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -9,7 +9,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_pulse - type: Gun - fireRate: 1.5 + fireRate: 1.4 selectedMode: SemiAuto availableModes: - SemiAuto @@ -17,7 +17,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: HitscanBatteryAmmoProvider proto: Pulse - fireCost: 80 + fireCost: 50 - type: Appearance - type: AmmoCounter @@ -40,7 +40,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: HitscanBatteryAmmoProvider proto: RedHeavyLaser - fireCost: 80 + fireCost: 45 - type: Appearance - type: AmmoCounter @@ -63,7 +63,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser.ogg - type: HitscanBatteryAmmoProvider proto: RedMediumLaser - fireCost: 120 + fireCost: 35 - type: Appearance - type: AmmoCounter @@ -78,7 +78,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_firedart - type: Gun - fireRate: 0.8 + fireRate: 2.2 selectedMode: SemiAuto availableModes: - SemiAuto @@ -86,7 +86,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser.ogg - type: HitscanBatteryAmmoProvider proto: RedLaser - fireCost: 80 + fireCost: 20 - type: Appearance - type: AmmoCounter @@ -101,7 +101,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_wholegen - type: Gun - projectileSpeed: 3 + projectileSpeed: 6 projectileSpeedModified: 6 fireRate: 0.8 selectedMode: SemiAuto @@ -113,7 +113,7 @@ variation: 0.2 - type: ProjectileBatteryAmmoProvider proto: TeslaGunBullet - fireCost: 100 + fireCost: 35 - type: Appearance - type: AmmoCounter @@ -136,7 +136,7 @@ path: /Audio/Weapons/Guns/Gunshots/taser2.ogg - type: ProjectileBatteryAmmoProvider proto: BulletDisablerSmgSpread - fireCost: 60 + fireCost: 20 - type: Appearance - type: AmmoCounter @@ -159,7 +159,7 @@ path: /Audio/Weapons/Guns/Gunshots/taser2.ogg - type: ProjectileBatteryAmmoProvider proto: BulletTaser - fireCost: 40 + fireCost: 15 - type: Appearance - type: AmmoCounter @@ -175,14 +175,14 @@ state: mecha_scatter - type: Gun fireRate: 1 - selectedMode: SemiAuto + selectedMode: FullAuto availableModes: - - SemiAuto + - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - type: ProjectileBatteryAmmoProvider proto: ShellShotgun - fireCost: 100 + fireCost: 40 - type: Appearance - type: AmmoCounter @@ -197,15 +197,15 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_carbine - type: Gun - fireRate: 1.2 - selectedMode: SemiAuto + fireRate: 1.6 + selectedMode: FullAuto availableModes: - - SemiAuto + - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - type: ProjectileBatteryAmmoProvider proto: ShellShotgunIncendiary - fireCost: 90 + fireCost: 45 - type: Appearance - type: AmmoCounter @@ -222,7 +222,7 @@ - type: Gun fireRate: 5 shotsPerBurst: 3 - burstCooldown: 1.2 + burstCooldown: 0.8 selectedMode: Burst availableModes: - Burst @@ -230,7 +230,7 @@ path: /Audio/_Sunrise/Weapons/Guns/Snipers/garand/garand.ogg - type: ProjectileBatteryAmmoProvider proto: CartridgeLightRifle - fireCost: 20 + fireCost: 10 - type: Appearance - type: AmmoCounter @@ -245,7 +245,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_ion - type: Gun - projectileSpeed: 20 + projectileSpeed: 18 fireRate: 0.6 selectedMode: SemiAuto availableModes: @@ -256,7 +256,7 @@ path: /Audio/Weapons/Guns/Empty/empty.ogg - type: ProjectileBatteryAmmoProvider proto: BulletEMP - fireCost: 400 + fireCost: 200 - type: Appearance - type: AmmoCounter - type: Battery @@ -274,9 +274,9 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_amlg90 - type: Gun - fireRate: 4 + fireRate: 5 shotsPerBurst: 3 - burstCooldown: 1.2 + burstCooldown: 0.8 selectedMode: Burst availableModes: - Burst @@ -286,7 +286,7 @@ path: /Audio/Weapons/Guns/Empty/empty.ogg - type: ProjectileBatteryAmmoProvider proto: BulletSyndiPlasma - fireCost: 20 + fireCost: 10 - type: Appearance - type: AmmoCounter @@ -309,7 +309,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: HitscanBatteryAmmoProvider proto: XrayLaser - fireCost: 200 + fireCost: 60 - type: Appearance - type: AmmoCounter @@ -324,10 +324,10 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_missilerack - type: Gun - fireRate: 1.2 - selectedMode: SemiAuto + fireRate: 1.3 + selectedMode: FullAuto availableModes: - - SemiAuto + - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - type: ProjectileBatteryAmmoProvider @@ -355,7 +355,7 @@ path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - type: ProjectileBatteryAmmoProvider proto: GrenadeBlast - fireCost: 220 + fireCost: 160 - type: Appearance - type: AmmoCounter - type: Battery diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml index aedf9473691..3dbdaf601b6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml @@ -9,7 +9,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_kineticgun - type: Gun - fireRate: 1 + fireRate: 1.2 selectedMode: SemiAuto availableModes: - SemiAuto @@ -17,7 +17,7 @@ path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg - type: ProjectileBatteryAmmoProvider proto: BulletKineticShuttle - fireCost: 50 + fireCost: 30 - type: Appearance - type: AmmoCounter # TODO: Plasma Cutter \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 3f55b6838c9..8bd43235edf 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -76,8 +76,8 @@ joinSystem: true - type: DoAfter - type: Repairable - fuelCost: 30 - doAfterDelay: 5 + fuelCost: 20 + doAfterDelay: 2 damage: types: Blunt: -15 @@ -161,7 +161,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 700 + damage: 1200 behaviors: - !type:PlaySoundBehavior sound: @@ -202,7 +202,7 @@ baseState: ripley openState: ripley-open brokenState: ripley-broken - mechToPilotDamageMultiplier: 0.75 + mechToPilotDamageMultiplier: 0.70 pilotWhitelist: components: - HumanoidAppearance @@ -230,7 +230,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 200: Critical + 250: Critical showOverlays: false allowRevives: true @@ -292,7 +292,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 250: Critical + 360: Critical showOverlays: false allowRevives: true @@ -354,7 +354,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 250: Critical + 320: Critical showOverlays: false allowRevives: true - type: PointLight @@ -418,7 +418,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 150: Critical + 250: Critical showOverlays: false allowRevives: true @@ -636,7 +636,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 300: Critical + 400: Critical showOverlays: false allowRevives: true - type: Tag @@ -688,7 +688,7 @@ damage: types: Blunt: 40 - Structural: 220 + Structural: 250 - type: MovementSpeedModifier baseWalkSpeed: 1.5 baseSprintSpeed: 2 @@ -697,7 +697,7 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect - reflectProb: 0.25 + reflectProb: 0.30 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: @@ -706,7 +706,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 450: Critical + 600: Critical showOverlays: false allowRevives: true - type: Tag @@ -775,7 +775,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 200: Critical + 280: Critical showOverlays: false allowRevives: true - type: Tag @@ -830,7 +830,7 @@ damage: types: Blunt: 30 - Structural: 180 + Structural: 200 - type: MovementSpeedModifier baseWalkSpeed: 2.4 baseSprintSpeed: 3 @@ -846,7 +846,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 400: Critical + 450: Critical showOverlays: false allowRevives: true @@ -906,7 +906,7 @@ damage: types: Blunt: 40 - Structural: 200 + Structural: 250 - type: MovementSpeedModifier baseWalkSpeed: 1 baseSprintSpeed: 1.5 @@ -915,7 +915,7 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect - reflectProb: 0.4 + reflectProb: 0.35 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: @@ -924,7 +924,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 500: Critical + 700: Critical showOverlays: false allowRevives: true @@ -984,7 +984,7 @@ damage: types: Blunt: 60 - Structural: 400 + Structural: 460 - type: MovementSpeedModifier baseWalkSpeed: 2.2 baseSprintSpeed: 3.7 @@ -1002,7 +1002,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 550: Critical + 800: Critical showOverlays: false allowRevives: true @@ -1064,8 +1064,8 @@ attackRate: 1 damage: types: - Blunt: 30 - Structural: 200 + Blunt: 35 + Structural: 250 - type: MovementSpeedModifier baseWalkSpeed: 2.2 baseSprintSpeed: 3.7 @@ -1083,7 +1083,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 350: Critical + 500: Critical showOverlays: false allowRevives: true @@ -1140,8 +1140,8 @@ attackRate: 1 damage: types: - Blunt: 30 - Structural: 200 + Blunt: 40 + Structural: 380 - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 3 @@ -1150,7 +1150,7 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect - reflectProb: 0.35 + reflectProb: 0.30 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: @@ -1159,7 +1159,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 450: Critical + 650: Critical showOverlays: false allowRevives: true @@ -1217,7 +1217,7 @@ damage: types: Blunt: 50 - Structural: 400 + Structural: 450 - type: MovementSpeedModifier baseWalkSpeed: 1 baseSprintSpeed: 1.5 @@ -1226,7 +1226,7 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect - reflectProb: 0.45 + reflectProb: 0.40 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: @@ -1235,7 +1235,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 500: Critical + 800: Critical showOverlays: false allowRevives: true diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 773d0d8b487..7ec810152fb 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -475,7 +475,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/gygax.rsi, state: darkgygax } productEntity: CrateCybersunDarkGygaxBundle cost: - Telecrystal: 65 + Telecrystal: 60 categories: - UplinkMechs conditions: @@ -491,7 +491,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/durand.rsi, state: darkdurand } productEntity: CrateCybersunRoverBundle cost: - Telecrystal: 75 + Telecrystal: 70 categories: - UplinkMechs conditions: @@ -507,7 +507,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: mauler } productEntity: CrateCybersunMaulerBundle cost: - Telecrystal: 90 + Telecrystal: 85 categories: - UplinkMechs conditions: @@ -525,7 +525,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_laser } productEntity: WeaponMechCombatImmolationGun cost: - Telecrystal: 7 + Telecrystal: 6 categories: - UplinkMechs conditions: @@ -541,7 +541,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_wholegen } productEntity: WeaponMechCombatTeslaCannon cost: - Telecrystal: 15 + Telecrystal: 12 categories: - UplinkMechs conditions: @@ -589,7 +589,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_uac2 } productEntity: WeaponMechCombatUltraRifle cost: - Telecrystal: 10 + Telecrystal: 6 categories: - UplinkMechs conditions: @@ -605,7 +605,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_ion } productEntity: WeaponMechCombatIon cost: - Telecrystal: 12 + Telecrystal: 10 categories: - UplinkMechs conditions: @@ -621,7 +621,7 @@ icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_amlg90 } productEntity: WeaponMechCombatAMLG90 cost: - Telecrystal: 15 + Telecrystal: 10 categories: - UplinkMechs conditions: @@ -637,7 +637,7 @@ icon: { sprite: /Textures/_Sunrise/Objects/Specific/Mech/mecha_vindictor.rsi, state: mecha_vindictor } productEntity: WeaponMechCombatVindictor cost: - Telecrystal: 30 + Telecrystal: 24 categories: - UplinkMechs conditions: @@ -653,7 +653,7 @@ icon: { sprite: /Textures/_Sunrise/Objects/Specific/Mech/mecha_uvm31.rsi, state: mecha_uvm31 } productEntity: WeaponMechCombatUVM31 cost: - Telecrystal: 20 + Telecrystal: 18 categories: - UplinkMechs conditions: 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 c36d33e690f..e1aa851dfee 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 @@ -10,7 +10,7 @@ - type: Gun minAngle: -25 maxAngle: 25 - fireRate: 7 + fireRate: 8 selectedMode: FullAuto availableModes: - FullAuto @@ -18,7 +18,7 @@ path: /Audio/_Sunrise/Weapons/Guns/HMGs/minigun_shot.ogg - type: ProjectileBatteryAmmoProvider proto: CartridgeLightRifle - fireCost: 20 + fireCost: 5 - type: Appearance - type: AmmoCounter @@ -37,7 +37,7 @@ maxAngle: 15 angleIncrease: 4 angleDecay: 16 - fireRate: 4.75 + fireRate: 5 selectedMode: FullAuto availableModes: - FullAuto @@ -46,7 +46,7 @@ params: volume: -1 - type: ProjectileBatteryAmmoProvider - proto: BulletSyndiPlasma2 - fireCost: 30 + proto: BulletSyndiPlasma + fireCost: 6 - type: Appearance - type: AmmoCounter \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index ec779476344..68bbd7e4746 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -80,7 +80,7 @@ startingCharge: 1000 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 35 + autoRechargeRate: 20 - type: ProjectileBatteryAmmoProvider proto: BulletDisabler fireCost: 50 @@ -362,8 +362,8 @@ steps: 3 zeroVisible: true - type: Battery - maxCharge: 1500 - startingCharge: 1500 + maxCharge: 3000 + startingCharge: 3000 - type: HitscanBatteryAmmoProvider proto: RedLaser fireCost: 50 @@ -504,8 +504,8 @@ steps: 6 zeroVisible: true - type: Battery - maxCharge: 1500 - startingCharge: 1500 + maxCharge: 2500 + startingCharge: 2500 - type: HitscanBatteryAmmoProvider proto: XrayLaser fireCost: 100 @@ -549,8 +549,8 @@ steps: 3 zeroVisible: true - type: Battery - maxCharge: 1500 - startingCharge: 1500 + maxCharge: 1800 + startingCharge: 1800 - type: HitscanBatteryAmmoProvider proto: RedHeavyLaser fireCost: 100 @@ -579,21 +579,22 @@ - type: Clothing sprite: _Sunrise/Objects/Weapons/Guns/Battery/syndielasergun.rsi - type: Gun - minAngle: 20 - maxAngle: 30 - angleIncrease: 4 - angleDecay: 16 - fireRate: 1.1 - selectedMode: SemiAuto + projectileSpeed: 5 + minAngle: 40 + maxAngle: 55 + angleIncrease: 14 + angleDecay: 7 + fireRate: 1.4 + selectedMode: FullAuto soundGunshot: collection: red_mamba params: volume: 5 availableModes: - - SemiAuto + - FullAuto - type: ProjectileBatteryAmmoProvider - proto: BulletSyndiPlasma3 - fireCost: 100 + proto: ProjectileDragonsBreath + fireCost: 75 #40 - type: Wieldable - type: GunWieldBonus minAngle: -18