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

Extended magazines #509

Merged
merged 6 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ research-technology-energy-gun = Энергетическое вооружени
research-technology-energy-gun-advance = Продвинутое энергетическое вооружение
research-technology-advance-laser = Военное энергетическое вооружение
research-technology-handcraft-nvd = Кустарные ПНВ
research-technology-basic-nvd = Продвинутое ПНВ
research-technology-basic-nvd = Продвинутое ПНВ
research-technology-extended-munitions = Расширенные обоймы
31 changes: 28 additions & 3 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,31 @@
- MechEquipmentKineticAccelerator
# These are roundstart but not replenishable for salvage

- type: technology # Sunrise-start
id: ExtendedAmunitions
name: research-technology-extended-amunitions
icon:
sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
state: base-b
discipline: Arsenal
tier: 2
cost: 10000
recipeUnlocks:
- BaseMagazinePistolCaselessRifleExtended
- MagazinePPSH41Extended
- MagazineMP5Extended
- MagazineMP7Extended
- MagazineP90
- MagazineM16A4Extended
- MagazineAR18Extended
- MagazineM28Extended
- MagazineG36Extended
- MagazineFamasExtended
- MagazineV31Extended
- MagazineBauer127Extended
- MagazineBR64Extended
- MagazineDragunovExtended # Sunrise-end

This comment was marked as resolved.


- type: technology
id: DraconicMunitions
name: research-technology-draconic-munitions
Expand Down Expand Up @@ -170,15 +195,15 @@
- type: technology
id: EnergyBarriers
name: research-technology-energy_barriers
icon:
icon:
sprite: Objects/Tools/EnergyDome/reinhardt.rsi
state: icon
discipline: Arsenal
tier: 2
cost: 6000
recipeUnlocks:
- EnergyDomeDirectionalTurtle

- type: technology
id: BasicShuttleArmament
name: research-technology-basic-shuttle-armament
Expand Down Expand Up @@ -306,4 +331,4 @@
- WeaponMechCombatShotgun
- WeaponMechCombatShotgunIncendiary
technologyPrerequisites:
- Gygax
- Gygax
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@
steps: 6
zeroVisible: false
- type: Appearance

- type: entity
parent: BaseMagazinePistolCaselessRifle
id: BaseMagazinePistolCaselessRifleExtended
components:
- type: BallisticAmmoProvider
capacity: 20
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,11 @@
steps: 6
zeroVisible: false
- type: Appearance

- type: entity
parent: MagazineDeagle
id: MagazineDeagleExtended
components:
- type: BallisticAmmoProvider
capacity: 10

Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,31 @@
steps: 2
zeroVisible: false
- type: Appearance

- type: entity
parent: БMagazinePPSH41
id: MagazinePPSH41Extended
components:
- type: BallisticAmmoProvider
capacity: 85

- type: entity
parent: MagazineMP5
id: MagazineMP5Extended
components:
- type: BallisticAmmoProvider
capacity: 54

- type: entity
parent: MagazineMP7
id: MagazineMP7Extended
components:
- type: BallisticAmmoProvider
capacity: 51

- type: entity
parent: MagazineP90
id: MagazineP90Extended
components:
- type: BallisticAmmoProvider
capacity: 63
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,45 @@
steps: 2
zeroVisible: false
- type: Appearance

- type: entity
parent: MagazineV31
id: MagazineV31Extended
components:
- type: BallisticAmmoProvider
capacity: 50

- type: entity
parent: MagazineFamas
id: MagazineFamasExtended
components:
- type: BallisticAmmoProvider
capacity: 34

- type: entity
parent: MagazineG36
id: MagazineG36Extended
components:
- type: BallisticAmmoProvider
capacity: 34

- type: entity
parent: MagazineM28
id: MagazineM28Extended
components:
- type: BallisticAmmoProvider
capacity: 34

- type: entity
parent: MagazineAR18
id: MagazineAR18Extended
components:
- type: BallisticAmmoProvider
capacity: 34

- type: entity
parent: MagazineM16A4
id: MagazineM16A4Extended
components:
- type: BallisticAmmoProvider
capacity: 34
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,23 @@
zeroVisible: false
- type: Appearance

- type: entity
parent: MagazineDragunov
id: MagazineDragunovExtended
components:
- type: BallisticAmmoProvider
capacity: 25

- type: entity
parent: MagazineBR64
id: MagazineBR64Extended
components:
- type: BallisticAmmoProvider
capacity: 25

- type: entity
parent: MagazineBauer127
id: MagazineBauer127Extended
components:
- type: BallisticAmmoProvider
capacity: 15
Loading