Skip to content

Commit 7d3d59a

Browse files
committed
refactor: use full weapon paths for items as asked in pr 805
1 parent e6aeae8 commit 7d3d59a

File tree

2 files changed

+69
-113
lines changed

2 files changed

+69
-113
lines changed

config/itemTypes.json

100755100644
Lines changed: 67 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -904,31 +904,35 @@
904904
"name": "Pistol"
905905
},
906906
{
907-
"id": "/KuvaLich/Secondaries/",
907+
"id": "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/",
908908
"name": "Pistol"
909909
},
910910
{
911-
"id": "/VoidTrader/VTDetron",
911+
"id": "/Lotus/Weapons/VoidTrader/VTDetron",
912912
"name": "Pistol"
913913
},
914914
{
915-
"id": "/MK1Series/MK1Furis",
915+
"id": "/Lotus/Weapons/MK1Series/MK1Furis",
916916
"name": "Pistol"
917917
},
918918
{
919-
"id": "/MK1Series/MK1Kunai",
919+
"id": "/Lotus/Weapons/MK1Series/MK1Kunai",
920920
"name": "Throwing"
921921
},
922922
{
923-
"id": "/Tenno/Grimoire/",
923+
"id": "/Lotus/Weapons/Tenno/Grimoire/TnDoppelgangerGrimoire",
924924
"name": "Pistol"
925925
},
926926
{
927-
"id": "/Thanotech/EntratiWristGun/",
927+
"id": "/Lotus/Weapons/Tenno/Grimoire/TnGrimoire",
928928
"name": "Pistol"
929929
},
930930
{
931-
"id": "/LongGuns/GrineerAssaultRifle/TwinGrakatas",
931+
"id": "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon",
932+
"name": "Pistol"
933+
},
934+
{
935+
"id": "/Lotus/Weapons/Grineer/LongGuns/GrineerAssaultRifle/TwinGrakatas",
932936
"name": "Dual Pistols"
933937
},
934938
{
@@ -964,216 +968,172 @@
964968
"name": "Shotgun"
965969
},
966970
{
967-
"id": "/KuvaLich/LongGuns/Hek/",
971+
"id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/",
968972
"name": "Shotgun"
969973
},
970974
{
971-
"id": "/KuvaLich/LongGuns/Sobek/",
975+
"id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/",
972976
"name": "Shotgun"
973977
},
974978
{
975-
"id": "/KuvaLich/LongGuns/Drakgoon/",
979+
"id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/",
976980
"name": "Shotgun"
977981
},
978982
{
979-
"id": "/KuvaLich/LongGuns/Kohm/",
983+
"id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/",
980984
"name": "Shotgun"
981985
},
982986
{
983-
"id": "/Syndicates/SteelMeridian/LongGuns/SMHek",
987+
"id": "/Lotus/Weapons/Syndicates/SteelMeridian/LongGuns/SMHek",
984988
"name": "Shotgun"
985989
},
986990
{
987-
"id": "/LongGuns/GrineerFlakCannon/",
991+
"id": "/Lotus/Weapons/Grineer/LongGuns/GrineerFlakCannon/",
988992
"name": "Shotgun"
989993
},
990994
{
991-
"id": "/LongGuns/GrnSpark/",
995+
"id": "/Lotus/Weapons/Grineer/LongGuns/GrnSpark/",
992996
"name": "Shotgun"
993997
},
994998
{
995-
"id": "/Syndicates/NewLoka/LongGuns/NLTigris",
999+
"id": "/Lotus/Weapons/Syndicates/NewLoka/LongGuns/NLTigris",
9961000
"name": "Shotgun"
9971001
},
9981002
{
999-
"id": "/LongGuns/PrimeTigris/",
1003+
"id": "/Lotus/Weapons/Tenno/LongGuns/PrimeTigris/",
10001004
"name": "Shotgun"
10011005
},
10021006
{
1003-
"id": "/LongGuns/PrimeAstilla/",
1007+
"id": "/Lotus/Weapons/Tenno/LongGuns/PrimeAstilla/",
10041008
"name": "Shotgun"
10051009
},
10061010
{
1007-
"id": "/LongGuns/PrimeCorinth/",
1011+
"id": "/Lotus/Weapons/Tenno/LongGuns/PrimeCorinth/",
10081012
"name": "Shotgun"
10091013
},
10101014
{
1011-
"id": "/LongGuns/PrimeCedo/",
1015+
"id": "/Lotus/Weapons/Tenno/LongGuns/PrimeCedo/",
10121016
"name": "Shotgun"
10131017
},
10141018
{
1015-
"id": "/BoardExec/Primary/CrpBEArcaPlasmor/",
1019+
"id": "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/",
10161020
"name": "Shotgun"
10171021
},
10181022
{
1019-
"id": "/MK1Series/MK1Strun",
1023+
"id": "/Lotus/Weapons/MK1Series/MK1Strun",
10201024
"name": "Shotgun"
10211025
},
10221026
{
1023-
"id": "/MK1Series/MK1Paris",
1027+
"id": "/Lotus/Weapons/MK1Series/MK1Paris",
10241028
"name": "Bow"
10251029
},
10261030
{
1027-
"id": "/Bows/",
1031+
"id": "/Lotus/Weapons/Tenno/Bows/",
10281032
"name": "Bow"
10291033
},
10301034
{
1031-
"id": "/Bow/",
1035+
"id": "/Lotus/Weapons/Tenno/Bow/",
10321036
"name": "Bow"
10331037
},
10341038
{
1035-
"id": "/LongGuns/RepeatingCrossbow/",
1036-
"name": "Crossbow"
1037-
},
1038-
{
1039-
"id": "/LongGuns/PrimeZhuge/",
1040-
"name": "Crossbow"
1041-
},
1042-
{
1043-
"id": "/LongGuns/TnoPrmryXbow/",
1044-
"name": "Crossbow"
1045-
},
1046-
{
1047-
"id": "/LongGuns/GarudaCrossbow/",
1048-
"name": "Crossbow"
1049-
},
1050-
{
1051-
"id": "/LongGuns/PrimeNagantaka/",
1052-
"name": "Crossbow"
1053-
},
1054-
{
1055-
"id": "/LongGuns/InfArmCannon/",
1039+
"id": "/Lotus/Weapons/Infested/LongGuns/InfArmCannon/",
10561040
"name": "Shotgun"
10571041
},
10581042
{
1059-
"id": "/LongGuns/CrpSplitLaser/",
1043+
"id": "/Lotus/Weapons/Corpus/LongGuns/CrpSplitLaser/",
10601044
"name": "Shotgun"
10611045
},
10621046
{
1063-
"id": "/LongGuns/CrpBriefcaseLauncher/",
1047+
"id": "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/",
10641048
"name": "Launcher"
10651049
},
10661050
{
1067-
"id": "/ClanTech/Chemical/RocketLauncher",
1051+
"id": "/Lotus/Weapons/ClanTech/Chemical/RocketLauncher",
10681052
"name": "Launcher"
10691053
},
10701054
{
1071-
"id": "/ClanTech/Bio/BioWeapon",
1055+
"id": "/Lotus/Weapons/ClanTech/Bio/BioWeapon",
10721056
"name": "Launcher"
10731057
},
10741058
{
1075-
"id": "/LongGuns/GrenadeLauncher/",
1059+
"id": "/Lotus/Weapons/Corpus/LongGuns/GrenadeLauncher/",
10761060
"name": "Launcher"
10771061
},
10781062
{
1079-
"id": "/Syndicates/PerrinSequence/LongGuns/PSPenta",
1063+
"id": "/Lotus/Weapons/Syndicates/PerrinSequence/LongGuns/PSPenta",
10801064
"name": "Launcher"
10811065
},
10821066
{
1083-
"id": "/LongGuns/GrnGrenadeLauncher/",
1067+
"id": "/Lotus/Weapons/Grineer/LongGuns/GrnGrenadeLauncher/",
10841068
"name": "Launcher"
10851069
},
10861070
{
1087-
"id": "/KuvaLich/LongGuns/Tonkor/",
1071+
"id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/",
10881072
"name": "Launcher"
10891073
},
10901074
{
1091-
"id": "/KuvaLich/LongGuns/Ogris/",
1075+
"id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/",
10921076
"name": "Launcher"
10931077
},
10941078
{
1095-
"id": "/KuvaLich/LongGuns/Zarr/",
1079+
"id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/",
10961080
"name": "Launcher"
10971081
},
10981082
{
1099-
"id": "/LongGuns/GrnCannon/",
1083+
"id": "/Lotus/Weapons/Grineer/LongGuns/GrnCannon/",
11001084
"name": "Launcher"
11011085
},
11021086
{
1103-
"id": "/LongGuns/TnHopliteSpear/",
1104-
"name": "Speargun"
1105-
},
1106-
{
1107-
"id": "/LongGuns/TnPriestSpear/",
1108-
"name": "Speargun"
1109-
},
1110-
{
1111-
"id": "/LongGuns/PrimeScourge/",
1112-
"name": "Speargun"
1113-
},
1114-
{
1115-
"id": "/LongGuns/Spears/",
1116-
"name": "Speargun"
1117-
},
1118-
{
1119-
"id": "/Grineer/LongGuns/GrnFlameSpear/",
1120-
"name": "Speargun"
1121-
},
1122-
{
1123-
"id": "/BoardExec/Primary/CrpBEFerrox/",
1124-
"name": "Speargun"
1125-
},
1126-
{
1127-
"id": "/LongGuns/CrpSentAmlgSniper/",
1128-
"name": "Sniper Rifle"
1087+
"id": "/Lotus/Weapons/Corpus/LongGuns/CrpSentAmlgSniper/",
1088+
"name": "Sniper"
11291089
},
11301090
{
1131-
"id": "/ClanTech/Energy/Railgun",
1132-
"name": "Sniper Rifle"
1091+
"id": "/Lotus/Weapons/ClanTech/Energy/Railgun",
1092+
"name": "Sniper"
11331093
},
11341094
{
1135-
"id": "/LongGuns/TnQuadSniper/",
1136-
"name": "Sniper Rifle"
1095+
"id": "/Lotus/Weapons/Tenno/LongGuns/TnQuadSniper/",
1096+
"name": "Sniper"
11371097
},
11381098
{
1139-
"id": "/LongGuns/FiveShotSniper/",
1140-
"name": "Sniper Rifle"
1099+
"id": "/Lotus/Weapons/Tenno/LongGuns/FiveShotSniper/",
1100+
"name": "Sniper"
11411101
},
11421102
{
1143-
"id": "/LongGuns/RubicoPrime/",
1144-
"name": "Sniper Rifle"
1103+
"id": "/Lotus/Weapons/Tenno/LongGuns/RubicoPrime/",
1104+
"name": "Sniper"
11451105
},
11461106
{
1147-
"id": "/Rifle/SniperRifle",
1148-
"name": "Sniper Rifle"
1107+
"id": "/Lotus/Weapons/Tenno/Rifle/SniperRifle",
1108+
"name": "Sniper"
11491109
},
11501110
{
1151-
"id": "/Rifle/VandalSniperRifle",
1152-
"name": "Sniper Rifle"
1111+
"id": "/Lotus/Weapons/Tenno/Rifle/VandalSniperRifle",
1112+
"name": "Sniper"
11531113
},
11541114
{
1155-
"id": "/LongGuns/InfSniperRifle/",
1156-
"name": "Sniper Rifle"
1115+
"id": "/Lotus/Weapons/Infested/LongGuns/InfSniperRifle/",
1116+
"name": "Sniper"
11571117
},
11581118
{
1159-
"id": "/InfestedLich/LongGuns/CodaSporothrix",
1160-
"name": "Sniper Rifle"
1119+
"id": "/Lotus/Weapons/Infested/InfestedLich/LongGuns/CodaSporothrix",
1120+
"name": "Sniper"
11611121
},
11621122
{
1163-
"id": "/LongGuns/PrimeLightningGun/",
1164-
"name": "Sniper Rifle"
1123+
"id": "/Lotus/Weapons/Tenno/LongGuns/PrimeLightningGun/",
1124+
"name": "Sniper"
11651125
},
11661126
{
1167-
"id": "/Rifle/TennoSniperRifle",
1168-
"name": "Sniper Rifle"
1127+
"id": "/Lotus/Weapons/Tenno/Rifle/TennoSniperRifle",
1128+
"name": "Sniper"
11691129
},
11701130
{
1171-
"id": "/LongGuns/PrimeVectis/",
1172-
"name": "Sniper Rifle"
1131+
"id": "/Lotus/Weapons/Tenno/LongGuns/PrimeVectis/",
1132+
"name": "Sniper"
11731133
},
11741134
{
1175-
"id": "/LongGuns/GrineerSniperRifle/",
1176-
"name": "Sniper Rifle"
1135+
"id": "/Lotus/Weapons/Grineer/LongGuns/GrineerSniperRifle/",
1136+
"name": "Sniper"
11771137
},
11781138
{
11791139
"id": "/LongGuns",
@@ -1302,4 +1262,4 @@
13021262
"id": "Challenges/Seasons",
13031263
"name": "Nightwave Challenge"
13041264
}
1305-
]
1265+
]

