Merge branch 'main'

This commit is contained in:
night0721 2022-03-02 19:13:34 +08:00
commit 182c2a21d6
8 changed files with 150 additions and 4 deletions

49
APEX/apex.json Normal file
View file

@ -0,0 +1,49 @@
{
"legends": [
"Bangalore",
"Bloodhound",
"Caustic",
"Crypto",
"Fuse",
"Gibraltar",
"Horizon",
"LIfeline",
"Loba",
"Mirage",
"Octane",
"Pathfinder",
"Rampart",
"Revenant",
"Valkyrie",
"Watton",
"Wraith"
],
"guns": [
"Bocek Bow",
"EVA-8",
"Kraber",
"Peacekeeper",
"Prowler",
"R-301 Carbine",
"R-99",
"Spitfire",
"Charge Rifle",
"Flatline",
"G7 Scout",
"Havoc",
"Mastiff",
"Sentinel",
"Triple Take",
"Volt",
"Wingman",
"Alternator",
"Devotion",
"Hemlok",
"Longbow",
"L-Star",
"RE-45",
"30-30 Repeater",
"Mozambique",
"P2020"
]
}

View file

@ -326,6 +326,10 @@ module.exports = {
name: "R9-0",
value: "E07",
},
{
name: "JAK-12",
value: "E08",
},
],
},
],

View file

@ -483,6 +483,10 @@ module.exports = {
name: "R9-0",
value: "E07",
},
{
name: "JAK-12",
value: "E08",
},
],
},
{

View file

@ -1,3 +1,5 @@
// Do we still need this ?
const mongoose = require("mongoose");
module.exports = mongoose.model(
"weapons",

View file

@ -27,7 +27,9 @@
"Shorty",
"Crossbow",
"R9-0",
"PPSh-41"
"PPSh-41",
"CBR4",
"SVD"
],
"weaponAlliasName": [
["MoW"],
@ -57,7 +59,9 @@
["725"],
["cb", "bow"],
["r9", "R9-O"],
["ppsh", "pp41"]
["ppsh", "pp41"],
["p90"],
["Dragonov"]
],
"attachmentActualName": [
["akimbo", "Stopping Power"],

View file

@ -607,7 +607,8 @@
"YKM Light Stock",
"RTC Steady Stock",
"OWC Skeleton Stock",
"No Stock"
"No Stock",
"Thunderbolt Sling"
],
"perk": [
"Tough",
@ -3010,6 +3011,58 @@
]
}
],
"JAK_12": [
{
"muzzle": [
"Tactical Suppressor",
"Monolithic Suppressor",
"OWC Light Compensator",
"Choke",
"RTC Light Muzzle Brake",
"Flash Guard",
"Marauder Suppressor"
],
"barrel": ["MIP Extended Light Barrel", "MIP Light Barrel (Short)", "OWC Marksman"],
"optic": [
"Red Dot Sight",
"Holographic Sight",
"Tactical Scope",
"3x Tactical Scope"
],
"stock": [
"YKM Light Stock",
"YKM Combat Stock",
"MIP Stalker Stock"
],
"ammo": [
"FRAG-12 Explosive Mag",
"Extended Mag C",
"Large Extended Mag D",
"Slug Reload"
],
"perk": [
"Sleight of Hand",
"Speed Up Kill",
"Slide Flak Jacket",
"Wounding",
"Full Ammo",
"Disable"
],
"laser": ["RTC Laser 1mW", "OWC Laser - Tactical", "MIP Laser 5mW"],
"underbarrel": [
"Ranger Foregrip",
"Operator Foregrip",
"Merc Foregrip",
"Strike Foregrip",
"Tactical Foregrip A"
],
"rear_grip": [
"Stippled Grip Tape",
"Granulated Grip Tape",
"Ruberized Grip Tape"
]
}
],
"Kilo_Bolt_Action": [
{
"muzzle": [

View file

@ -61,6 +61,7 @@
"E05": "KRM 262",
"E06": "Echo",
"E07": "R9-0",
"E08": "JAK-12",
"F01": "Kilo Bolt-Action",
"F02": "SKS",
"F03": "SP-R 208",

View file

@ -1,5 +1,6 @@
{
"secondary": [
"None",
"Knife / Base Melee",
"Axe",
"Shovel",
@ -16,6 +17,7 @@
"Thumper"
],
"perk_1": [
"None",
"Fast Recover",
"Persistence",
"Flak Jacket",
@ -29,6 +31,7 @@
"Iron Lungs"
],
"perk_2": [
"None",
"Vulture",
"Toughness",
"Tracker",
@ -41,6 +44,7 @@
"Gung-Ho"
],
"perk_3": [
"None",
"Hard Line",
"Demo Expert",
"Tactical Mask",
@ -51,7 +55,8 @@
"Hard Alert",
"Launcher Plus"
],
"scorestreak": [
"scorestreek": [
"None",
"Shield Turret",
"UAV",
"Shock RC",
@ -76,6 +81,7 @@
"VTOL"
],
"operator_skill": [
"None",
"Purifier",
"War Machine",
"Death Machine",
@ -94,5 +100,28 @@
"Kinetic Armor",
"TAK-5",
"Munitions Box"
],
"lethal": [
"None",
"Frag Grenade",
"Sticky Grenade",
"Tripmine",
"Combat Axe",
"Thermite",
"Molotov Cocktail"
],
"tactical": [
"None",
"Flashbang Grenade",
"Smoke Grenade",
"Concussion Grenade",
"EMP",
"Trophy System",
"Cryo Bomb",
"Heartbeat Sensor",
"Gas Grenade",
"Storm Ball",
"Flash Drone",
"Decoy Grenade"
]
}