Skip to content

Commit 50c4242

Browse files
committed
Subdivide HDBulletLib's Shop Entries
It's not perfect, and honestly I'd rather just figure out scrolling at this point, but it should prevent the overflowing that was happening.
1 parent 9d26c84 commit 50c4242

1 file changed

Lines changed: 28 additions & 28 deletions

File tree

LANGUAGE

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,17 +1035,17 @@ MERCH_FLAVOR_WEAPONCRATE = "Ammo sold separately.";
10351035
// ------------------
10361036

10371037
// .069 Bore Shell
1038-
MERCH_CAT_069BORE = "Joint Task Force";
1038+
MERCH_CAT_069BORE = "Joint Task Force (Shotguns)";
10391039
MERCH_TAG_069BORE = ".066 Bore Shell";
10401040
MERCH_FLAVOR_069BORE = "These shotgun shells have undergone a strict weight-loss program!";
10411041

10421042
// .300 Savage
1043-
MERCH_CAT_300SAVAGE = "Joint Task Force";
1043+
MERCH_CAT_300SAVAGE = "Joint Task Force (Rifles)";
10441044
MERCH_TAG_300SAVAGE = ".300 Savage Rounds";
10451045
MERCH_FLAVOR_300SAVAGE = "Like when that dude kicked the other dude into the pit.";
10461046

10471047
// .30-06
1048-
MERCH_CAT_3006 = "Joint Task Force";
1048+
MERCH_CAT_3006 = "Joint Task Force (Rifles)";
10491049
MERCH_TAG_3006 = ".30-06 Rounds";
10501050
MERCH_FLAVOR_3006 = "For when you wanna ping ping.";
10511051

@@ -1055,57 +1055,57 @@ MERCH_TAG_355 = ".355 Rounds";
10551055
MERCH_FLAVOR_355 = "Rarer than diamonds.";
10561056

10571057
// .420 Frei
1058-
MERCH_CAT_420FREI = "Joint Task Force";
1058+
MERCH_CAT_420FREI = "Joint Task Force (Handguns)";
10591059
MERCH_TAG_420FREI = ".451 Frei";
10601060
MERCH_FLAVOR_420FREI = "An antique cartridge. They seem a bit strange, don't they?";
10611061

10621062
// .45 ACP
1063-
MERCH_CAT_45ACP = "Joint Task Force";
1063+
MERCH_CAT_45ACP = "Joint Task Force (Handguns)";
10641064
MERCH_TAG_45ACP = ".45 ACP";
10651065
MERCH_FLAVOR_45ACP = "The stopping power on these is really incredible.";
10661066

10671067
// .45 LC
1068-
MERCH_CAT_45LC = "Joint Task Force";
1068+
MERCH_CAT_45LC = "Joint Task Force (Handguns)";
10691069
MERCH_TAG_45LC = ".45 Long Colt Ammo";
10701070
MERCH_FLAVOR_45LC = "Known as 'America's round'. They sure are a long way from home, though.";
10711071

10721072
// .45 LC (Golden)
1073-
MERCH_CAT_G45LC = "Joint Task Force";
1073+
MERCH_CAT_G45LC = "Joint Task Force (Handguns)";
10741074
MERCH_TAG_G45LC = "Golden .45 Long Colt Ammo";
10751075
MERCH_FLAVOR_G45LC = "It's not about the money, it's about sending a message.";
10761076

10771077
// .50 AE
1078-
MERCH_CAT_50AE = "Joint Task Force";
1078+
MERCH_CAT_50AE = "Joint Task Force (Handguns)";
10791079
MERCH_TAG_50AE = ".50 Action Express";
10801080
MERCH_FLAVOR_50AE = "Ought to kill something in a single shot. If it doesn't, shoot again.";
10811081

10821082
// .50 AM
1083-
MERCH_CAT_50AM = "Joint Task Force";
1083+
MERCH_CAT_50AM = "Joint Task Force (Handguns)";
10841084
MERCH_TAG_50AM = ".50 Action Mega";
10851085
MERCH_FLAVOR_50AM = "Not to be confused with the similarly-named .50 Action Express.";
10861086

10871087
// .50 OMG
1088-
MERCH_CAT_50OMG = "Joint Task Force";
1088+
MERCH_CAT_50OMG = "Joint Task Force (Rifles)";
10891089
MERCH_TAG_50OMG = ".50 OMG";
10901090
MERCH_FLAVOR_50OMG = "The one round that guarantees nothing will wallbang back at you.";
10911091

