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.

Sign up for GitHub

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

Jump to bottom

Weapon ID Standardisation #550

Merged
merged 9 commits into from
Sep 25, 2024
Merged

Weapon ID Standardisation #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b5cc7dc
standardise sniper and SMG IDs, fix some names
Peptide90 Sep 23, 2024
1285cf1
Adds new SMG base to cut down code duplication
Peptide90 Sep 23, 2024
420515b
Rifles and Shotguns standard IDs and bases
Peptide90 Sep 23, 2024
739aa03
revolvers standardised
Peptide90 Sep 23, 2024
879e40a
fix pistol IDs
Peptide90 Sep 23, 2024
dc3383c
LMG and battery guns standardised
Peptide90 Sep 23, 2024
f24dbf3
Revert "Auxiliary commit to revert individual files from dc3383ca6973…
Peptide90 Sep 23, 2024
8eddfb4
tidy up weapon crafting
Peptide90 Sep 23, 2024
f8383bb
revolver fix
Peptide90 Sep 25, 2024
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
54 changes: 53 additions & 1 deletion Resources/Migrations/N14Migrations.yml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

50: N14WeaponHunterRevolver: N14WeaponHunterRevolver45-70Hunter

  • Wrong ID. Need N14WeaponRevolver45-70Hunter

Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,56 @@ N14ClothingHeadHatNCRHelmetMetal: N14ClothingHeadHatNCRHelmetMetalSnow
N14ClothingOfficerUniformNCR: N14ClothingOfficerUniformNCRSnow
N14ClothingUniformNCR: N14ClothingUniformNCRSnow
N14ClothingOuterNCRPouchedVest: N14ClothingOuterNCRPouchedVestDesert
N14ClothingOuterNCRVest: N14ClothingOuterNCRVestSnow
N14ClothingOuterNCRVest: N14ClothingOuterNCRVestSnow

