update

2026-09-28 19:44:30 +02:00
parent dfcd3cb713
commit f0a8f18de8
37 changed files with 1588 additions and 880 deletions
--- a/scripts/ui/campaign_screen.gd
+++ b/scripts/ui/campaign_screen.gd
@@ -1,32 +1,37 @@
 class_name CampaignScreen
 extends Control
+## Kampagne als Pfad: zehn Stationen je Kapitel, darunter die gewählte Stufe im Detail.

 var app
 var chapter := 1
+var selected := 0          # gewählte Stufe (Index über alle Kapitel)
 var perk_box: OptionButton
+var node_buttons: Array = []


 func _ready() -> void:
    var p: Profile = app.profile
    chapter = mini(Campaign.chapter(p.campaign_stage), Campaign.CHAPTERS.size())
+    selected = mini(p.campaign_stage, Campaign.total() - 1)
    build()


 func build() -> void:
    Style.clear(self)
+    node_buttons = []
    var p: Profile = app.profile
-    var col := Style.column(self, 1000, 16, 5)
-    Style.clabel(col, "Kampagne", 34, Style.GOLD, "center", true)
-    var tabs := Style.row(col, 10)
-    tabs.alignment = BoxContainer.ALIGNMENT_CENTER
+    Style.header(self, "Kampagne", func(): app.show_screen(MenuScreen.new()))
+    var n := Campaign.STAGES.size()
+    var x := 40
    for c in Campaign.CHAPTERS.size():
-        var b := Style.cbutton(tabs, "Kapitel %d" % (c + 1), Vector2(140, 36), set_chapter.bind(c + 1), Color("285a3c") if chapter == c + 1 else null)
-        b.disabled = p.campaign_stage < c * Campaign.STAGES.size()
+        var b := Style.button(self, "Kapitel %d" % (c + 1), Rect2(x, 88, 150, 38), set_chapter.bind(c + 1), Style.PRIMARY if chapter == c + 1 else null)
+        b.disabled = p.campaign_stage < c * n
+        x += 160
    if p.perk_unlocked():
-        var pr := Style.row(tabs, 8)
-        Style.clabel(pr, "Dein Merkmal:", 15, Style.MUTED, "right", false, 110)
+        Style.label(self, "Dein Merkmal:", 15, Style.MUTED, Rect2(760, 96, 130, 24), "right")
        perk_box = OptionButton.new()
-        perk_box.custom_minimum_size = Vector2(300, 36)
+        perk_box.position = Vector2(900, 88)
+        perk_box.size = Vector2(340, 38)
        perk_box.add_item("keins")
        var keys: Array = Game.PERKS.keys()
        for k in keys:
@@ -35,54 +40,90 @@ func build() -> void:
        perk_box.item_selected.connect(func(i: int):
            p.perk = "" if i == 0 else keys[i - 1]
            app.save())
-        pr.add_child(perk_box)
-    var offset := (chapter - 1) * Campaign.STAGES.size()
-    for k in Campaign.STAGES.size():
+        add_child(perk_box)
+    # Pfad mit Stationen
+    var offset := (chapter - 1) * n
+    var y := 190.0
+    var step := (1280 - 200) / float(n - 1)
+    var centers: Array[Vector2] = []
+    for k in n:
+        centers.append(Vector2(100 + k * step, y))
+    var path := Control.new()
+    path.mouse_filter = Control.MOUSE_FILTER_IGNORE
+    path.draw.connect(func():
+        for k in n - 1:
+            var done: bool = offset + k + 1 <= p.campaign_stage
+            path.draw_line(centers[k], centers[k + 1], Style.GREEN if done else Style.PANEL_LIGHT, 4.0))
+    add_child(path)
+    for k in n:
        var i := offset + k
-        var st := Campaign.stage(i)
        var done := i < p.campaign_stage
        var next := i == p.campaign_stage
