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

Compression of Arsenal techs #2759

Merged
merged 6 commits into from
Jan 22, 2025
Merged
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
Original file line number Diff line number Diff line change
@@ -12,7 +12,8 @@
recipeUnlocks:
- ClothingHeadHelmetInsulated
- ClothingHeadCage
# - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is.
- MagazineBoxSpecialMindbreaker
- BoxShellSoulbreaker

- type: technology
id: Metempsychosis
83 changes: 41 additions & 42 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
# Tier 1

- type: technology
id: DraconicMunitions
name: research-technology-draconic-munitions
icon:
sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
state: incendiarydisplay
discipline: Arsenal
tier: 2 # DeltaV moved to t2 from t1
cost: 10000
recipeUnlocks:
- BoxShotgunIncendiary
- MagazineRifleIncendiary
- MagazinePistolIncendiary
- MagazineLightRifleIncendiary
- SpeedLoaderMagnumIncendiary
- MagazineShotgunIncendiary
- MagazineBoxPistolIncendiary
- MagazineBoxMagnumIncendiary
- MagazineBoxLightRifleIncendiary
- MagazineBoxRifleIncendiary
- MagazineBoxSpecialIncendiary # DeltaV
#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace
# id: DraconicMunitions
# name: research-technology-draconic-muntions
# icon:
# sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
# state: incendiarydisplay
# discipline: Arsenal
# tier: 1
# cost: 10000
# recipeUnlocks:
# - BoxShotgunIncendiary
# - MagazineRifleIncendiary
# - MagazinePistolIncendiary
# - MagazineLightRifleIncendiary
# - SpeedLoaderMagnumIncendiary
# - MagazineShotgunIncendiary
# - MagazineBoxPistolIncendiary
# - MagazineBoxMagnumIncendiary
# - MagazineBoxLightRifleIncendiary
# - MagazineBoxRifleIncendiary

- type: technology
id: WeaponizedLaserManipulation
@@ -61,28 +60,28 @@
- MagazineBoxSpecialRubber
# End of modified code

- type: technology
id: UraniumMunitions
name: research-technology-uranium-munitions
icon:
sprite: Objects/Materials/Sheets/other.rsi
state: uranium
discipline: Arsenal
tier: 2 # DeltaV moved to t2 from t1
cost: 7500
recipeUnlocks:
- MagazineRifleUranium
- MagazinePistolUranium
- MagazineLightRifleUranium
- SpeedLoaderMagnumUranium
- MagazineBoxPistolUranium
- MagazineBoxMagnumUranium
- MagazineBoxLightRifleUranium
- MagazineBoxRifleUranium
- BoxShotgunUranium
#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace
# id: UraniumMunitions
# name: research-technology-uranium-munitions
# icon:
# sprite: Objects/Materials/Sheets/other.rsi
# state: uranium
# discipline: Arsenal
# tier: 1
# cost: 7500
# recipeUnlocks:
# - MagazineRifleUranium
# - MagazinePistolUranium
# - MagazineLightRifleUranium
# - SpeedLoaderMagnumUranium
# - MagazineBoxPistolUranium
# - MagazineBoxMagnumUranium
# - MagazineBoxLightRifleUranium
# - MagazineBoxRifleUranium
# - BoxShotgunUranium
# DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree
- SpeedLoaderSpecialUranium
- MagazineBoxSpecialUranium
# - SpeedLoaderSpecialUranium
# - MagazineBoxSpecialUranium
# End of modified code

- type: technology
23 changes: 21 additions & 2 deletions Resources/Prototypes/_DV/Research/arsenal.yml
Original file line number Diff line number Diff line change
@@ -10,9 +10,28 @@
tier: 1
cost: 7500
recipeUnlocks:
- MagazineRifleUranium
- MagazinePistolUranium
- MagazineLightRifleUranium
- SpeedLoaderMagnumUranium
- MagazineBoxPistolUranium
- MagazineBoxMagnumUranium
- MagazineBoxLightRifleUranium
- MagazineBoxRifleUranium
- BoxShotgunUranium
- SpeedLoaderSpecialUranium
- MagazineBoxSpecialUranium
- BoxShotgunIncendiary
- MagazineRifleIncendiary
- MagazinePistolIncendiary
- MagazineLightRifleIncendiary
- SpeedLoaderMagnumIncendiary
- MagazineShotgunIncendiary
- MagazineBoxPistolIncendiary
- MagazineBoxMagnumIncendiary
- MagazineBoxLightRifleIncendiary
- MagazineBoxRifleIncendiary
- MagazineBoxSpecialHoly
- MagazineBoxSpecialMindbreaker
- BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo

- type: technology
id: EnergyGuns