0.10.0 release

FallBackITA27 · May 26, 2024 · c16c426 · c16c426
1 parent a285928
commit c16c426
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 2 deletions.
diff --git a/gtav-interactive-map/assets/cayoPericoKosatkaApproachVehicle.json 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
@@ -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
diff --git a/gtav-interactive-map/gtavIcons/weaponLocker.svg b/gtav-interactive-map/gtavIcons/weaponLocker.svg
diff --git a/gtav-interactive-map/index.html b/gtav-interactive-map/index.html
@@ -49,6 +49,8 @@
     <script defer src="./loadScripts/cayoPericoPlasmaCutter.js"></script>
     <script defer src="./loadScripts/cayoPericoFingerprintCloner.js"></script>
     <script defer src="./loadScripts/cayoPericoCuttingTorch.js"></script>
+    <script defer src="./loadScripts/cayoPericoWeaponLoadout.js"></script>
+    <script defer src="./loadScripts/cayoPericoKosatkaApproachVehicle.js"></script>
     <script defer src="./script.js"></script>
 </head>
 <body>
@@ -87,6 +89,8 @@ <h2>Contents</h2>
                                 <li><a href="#markers-cayopericoheist-plasmacutter">Plasma Cutter Locations</a></li>
                                 <li><a href="#markers-cayopericoheist-fingerprintcloner">Fingerprint Cloner Locations</a></li>
                                 <li><a href="#markers-cayopericoheist-cuttingtorch">Cutting Torch Locations</a></li>
+                                <li><a href="#markers-cayopericoheist-weaponloadout">Weapon Loadout Locations</a></li>
+                                <li><a href="#markers-cayopericoheist-kosatkaapproachvehicle">Approach Vehicle / Kosatka Locations</a></li>
                             </ul>
                         </li>
                     </ol>
@@ -207,6 +211,18 @@ <h2>Cutting Torch Locations</h2>
         <button id="markers-cayopericoheist-cuttingtorch-show-all-btn">Show All</button>
         <button id="markers-cayopericoheist-cuttingtorch-hide-all-btn">Hide All</button>
         <div id="cuttingTorchDiv"></div>
+        <hr class="fifty">
+        <div id="markers-cayopericoheist-weaponloadout"></div>
+        <h2>Weapon Loadout Locations</h2>
+        <button id="markers-cayopericoheist-weaponloadout-show-all-btn">Show All</button>
+        <button id="markers-cayopericoheist-weaponloadout-hide-all-btn">Hide All</button>
+        <div id="weaponLoadoutDiv"></div>
+        <hr class="fifty">
+        <div id="markers-cayopericoheist-kosatkaapproachvehicle"></div>
+        <h2>Weapon Loadout Locations</h2>
+        <button id="markers-cayopericoheist-kosatkaapproachvehicle-show-all-btn">Show All</button>
+        <button id="markers-cayopericoheist-kosatkaapproachvehicle-hide-all-btn">Hide All</button>
+        <div id="kosatkaApproachVehicleDiv"></div>
         <hr>
         <div id="settings">
         <h2>Settings</h2>
@@ -262,6 +278,9 @@ <h3>Timers</h3>
         <div id="changelog"></div>
         <h2>Changelog</h2>
         <p>All the dates are in <a target="_blank" href="https://en.wikipedia.org/wiki/Central_European_Time">CET</a>.</p>
+        <h3>2024 - 05 - 27 | 00:00 | Version 0.10.0</h3>
+        <p>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.</p>
+        <p class="sig">Signed: FalB</p>
         <h3>2024 - 05 - 24 | 18:13 | Version 0.9.0</h3>
         <p>Reformatted a bunch of code, added Cayo Perico Heist Prep locations: Cutting Torch, Fingerprint Cloner, Plasma Cutter</p>
         <p class="sig">Signed: FalB</p>

diff --git a/gtav-interactive-map/loadScripts/cayoPericoKosatkaApproachVehicle.js 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
@@ -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
@@ -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
@@ -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 {