update

scripts/ui/collection_screen.gd

@@ -1,7 +1,7 @@
 class_name CollectionScreen
 extends Control
-## Sammlung: alle Karten gehören dir. Gesammelt wird die Seltenheitsstufe — reine Optik.
-## Aufwerten kostet Staub, eine Stufe abgeben bringt Staub.
+## Sammlung: alle Karten des Spiels, die fehlenden abgedunkelt. Eigene Karten lassen sich
+## aufwerten (Staub) oder zerlegen (bringt Staub), fehlende herstellen (Staub).
 
 var app
 var filter := ""
@@ -15,6 +15,7 @@ var preview_holder: Control
 var info_label: Label
 var b_dismantle: Button
 var b_upgrade: Button
+var b_craft: Button
 
 
 func _ready() -> void:
@@ -43,6 +44,7 @@ func _ready() -> void:
     info_label = Style.label(self, "", 15, Style.MUTED, Rect2(840, 476, 380, 30), "center")
     b_upgrade = Style.button(self, "", Rect2(840, 530, 380, 46), upgrade, Style.PRIMARY)
     b_dismantle = Style.button(self, "", Rect2(840, 586, 380, 46), dismantle, Color("5a3c28"))
+    b_craft = Style.button(self, "", Rect2(840, 530, 380, 46), craft, Style.PRIMARY)
     msg_label = Style.label(self, "", 15, Style.GREEN, Rect2(840, 650, 380, 48), "center")
     refresh()
 
@@ -57,7 +59,7 @@ func set_filter(e: String) -> void:
     refresh()
 
 
-## Aufgewertete Karten zuerst, sonst in Kartenreihenfolge.
+## Eigene Karten zuerst (höhere Stufen vorn), dann die fehlenden, sonst in Kartenreihenfolge.
 func cards() -> Array:
     var out: Array = Cards.all().duplicate()
     if filter != "":
@@ -69,7 +71,10 @@ func cards() -> Array:
     var order := {}
     for i in out.size():
         order[out[i].id] = i
-    out.sort_custom(func(a, b): return p.level(a.id) > p.level(b.id) if p.level(a.id) != p.level(b.id) else order[a.id] < order[b.id])
+    out.sort_custom(func(a, b):
+        if p.owns(a.id) != p.owns(b.id):
+            return p.owns(a.id)
+        return p.level(a.id) > p.level(b.id) if p.level(a.id) != p.level(b.id) else order[a.id] < order[b.id])
     return out
 
 
@@ -111,11 +116,31 @@ func dismantle() -> void:
     refresh()
 
 
+func craft() -> void:
+    if selected == null:
+        return
+    var err: String = app.profile.craft(selected.id)
+    if err == "":
+        app.sfx.play("combo")
+        app.save()
+        say(tr("%s hergestellt") % selected.title(), true)
+    else:
+        say(err, false)
+    refresh()
+
+
 func refresh() -> void:
     var p: Profile = app.profile
     dust_label.text = "Staub: %d" % p.dust
-    grid.fill(cards(), func(c): return p.rarity(c.id))
+    var shown := cards()
+    grid.fill(shown.map(func(c): return c.leveled(p.level(c.id))), func(c): return Cards.RARITIES[c.look])
+    var views := grid.views()
+    for i in views.size():
+        views[i].dim = not p.owns(shown[i].id)
     Style.clear(preview_holder)
+    b_craft.visible = false
+    b_upgrade.visible = true
+    b_dismantle.visible = true
     if selected == null:
         info_label.text = "Keine Karte gewählt"
         b_upgrade.text = "Aufwerten"
@@ -123,11 +148,19 @@ func refresh() -> void:
         b_upgrade.disabled = true
         b_dismantle.disabled = true
         return
-    var v := CardView.new(selected, Vector2(220, 308), false, p.rarity(selected.id))
+    var v := CardView.new(selected.leveled(p.level(selected.id)), Vector2(220, 308), false, p.rarity(selected.id))
     v.position = Vector2(920, 152)
     v.mouse_filter = Control.MOUSE_FILTER_IGNORE
     preview_holder.add_child(v)
     var lvl := p.level(selected.id)
+    if not p.owns(selected.id):
+        info_label.text = tr("Nicht in der Sammlung")
+        b_upgrade.visible = false
+        b_dismantle.visible = false
+        b_craft.visible = true
+        b_craft.text = tr("Herstellen (%d Staub)") % Profile.CRAFT_COST
+        b_craft.disabled = p.dust < Profile.CRAFT_COST
+        return
     info_label.text = "%s · %s" % [tr(selected.combo()), tr(p.rarity(selected.id))]
     if lvl >= Cards.RARITIES.size() - 1:
         b_upgrade.text = "Höchste Stufe"
@@ -136,5 +169,5 @@ func refresh() -> void:
         var next: String = Cards.RARITIES[lvl + 1]
         b_upgrade.text = "Aufwerten zu %s (%d Staub)" % [tr(next), Profile.DUST_UPGRADE[next]]
         b_upgrade.disabled = p.dust < Profile.DUST_UPGRADE[next]
-    b_dismantle.text = "Zerlegen" if lvl == 0 else "Zerlegen (+%d Staub)" % Profile.DUST_DISMANTLE[Cards.RARITIES[lvl]]
-    b_dismantle.disabled = lvl == 0
+    b_dismantle.text = "Zerlegen (+%d Staub)" % Profile.DUST_DISMANTLE[Cards.RARITIES[lvl]]
+    b_dismantle.disabled = false