10921092
// .500 S&W Heavy
1093-
MERCH_CAT_500SWH = "Joint Task Force";
1093+
MERCH_CAT_500SWH = "Joint Task Force (Handguns)";
10941094
MERCH_TAG_500SWH = ".500 S&W Handloads";
10951095
MERCH_FLAVOR_500SWH = "These ought to punch a hole.";
10961096

10971097
// .500 S&W Light
1098-
MERCH_CAT_500SWL = "Joint Task Force";
1098+
MERCH_CAT_500SWL = "Joint Task Force (Handguns)";
10991099
MERCH_TAG_500SWL = ".500 S&W";
11001100
MERCH_FLAVOR_500SWL = "Much better than the peashooter .355, isn't it?";
11011101

11021102
// 10mm
1103-
MERCH_CAT_10MM = "Joint Task Force";
1103+
MERCH_CAT_10MM = "Joint Task Force (Handguns)";
11041104
MERCH_TAG_10MM = "10mm Ammo";
11051105
MERCH_FLAVOR_10MM = "Because 10 is better than 9.";
11061106

11071107
// 12ga Flares
1108-
MERCH_CAT_12GFLARE = "Joint Task Force";
1108+
MERCH_CAT_12GFLARE = "Joint Task Force (Shotguns)";
11091109
MERCH_TAG_12GFLARE = "Flare Gun Ammo";
11101110
MERCH_FLAVOR_12GFLARE = "You're gonna paint the town red with these.";
11111111

@@ -1115,12 +1115,12 @@ MERCH_TAG_12GSHELL = "Shotgun Shells";
11151115
MERCH_FLAVOR_12GSHELL = "Point away from self.";
11161116

11171117
// 12ga Slug
1118-
MERCH_CAT_12GSLUG = "Joint Task Force";
1118+
MERCH_CAT_12GSLUG = "Joint Task Force (Shotguns)";
11191119
MERCH_TAG_12GSLUG = "Shotgun Slug";
11201120
MERCH_FLAVOR_12GSLUG = "These aren't slimy like the others.";
11211121

11221122
// 20mm Grenade
1123-
MERCH_CAT_20MMGRENADE = "Joint Task Force";
1123+
MERCH_CAT_20MMGRENADE = "Joint Task Force (Explosives)";
11241124
MERCH_TAG_20MMGRENADE = "20mm Grenade";
11251125
MERCH_FLAVOR_20MMGRENADE = "Smaller payload, just as big-uh boom.";
11261126

@@ -1130,27 +1130,27 @@ MERCH_TAG_4MMMAG = "4.26mm UAC Standard Magazines";
11301130
MERCH_FLAVOR_4MMMAG = "Luckily for you, these magazines come with the DRM intact.";
11311131

11321132
// 4ga Shell
1133-
MERCH_CAT_4GSHELL = "Joint Task Force";
1133+
MERCH_CAT_4GSHELL = "Joint Task Force (Shotguns)";
11341134
MERCH_TAG_4GSHELL = "4 gauge 00 buckshot";
11351135
MERCH_FLAVOR_4GSHELL = "That's a lotta shot fer yer buck, err shot.";
11361136

11371137
// 4ga Slug
1138-
MERCH_CAT_4GSLUG = "Joint Task Force";
1138+
MERCH_CAT_4GSLUG = "Joint Task Force (Shotguns)";
11391139
MERCH_TAG_4GSLUG = "4 gauge saboted slug";
11401140
MERCH_FLAVOR_4GSLUG = "That's a lotta slug fer yer, sabot-ed, slug? Nah that's not it.";
11411141

11421142
// 5mm BR
1143-
MERCH_CAT_5MMBR = "Joint Task Force";
1143+
MERCH_CAT_5MMBR = "Joint Task Force (Handguns)";
11441144
MERCH_TAG_5MMBR = ".5x16mm Bumblebee Rimfire";
11451145
MERCH_FLAVOR_5MMBR = "Oh no, not the bees... Not the bees! AAAAAHHHH!";
11461146

11471147
// 6mm Flechette
1148-
MERCH_CAT_6MMFLECHETTE = "Joint Task Force";
1148+
MERCH_CAT_6MMFLECHETTE = "Joint Task Force (Rifles)";
11491149
MERCH_TAG_6MMFLECHETTE = "6x42mm SCF Flechette";
11501150
MERCH_FLAVOR_6MMFLECHETTE = "These flechettes are almost as dangerous as lawn darts!";
11511151