-        var panel := PanelContainer.new()
-        panel.add_theme_stylebox_override("panel", Style.box(Style.PANEL if not done else Style.darker(Style.PANEL, 0.8), 6,
-            Style.GOLD if next else null, 2 if next else 0))
-        col.add_child(panel)
-        var pad := MarginContainer.new()  # Innenabstand, damit Name und Knopf nicht am Rahmen kleben
-        for side in ["left", "right"]:
-            pad.add_theme_constant_override("margin_" + side, 14)
-        panel.add_child(pad)
-        var r := Style.row(pad, 10)
-        r.custom_minimum_size = Vector2(0, 50)
-        var nm := Style.clabel(r, "%s · %s" % [st.name, st.title], 16, Style.TEXT if not done else Style.MUTED, "left", true, 420)
-        nm.size_flags_horizontal = Control.SIZE_EXPAND_FILL  # schiebt die Punkte und den Knopf nach rechts
-        var dots := Control.new()
-        dots.custom_minimum_size = Vector2(60, 0)
-        dots.mouse_filter = Control.MOUSE_FILTER_IGNORE
-        var elems: Array = st.elements
-        dots.draw.connect(func():
-            for m in elems.size():
-                dots.draw_circle(Vector2(10 + m * 18, dots.size.y / 2), 7, Cards.ELEMENT_COLORS[elems[m]]))
-        r.add_child(dots)
-        if done:
-            Style.cbutton(r, "Wiederholen", Vector2(130, 36), _start.bind(i))
-        elif next:
-            Style.cbutton(r, "Kämpfen", Vector2(130, 36), _start.bind(i), Color("285a3c"))
-        else:
-            var b := Style.cbutton(r, "Gesperrt", Vector2(130, 36), func(): pass)
-            b.disabled = true
+        var b := Button.new()
+        b.text = str(i + 1)
+        b.position = centers[k] - Vector2(24, 24)
+        b.size = Vector2(48, 48)
+        var base: Color = Style.PRIMARY if done else (Color("5a4628") if next else Style.PANEL)
+        var edge: Color = Style.GOLD if i == selected else (Style.GREEN if done else Style.MUTED)
+        b.add_theme_stylebox_override("normal", Style.box(base, 24, edge, 3 if i == selected else 2))
+        b.add_theme_stylebox_override("hover", Style.box(Style.lighter(base), 24, edge, 3))
+        b.add_theme_stylebox_override("pressed", Style.box(Style.darker(base), 24, edge, 3))
+        b.add_theme_stylebox_override("disabled", Style.box(Style.darker(Style.PANEL, 0.8), 24, Style.PANEL_LIGHT, 2))
+        b.add_theme_stylebox_override("focus", Style.box(Color(0, 0, 0, 0), 24, Style.GOLD, 3))
+        b.disabled = i > p.campaign_stage
+        b.pressed.connect(func():
+            selected = i
+            build())
+        Style.juice(b)
+        add_child(b)
+        node_buttons.append(b)
+        if next and Style.animations:
+            b.pivot_offset = b.size / 2
+            var tw := b.create_tween().set_loops()
+            tw.tween_property(b, "scale", Vector2(1.1, 1.1), 0.6).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_IN_OUT)
+            tw.tween_property(b, "scale", Vector2.ONE, 0.6).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_IN_OUT)
+    # Gewählte Stufe
+    var st := Campaign.stage(selected)
+    var done := selected < p.campaign_stage
+    var next := selected == p.campaign_stage
+    Style.panel(self, Rect2(240, 270, 800, 300))
+    Style.label(self, "%s · %s" % [st.name, st.title], 28, Style.TEXT, Rect2(270, 290, 740, 40), "center", true)
+    var dots := Control.new()
+    dots.mouse_filter = Control.MOUSE_FILTER_IGNORE
+    var elems: Array = st.elements
+    dots.draw.connect(func():
+        var w := elems.size() * 26 - 6
+        for m in elems.size():
+            dots.draw_circle(Vector2(640 - w / 2.0 + 10 + m * 26, 348), 10, Cards.ELEMENT_COLORS[elems[m]]))
+    add_child(dots)
+    Style.label(self, "%s   ·   %s" % [tr("%d Leben") % int(st.life), tr("%d Münzen") % st.reward], 16, Style.MUTED, Rect2(270, 370, 740, 24), "center")
+    var perks: Array = st.perks
+    var py := 402
+    for k in perks:
+        Style.label(self, "★ " + tr(Game.PERKS[k]), 15, Style.GOLD, Rect2(270, py, 740, 22), "center")
+        py += 24
+    if done:
+        Style.button(self, "Wiederholen", Rect2(540, 500, 200, 50), _start.bind(selected))
+    elif next:
+        var b := Style.button(self, "Kämpfen", Rect2(540, 500, 200, 50), _start.bind(selected), Style.PRIMARY)
+        b.add_theme_font_size_override("font_size", 20)
+    else:
+        var b := Style.button(self, "Gesperrt", Rect2(540, 500, 200, 50), func(): pass)
+        b.disabled = true
    if p.campaign_stage >= Campaign.total():
-        Style.clabel(col, "Alle Kapitel abgeschlossen", 16, Style.GREEN, "center", true)
-    var br := Style.row(col)
-    br.alignment = BoxContainer.ALIGNMENT_CENTER
-    Style.cbutton(br, "Zurück", Vector2(160, 40), func(): app.show_screen(MenuScreen.new()))
+        Style.label(self, "Alle Kapitel abgeschlossen", 16, Style.GREEN, Rect2(0, 600, 1280, 24), "center", true)


 func set_chapter(c: int) -> void:
    chapter = c
+    var p: Profile = app.profile
+    var first := (c - 1) * Campaign.STAGES.size()
+    selected = p.campaign_stage if Campaign.chapter(mini(p.campaign_stage, Campaign.total() - 1)) == c else first
    build()


 func _start(stage: int) -> void:
-    app.show_screen(BattleScreen.new(0, stage))
+    app.show_screen(BattleScreen.new(stage))


 func _input(event: InputEvent) -> void: