diff --git a/images/attachments/hopups/13.png b/images/attachments/hopups/13.png new file mode 100644 index 0000000..2aaeea7 Binary files /dev/null and b/images/attachments/hopups/13.png differ diff --git a/images/attachments/mags/01_00.png b/images/attachments/mags/01_00.png new file mode 100644 index 0000000..42fc4c4 Binary files /dev/null and b/images/attachments/mags/01_00.png differ diff --git a/images/attachments/optics/none.png b/images/attachments/optics/none.png new file mode 100644 index 0000000..183dfad Binary files /dev/null and b/images/attachments/optics/none.png differ diff --git a/images/attachments/optics/none.svg b/images/attachments/optics/none.svg deleted file mode 100644 index 71108a1..0000000 --- a/images/attachments/optics/none.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/images/legends/icon/00.png b/images/legends/icon/00.png index c5a5b2d..95a2da7 100644 Binary files a/images/legends/icon/00.png and b/images/legends/icon/00.png differ diff --git a/images/legends/icon/01.png b/images/legends/icon/01.png index 41d044a..46a7f5f 100644 Binary files a/images/legends/icon/01.png and b/images/legends/icon/01.png differ diff --git a/images/legends/icon/02.png b/images/legends/icon/02.png index a60846c..2d620b1 100644 Binary files a/images/legends/icon/02.png and b/images/legends/icon/02.png differ diff --git a/images/legends/icon/03.png b/images/legends/icon/03.png index 8402608..a6bfb7a 100644 Binary files a/images/legends/icon/03.png and b/images/legends/icon/03.png differ diff --git a/images/legends/icon/04.png b/images/legends/icon/04.png index b812c58..7c5619a 100644 Binary files a/images/legends/icon/04.png and b/images/legends/icon/04.png differ diff --git a/images/legends/icon/05.png b/images/legends/icon/05.png index 4e6ae59..cbd20f6 100644 Binary files a/images/legends/icon/05.png and b/images/legends/icon/05.png differ diff --git a/images/legends/icon/06.png b/images/legends/icon/06.png index 5f6247e..86ab85b 100644 Binary files a/images/legends/icon/06.png and b/images/legends/icon/06.png differ diff --git a/images/legends/icon/07.png b/images/legends/icon/07.png index 00af2fd..9d4f3ba 100644 Binary files a/images/legends/icon/07.png and b/images/legends/icon/07.png differ diff --git a/images/legends/icon/08.png b/images/legends/icon/08.png index c9c83f4..aa4a018 100644 Binary files a/images/legends/icon/08.png and b/images/legends/icon/08.png differ diff --git a/images/legends/icon/10.png b/images/legends/icon/10.png index d9ce779..1e3e3bb 100644 Binary files a/images/legends/icon/10.png and b/images/legends/icon/10.png differ diff --git a/images/legends/icon/15.png b/images/legends/icon/15.png index 4591e82..980de59 100644 Binary files a/images/legends/icon/15.png and b/images/legends/icon/15.png differ diff --git a/images/legends/icon/18.png b/images/legends/icon/18.png new file mode 100644 index 0000000..1a9cb94 Binary files /dev/null and b/images/legends/icon/18.png differ diff --git a/images/legends/passive/18.png b/images/legends/passive/18.png new file mode 100644 index 0000000..0fd1a86 Binary files /dev/null and b/images/legends/passive/18.png differ diff --git a/images/legends/tactical/18.png b/images/legends/tactical/18.png new file mode 100644 index 0000000..5978c0e Binary files /dev/null and b/images/legends/tactical/18.png differ diff --git a/images/legends/ultimate/18.png b/images/legends/ultimate/18.png new file mode 100644 index 0000000..efe722b Binary files /dev/null and b/images/legends/ultimate/18.png differ diff --git a/images/weapons/car.png b/images/weapons/car.png new file mode 100644 index 0000000..5b95054 Binary files /dev/null and b/images/weapons/car.png differ diff --git a/script.js b/script.js index ca0d6f9..c4eca94 100644 --- a/script.js +++ b/script.js @@ -16,7 +16,8 @@ var legend_names = [ "HORIZON", "FUSE", "VALKYRIE", - "SEER" + "SEER", + "ASH" ]; var legend_descriptions = [ @@ -37,7 +38,8 @@ var legend_descriptions = [ "GRAVITATIONAL MANIPULATOR", "EXPLOSIVES ENTHUSIAST", "WINGED AVENGER", - "AMBUSH ARTIST" + "AMBUSH ARTIST", + "INCISIVE INSIGATOR" ]; var legend_passives = [ @@ -58,7 +60,8 @@ var legend_passives = [ "SPACEWALK", "GRENADIER", "VTOL JETS", - "FOCUS OF ATTENTION" + "FOCUS OF ATTENTION", + "MARKED FOR DEATH" ]; var legend_tacticals = [ @@ -79,7 +82,8 @@ var legend_tacticals = [ "GRAVITY LIFT", "KNUCKLE CLUSTER", "MISSILE SWARM", - "HEART SEEKER" + "HEART SEEKER", + "ARC SNARE" ]; var legend_ultimates = [ @@ -100,11 +104,12 @@ var legend_ultimates = [ "BLACK HOLE", "THE MOTHERLODE", "SKYWARD DIVE", - "EXHIBIT" + "EXHIBIT", + "PHASE BREACH" ]; -var legend_classes = [0, 1, 2, 0, 3, 3, 1, 3, 3, 1, 0, 3, 2, 1, 3, 3, 0, 0]; -var legend_mods = [-1, 0, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]; +var legend_classes = [0, 1, 2, 0, 3, 3, 1, 3, 3, 1, 0, 3, 2, 1, 3, 3, 0, 0, 3]; +var legend_mods = [-1, 0, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]; var legend_classes_txt = ["RECON", "DEFENSE", "SUPPORT", "OFFENSE"]; var legend_mods_txt = ["FORTIFIED", "LOW PROFILE"]; @@ -124,9 +129,10 @@ var hopup_txt = [ "QUICKDRAW HOLSTER", "SHATTER CAPS", "DEADEYE'S TEMPO", - "BOOSTED LOADER" + "BOOSTED LOADER", + "DUAL SHELL" ]; -var hopup_level = [3, 3, 4, 4, 3, 3, 4, 3, 1, 3, 3, 3, 4]; +var hopup_level = [3, 3, 4, 4, 3, 3, 4, 3, 1, 3, 3, 3, 4, 3]; var mag_txt = ["EXTENDED LIGHT MAGAZINE", "EXTENDED HEAVY MAGAZINE", "EXTENDED SNIPER MAGAZINE", "EXTENDED ENERGY MAGAZINE"]; var ammo_txt = ["LIGHT ROUNDS", "HEAVY ROUNDS", "SNIPER AMMO", "ENERGY AMMO", "SHOTGUN SHELLS", "ARROWS"]; @@ -138,33 +144,34 @@ var weapon2 = -1; // Longest - KRABER // Tallest - RE-45 -weapons.push({name:"VK-47 FLATLINE", barrel:false, bolt:false, mag:1, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"flatline.png"}); -weapons.push({name:"R-301 CARBINE", barrel:true, bolt:false, mag:0, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"r301.png"}); -weapons.push({name:"VOLT SMG", barrel:true, bolt:false, mag:3, optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"volt.png"}); -weapons.push({name:"L-STAR EMG", barrel:true, bolt:false, mag:3, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"lstar.png"}); -weapons.push({name:"RAMPAGE", barrel:true, bolt:false, mag:1, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"rampage.png"}); -weapons.push({name:"HAVOC RIFLE", barrel:false, bolt:false, mag:3, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[3], multi_hopup:false, ammo:3, filename:"havoc.png"}); -weapons.push({name:"DEVOTION LMG", barrel:true, bolt:false, mag:3, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[3], multi_hopup:false, ammo:3, filename:"devotion.png"}); -weapons.push({name:"30-30 REPEATER", barrel:false, bolt:false, mag:1, optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[10], multi_hopup:false, ammo:1, filename:"3030.png"}); -weapons.push({name:"G7 SCOUT", barrel:true, bolt:false, mag:0, optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:0, filename:"g7.png"}); -weapons.push({name:"WINGMAN", barrel:false, bolt:false, mag:1, optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[12], multi_hopup:false, ammo:1, filename:"wingman.png"}); -weapons.push({name:"BOCEK COMPOUND BOW", barrel:false, bolt:false, mag:-1, optic:[1, 2, 3, 4, 5], stock_standard:false, stock_sniper:false, hopup:[10, 11], multi_hopup:true, ammo:5, filename:"bocek.png"}); -weapons.push({name:"HEMLOK BURST AR", barrel:true, bolt:false, mag:1, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[12], multi_hopup:false, ammo:1, filename:"hemlok.png"}); -weapons.push({name:"PROWLER BURST PDW", barrel:false, bolt:false, mag:1, optic:[], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"prowler.png"}); -weapons.push({name:"RE-45 AUTO", barrel:true, bolt:false, mag:0, optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"re45.png"}); -weapons.push({name:"R-99 SMG", barrel:true, bolt:false, mag:0, optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"r99.png"}); -weapons.push({name:"LONGBOW DMR", barrel:true, bolt:false, mag:2, optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"longbow.png"}); -weapons.push({name:"SENTINEL", barrel:false, bolt:false, mag:2, optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[11], multi_hopup:false, ammo:2, filename:"sentinel.png"}); -weapons.push({name:"CHARGE RIFLE", barrel:false, bolt:false, mag:-1, optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"chargerifle.png"}); -weapons.push({name:"PEACEKEEPER", barrel:false, bolt:true, mag:-1, optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"peacekeeper.png"}); -weapons.push({name:"EVA-8 AUTO", barrel:false, bolt:true, mag:-1, optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"eva8.png"}); -weapons.push({name:"MASTIFF SHOTGUN", barrel:false, bolt:true, mag:-1, optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"mastiff.png"}); -weapons.push({name:"P2020", barrel:false, bolt:false, mag:0, optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"p2020.png"}); -weapons.push({name:"MOZAMBIQUE SHOTGUN", barrel:false, bolt:true, mag:-1, optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"mozambique.png"}); -//weapons.push({name:"M600 SPITFIRE", barrel:true, bolt:false, mag:1, optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"spitfire.png"}); -//weapons.push({name:"ALTERNATOR SMG", barrel:true, bolt:false, mag:0, optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"alternator.png"}); -//weapons.push({name:"TRIPLE TAKE", barrel:false, bolt:false, mag:3, optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:3, filename:"tripletake.png"}); -//weapons.push({name:"KRABER .50-CAL SNIPER", barrel:false, bolt:true, mag:-1, optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:2, filename:"kraber.png"}); +weapons.push({name:"VK-47 FLATLINE", barrel:false, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"flatline.png"}); +weapons.push({name:"R-301 CARBINE", barrel:true, bolt:false, mag:[0], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"r301.png"}); +weapons.push({name:"C.A.R. SMG", barrel: true, bolt:false, mag:[1,0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"car.png"}); +weapons.push({name:"VOLT SMG", barrel:true, bolt:false, mag:[3], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"volt.png"}); +weapons.push({name:"L-STAR EMG", barrel:true, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"lstar.png"}); +weapons.push({name:"RAMPAGE", barrel:true, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"rampage.png"}); +weapons.push({name:"HAVOC RIFLE", barrel:false, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[3], multi_hopup:false, ammo:3, filename:"havoc.png"}); +weapons.push({name:"30-30 REPEATER", barrel:false, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[10, 13], multi_hopup:false, ammo:1, filename:"3030.png"}); +weapons.push({name:"TRIPLE TAKE", barrel:false, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:3, filename:"tripletake.png"}); +weapons.push({name:"DEVOTION LMG", barrel:true, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[3], multi_hopup:false, ammo:3, filename:"devotion.png"}); +weapons.push({name:"WINGMAN", barrel:false, bolt:false, mag:[1], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[12], multi_hopup:false, ammo:1, filename:"wingman.png"}); +weapons.push({name:"BOCEK COMPOUND BOW", barrel:false, bolt:false, mag:[], optic:[1, 2, 3, 4, 5], stock_standard:false, stock_sniper:false, hopup:[10, 11], multi_hopup:true, ammo:5, filename:"bocek.png"}); +weapons.push({name:"HEMLOK BURST AR", barrel:true, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[12], multi_hopup:false, ammo:1, filename:"hemlok.png"}); +weapons.push({name:"PROWLER BURST PDW", barrel:false, bolt:false, mag:[1], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"prowler.png"}); +weapons.push({name:"RE-45 AUTO", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"re45.png"}); +weapons.push({name:"R-99 SMG", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"r99.png"}); +weapons.push({name:"EVA-8 AUTO", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"eva8.png"}); +weapons.push({name:"MASTIFF SHOTGUN", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[13], multi_hopup:false, ammo:4, filename:"mastiff.png"}); +weapons.push({name:"PEACEKEEPER", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"peacekeeper.png"}); +weapons.push({name:"MOZAMBIQUE SHOTGUN", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"mozambique.png"}); +weapons.push({name:"P2020", barrel:false, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"p2020.png"}); +weapons.push({name:"LONGBOW DMR", barrel:true, bolt:false, mag:[2], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"longbow.png"}); +weapons.push({name:"SENTINEL", barrel:false, bolt:false, mag:[2], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[11], multi_hopup:false, ammo:2, filename:"sentinel.png"}); +weapons.push({name:"CHARGE RIFLE", barrel:false, bolt:false, mag:[], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"chargerifle.png"}); +//weapons.push({name:"G7 SCOUT", barrel:true, bolt:false, mag:[0], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:0, filename:"g7.png"}); +//weapons.push({name:"M600 SPITFIRE", barrel:true, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"spitfire.png"}); +//weapons.push({name:"ALTERNATOR SMG", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"alternator.png"}); +//weapons.push({name:"KRABER .50-CAL SNIPER", barrel:false, bolt:true, mag:[], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"kraber.png"}); function zeroPad(nr,base) { @@ -277,6 +284,7 @@ function randomize_attachments_single(weapon) var result = []; var pick; + // Barrel if (weapon.barrel == true) { pick = Math.floor(Math.random() * 4); @@ -298,7 +306,8 @@ function randomize_attachments_single(weapon) result.push(""); } } - + + // Shotgun Bolt if (weapon.bolt == true) { pick = Math.floor(Math.random() * 4); @@ -313,23 +322,55 @@ function randomize_attachments_single(weapon) result.push(""); } } - - if (weapon.mag != -1) + + // Extended Mag + if (weapon.mag.length != 0) { - pick = Math.floor(Math.random() * 5); - result.push(pick); - result.push("images/attachments/mags/" + zeroPad(weapon.mag, 10) + ".png"); - - if (pick != 0) + if (weapon.mag.length != 1) { - result.push(mag_txt[weapon.mag]); + // Multi Mag + pick = Math.floor(Math.random() * 5); + result.push(pick); + if (pick != 0) + { + var pick2 = Math.floor(Math.random() * weapon.mag.length); + result.push("images/attachments/mags/" + zeroPad(weapon.mag[pick2], 10) + ".png"); + result.push(mag_txt[weapon.mag[pick2]]); + } + else + { + var mag_str = "images/attachments/mags/"; + for (let i = 0; i < weapon.mag.length; ++i) + { + mag_str += zeroPad(weapon.mag[i], 10); + if (i != weapon.mag.length - 1) + { + mag_str += "_"; + } + } + mag_str += ".png" + result.push(mag_str); + result.push(""); + } } else { - result.push(""); + // Single Mag + pick = Math.floor(Math.random() * 5); + result.push(pick); + result.push("images/attachments/mags/" + zeroPad(weapon.mag[0], 10) + ".png"); + if (pick != 0) + { + result.push(mag_txt[weapon.mag[0]]); + } + else + { + result.push(""); + } } } + // Optics if (!document.getElementById("attachment_check").checked) { pick = Math.floor(Math.random() * (weapon.optic.length + 1)); @@ -349,10 +390,11 @@ function randomize_attachments_single(weapon) else { result.push(0); - result.push("images/attachments/optics/none.svg"); + result.push("images/attachments/optics/none.png"); result.push(""); } + // Standard Stock if (weapon.stock_standard == true) { pick = Math.floor(Math.random() * 4); @@ -367,7 +409,8 @@ function randomize_attachments_single(weapon) result.push(""); } } - + + // Sniper Stock if (weapon.stock_sniper == true) { pick = Math.floor(Math.random() * 4); @@ -383,6 +426,7 @@ function randomize_attachments_single(weapon) } } + // Hopups if (weapon.multi_hopup) { for (var i = 0; i < weapon.hopup.length; ++i)