update

scripts/net.gd

@@ -17,9 +17,9 @@ var peer: ENetMultiplayerPeer
 var is_host := false
 var connected := false
 var my_name := "Spieler"
-var my_deck: Array = []   # Karten-IDs
+var my_pick := {"looks": {}}  # eigene Kartenoptik (Seltenheit), die der Gegner sieht
 var names := {}           # peer_id -> Name (nur im Host vollständig, sonst Kopie)
-var decks := {}           # peer_id -> Karten-IDs (Host)
+var picks := {}           # peer_id -> {"looks": {...}} (Host)
 var seats := {}           # peer_id -> Spielerindex (Host)
 var my_seat := -1
 var game: Game            # Host
@@ -56,7 +56,7 @@ func host(port: int = PORT) -> Error:
     is_host = true
     connected = true
     names = {1: my_name}
-    decks = {1: my_deck}
+    picks = {1: my_pick}
     spectators = {}
     status = "Warte auf Mitspieler …"
     lobby_changed.emit()
@@ -83,7 +83,7 @@ func leave() -> void:
     is_host = false
     connected = false
     names = {}
-    decks = {}
+    picks = {}
     seats = {}
     waiting = {}
     my_seat = -1
@@ -111,7 +111,7 @@ func _fail(reason: String) -> void:
 func _on_connected() -> void:
     connected = true
     status = "Verbunden"
-    register.rpc_id(1, my_name, my_deck, spectator)
+    register.rpc_id(1, my_name, my_pick, spectator)
 
 
 # --- Host-Wechsel ---------------------------------------------------------------
@@ -230,7 +230,7 @@ func _on_peer_disconnected(id: int) -> void:
         return
     var pname: String = names.get(id, "")
     names.erase(id)
-    decks.erase(id)
+    picks.erase(id)
     spectators.erase(id)
     if game != null and seats.has(id):
         var p: Game.Player = game.players[seats[id]]
@@ -256,17 +256,19 @@ func tick() -> void:
             waiting.erase(pname)
             game.say("%s kehrt nicht zurück und scheidet aus." % p.name)
             game.damage(p, 999)
+            game.cleanup()
             game.check_end()
+            if game.winner == "" and game.current() == p:
+                game.end_turn()  # sonst bliebe das Spiel beim Ausgeschiedenen hängen
             action_applied.emit()
         elif game.current() == p:
-            p.mulligan_done = true
             game.say("%s ist nicht da, der Zug wird übersprungen." % p.name)
             game.end_turn()
             action_applied.emit()
 
 
 @rpc("any_peer", "reliable")
-func register(name: String, deck_ids: Array, as_spectator: bool = false) -> void:
+func register(name: String, pick: Dictionary, as_spectator: bool = false) -> void:
     if not is_host:
         return
     var id := multiplayer.get_remote_sender_id()
@@ -293,7 +295,7 @@ func register(name: String, deck_ids: Array, as_spectator: bool = false) -> void
             status = "%s wollte beitreten, das Spiel läuft schon" % name
         return
     names[id] = name
-    decks[id] = deck_ids
+    picks[id] = pick
     lobby_update.rpc(names, spectators)
     lobby_changed.emit()
 
@@ -313,18 +315,14 @@ func start_battle(n_ai: int) -> void:
     var players := []
     seats = {}
     for id in ids:
-        var deck_ids: Array = decks.get(id, [])
-        var deck := []
-        for cid in deck_ids:
+        var pick: Dictionary = picks.get(id, {})
+        var p := Game.Player.new(names[id], true, Game.START_LIFE)
+        for cid in pick.get("looks", {}):
             if Cards.has_id(cid):
-                deck.append(Cards.by_id(cid))
-        if Game.validate_deck(deck)[0] == false:
-            var pool: Array = Cards.ELEMENTS.duplicate()
-            Game.shuffle(pool, r)
-            deck = Game.build_opponent_deck(r, [pool[0], pool[1]])
-        players.append(Game.Player.new(names[id], deck, true, Game.START_LIFE))
+                p.looks[cid] = int(pick.looks[cid])
+        players.append(p)
     for i in n_ai:
-        players.append(Game.random_opponent(r, i + 1))
+        players.append(DeckGen.random_opponent(i + 1))
     game = Game.new(players[0], players.slice(1), r)
     game.start()
     for id in ids:
@@ -398,12 +396,15 @@ func _apply(id: int, action: Dictionary) -> void:
             var t = resolve_ref(action.get("target"))
             if cr != null and t != null:
                 game.attack(cr, t)
-        "mulligan":
-            var cards := []
-            for i in action.get("hand", []):
-                if int(i) >= 0 and int(i) < p.hand.size():
-                    cards.append(p.hand[int(i)])
-            game.mulligan(p, cards)
+        "buy":
+            game.buy(p, int(action.get("slot", -1)))
+        "reroll":
+            game.reroll(p)
+        "fuse":
+            var a := game.find_creature(int(action.get("uid", -1)))
+            var b := game.find_creature(int(action.get("other", -1)))
+            if a != null and b != null:
+                game.fuse(p, a, b)
         "end":
             game.end_turn()
         _: