From c16c42694439323669e6ea82a1dc7ef720c0e3dc Mon Sep 17 00:00:00 2001 From: FallBackITA27 Date: Mon, 27 May 2024 00:02:18 +0200 Subject: [PATCH] 0.10.0 release --- .../cayoPericoKosatkaApproachVehicle.json | 14 ++++++++ .../assets/cayoPericoWeaponLoadout.json | 35 +++++++++++++++++++ gtav-interactive-map/gtavIcons/kosatkaRed.svg | 1 + .../gtavIcons/weaponLocker.svg | 1 + gtav-interactive-map/index.html | 19 ++++++++++ .../cayoPericoKosatkaApproachVehicle.js | 15 ++++++++ .../loadScripts/cayoPericoWeaponLoadout.js | 19 ++++++++++ gtav-interactive-map/script.js | 28 ++++++++++++++- gtav-interactive-map/stylesheet.css | 10 +++++- 9 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 gtav-interactive-map/assets/cayoPericoKosatkaApproachVehicle.json create mode 100644 gtav-interactive-map/assets/cayoPericoWeaponLoadout.json create mode 100644 gtav-interactive-map/gtavIcons/kosatkaRed.svg create mode 100644 gtav-interactive-map/gtavIcons/weaponLocker.svg create mode 100644 gtav-interactive-map/loadScripts/cayoPericoKosatkaApproachVehicle.js create mode 100644 gtav-interactive-map/loadScripts/cayoPericoWeaponLoadout.js diff --git a/gtav-interactive-map/assets/cayoPericoKosatkaApproachVehicle.json b/gtav-interactive-map/assets/cayoPericoKosatkaApproachVehicle.json new file mode 100644 index 0000000..0c6d977 --- /dev/null +++ b/gtav-interactive-map/assets/cayoPericoKosatkaApproachVehicle.json @@ -0,0 +1,14 @@ +[ + { + "display_name": "North Point Kosatka", + "coords": [83.563413, -94.075928] + }, + { + "display_name": "Paleto Cove Kosatka", + "coords": [76.25826, -140.075684] + }, + { + "display_name": "Mount Gordo Kosatka", + "coords": [78.759229, -22.324219] + } +] diff --git a/gtav-interactive-map/assets/cayoPericoWeaponLoadout.json b/gtav-interactive-map/assets/cayoPericoWeaponLoadout.json new file mode 100644 index 0000000..f0b0343 --- /dev/null +++ b/gtav-interactive-map/assets/cayoPericoWeaponLoadout.json @@ -0,0 +1,35 @@ +{ + "singleMarkers": [ + { + "display_name": "Penris Building", + "coords": [0.35156, -92.955322] + }, + { + "display_name": "Schlongberg Sachs Center", + "coords": [-2.866235, -101.239014] + }, + { + "display_name": "707 Vespucci", + "coords": [-4.82826, -101.733398] + } + ], + "line": [ + { + "coords": [ + [-45.470265, -86.009904], + [36.686041, -42.835693] + ], + "marker_points": [0, 1], + "names": ["Merryweather HQ", "Palmer-Taylor Power Station"], + "display_name": "Weapon Loadout", + "options": { + "color": "#AF4", + "interactive": false + }, + "tooltip_options": { + "permanent": true, + "direction": "center" + } + } + ] +} diff --git a/gtav-interactive-map/gtavIcons/kosatkaRed.svg b/gtav-interactive-map/gtavIcons/kosatkaRed.svg new file mode 100644 index 0000000..9ce5d2f --- /dev/null +++ b/gtav-interactive-map/gtavIcons/kosatkaRed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gtav-interactive-map/gtavIcons/weaponLocker.svg b/gtav-interactive-map/gtavIcons/weaponLocker.svg new file mode 100644 index 0000000..85ff674 --- /dev/null +++ b/gtav-interactive-map/gtavIcons/weaponLocker.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gtav-interactive-map/index.html b/gtav-interactive-map/index.html index 8718fda..c660f5a 100644 --- a/gtav-interactive-map/index.html +++ b/gtav-interactive-map/index.html @@ -49,6 +49,8 @@ + + @@ -87,6 +89,8 @@

Contents

  • Plasma Cutter Locations
  • Fingerprint Cloner Locations
  • Cutting Torch Locations
    • +
  • Weapon Loadout Locations
    • +
  • Approach Vehicle / Kosatka Locations
    • @@ -207,6 +211,18 @@

    Cutting Torch Locations

    +
    +
    +

    Weapon Loadout Locations

    + + +
    +
    +
    +

    Weapon Loadout Locations

    + + +

    Settings

    @@ -262,6 +278,9 @@

    Timers

    Changelog

    All the dates are in CET.

    +

    2024 - 05 - 27 | 00:00 | Version 0.10.0

    +

    Obsoleted the speedrun.com/gtao map for Cayo Perico, by adding all their features. This includes the newly added Weapon Loadout mission markers and the Kosatka Approach Vehicle spawns. I will be working on adding the rest of the actual preps over the next few days.

    +

    Signed: FalB

    2024 - 05 - 24 | 18:13 | Version 0.9.0

    Reformatted a bunch of code, added Cayo Perico Heist Prep locations: Cutting Torch, Fingerprint Cloner, Plasma Cutter

    Signed: FalB

    diff --git a/gtav-interactive-map/loadScripts/cayoPericoKosatkaApproachVehicle.js b/gtav-interactive-map/loadScripts/cayoPericoKosatkaApproachVehicle.js new file mode 100644 index 0000000..1fb7a1f --- /dev/null +++ b/gtav-interactive-map/loadScripts/cayoPericoKosatkaApproachVehicle.js @@ -0,0 +1,15 @@ +function loadCayoPericoKosatkaApproachVehicle(r) { + let layers = genericMarkers( + "kosatkaApproachVehicleDiv", + r, + constantData.icons.kosatkaRed, + "lastPickCayoPericoKosatkaApproachVehicle" + ); + + displayButtons( + "markers-cayopericoheist-kosatkaapproachvehicle-show-all-btn", + "markers-cayopericoheist-kosatkaapproachvehicle-hide-all-btn", + layers, + "lastPickCayoPericoKosatkaApproachVehicle" + ); +} diff --git a/gtav-interactive-map/loadScripts/cayoPericoWeaponLoadout.js b/gtav-interactive-map/loadScripts/cayoPericoWeaponLoadout.js new file mode 100644 index 0000000..418967e --- /dev/null +++ b/gtav-interactive-map/loadScripts/cayoPericoWeaponLoadout.js @@ -0,0 +1,19 @@ +function loadCayoPericoWeaponLoadout(r) { + let layers = genericLine("weaponLoadoutDiv", r.line); + + layers = genericMarkers( + "weaponLoadoutDiv", + r.singleMarkers, + constantData.icons.weaponLocker, + "lastPickCayoPericoWeaponLoadout", + layers, + 1 + ); + + displayButtons( + "markers-cayopericoheist-weaponloadout-show-all-btn", + "markers-cayopericoheist-weaponloadout-hide-all-btn", + layers, + "lastPickCayoPericoWeaponLoadout" + ); +} diff --git a/gtav-interactive-map/script.js b/gtav-interactive-map/script.js index 9eda2ec..80930aa 100644 --- a/gtav-interactive-map/script.js +++ b/gtav-interactive-map/script.js @@ -9,7 +9,7 @@ const weekday = [ ]; let saveData = { - version: "0.9.0", + version: "0.10.0", pointerMode: false, selectedTileLayer: "game", lastZoom: 2, @@ -46,6 +46,8 @@ let saveData = { lastPickCayoPericoPlasmaCutter: "hideAll", lastPickCayoPericoFingerprintCloner: "hideAll", lastPickCayoPericoCuttingTorch: "hideAll", + lastPickCayoPericoWeaponLocker: "hideAll", + lastPickCayoPericoKosatkaApproachVehicle: "hideAll", }; function loadInSaveData(dataStr) { @@ -132,6 +134,12 @@ function loadInSaveData(dataStr) { temporarySaveData.pointerMode = false; } if (temporarySaveData.version === "0.9.0") { + temporarySaveData.version = "0.10.0"; + temporarySaveData.lastPickCayoPericoWeaponLocker = "hideAll"; + temporarySaveData.lastPickCayoPericoKosatkaApproachVehicle = + "hideAll"; + } + if (temporarySaveData.version === "0.10.0") { // Current version } // Here you check the version tag in the savedata and modify it to match the data right after - this way old save data will not be lost. @@ -331,6 +339,10 @@ const constantData = { className: "kosatka", iconSize: [22, 22], }), + kosatkaRed: L.divIcon({ + className: "kosatka red", + iconSize: [22, 22], + }), plane: L.divIcon({ className: "plane", iconSize: [22, 22], @@ -375,6 +387,10 @@ const constantData = { className: "collectible truck movieprop rebel", iconSize: [22, 22], }), + weaponLocker: L.divIcon({ + className: "weaponLocker", + iconSize: [22, 22], + }), }, }; @@ -501,6 +517,16 @@ async function loadDynamicData() { .then((r) => r.json()) .then(loadCayoPericoCuttingTorch) ); + x.push( + fetch("./assets/cayoPericoWeaponLoadout.json") + .then((r) => r.json()) + .then(loadCayoPericoWeaponLoadout) + ); + x.push( + fetch("./assets/cayoPericoKosatkaApproachVehicle.json") + .then((r) => r.json()) + .then(loadCayoPericoKosatkaApproachVehicle) + ); // x.push( // fetch("./assets/buildings.json").then(r=>r.json()).then(r=>{ // for (marker of r) { diff --git a/gtav-interactive-map/stylesheet.css b/gtav-interactive-map/stylesheet.css index f2c9282..025df49 100644 --- a/gtav-interactive-map/stylesheet.css +++ b/gtav-interactive-map/stylesheet.css @@ -183,10 +183,18 @@ ul { flex-direction: column; } +.weaponLocker { + background-image: url("gtavIcons/weaponLocker.svg"); +} + .kosatka { background-image: url("gtavIcons/kosatka.svg"); } +.kosatka.red { + background-image: url("gtavIcons/kosatkaRed.svg"); +} + .plane { background-image: url("gtavIcons/plane.svg"); } @@ -204,7 +212,7 @@ ul { } .lamardavis { - background-image: url("gtavIcons/lamarDavis.svg") + background-image: url("gtavIcons/lamarDavis.svg"); } .playingcard {