11521152
// 7.62mm Tokarev
1153-
MERCH_CAT_762TOKAREV = "Joint Task Force";
1153+
MERCH_CAT_762TOKAREV = "Joint Task Force (Handguns)";
11541154
MERCH_TAG_762TOKAREV = "7.62 Tokarev Rounds";
11551155
MERCH_FLAVOR_762TOKAREV = "I can't tell if this is for a handgun or a rifle...";
11561156

@@ -1160,7 +1160,7 @@ MERCH_TAG_7MM = "7mm Rounds";
11601160
MERCH_FLAVOR_7MM = "You don't need to face your enemies if you shoot them through the wall.";
11611161

11621162
// 8mm Electromagnetic Cartridges
1163-
MERCH_CAT_8MMEC = "Joint Task Force";
1163+
MERCH_CAT_8MMEC = "Joint Task Force (Rifles)";
11641164
MERCH_TAG_8MMEC = "8x35mm Electromagnetic Cartridges";
11651165
MERCH_FLAVOR_8MMEC = "Fuckin' magnets, how do they work?";
11661166

@@ -1190,7 +1190,7 @@ MERCH_TAG_BATTERY = "Battery";
11901190
MERCH_FLAVOR_BATTERY = "Positively charged.";
11911191

11921192
// Birdshot
1193-
MERCH_CAT_BIRDSHOT = "Joint Task Force";
1193+
MERCH_CAT_BIRDSHOT = "Joint Task Force (Shotguns)";
11941194
MERCH_TAG_BIRDSHOT = "Birdshot Shells";
11951195
MERCH_FLAVOR_BIRDSHOT = "Goin' skeet shootin'?";
11961196

@@ -1225,7 +1225,7 @@ MERCH_TAG_DYNAMITE = "Dynamite";
12251225
MERCH_FLAVOR_DYNAMITE = "Do I look like a propsector?";
12261226

12271227
// Explosive Shells
1228-
MERCH_CAT_XSHELL = "Joint Task Force";
1228+
MERCH_CAT_XSHELL = "Joint Task Force (Shotguns)";
12291229
MERCH_TAG_XSHELL = "Explosive Shells";
12301230
MERCH_FLAVOR_XSHELL = "You wanna stay alive? Buy these from me.";
12311231

@@ -1255,12 +1255,12 @@ MERCH_TAG_IMPACTGRENADE = "Impact Grenade";
12551255
MERCH_FLAVOR_IMPACTGRENADE = "whatever you do, don't drop this.";
12561256

12571257
// Lead Ball
1258-
MERCH_CAT_LEADBALL = "Joint Task Force";
1258+
MERCH_CAT_LEADBALL = "Joint Task Force (Misc.)";
12591259
MERCH_TAG_LEADBALL = "Lead Ball";
12601260
MERCH_FLAVOR_LEADBALL = "Make sure you pack it in good.";
12611261

12621262
// Less-Lethal Shell
1263-
MERCH_CAT_LLSHELL = "Joint Task Force";
1263+
MERCH_CAT_LLSHELL = "Joint Task Force (Shotguns)";
12641264
MERCH_TAG_LLSHELL = "Less-Lethal Shells";
12651265
MERCH_FLAVOR_LLSHELL = "I have no idea why anyone would want these, but I'll sell them if you're buying.";
12661266

@@ -1290,12 +1290,12 @@ MERCH_TAG_THUNDERGRENADE = "Thunder Grenade";
12901290
MERCH_FLAVOR_THUNDERGRENADE = "Shockingly fun to use.";
12911291

12921292
// Thunder Rocket
1293-
MERCH_CAT_THUNDERROCKET = "Joint Task Force";
1293+
MERCH_CAT_THUNDERROCKET = "Joint Task Force (Explosives)";
12941294
MERCH_TAG_THUNDERROCKET = "Thunder Rocket";
12951295
MERCH_FLAVOR_THUNDERROCKET = "Sparky sparky boom, man!";
12961296

12971297
// Tortoise Rocket
1298-
MERCH_CAT_TORTOISEROCKET = "Joint Task Force";
1298+
MERCH_CAT_TORTOISEROCKET = "Joint Task Force (Explosives)";
12991299
MERCH_TAG_TORTOISEROCKET = "Tortoise Rocket";
13001300
MERCH_FLAVOR_TORTOISEROCKET = "It'll boom ya, it's the boomiest!";
13011301

0 commit comments

Comments
 (0)