-
- ![Player Card]()
-
Loading...
-Level: --
+
+ ![Player Card]()
+
Loading...
+Level: --
-
+
- Aktueller Rang
-Unranked
+Unranked
0 RR
-
-
Berechnete Performance
- -
-
@@ -96,9 +92,8 @@
const mode = document.getElementById('matchModeSelect').value;
const btn = document.getElementById('searchBtn');
- // Splitte Name und Tag anhand des '#'
if (!riotId.includes('#')) {
- alert("Bitte gib die Riot ID im Format Name#TAG an (z.B. TenZ#NA1)!");
+ alert("Format ungültig! Bitte nutze Name#TAG (z.B. TenZ#NA1)");
return;
}
@@ -106,11 +101,6 @@
const name = parts[0].trim();
const tag = parts[1].trim();
- if (!name || !tag) {
- alert("Name oder Tag darf nicht leer sein!");
- return;
- }
-
btn.innerText = "Analysiere...";
btn.disabled = true;
@@ -119,7 +109,7 @@
const data = await response.json();
if (response.ok && data.status === "success") {
- // Basisdaten füllen
+ // Dashboard füllen
document.getElementById('playerNameTag').innerText = `${data.account.name}#${data.account.tag}`;
document.getElementById('playerLevel').innerText = `Level: ${data.account.level}`;
document.getElementById('playerCard').src = data.account.card_url || 'https://media.valorant-api.com/playercards/9fb348bc-41a4-91ad-d131-1ca1efdc3535/smallart.png';
@@ -127,53 +117,75 @@
document.getElementById('playerRank').innerText = data.rank.current_tier_name;
document.getElementById('playerRR').innerText = `${data.rank.ranking_in_tier} RR`;
- // Statistiken füllen
document.getElementById('statWinrate').innerText = data.calculated_stats.win_rate;
document.getElementById('statKD').innerText = data.calculated_stats.kd_ratio;
document.getElementById('statADR').innerText = data.calculated_stats.avg_damage_round;
document.getElementById('statMatches').innerText = data.calculated_stats.matches_analyzed;
- // Agenten füllen
+ // Agenten Boxen
const agentContainer = document.getElementById('agentContainer');
agentContainer.innerHTML = '';
- if (data.top_agents.length === 0) {
- agentContainer.innerHTML = '
- Winrate
- 0%
-
-
- K/D Ratio
- 0.0
-
-
- Ø Schaden / Runde (ADR)
- 0.0
-
-
- Analysierte Matches
- 0
-
+
+
+
+
+
+ Winrate
+ 0%
-
-
-
- Top Agenten
- +
+ K/D Ratio
+ 0.0
+
+
+ Ø Schaden / Rnd.
+ 0.0
+
+
+ Matches Analysiert
+ 0
-
Match Historie (Letzte 15 Matches)
-
-
+
+
Top Agenten
+
+
Match Historie (Letzte 15 Matches)
+
+
+ Keine Daten verfügbar.
'; - } else { - data.top_agents.forEach(agent => { - agentContainer.insertAdjacentHTML('beforeend', ` -
- ${agent.name}
- ${agent.count}x gespielt
-
- `);
- });
- }
+ data.top_agents.forEach(agent => {
+ agentContainer.insertAdjacentHTML('beforeend', `
+
+ ${agent.name}
+ ${agent.count}x
+
+ `);
+ });
- // Match Historie aufbauen
+ // Match History sauber rendern (Wie dein Altes liebgewonnenes Layout!)
const historyContainer = document.getElementById('matchHistoryContainer');
historyContainer.innerHTML = '';
if (!data.matches || data.matches.length === 0) {
- historyContainer.innerHTML = 'Keine Matches in diesem Spielmodus gefunden.
'; + historyContainer.innerHTML = 'Keine Matches gefunden.
'; } else { data.matches.forEach(match => { - const borderClass = match.has_won ? 'border-emerald-500/30 bg-emerald-950/10' : 'border-rose-500/30 bg-rose-950/10'; - const textClass = match.has_won ? 'text-emerald-400' : 'text-rose-400'; - const statusText = match.has_won ? 'SIEG' : 'NIEDERLAGE'; + // Dynamisches Styling je nach Win/Loss + const borderClass = match.has_won ? 'border-emerald-500/30' : 'border-rose-500/30'; + const badgeBg = match.has_won ? 'bg-emerald-500/20 text-emerald-300' : 'bg-rose-500/20 text-rose-300'; + const statusLabel = match.has_won ? 'WIN' : 'LOSS'; + + // RR String bauen (+ / - oder verstecken wenn Modus != Comp) + let rrDisplay = ''; + if (match.mmr_change !== null && mode === 'competitive') { + if (match.mmr_change > 0) { + rrDisplay = `+${match.mmr_change} RR`; + } else if (match.mmr_change < 0) { + rrDisplay = `${match.mmr_change} RR`; + } else { + rrDisplay = `0 RR`; + } + } historyContainer.insertAdjacentHTML('beforeend', ` -
-
- 
+
+
+
+
+
+
+
-
- ${match.agent}
- ${match.map} • ${match.mode}
+
+ ${match.agent}
+ ${statusLabel}
+
+ ${match.map} • ${match.mode}
- ${statusText} (${match.score})
- KDA: ${match.kills} / ${match.deaths} / ${match.assists}
+
+
`);
});
@@ -183,10 +195,10 @@
document.getElementById('searchSection').classList.add('hidden');
document.getElementById('profileSection').classList.remove('hidden');
} else {
- alert("Fehler: " + (data.message || "Spieler nicht gefunden. Überprüfe Name, TAG und Spielmodus."));
+ alert("Fehler: " + (data.message || "Spieler konnte nicht geladen werden. Checke Name, Tag und Modus."));
}
} catch (error) {
- alert("Verbindungsfehler oder API antwortet nicht.");
+ alert("Verbindungsabbruch oder API temporär offline.");
} finally {
btn.innerText = "Analyse starten";
btn.disabled = false;
diff --git a/AstraOS/astra_os.py b/AstraOS/astra_os.py
index f4b3cc1..fe761c9 100644
--- a/AstraOS/astra_os.py
+++ b/AstraOS/astra_os.py
@@ -1540,12 +1540,11 @@ def get_valorant_stats(name, tag):
if not VALORANT_API_KEY:
return jsonify({"status": "error", "message": "API-Key Konfiguration fehlt in der .env-Datei."}), 500
- # Filter/Match-Typ aus den Query-Parametern auslesen (Standard: competitive)
match_mode = request.args.get('mode', 'competitive')
headers = {"Authorization": VALORANT_API_KEY}
try:
- # 1. Account Basis-Daten abrufen
+ # 1. Account Basis-Daten
acc_res = requests.get(f"{VALORANT_API_BASE}/v1/account/{name}/{tag}?force=true", headers=headers, timeout=10)
if acc_res.status_code != 200:
return jsonify(
@@ -1559,13 +1558,22 @@ def get_valorant_stats(name, tag):
mmr_data = mmr_res.json().get('data', {}) if mmr_res.status_code == 200 else {}
if not mmr_data: mmr_data = {}
- # 3. Match Historie abrufen (Größe auf 15 erhöht, dynamischer Modus)
+ # 3. RR-Verlauf (MMR History) für Plus/Minus Erkennung abrufen
+ rr_history = {}
+ if match_mode == 'competitive':
+ history_res = requests.get(f"{VALORANT_API_BASE}/v1/mmr-history/{region}/{name}/{tag}", headers=headers,
+ timeout=10)
+ if history_res.status_code == 200:
+ for h_item in history_res.json().get('data', []):
+ m_id = h_item.get('match_id')
+ if m_id:
+ rr_history[m_id] = h_item.get('mmr_change_to_last_game', 0)
+
+ # 4. Match Historie (Größe 15)
matches_res = requests.get(f"{VALORANT_API_BASE}/v3/matches/{region}/{name}/{tag}?size=15&mode={match_mode}",
headers=headers, timeout=10)
matches_list = matches_res.json().get('data', []) if matches_res.status_code == 200 else []
- if not matches_list: matches_list = []
- # Statistiken und Match-Details vorbereiten
match_count = 0
wins = 0
total_kills = 0
@@ -1578,9 +1586,9 @@ def get_valorant_stats(name, tag):
for match in matches_list:
metadata = match.get('metadata', {})
+ match_id = metadata.get('matchid')
players = match.get('players', {}).get('all_players', [])
- # Eigenen Spieler im Match suchen
me = next((p for p in players if
p.get('name', '').lower() == name.lower() and p.get('tag', '').lower() == tag.lower()), None)
if not me:
@@ -1590,7 +1598,6 @@ def get_valorant_stats(name, tag):
agent_name = me.get('character', 'Unknown')
agent_counts[agent_name] = agent_counts.get(agent_name, 0) + 1
- # Stats sammeln
stats = me.get('stats', {})
m_kills = stats.get('kills', 0)
m_deaths = stats.get('deaths', 0)
@@ -1600,7 +1607,6 @@ def get_valorant_stats(name, tag):
total_deaths += m_deaths
total_assists += m_assists
- # Rundenauswertung für Win/Loss & Schaden
teams = match.get('teams', {})
my_team_color = me.get('team', '').lower()
my_team_data = teams.get(my_team_color, {})
@@ -1609,43 +1615,43 @@ def get_valorant_stats(name, tag):
if has_won:
wins += 1
- # Runden-Zähler extrahieren
red_rounds = teams.get('red', {}).get('rounds_won', 0) or 0
blue_rounds = teams.get('blue', {}).get('rounds_won', 0) or 0
rounds_played = red_rounds + blue_rounds
total_rounds += rounds_played
- # Score-Anzeige formatieren (z.B. "13 - 5")
if my_team_color == 'red':
score_str = f"{red_rounds} : {blue_rounds}"
else:
score_str = f"{blue_rounds} : {red_rounds}"
- # Schaden aus Runden summieren
match_damage = 0
round_data = match.get('rounds', [])
for r in round_data:
- player_stats = r.get('player_stats', [])
- p_round_stat = next((ps for ps in player_stats if ps.get('player_name', '').lower() == name.lower()),
- None)
+ p_round_stat = next(
+ (ps for ps in r.get('player_stats', []) if ps.get('player_name', '').lower() == name.lower()), None)
if p_round_stat:
match_damage += p_round_stat.get('damage', 0)
total_damage += match_damage
- # Einzelnes Match für die Liste aufbereiten
+ # Bestimme den RR Change aus unserer History-Map
+ mmr_change = rr_history.get(match_id, 0) if match_mode == 'competitive' else None
+
processed_matches.append({
"map": metadata.get('map', 'Unknown'),
"mode": metadata.get('mode', 'Unknown'),
"agent": agent_name,
"agent_img": me.get('assets', {}).get('agent', {}).get('small', ''),
+ # Map-Hintergrundbild aus den Match-Metadaten ziehen
+ "map_img": metadata.get('images', {}).get('wide', ''),
"kills": m_kills,
"deaths": m_deaths,
"assists": m_assists,
"score": score_str,
- "has_won": has_won
+ "has_won": has_won,
+ "mmr_change": mmr_change
})
- # Globale Schnitte berechnen
kd_calculated = round(total_kills / total_deaths, 2) if total_deaths > 0 else total_kills
winrate_calculated = round((wins / match_count) * 100, 1) if match_count > 0 else 0
adr_calculated = round(total_damage / total_rounds, 1) if total_rounds > 0 else 0
+
+
+ KDA: ${match.kills} / ${match.deaths} / ${match.assists}
+ Ergebnis: ${match.score}
+
+
+ ${rrDisplay}
+