Adds the Estoc DMR to the syndicate uplink (#38122)

* Initial commit, adds the prototype, sprites and attributions, entries into syndicate uplink for weapon bundle and magazines

* Reduced weapon spread when wielded

* minor visual updates to sprites

* slightly adjusted burst rate down

* Update duffelbag.yml

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
This commit is contained in:
August Sun
2025-06-16 18:20:08 -06:00
committed by GitHub
parent 5c7063e139
commit bdcdb6e338
17 changed files with 161 additions and 1 deletions

View File

@@ -57,6 +57,18 @@
amount: 2
# - id: SMGSuppressor
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicateFilledRifle
name: Estoc DMR bundle
description: "For medium-range sharpshooting, the Estoc DMR. Bundled with three magazines."
components:
- type: StorageFill
contents:
- id: WeaponRifleEstoc
- id: MagazineRifle
amount: 2
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicateFilledRevolver

View File

@@ -186,6 +186,20 @@
categories:
- UplinkWeaponry
- type: listing
id: UplinkEstocBundle
name: uplink-estoc-bundle-name
description: uplink-estoc-bundle-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/estoc.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledRifle
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 11
cost:
Telecrystal: 18
categories:
- UplinkWeaponry
- type: listing
id: UplinkBulldogBundle
name: uplink-buldog-bundle-name
@@ -557,6 +571,17 @@
categories:
- UplinkAmmo
# For the Estoc
- type: listing
id: UplinkEstocAmmo
name: uplink-estoc-ammo-name
description: uplink-estoc-ammo-desc
productEntity: MagazineRifle
cost:
Telecrystal: 2
categories:
- UplinkAmmo
# for the hristov
- type: listing
id: UplinkHristovAmmo

View File

@@ -191,6 +191,71 @@
zeroVisible: true
- type: Appearance
- type: entity
name: Estoc DMR
parent: [BaseWeaponRifle, BaseSyndicateContraband]
id: WeaponRifleEstoc
description: A designated marksman rifle, favored for medium-to-long range engagements. Uses .20 rifle ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/estoc.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: Objects/Weapons/Guns/Rifles/estoc.rsi
- type: Gun
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/estocshot.ogg
minAngle: 30
maxAngle: 43
shotsPerBurst: 3
selectedMode: Burst
availableModes:
- Burst
- SemiAuto
burstFireRate: 14
- type: GunWieldBonus
minAngle: -28
maxAngle: -25
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineRifle
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineRifle
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgeRifle
priority: 1
whitelist:
tags:
- CartridgeRifle
- type: SpeedModifiedOnWield
walkModifier: 0.75
sprintModifier: 0.75
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 2
pvsIncrease: 0.2
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: entity
name: Foam Force Astro Ace
parent: [BaseWeaponShotgun, BaseGunWieldable]