index.d.ts

100755100644
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,6 @@ declare module '@wfcd/items' {
816816
| 'Companion Weapon'
817817
| 'Conservation Tag'
818818
| 'Conservation Prey'
819-
| 'Crossbow'
820819
| 'Currency'
821820
| 'Cut Gem'
822821
| 'Dual Pistols'
@@ -878,10 +877,9 @@ declare module '@wfcd/items' {
878877
| 'Simulacrum'
879878
| 'Skin'
880879
| 'Skins'
881-
| 'Sniper Rifle'
880+
| 'Sniper'
882881
| 'Solaris Bounty Rewards'
883882
| 'Sortie Rewards'
884-
| 'Speargun'
885883
| 'Specter'
886884
| 'Syandana'
887885
| 'Theme Background'
@@ -942,7 +940,6 @@ declare module '@wfcd/items' {
942940
| 'Arch-Gun'
943941
| 'Arch-Melee'
944942
| 'Bow'
945-
| 'Crossbow'
946943
| 'Kitgun'
947944
| 'Launcher'
948945
| 'Companion Weapon'
@@ -951,8 +948,7 @@ declare module '@wfcd/items' {
951948
| 'Pistol'
952949
| 'Rifle'
953950
| 'Shotgun'
954-
| 'Sniper Rifle'
955-
| 'Speargun'
951+
| 'Sniper'
956952
| 'Zaw';
957953

958954
type SystemName =

0 commit comments

Comments
 (0)