- Added custom icon for float planes

- 1% chance the map says FiB Spy Satellite as its title
- Add view on map button to logs and player page
- Some map bugfixes

Author: coalaura

public/images/icons/float_plane.png

@@ -106,9 +106,9 @@
                             </inertia-link>
                         </td>
                         <td class="px-6 py-3 border-t mobile:block" :title="t('global.server_timeout')">
-                            <span class="font-semibold" v-if="log.status.status === 'online'">
+                            <a class="font-semibold" :href="'/map#server_' + log.status.serverId" :title="t('global.view_map')" v-if="log.status.status === 'online'">
                                 {{ log.status.serverId }}
-                            </span>
+                            </a>
                             <span class="font-semibold" v-else>
                                 {{ t('global.status.' + log.status.status) }}
                             </span>

resources/js/Pages/Logs/Index.vue

@@ -3,7 +3,7 @@
 
         <portal to="title">
             <h1 class="dark:text-white !mb-2">
-                {{ t('map.title') }}
+                <span id="map_title">{{ t('map.title') }}</span>
                 <select class="inline-block w-90 ml-4 px-4 py-2 bg-gray-200 dark:bg-gray-600 border rounded"
                         id="server">
                     <option v-for="server in servers" :key="server.name" :value="server.name">{{ server.name }}</option>
@@ -17,7 +17,7 @@
         <portal to="actions">
             <div>
                 <!-- Stop tracking -->
-                <button class="px-5 py-2 mr-3 font-semibold text-white rounded bg-danger dark:bg-dark-danger mobile:block mobile:w-full mobile:m-0 mobile:mb-3" @click="trackedPlayer = null" v-if="trackedPlayer">
+                <button class="px-5 py-2 mr-3 font-semibold text-white rounded bg-danger dark:bg-dark-danger mobile:block mobile:w-full mobile:m-0 mobile:mb-3" @click="stopTracking()" v-if="trackedPlayer">
                     <i class="fas fa-stop mr-1"></i>
                     {{ t('map.stop_track') }}
                 </button>
@@ -182,6 +182,10 @@ export default {
                 lng: coords.x
             }
         },
+        stopTracking() {
+            this.trackedPlayer = null;
+            window.location.hash = '';
+        },
         hostname(isSocket) {
             const isDev = window.location.hostname === 'localhost';
 
@@ -371,7 +375,7 @@ export default {
                             isPassenger = 'vehicle' in player && player.vehicle && !player.vehicle.driving,
                             isInvisible = 'invisible' in player && player.invisible,
                             isDead = player.character && 'dead' in player.character && player.character.dead,
-                            speed = 'vehicle' in player && player.vehicle && 'speed' in player.vehicle ? player.vehicle.speed : null,
+                            speed = 'speed' in player ? player.speed : null,
                             icon = _this.getIcon(player, isDriving, isPassenger, isInvisible, isDead),
                             vehicle = _this.getVehicleType(player.vehicle),
                             isStaff = _this.staff.includes(player.steamIdentifier);
@@ -459,6 +463,11 @@ export default {
 </tr>`.replace(/\r?\n(\s{4})?/gm, ''));
                         }
 
+                        if (_this.trackedPlayer && (_this.trackedPlayer === 'server_' + player.source || (_this.trackedPlayer.startsWith('steam:') && _this.trackedPlayer === player.steamIdentifier))) {
+                            _this.trackedPlayer = id;
+                            window.location.hash = id;
+                        }
+
                         if (_this.trackedPlayer === id) {
                             extra += '<br><br><a href="#" class="track-cid" data-trackid="stop">' + _this.t('map.stop_track') + '</a>';
 
@@ -649,11 +658,19 @@ export default {
 
         $(document).ready(function () {
             $('#server').on('change', function () {
+                _this.firstRefresh = true;
+
                 _this.doMapRefresh($(this).val());
             });
             $('#server').trigger('change');
         });
 
+        if (Math.round(Math.random() * 100) === 1) { // 1% chance it says fib spy satellite map
+            $(document).ready(function() {
+                $('#map_title').text(_this.t('map.spy_satellite'));
+            });
+        }
+
         VueInstance = this;
     }
 };

resources/js/Pages/Map/Index.vue

@@ -35,6 +35,11 @@
 
         <portal to="actions">
             <div>
+                <!-- View on Map -->
+                <inertia-link class="px-5 py-2 mr-3 font-semibold text-white rounded bg-blue-600 dark:bg-blue-500 mobile:block mobile:w-full mobile:m-0 mobile:mb-3" :href="'/map#' + player.steamIdentifier" v-if="player.status.status === 'online'">
+                    <i class="fas fa-envelope-open-text"></i>
+                    {{ t('global.view_map') }}
+                </inertia-link>
                 <!-- StaffPM -->
                 <button class="px-5 py-2 mr-3 font-semibold text-white rounded bg-blue-600 dark:bg-blue-500 mobile:block mobile:w-full mobile:m-0 mobile:mb-3" @click="isStaffPM = true" v-if="player.status.status === 'online'">
                     <i class="fas fa-envelope-open-text"></i>

resources/js/Pages/Players/Show.vue

@@ -63,12 +63,17 @@
             "predator"
         ]
     },
+    "float_plane": {
+        "size": 28,
+        "models": [
+            "dodo"
+        ]
+    },
     "light_plane": {
         "size": 28,
         "models": [
             "alphaz1",
             "cuban800",
-            "dodo",
             "duster",
             "howard",
             "mammatus",

resources/js/data/vehicles.json

@@ -11,6 +11,7 @@
         "view": "View",
         "refresh": "Refresh",
         "delete": "Delete",
+        "view_map": "View on Live-Map",
         "status": {
             "online": "Online",
             "offline": "Offline",
@@ -63,7 +64,8 @@
         "track": "Track character",
         "stop_track": "Stop tracking character",
         "afk_title": "AFK Players",
-        "command": "tp"
+        "command": "tp",
+        "spy_satellite": "FiB Spy Satellite Map"
     },
     "nav": {
         "dark": "Dark",