# 23/09/2024 - Weapon ID standardisation
N14WeaponAntiMateriel: N14WeaponSniper50AntiMateriel
N14Weapon50NcrRifle: N14WeaponSniper50NCRRifle
N14WeaponLeverCarbine: N14WeaponSniper44LeverCarbine
N14WeaponLeverRifle: N14WeaponSniper308LeverRifle
N14WeaponBrushGun: N14WeaponSniper45-70BrushGun
N14WeaponPipeRifle: N14WeaponSniper308PipeRifle
N14WeaponSniperVarmint: N14WeaponSniper556VarmintRifle
N14WeaponSubMachineGun10mm: N14WeaponSMG10mm
N14WeaponSubMachineGun12mm: N14WeaponSMG12mm
N14weapon12mmpipe: N14WeaponSMG12mmPipe
N14weapon10mmpipe: N14WeaponSMG10mmPipe
N14WeaponAdvanceSubMachineGun12mm: N14WeaponSMG12mmAdvanced
N14weapon9mmSMG: N14WeaponSMG9mm
N14Weapon45SMG: N14WeaponSMG45
N14WeaponDoubleBarrelShotgun: N14WeaponShotgunDoubleBarrel
N14WeaponSawedOffShotgun: N14WeaponShotgunSawedOff
N14WeaponSawedOffShotgunEmpty: N14WeaponShotgunSawedOffEmpty
N14WeaponAutoShotgun: N14WeaponShotgunAuto
N14WeaponCaravanShotgun: N14WeaponShotgunCaravan
N14WeaponLeverShotgun: N14WeaponShotgunLever
N14WeaponRiotShotgun: N14WeaponShotgunRiot
N14WeaponRifleR91: N14WeaponRifle556R91
N14WeaponChineseRifle: N14WeaponRifle762Chinese
N14WeaponCarbine: N14WeaponRifle556Carbine
N14WeaponMarksman: N14WeaponRifle762Marksman
N14WeaponService: N14WeaponRifle556Service
N14WeaponScout: N14WeaponRifle556Scout
N14WeaponBattleRifle: N14WeaponRifle308Battle
N14WeaponOldCarbine: N14WeaponRifle556CarbineOld
N14WeaponRevolverMagnun: N14WeaponRevolver44Magnun
N14WeaponRevolverCaptainMagnun: N14WeaponRevolver44MagnumCaptain
N14WeaponHunterRevolver: N14WeaponRevolver45-70Hunter
N14Weaponwildwhisper: N14WeaponRevolver45-70WildWhisper
N14WeaponRangerSequoia: N14WeaponRevolver45-70RangerSequoia
N14WeaponPistolColt: N14WeaponPistol45Colt
N14WeaponPipe10mm: N14WeaponPistol10mmPipe
N14WeaponPistolChinese: N14WeaponPistol9mmChinese
N14WeaponPistolSpy: N14WeaponPistol9mmSpy
N14WeaponAutoRifle: N14WeaponLMGAutoRifle
N14WeaponAvengerMinigun: N14WeaponMinigunAvenger
WeaponFlamer: N14WeaponFlamer
N14WeaponRechargerRifle: N14WeaponLaserRifleRecharger
N14WeaponRechargerPistol: N14WeaponLaserPistolRecharger
N14WeaponLaserAutoRifle: N14WeaponLaserRifleAuto
N14WeaponPlasmaAutoRifle: N14WeaponPlasmaRifleAuto
N14WeaponLaserProtoRifle: N14WeaponLaserRiflePrototypeAER14
N14WeaponUrbanPlasmaRifle: N14WeaponPlasmaRifleUrban
N14WeaponMultiplas: N14WeaponPlasmaMultiplas
N14WeaponWattz3000: N14WeaponLaserRifleWattz3000
N14WeaponWattz2000: N14WeaponLaserRifleWattz2000
8 changes: 4 additions & 4 deletions Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi
state: base
product: N14WeaponRifleR91
product: N14WeaponRifle556R91
cost: 2000
category: Weapons
group: market
Expand All @@ -78,7 +78,7 @@
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi
state: base
product: N14WeaponChineseRifle
product: N14WeaponRifle762Chinese
cost: 2500
category: Weapons
group: market
Expand All @@ -88,7 +88,7 @@
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi
state: base
product: N14WeaponCarbine
product: N14WeaponRifle556Carbine
cost: 2500
category: Weapons
group: market
Expand All @@ -98,7 +98,7 @@
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi
state: base
product: N14WeaponMarksman
product: N14WeaponRifle762Marksman
cost: 3000
category: Weapons
group: market
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
- id: N14BoxPlasticFilledWastelander
- id: Magazine45SubMachineGun
- id: Magazine45SubMachineGun
- id: N14Weapon45SMG
- id: N14WeaponSMG45

- type: entity
noSpawn: true
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/_Nuclear14/Catalog/Fills/Belts/belt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
components:
- type: StorageFill
contents:
- id: N14WeaponRevolverMagnun
- id: N14WeaponRevolver44Magnun
- id: SpeedLoader44
- id: SpeedLoader44
- id: SpeedLoader44
Expand Down Expand Up @@ -41,7 +41,7 @@
components:
- type: StorageFill
contents:
- id: N14WeaponRangerSequoia
- id: N14WeaponRevolver45-70RangerSequoia
- id: SpeedLoader45-70
- id: SpeedLoader45-70
- id: SpeedLoader45-70
Expand All @@ -53,7 +53,7 @@
components:
- type: StorageFill
contents:
- id: N14WeaponHunterRevolver
- id: N14WeaponRevolver45-70Hunter
- id: SpeedLoader45-70
- id: SpeedLoader45-70
- id: SpeedLoader45-70
Expand All @@ -65,7 +65,7 @@
components:
- type: StorageFill
contents:
- id: N14Weaponwildwhisper
- id: N14WeaponRevolver45-70WildWhisper
- id: SpeedLoader45-70
- id: SpeedLoader45-70
- id: SpeedLoader45-70
Expand All @@ -77,7 +77,7 @@
components:
- type: StorageFill
contents:
- id: N14WeaponRevolverCaptainMagnun
- id: N14WeaponRevolver44MagnumCaptain
- id: SpeedLoader44
- id: SpeedLoader44
- id: SpeedLoader44
Expand Down
Loading
Loading