update

scripts/ui/card_grid.gd

@@ -1,13 +1,13 @@
 class_name CardGrid
 extends ScrollContainer
-## Scrollbares Kartenraster mit Beschriftung unter jeder Karte.
+## Scrollbares Kartenraster.
 
 signal card_clicked(card: Cards.Card)
 
-const COLS := 7
-const CW := 100
-const CH := 140
-const GAP := 12
+const COLS := 6
+const CW := 112
+const CH := 157
+const GAP := 14
 
 var grid: GridContainer
 
@@ -24,19 +24,16 @@ func _init(rect: Rect2) -> void:
     add_child(grid)
 
 
-## cards: Karten; label_fn(card) -> String; dim_fn(card) -> bool; rarity_fn(card) -> String (Optik)
-func fill(cards: Array, label_fn: Callable, dim_fn: Callable, rarity_fn: Callable = Callable()) -> void:
+## cards: Karten; rarity_fn(card) -> String: die Stufe, die die Karte zeigt (Optik)
+func fill(cards: Array, rarity_fn: Callable) -> void:
     Style.clear(grid)
     for c in cards:
         var cell := Control.new()
-        cell.custom_minimum_size = Vector2(CW, CH + 16)
+        cell.custom_minimum_size = Vector2(CW, CH)
         cell.mouse_filter = Control.MOUSE_FILTER_IGNORE
-        var v := CardView.new(c, Vector2(CW, CH), true, rarity_fn.call(c) if rarity_fn.is_valid() else "gewöhnlich")
-        v.dim = dim_fn.call(c)
+        var v := CardView.new(c, Vector2(CW, CH), true, rarity_fn.call(c))
         v.clicked.connect(func(_view): card_clicked.emit(c))
         cell.add_child(v)
-        var text: String = label_fn.call(c)
-        Style.label(cell, text, 12, Style.MUTED if v.dim else Style.TEXT, Rect2(0, CH + 1, CW, 16), "center")
         grid.add_child(cell)