diff --git a/assets/css/custom.css b/assets/css/custom.css index 9663d60..0e8e49b 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -190,14 +190,4 @@ th { td { padding: 10px; border-bottom: 1px solid var(--nord-1); -} - -@keyframes blink { - 0% { opacity: 1; } - 50% { opacity: 0.3; } - 100% { opacity: 1; } -} - -.blink-effect { - animation: blink 1.5s infinite ease-in-out; -} +} \ No newline at end of file diff --git a/gm_console.php b/gm_console.php index 2148c2e..daa7daf 100644 --- a/gm_console.php +++ b/gm_console.php @@ -297,16 +297,13 @@ if ($view === 'sector') { $p['terrestrial_controls'] = []; $p['cities'] = isset($city_counts[$p['id']]) ? array_fill(0, $city_counts[$p['id']], []) : []; - $dynamic_status = (!empty($p['status']) && $p['status'] !== 'sta_auto') ? $p['status'] : 'sta_inhabited'; + $dynamic_status = calculateCelestialStatus($p, $db, $statuses_map); $sector_data[$p['sector_id']][$p['slot']] = ['status' => $dynamic_status, 'type' => $p['type']]; if (!in_array($p['sector_id'], $active_sectors)) { $active_sectors[] = (int)$p['sector_id']; } } } function getStatusColor($status, $type, $statuses_map, $object_types_map) { -function getStatusBlink($status, $statuses_map) { - return (strpos($statuses_map[$status]['color'] ?? '', 'blink') !== false) ? 'blink-effect' : ''; -} if ($type === 'empty') return 'rgba(255,255,255,0.05)'; $c = $statuses_map[$status]['color'] ?? 'rgba(255,255,255,0.05)'; return str_replace(';blink', '', $c); } @@ -480,7 +477,7 @@ function getStatusBlink($status, $statuses_map) { $dotColor = 'rgba(255,255,255,0.05)'; if (isset($sector_data[$s][$p])) { $dotColor = getStatusColor($sector_data[$s][$p]['status'], $sector_data[$s][$p]['type'], $statuses_map, $object_types_map); } ?> -
" style="background-color: ;">
+
SECTEUR
diff --git a/index.php b/index.php index 328b7af..f01d7c6 100644 --- a/index.php +++ b/index.php @@ -167,7 +167,7 @@ if ($view === 'sector') { $p['terrestrial_controls'] = []; // Simplified $p['cities'] = isset($city_counts[$p['id']]) ? array_fill(0, $city_counts[$p['id']], []) : []; - $dynamic_status = (!empty($p['status']) && $p['status'] !== 'sta_auto') ? $p['status'] : 'sta_inhabited'; + $dynamic_status = calculateCelestialStatus($p, $db, $statuses_map); $sector_data[$p['sector_id']][$p['slot']] = ['status' => $dynamic_status, 'type' => $p['type']]; if (!in_array($p['sector_id'], $active_sectors)) { $active_sectors[] = (int)$p['sector_id']; } } @@ -175,9 +175,6 @@ if ($view === 'sector') { } function getStatusColor($status, $statuses_map) { -function getStatusBlink($status, $statuses_map) { - return (strpos($statuses_map[$status]['color'] ?? '', 'blink') !== false) ? 'blink-effect' : ''; -} $c = $statuses_map[$status]['color'] ?? 'rgba(255,255,255,0.05)'; return str_replace(';blink', '', $c); } ?> @@ -651,7 +648,7 @@ function getStatusBlink($status, $statuses_map) { $dotColor = 'rgba(255,255,255,0.05)'; if (isset($sector_data[$s][$p])) { $dotColor = getStatusColor($sector_data[$s][$p]['status'], $statuses_map); } ?> -
" style="background-color: ;">
+
SECTEUR