The takers of free kicks, penalties and corners can be named in the line-up
The read lineup states the three takers (setPieces; null is the assistant's choice) and the new command lineup.setPiece names one or hands all three back, through the game's own set_pitch_set_piece_taker_source and auto_pitch_set_piece_takers_source. In the line-up, Schütze opens the three cards; a card is chosen and the next click on a player names him. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
1 parent
11264ccdb5
commit
92555b9ba0
9 files changed
+116
-3
No files matched your search
@@ -9245,8 +9245,22 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
|
||||
{"partnerId", partner >= 0 ? cli::Json(row_ids[size_t(partner)]) : cli::Json(nullptr)}});
|
||||
}
|
||||
}
|
||||
// the takers of free kicks, penalties and corners (manager record +0xafc, +0xafe, +0xb08:
|
||||
// the player's index + 1, zero the assistant's choice; valid once +0xb0a carries 0x3253)
|
||||
const size_t taker_rec = size_t(manager) * 0xb0c;
|
||||
const bool takers_set = taker_rec + 0xb0b < g_.manager_records.size() &&
|
||||
uint16_t(g_.manager_records[taker_rec + 0xb0a] | uint16_t(g_.manager_records[taker_rec + 0xb0b]) << 8) == 0x3253;
|
||||
const auto taker = [&](size_t offset) -> cli::Json {
|
||||
if (!takers_set) return nullptr;
|
||||
const uint16_t stored = uint16_t(g_.manager_records[taker_rec + offset] | uint16_t(g_.manager_records[taker_rec + offset + 1]) << 8);
|
||||
if (!stored || stored > 0x0fff) return nullptr;
|
||||
for (size_t row = 0; row < range.count; ++row)
|
||||
if ((g_.squad_slots[range.first + row] & 0x0fff) == stored - 1) return row_ids[row];
|
||||
return nullptr;
|
||||
};
|
||||
return modern::ui_snapshot(g_, context, request_id,
|
||||
O{{"kind", "lineup"}, {"teamId", modern::ui_team_id(g_, team)}, {"formationId", nullptr}, {"order", std::move(order)},
|
||||
{"setPieces", O{{"freeKick", taker(0xafc)}, {"penalty", taker(0xafe)}, {"corner", taker(0xb08)}}},
|
||||
{"surface", g_.indoor ? "indoor" : "outdoor"}, {"durationMinutes", g_.indoor ? 40 : 90}, {"starterCount", 11},
|
||||
{"pairs", std::move(pairs)},
|
||||
{"rows", std::move(rows)}, {"positions", std::move(positions)}, {"depthMax", 19}, {"laneMax", 8},
|
||||
@@ -10953,6 +10967,35 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
|
||||
if (!ok) { restore(); return refuse(error == "unknown_player" ? "unknown_player" : "lineup_refused", error); }
|
||||
revision = previous + 1;
|
||||
answer = modern::ui_command_result(request_id, previous, revision, {"lineup", "squad"}, "Aufstellung übernommen.");
|
||||
} else if (kind == "lineup.setPiece") {
|
||||
// payload {piece: "freeKick" | "penalty" | "corner", playerId} names one taker;
|
||||
// {auto: true} hands all three back to the assistant (the original's AUTO)
|
||||
const int team = g_.manager_teams[size_t(manager)];
|
||||
const SquadRange range = squad_range(team);
|
||||
if (!initialize_pitch_set_piece_source(g_, manager, team)) { restore(); return refuse("lineup_refused", "Schützen sind hier nicht verfügbar."); }
|
||||
const size_t rec = size_t(manager) * 0xb0c;
|
||||
static constexpr size_t offsets[] = {0xafc, 0xafe, 0xb08};
|
||||
std::array<uint16_t, 3> current{};
|
||||
for (size_t i = 0; i < 3; ++i) current[i] = uint16_t(g_.manager_records[rec + offsets[i]] | uint16_t(g_.manager_records[rec + offsets[i] + 1]) << 8);
|
||||
bool ok = false;
|
||||
if (const cli::Json* automatic = ui_field(*payload, "auto"); automatic && automatic->boolean() && *automatic->boolean()) {
|
||||
ok = auto_pitch_set_piece_takers_source(g_, manager, team, current);
|
||||
} else {
|
||||
const std::string piece = ui_text(*payload, "piece"), id = ui_text(*payload, "playerId");
|
||||
const int selector = piece == "freeKick" ? 2 : piece == "penalty" ? 3 : piece == "corner" ? 4 : 0;
|
||||
if (!selector || id.empty()) { restore(); return refuse("invalid_payload", "piece ist freeKick, penalty oder corner; playerId nennt den Schützen."); }
|
||||
size_t at = range.count;
|
||||
for (size_t row = 0; row < range.count; ++row) {
|
||||
const int p = g_.squad_slots[range.first + row] & 0x0fff;
|
||||
if (p != 0x0fff && modern::ui_player_id(g_, p) == id) at = row;
|
||||
}
|
||||
if (at == range.count) { restore(); return refuse("unknown_player", "Dieser Spieler gehört nicht zum Kader."); }
|
||||
const uint16_t slot = g_.squad_slots[range.first + at];
|
||||
ok = set_pitch_set_piece_taker_source(g_, manager, team, selector, int(at), slot & 0x0fff, slot, current[size_t(selector - 2)]);
|
||||
}
|
||||
if (!ok) { restore(); return refuse("lineup_refused", "Schütze kann nur sein, wer aufgestellt oder auf der Bank und einsatzfähig ist."); }
|
||||
revision = previous + 1;
|
||||
answer = modern::ui_command_result(request_id, previous, revision, {"lineup"}, "Schützen übernommen.");
|
||||
} else {
|
||||
return refuse("unknown_command", "Unbekannter Befehl: " + kind);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user