update

scripts/ui/collection_screen.gd

@@ -1,7 +1,7 @@
 class_name CollectionScreen
 extends Control
-## Sammlung: alle Karten mit Besitzstand; ausgewählte Karten lassen sich
-## zerlegen (Staub) oder herstellen.
+## Sammlung: alle Karten gehören dir. Gesammelt wird die Seltenheitsstufe — reine Optik.
+## Aufwerten kostet Staub, eine Stufe abgeben bringt Staub.
 
 var app
 var filter := ""
@@ -14,14 +14,11 @@ var msg_label: Label
 var preview_holder: Control
 var info_label: Label
 var b_dismantle: Button
-var b_craft: Button
-var b_extras: Button
+var b_upgrade: Button
 
 
 func _ready() -> void:
     Style.label(self, "Sammlung", 30, Style.GOLD, Rect2(20, 8, 400, 40), "left", true)
-    Style.label(self, "Karte anklicken, dann zerlegen oder herstellen. Überschuss: alles über %d Kopien." % Game.MAX_COPIES,
-        14, Style.MUTED, Rect2(240, 18, 600, 24))
     Style.button(self, "Alle", Rect2(20, 55, 60, 34), set_filter.bind(""))
     for i in Cards.ELEMENTS.size():
         var e: String = Cards.ELEMENTS[i]
@@ -44,10 +41,9 @@ func _ready() -> void:
     preview_holder.mouse_filter = Control.MOUSE_FILTER_IGNORE
     add_child(preview_holder)
     info_label = Style.label(self, "", 14, Style.MUTED, Rect2(860, 396, 390, 66), "center")
-    b_dismantle = Style.button(self, "", Rect2(860, 470, 390, 44), dismantle, Color("5a3c28"))
-    b_craft = Style.button(self, "", Rect2(860, 524, 390, 44), craft, Color("285a3c"))
-    b_extras = Style.button(self, "", Rect2(860, 600, 390, 44), dismantle_extras)
-    msg_label = Style.label(self, "", 15, Style.GREEN, Rect2(860, 660, 390, 48), "center")
+    b_upgrade = Style.button(self, "", Rect2(860, 480, 390, 44), upgrade, Color("285a3c"))
+    b_dismantle = Style.button(self, "", Rect2(860, 534, 390, 44), dismantle, Color("5a3c28"))
+    msg_label = Style.label(self, "", 15, Style.GREEN, Rect2(860, 600, 390, 48), "center")
     Style.button(self, "Zurück", Rect2(1150, 740, 110, 44), func(): app.show_screen(MenuScreen.new()))
     refresh()
 
@@ -83,71 +79,57 @@ func say(m: String, ok: bool) -> void:
     msg_label.add_theme_color_override("font_color", Style.GREEN if ok else Style.RED)
 
 
+func upgrade() -> void:
+    if selected == null:
+        return
+    var err: String = app.profile.upgrade(selected.id)
+    if err == "":
+        app.sfx.play("play")
+        app.save()
+        say(tr("%s ist jetzt %s") % [selected.title(), tr(app.profile.rarity(selected.id))], true)
+    else:
+        say(err, false)
+    refresh()
+
+
 func dismantle() -> void:
     if selected == null:
         return
+    var lvl: int = app.profile.level(selected.id)
     var err: String = app.profile.dismantle(selected.id)
     if err == "":
         app.sfx.play("click")
         app.save()
-        say(tr("%s zerlegt (+%d Staub)") % [selected.title(), Profile.DUST_DISMANTLE[selected.rarity]], true)
+        say(tr("%s zerlegt (+%d Staub)") % [selected.title(), Profile.DUST_DISMANTLE[Cards.RARITIES[lvl]]], true)
     else:
         say(err, false)
     refresh()
 
 
-func craft() -> void:
-    if selected == null:
-        return
-    var err: String = app.profile.craft(selected.id)
-    if err == "":
-        app.sfx.play("play")
-        app.save()
-        var notes: Array[String] = app.profile.take_notices()
-        say(tr("%s hergestellt") % selected.title() + ("  ·  " + "  ·  ".join(notes) if not notes.is_empty() else ""), true)
-    else:
-        say(err, false)
-    refresh()
-
-
-func dismantle_extras() -> void:
-    var got: int = app.profile.dismantle_extras()
-    if got > 0:
-        app.save()
-        say("Überschuss zerlegt: +%d Staub" % got, true)
-    else:
-        say("Kein Überschuss vorhanden", false)
-    refresh()
-
-
 func refresh() -> void:
     var p: Profile = app.profile
     dust_label.text = "Staub: %d" % p.dust
-    grid.fill(cards(),
-        func(c): return "%dx" % p.collection.get(c.id, 0) if p.collection.get(c.id, 0) > 0 else "fehlt",
-        func(c): return p.collection.get(c.id, 0) == 0)
+    grid.fill(cards(), func(c): return tr(p.rarity(c.id)), func(_c): return false, func(c): return p.rarity(c.id))
     Style.clear(preview_holder)
     if selected == null:
         info_label.text = "Keine Karte gewählt"
+        b_upgrade.text = "Aufwerten"
         b_dismantle.text = "Zerlegen"
-        b_craft.text = "Herstellen"
+        b_upgrade.disabled = true
         b_dismantle.disabled = true
-        b_craft.disabled = true
+        return
+    var v := CardView.new(selected, Vector2(200, 280), false, p.rarity(selected.id))
+    v.position = Vector2(955, 100)
+    v.mouse_filter = Control.MOUSE_FILTER_IGNORE
+    preview_holder.add_child(v)
+    var lvl := p.level(selected.id)
+    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"
+        b_upgrade.disabled = true
     else:
-        var v := CardView.new(selected, Vector2(200, 280))
-        v.position = Vector2(955, 100)
-        v.mouse_filter = Control.MOUSE_FILTER_IGNORE
-        preview_holder.add_child(v)
-        var owned: int = p.collection.get(selected.id, 0)
-        var st: Dictionary = p.card_stats.get(selected.id, {"played": 0, "games": 0, "wins": 0})
-        info_label.text = "%s · %s · Wert %.1f\nIm Besitz: %dx · Gespielt %dx · %d Partien, %d Siege" % [
-            selected.combo(), selected.rarity, Cards.card_value(selected), owned, st.played, st.games, st.wins]
-        b_dismantle.text = "Zerlegen (+%d Staub)" % Profile.DUST_DISMANTLE[selected.rarity]
-        b_craft.text = "Herstellen (%d Staub)" % Profile.DUST_CRAFT[selected.rarity]
-        b_dismantle.disabled = owned == 0
-        b_craft.disabled = p.dust < Profile.DUST_CRAFT[selected.rarity]
-    var extras := 0
-    for cid in p.collection:
-        extras += maxi(0, p.collection[cid] - Game.MAX_COPIES)
-    b_extras.text = "Überschuss zerlegen (%d Karten)" % extras
-    b_extras.disabled = extras == 0
+        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