Reset new demo careers while retaining confirmed user choices (by Codex)
This commit is contained in:
1 parent
8e3d9f83e0
commit
e710937ca9
5 files changed
+165
-5
No files matched your search
@@ -121,3 +121,23 @@ Prüfsummen und Zähler stehen in `QA-2026-10-27.json`. Private Bilder und echte
|
|||||||
zugehörige POC-JSONs bleiben im privaten QA-Bestand; sie werden nicht als
|
zugehörige POC-JSONs bleiben im privaten QA-Bestand; sie werden nicht als
|
||||||
proprietäre PNGs in den öffentlichen Quellen verteilt. Kein vollständiger
|
proprietäre PNGs in den öffentlichen Quellen verteilt. Kein vollständiger
|
||||||
Windows-/macOS-Build oder ein Engine-Spiel wurde damit abgenommen.
|
Windows-/macOS-Build oder ein Engine-Spiel wurde damit abgenommen.
|
||||||
|
|
||||||
|
## Bestätigter Neustart und erneute menschliche Übernahme
|
||||||
|
|
||||||
|
Der folgende Modellpatch setzt eine bestätigte neue Karriere aus einem frischen
|
||||||
|
DemoSource-Snapshot desselben Katalogs auf. Geld, Datum, Camp, Aufstellung,
|
||||||
|
Verträge, Stadion und alte Teamansichten werden auch beim identischen Verein
|
||||||
|
neu initialisiert. Zuletzt bestätigte180Optionszellen, Automatik und alte
|
||||||
|
Anzeige-/Soundpräferenzen bleiben bewusst erhalten. Trainingsautomatik wird auf
|
||||||
|
die frischen Trainingswerte angewendet; alte Trainingsfortschritte werden nicht
|
||||||
|
übernommen. Die App reicht diese bestätigten Blöcke vor dem Source-Tausch in
|
||||||
|
dieselbe atomare Startaktion durch. Ein fehlerhafter Start erhält Source,
|
||||||
|
Revision und Dirty-Marker unverändert.
|
||||||
|
|
||||||
|
Wählt ein neuer Mensch einen zuvor als KI markierten Verein, entfällt der
|
||||||
|
widersprüchliche aktuelle KI-Vermerk. Andere Personen und die aktive Identität
|
||||||
|
bleiben erhalten. Die synthetischen Negativ-/Positivtests prüfen dies ebenso wie
|
||||||
|
Neustart vor/nach Game End. Ein anschließender enger nativer Lauf bestätigt den
|
||||||
|
Hauptmenü→Neues-Spiel-Anschluss mit sichtbaren Karrieresentinels und unverändert
|
||||||
|
übernommenen bestätigten Optionen. Frühere versiegelte QA-Kohorten werden diesem
|
||||||
|
Folgepatch nicht rückwirkend zugerechnet.
|
||||||
@@ -193,10 +193,9 @@ void App::entry_confirm() {
|
|||||||
} else {
|
} else {
|
||||||
// Construct and validate before releasing any part of the current session.
|
// Construct and validate before releasing any part of the current session.
|
||||||
auto demo = std::make_unique<DemoSource>(catalog);
|
auto demo = std::make_unique<DemoSource>(catalog);
|
||||||
const auto result =
|
Json start={{"setup",start_options_},{"managers",candidate}};
|
||||||
demo->apply({demo->snapshot().revision,
|
if(source_){const auto previous=snap();start["preferences"]=previous.state.at("preferences");start["settings"]=previous.state.at("settings");}
|
||||||
"start",
|
const auto result=demo->apply({demo->snapshot().revision,"start",start});
|
||||||
{{"setup", start_options_}, {"managers", candidate}}});
|
|
||||||
if (!result.ok) {
|
if (!result.ok) {
|
||||||
message("Die neue Partie konnte nicht übernommen werden: " +
|
message("Die neue Partie konnte nicht übernommen werden: " +
|
||||||
result.error);
|
result.error);
|
||||||
|
|||||||
@@ -303,6 +303,14 @@ ActionResult DemoSource::apply(const Action &action) {
|
|||||||
return {false,revision_,"career_ended"};
|
return {false,revision_,"career_ended"};
|
||||||
if (!start && !next.at("edits").value("setup",Json::object()).value("league",true) && managers.size()>1)
|
if (!start && !next.at("edits").value("setup",Json::object()).value("league",true) && managers.size()>1)
|
||||||
return {false,revision_,"national_one_manager"};
|
return {false,revision_,"national_one_manager"};
|
||||||
|
Json retained_preferences,retained_settings;
|
||||||
|
if(start){
|
||||||
|
retained_preferences=action.value.value("preferences",state_.at("preferences"));
|
||||||
|
retained_settings=action.value.value("settings",state_.at("settings"));
|
||||||
|
if(!preferences(retained_preferences))return {false,revision_,"invalid_preferences"};
|
||||||
|
// A new presentation career never inherits progression or team data.
|
||||||
|
DemoSource fresh(catalog_);next=fresh.snapshot().state;
|
||||||
|
}
|
||||||
next["managers"] = std::move(managers);
|
next["managers"] = std::move(managers);
|
||||||
if (start) {
|
if (start) {
|
||||||
auto options=action.value.at("setup");options["mode"]=3;
|
auto options=action.value.at("setup");options["mode"]=3;
|
||||||
@@ -314,6 +322,11 @@ ActionResult DemoSource::apply(const Action &action) {
|
|||||||
if (std::none_of(next["managers"].begin(),next["managers"].end(),[&](const auto &m){return m.value("portrait",0)==active;}))
|
if (std::none_of(next["managers"].begin(),next["managers"].end(),[&](const auto &m){return m.value("portrait",0)==active;}))
|
||||||
next["career"]["active_portrait"]=next["managers"][0].value("portrait",0);
|
next["career"]["active_portrait"]=next["managers"][0].value("portrait",0);
|
||||||
}
|
}
|
||||||
|
if(!start && next.contains("career")){
|
||||||
|
Json ai=Json::array();for(const auto &id:next["career"].at("ai_teams"))
|
||||||
|
if(std::none_of(next["managers"].begin(),next["managers"].end(),[&](const auto &m){return m.value("club","")==id.get<std::string>();}))ai.push_back(id);
|
||||||
|
next["career"]["ai_teams"]=std::move(ai);
|
||||||
|
}
|
||||||
const auto first=demo_career_manager(next).value("club", "");
|
const auto first=demo_career_manager(next).value("club", "");
|
||||||
if (next.at("training").at("club") != first) {
|
if (next.at("training").at("club") != first) {
|
||||||
next["training"] = demo_training(*catalog_, first);
|
next["training"] = demo_training(*catalog_, first);
|
||||||
@@ -340,6 +353,9 @@ ActionResult DemoSource::apply(const Action &action) {
|
|||||||
: "complete";
|
: "complete";
|
||||||
next["opening_created"] = false;
|
next["opening_created"] = false;
|
||||||
next["opening_flow"] = make_demo_opening(*catalog_, next, action.value.at("setup").at("league").get<bool>());
|
next["opening_flow"] = make_demo_opening(*catalog_, next, action.value.at("setup").at("league").get<bool>());
|
||||||
|
next["preferences"]=retained_preferences;
|
||||||
|
const auto settings_error=edit_demo_settings(next,retained_settings);
|
||||||
|
if(!settings_error.empty())return {false,revision_,settings_error};
|
||||||
}
|
}
|
||||||
} else if (action.kind == "environment" || action.kind == "advertising" ||
|
} else if (action.kind == "environment" || action.kind == "advertising" ||
|
||||||
action.kind == "toto") {
|
action.kind == "toto") {
|
||||||
|
|||||||
@@ -47,7 +47,8 @@ public:
|
|||||||
explicit DemoSource(std::shared_ptr<const Catalog>);
|
explicit DemoSource(std::shared_ptr<const Catalog>);
|
||||||
Snapshot snapshot() const override;
|
Snapshot snapshot() const override;
|
||||||
// "start" publishes {setup,managers} together; setup is kept in edits.setup
|
// "start" publishes {setup,managers} together; setup is kept in edits.setup
|
||||||
// for checkpoint compatibility. It creates presentation state only.
|
// for checkpoint compatibility. Optional checked settings/preferences carry
|
||||||
|
// confirmed user choices into a fresh source. It creates presentation state only.
|
||||||
ActionResult apply(const Action &) override;
|
ActionResult apply(const Action &) override;
|
||||||
Json read_almanac(const Json &) const override;
|
Json read_almanac(const Json &) const override;
|
||||||
Json read_statistics(const Json &) const override;
|
Json read_statistics(const Json &) const override;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include "modern/ui/demo_finance.hpp"
|
#include "modern/ui/demo_finance.hpp"
|
||||||
#include "modern/ui/demo_lineup.hpp"
|
#include "modern/ui/demo_lineup.hpp"
|
||||||
#include "modern/ui/demo_opening.hpp"
|
#include "modern/ui/demo_opening.hpp"
|
||||||
|
#include "modern/ui/demo_settings.hpp"
|
||||||
#include "modern/ui/demo_stadium.hpp"
|
#include "modern/ui/demo_stadium.hpp"
|
||||||
#include "modern/ui/demo_statistics.hpp"
|
#include "modern/ui/demo_statistics.hpp"
|
||||||
#include "modern/ui/demo_widgets.hpp"
|
#include "modern/ui/demo_widgets.hpp"
|
||||||
@@ -98,9 +99,114 @@ Json start(int players = 2) {
|
|||||||
return {{"setup", setup(players)}, {"managers", managers}};
|
return {{"setup", setup(players)}, {"managers", managers}};
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
namespace {
|
||||||
|
void historical_metadata(const Fixture &fixture) {
|
||||||
|
DemoSource source(fixture.world);
|
||||||
|
require(source.apply({0, "start", start(4)}).ok, "Metadata start");
|
||||||
|
require(source
|
||||||
|
.apply({source.snapshot().revision,
|
||||||
|
"career",
|
||||||
|
{{"kind", "select_manager"}, {"portrait", 2}}})
|
||||||
|
.ok,
|
||||||
|
"Metadata select");
|
||||||
|
require(source
|
||||||
|
.apply({source.snapshot().revision,
|
||||||
|
"career",
|
||||||
|
{{"kind", "role"}, {"value", "national"}}})
|
||||||
|
.ok,
|
||||||
|
"Metadata national role");
|
||||||
|
const auto stored = source.snapshot().state;
|
||||||
|
require(source
|
||||||
|
.apply({source.snapshot().revision,
|
||||||
|
"career",
|
||||||
|
{{"kind", "role"}, {"value", "club"}}})
|
||||||
|
.ok,
|
||||||
|
"Metadata viewer role");
|
||||||
|
require(source
|
||||||
|
.apply({source.snapshot().revision,
|
||||||
|
"career",
|
||||||
|
{{"kind", "select_manager"}, {"portrait", 0}}})
|
||||||
|
.ok,
|
||||||
|
"Metadata viewer selection");
|
||||||
|
const auto meta = DemoFiles::career_metadata(stored);
|
||||||
|
require(meta.at("role") == "national" &&
|
||||||
|
meta.at("current_manager").at("portrait") == 2,
|
||||||
|
"Saved national role/person replaced by current viewer");
|
||||||
|
}
|
||||||
|
void start_reset(const Fixture &fixture, bool ended) {
|
||||||
|
DemoSource source(fixture.world);
|
||||||
|
const auto defaults = source.snapshot().state;
|
||||||
|
const auto act = [&](const std::string &kind, const Json &value) {
|
||||||
|
const auto r = source.apply({source.snapshot().revision, kind, value});
|
||||||
|
require(r.ok, "Start-reset setup action failed");
|
||||||
|
};
|
||||||
|
act("finance", {{"kind", "deposit"}, {"value", 400}});
|
||||||
|
act("ticket", 22);
|
||||||
|
act("camp.select", "resort:2");
|
||||||
|
act("camp.remember", nullptr);
|
||||||
|
act("lineup", {{"kind", "weight"}, {"index", 0}});
|
||||||
|
const Json preferences = {
|
||||||
|
{"theme", "silver"}, {"volume", 33}, {"effects", false}};
|
||||||
|
act("preferences", preferences);
|
||||||
|
auto settings = source.snapshot().state.at("settings");
|
||||||
|
settings["cells"][0] = 0;
|
||||||
|
settings["automation"]["lineup"] = true;
|
||||||
|
settings["automation"]["training"] = true;
|
||||||
|
act("settings", settings);
|
||||||
|
auto imported = source.snapshot().state;
|
||||||
|
imported["date"] = "2040-05-17";
|
||||||
|
imported["desktop"] = default_desktop();
|
||||||
|
source.load_data(imported, false);
|
||||||
|
if (ended)
|
||||||
|
act("career", {{"kind", "resign"}, {"portrait", 0}});
|
||||||
|
auto payload = Json{{"setup", setup(1)},
|
||||||
|
{"managers", Json::array({manager(0, "New Coach")})}};
|
||||||
|
const auto before = source.snapshot();
|
||||||
|
const bool dirty = source.dirty();
|
||||||
|
auto invalid = payload;
|
||||||
|
invalid["settings"] = {
|
||||||
|
{"version", 1}, {"cells", Json::array()}, {"automation", Json::object()}};
|
||||||
|
require(!source.apply({before.revision, "start", invalid}).ok &&
|
||||||
|
source.snapshot().state == before.state &&
|
||||||
|
source.snapshot().revision == before.revision &&
|
||||||
|
source.dirty() == dirty,
|
||||||
|
"Rejected start changed canonical state/revision/dirty");
|
||||||
|
require(source.apply({before.revision, "start", payload}).ok,
|
||||||
|
"Start reset failed");
|
||||||
|
const auto now = source.snapshot().state;
|
||||||
|
for (const auto *key : {"cash", "deposit", "debt", "ticket", "camp", "lineup",
|
||||||
|
"contracts", "stadium", "calendar", "date"})
|
||||||
|
require(now.at(key) == defaults.at(key),
|
||||||
|
"New start retained a career sentinel");
|
||||||
|
require(now.at("preferences") == preferences &&
|
||||||
|
now.at("settings") == settings,
|
||||||
|
"New start lost confirmed display/sound/options/automation choices");
|
||||||
|
require(now.at("training").at("areas") ==
|
||||||
|
defaults.at("training").at("areas") &&
|
||||||
|
now.at("training").at("autos") ==
|
||||||
|
Json::array({true, true, true, true}),
|
||||||
|
"Fresh training did not retain only the chosen automation preset");
|
||||||
|
require(now.at("career_views").empty() &&
|
||||||
|
now.at("career").at("ai_teams").empty() &&
|
||||||
|
now.at("career").at("ended") == false,
|
||||||
|
"New start retained old ownership/cache state");
|
||||||
|
require(demo_career_manager(now).at("name") == "New Coach",
|
||||||
|
"New start retained old manager identity");
|
||||||
|
DemoSource app_target(fixture.world);
|
||||||
|
payload["preferences"] = preferences;
|
||||||
|
payload["settings"] = settings;
|
||||||
|
require(app_target.apply({0, "start", payload}).ok &&
|
||||||
|
app_target.snapshot().state.at("preferences") == preferences &&
|
||||||
|
app_target.snapshot().state.at("settings") == settings,
|
||||||
|
"Fresh App target did not carry explicit confirmed user choices");
|
||||||
|
}
|
||||||
|
} // namespace
|
||||||
int main() {
|
int main() {
|
||||||
try {
|
try {
|
||||||
Fixture f;
|
Fixture f;
|
||||||
|
historical_metadata(f);
|
||||||
|
start_reset(f, false);
|
||||||
|
start_reset(f, true);
|
||||||
DemoSource source(f.world);
|
DemoSource source(f.world);
|
||||||
auto options = setup(4);
|
auto options = setup(4);
|
||||||
options["mode"] = 1;
|
options["mode"] = 1;
|
||||||
@@ -217,6 +323,24 @@ int main() {
|
|||||||
require(source.snapshot().state.at("career").at("ai_teams") ==
|
require(source.snapshot().state.at("career").at("ai_teams") ==
|
||||||
Json::array({"club:entry-0"}),
|
Json::array({"club:entry-0"}),
|
||||||
"AI handover");
|
"AI handover");
|
||||||
|
auto joined = source.snapshot().state.at("managers");
|
||||||
|
auto bad_join = joined;
|
||||||
|
auto returned = manager(0, "Returning Coach");
|
||||||
|
returned["club"] = "club:foreign";
|
||||||
|
bad_join.push_back(returned);
|
||||||
|
const auto join_before = source.snapshot();
|
||||||
|
require(!source.apply({join_before.revision, "managers", bad_join}).ok &&
|
||||||
|
source.snapshot().state == join_before.state,
|
||||||
|
"Rejected rejoin changed roster or AI ownership");
|
||||||
|
joined.push_back(manager(0, "Returning Coach"));
|
||||||
|
require(source.apply({join_before.revision, "managers", joined}).ok,
|
||||||
|
"Valid AI-team rejoin failed");
|
||||||
|
require(source.snapshot().state.at("career").at("ai_teams").empty() &&
|
||||||
|
demo_career_manager(source.snapshot().state).at("portrait") ==
|
||||||
|
2,
|
||||||
|
"Rejoin retained conflicting AI owner or switched active person");
|
||||||
|
require(act({{"kind", "resign"}, {"portrait", 0}}).ok,
|
||||||
|
"Rejoined owner resignation failed");
|
||||||
for (int p : {2, 1, 3})
|
for (int p : {2, 1, 3})
|
||||||
require(act({{"kind", "resign"}, {"portrait", p}}).ok,
|
require(act({{"kind", "resign"}, {"portrait", p}}).ok,
|
||||||
"remaining resignation");
|
"remaining resignation");
|
||||||
|
|||||||
Reference in new issue
Block a user