update

scripts/ui/style.gd

@@ -2,12 +2,8 @@ class_name Style
 ## Farben, Schriften, Theme und Zeichenhilfen.
 
 const FONT: FontFile = preload("res://assets/fonts/DejaVuSans.ttf")
-static var font_scale := 1.0  # Einstellung „Große Schrift“
-
-
-static func fs(size: int) -> int:
-    return int(round(size * font_scale))
 const FONT_BOLD: FontFile = preload("res://assets/fonts/DejaVuSans-Bold.ttf")
+static var font_scale := 1.0  # Einstellung „Große Schrift“
 
 const BG := Color("1a1c24")
 const PANEL := Color("282b36")
@@ -20,6 +16,12 @@ const RED := Color("e65555")
 const BLUE := Color("6eaaf0")
 const YELLOW := Color("ffe65a")
 const ORANGE := Color("ff963c")
+const PURPLE := Color("8c78dc")
+
+
+## Schriftgröße mit der Einstellung „Große Schrift“.
+static func fs(size: int) -> int:
+    return int(round(size * font_scale))
 
 
 static func darker(c: Color, f: float = 0.65) -> Color:
@@ -244,65 +246,42 @@ static func border(ci: CanvasItem, rect: Rect2, color: Color, width: int, radius
     ci.draw_style_box(sb, rect)
 
 
+## Hintergrund in Elementfarbe; ein verschmolzenes Wesen zeigt seine Elemente als Streifen.
 static func fill_elements(ci: CanvasItem, rect: Rect2, elements: Array, radius: int = 8) -> void:
-    var a: Color = Cards.ELEMENT_COLORS[elements[0]]
     if elements.size() == 1:
-        ci.draw_style_box(box(a, radius), rect)
-    elif elements[0] == elements[1]:
-        # Doppeltes Element: gleiche Farbe mit zweitem, hellem Innenrahmen
-        ci.draw_style_box(box(a, radius), rect)
-        border(ci, rect.grow(-5), lighter(a, 0.27), 2, maxi(2, radius - 3))
-    else:
-        var b: Color = Cards.ELEMENT_COLORS[elements[1]]
-        var half := floorf(rect.size.x / 2)
-        var left := StyleBoxFlat.new()
-        left.bg_color = a
-        left.corner_radius_top_left = radius
-        left.corner_radius_bottom_left = radius
-        var right := StyleBoxFlat.new()
-        right.bg_color = b
-        right.corner_radius_top_right = radius
-        right.corner_radius_bottom_right = radius
-        ci.draw_style_box(left, Rect2(rect.position, Vector2(half, rect.size.y)))
-        ci.draw_style_box(right, Rect2(rect.position + Vector2(half, 0), Vector2(rect.size.x - half, rect.size.y)))
+        ci.draw_style_box(box(Cards.ELEMENT_COLORS[elements[0]], radius), rect)
+        return
+    var n := elements.size()
+    var w := rect.size.x / n
+    for i in n:
+        var sb := StyleBoxFlat.new()
+        sb.bg_color = Cards.ELEMENT_COLORS[elements[i]]
+        if i == 0:
+            sb.corner_radius_top_left = radius
+            sb.corner_radius_bottom_left = radius
+        if i == n - 1:
+            sb.corner_radius_top_right = radius
+            sb.corner_radius_bottom_right = radius
+        ci.draw_style_box(sb, Rect2(rect.position + Vector2(floorf(i * w), 0), Vector2(ceilf(w), rect.size.y)))
 
 
-# --- Kartensymbole (prozedural, je Element und Kartenart) --------------------------
+# --- Kartensymbole (prozedural, je Element) --------------------------
 
 static func glyph(ci: CanvasItem, card, center: Vector2, size: float) -> void:
     var variant := absi(hash(card.id)) % 3
     var col := lighter(Cards.ELEMENT_COLORS[card.elements[0]], 0.38)
     col.a = 0.95
-    if card.is_trap():
-        # Falle: Kreuz im Kreis
-        ci.draw_arc(center, size * 0.5, 0, TAU, 32, col, maxf(2, size * 0.08))
-        var d := size * 0.28
-        ci.draw_line(center + Vector2(-d, -d), center + Vector2(d, d), col, maxf(2, size * 0.1))
-        ci.draw_line(center + Vector2(-d, d), center + Vector2(d, -d), col, maxf(2, size * 0.1))
-        return
-    if card.kind == "Zauber":
-        _star(ci, center, size * 0.55, Color(col, 0.35))
     var elems: Array = card.elements
-    if elems.size() >= 2 and elems[0] != elems[1]:
-        _element_glyph(ci, elems[0], center + Vector2(-size * 0.28, 0), size * 0.62, variant, col)
-        var col2 := lighter(Cards.ELEMENT_COLORS[elems[1]], 0.38)
-        col2.a = 0.95
-        _element_glyph(ci, elems[1], center + Vector2(size * 0.28, 0), size * 0.62, variant, col2)
-    else:
+    if elems.size() == 1:
         _element_glyph(ci, elems[0], center, size, variant, col)
-        if elems.size() >= 2:
-            ci.draw_arc(center, size * 0.6, 0, TAU, 32, Color(col, 0.7), 2)
-        if elems.size() >= 3:
-            ci.draw_arc(center, size * 0.72, 0, TAU, 40, Color(col, 0.5), 2)
-
-
-static func _star(ci: CanvasItem, c: Vector2, r: float, col: Color) -> void:
-    var pts := PackedVector2Array()
-    for i in 8:
-        var a := TAU * i / 8 - PI / 2
-        var rr := r if i % 2 == 0 else r * 0.45
-        pts.append(c + Vector2(cos(a), sin(a)) * rr)
-    ci.draw_colored_polygon(pts, col)
+        return
+    # Verschmolzen: die ersten beiden Elemente nebeneinander, ab dem dritten ein Ring
+    _element_glyph(ci, elems[0], center + Vector2(-size * 0.28, 0), size * 0.62, variant, col)
+    var col2 := lighter(Cards.ELEMENT_COLORS[elems[1]], 0.38)
+    col2.a = 0.95
+    _element_glyph(ci, elems[1], center + Vector2(size * 0.28, 0), size * 0.62, variant, col2)
+    if elems.size() >= 3:
+        ci.draw_arc(center, size * 0.72, 0, TAU, 40, Color(col, 0.5), 2)
 
 
 static func _element_glyph(ci: CanvasItem, element: String, c: Vector2, size: float, variant: int, col: Color) -> void: