Bind the transfer market to world-relative Modern data (by Codex)
This commit is contained in:
1 parent
e559e84a69
commit
1e88304019
23 files changed
+1230
-76
No files matched your search
@@ -15,7 +15,7 @@ using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
const std::string mode=argc>1?argv[1]:"";
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto","verify-stadium","complete-stadium"};
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto","verify-stadium","complete-stadium","verify-transfer"};
|
||||
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
|
||||
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
|
||||
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
|
||||
@@ -158,6 +158,35 @@ int main(int argc, char **argv) {
|
||||
auto link = EngineBridge::open(world, out / "input.obs");
|
||||
const auto before = link->snapshot(); write("before.json", before);
|
||||
if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection");
|
||||
if(mode=="verify-transfer") {
|
||||
const auto value=engine_transfer_projection(before,engine_transfer_filters());write("projection.json",value);
|
||||
Json commands=Json::array();
|
||||
const auto run=[&](const Json &request){const auto result=link->command(request);commands.push_back({{"request",request},{"response",result}});return result;};
|
||||
Json current=before,list_request;bool found=false;int refusal_count=0;
|
||||
for(const auto&candidate:before.at("transfer").at("data").at("squad")) {
|
||||
if(candidate.at("listed")==true)continue;
|
||||
const Json listing={{"kind","sell"},{"player",candidate.at("playerId")}};
|
||||
list_request=engine_transfer_command(current,listing,"request:list-player-"+candidate.at("playerId").get<std::string>());
|
||||
const auto response=run(list_request);
|
||||
if(response.value("messageType","")=="error") {if(link->snapshot()!=current)throw std::runtime_error("refused listing changed game");++refusal_count;continue;}
|
||||
current=link->snapshot();for(const auto&p:current.at("transfer").at("data").at("squad"))if(p.at("playerId")==candidate.at("playerId")&&p.at("listed")==true)found=true;
|
||||
if(!found)throw std::runtime_error("false successful listing feedback");break;
|
||||
}
|
||||
if(!found)throw std::runtime_error("no actual listable player");write("listed.json",current);
|
||||
auto stale=list_request;stale["requestId"]="request:stale-transfer";if(run(stale).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("stale transfer changed game");
|
||||
Json draft;for(const auto&p:current.at("transfer").at("data").at("listings"))if(p.at("ownListing")==false){draft={{"kind","buy"},{"player",p.at("playerId")},{"listing",p.at("id")},{"fee",engine_money_minor(p.at("askingFee"))/100},{"salary",12000},{"months",24},{"bonuses",{1,2,3,4,5,6,7}}};break;}
|
||||
if(draft.is_null())throw std::runtime_error("no actual market candidate");
|
||||
auto request=engine_transfer_command(current,draft,"request:transfer-offer");
|
||||
auto bad=request;bad["requestId"]="request:wrong-currency";bad["payload"]["fee"]["currency"]="USD";
|
||||
if(run(bad).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("invalid currency changed game");
|
||||
bad=request;bad["requestId"]="request:overflow-fee";bad["payload"]["fee"]["minor"]="429496729600";
|
||||
if(run(bad).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("overflow fee changed game");
|
||||
bad=request;bad["requestId"]="request:overflow-salary";bad["payload"]["monthlySalary"]["minor"]="214748364700";
|
||||
if(run(bad).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("overflow salary changed game");
|
||||
const auto offered=run(request);write("offered.json",offered);const auto after=link->snapshot();write("after.json",after);if(offered.value("messageType","")!="command_result")throw std::runtime_error(offered.dump());
|
||||
if(offered.value("outcome","")=="offer_pending"){bool bid=false;for(const auto&p:after.at("transfer").at("data").at("listings"))if(p.at("playerId")==draft.at("player")&&p.at("ownBid").is_object()){bid=true;if(p.at("ownBid").at("bonuses")!=draft.at("bonuses"))throw std::runtime_error("pending bonuses differ");}if(!bid)throw std::runtime_error("pending bid missing");}
|
||||
link->save_copy(out/"after.obs");write("commands.json",commands);write("receipt.json",{{"status","passed"},{"actualListing",true},{"listingRefusals",refusal_count},{"staleRefused",true},{"invalidMoneyRefused",true},{"offerOutcome",offered.value("outcome",std::string("applied"))}});std::cout<<"actual transfer listing, offer, bonuses and invalid money passed\n";return 0;
|
||||
}
|
||||
if(mode=="verify-toto") {
|
||||
const auto value=engine_toto_projection(before);if(value.at("programme").at("complete")!=true)throw std::runtime_error("fixture has no eleven-match coupon");Json rows=Json::array();for(int column=0;column<2;++column){auto tips=value.at("suggestions");if(column){tips[0]=tips[0]==0?1:0;}rows.push_back(tips);}const Json payload={{"stake",{{"currency","EUR"},{"minorUnits",2},{"minor","5000000"}}},{"columns",rows}};
|
||||
const auto quote=link->read({{"kind","toto"},{"draft",payload}});write("quote.json",quote);if(link->read({{"kind","toto"},{"draft",payload}})!=quote||link->snapshot()!=before)throw std::runtime_error("Toto quote changed session");const auto &offer=quote.at("data").at("draftQuote");if(offer.at("allowed")!=true||engine_money_minor(offer.at("cost"))!=10500000||engine_money_minor(offer.at("fee"))!=500000)throw std::runtime_error("wrong actual two-column cost");
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
using namespace bmh::modern_ui;
|
||||
namespace {
|
||||
void check(bool yes, const char *why) {
|
||||
if (!yes)
|
||||
throw std::runtime_error(why);
|
||||
}
|
||||
template <class F> void rejected(F f) {
|
||||
bool caught = false;
|
||||
try {
|
||||
f();
|
||||
} catch (const std::exception &) {
|
||||
caught = true;
|
||||
}
|
||||
check(caught, "invalid transfer accepted");
|
||||
}
|
||||
Json money(int64_t n) {
|
||||
return {{"currency", "EUR"},
|
||||
{"minorUnits", 2},
|
||||
{"minor", std::to_string(n * 100)}};
|
||||
}
|
||||
Json fixture() {
|
||||
const Json meta = {{"contractVersion", "bmh-modern-ui@draft1"},
|
||||
{"careerId", "career:test"},
|
||||
{"worldId", "world:test"},
|
||||
{"worldRevision", "1"},
|
||||
{"stateRevision", "3"},
|
||||
{"scope",
|
||||
{{"role", "club"},
|
||||
{"managerId", "manager:test"},
|
||||
{"teamId", "club:test"},
|
||||
{"allowedCommands", {"transfer.submit"}}}}};
|
||||
Json b;
|
||||
for (auto *kind : {"session", "desktop", "camps", "transfer"})
|
||||
b[kind] = {{"messageType", "snapshot"},
|
||||
{"meta", meta},
|
||||
{"data", {{"kind", kind}}}};
|
||||
b["desktop"]["data"].update({{"manager", {{"id", "manager:test"}}},
|
||||
{"team", {{"id", "club:test"}}},
|
||||
{"accounts", {{"cash", money(5000000)}}}});
|
||||
b["camps"]["data"]["camps"] = Json::array();
|
||||
const Json details = {{"name", "Synthetic Player"},
|
||||
{"nationId", nullptr},
|
||||
{"photoAssetId", nullptr},
|
||||
{"condition", 71},
|
||||
{"technique", 62},
|
||||
{"form", 53},
|
||||
{"skills", {0, 1, 2, 3, 2, 1, 0}}};
|
||||
auto &d = b["transfer"]["data"];
|
||||
d.update(
|
||||
{{"teamId", "club:test"},
|
||||
{"cash", money(5000000)},
|
||||
{"creditLine", money(1000000)},
|
||||
{"activeStrengths", {10, 20, 30, 40, 25}},
|
||||
{"teamStrengths", {11, 21, 31, 41, 26}},
|
||||
{"squad", Json::array({{{"playerId", "player:own"},
|
||||
{"age", 26},
|
||||
{"position", "mid"},
|
||||
{"strength", 61},
|
||||
{"listed", false},
|
||||
{"details", details}}})},
|
||||
{"listings",
|
||||
Json::array(
|
||||
{{{"id", "listing:0"},
|
||||
{"playerId", "player:market"},
|
||||
{"sellerId", "club:other"},
|
||||
{"seller", "Other club"},
|
||||
{"age", 25},
|
||||
{"position", "fwd"},
|
||||
{"strength", 64},
|
||||
{"details", details},
|
||||
{"askingFee", money(1234567)},
|
||||
{"salaryReference", money(120000)},
|
||||
{"salaryDemandPercent", 110},
|
||||
{"offers", 0},
|
||||
{"offerTerms",
|
||||
{{"buy",
|
||||
{{"fee", money(1234567)}, {"maximumFee", money(2469134)}}},
|
||||
{"loan",
|
||||
{{"fee", money(308641)}, {"maximumFee", money(617282)}}},
|
||||
{"maximumMonthlySalary", money(200000)}}},
|
||||
{"loanAvailable", true},
|
||||
{"ownListing", false},
|
||||
{"ownBid", nullptr}}})}});
|
||||
return b;
|
||||
}
|
||||
} // namespace
|
||||
int main() {
|
||||
try {
|
||||
auto b = fixture(), f = engine_transfer_filters();
|
||||
const auto before = b;
|
||||
auto v = engine_transfer_projection(b, f);
|
||||
check(b == before, "projection mutated source");
|
||||
check(v.at("own").size() == 1 && v.at("market").size() == 1,
|
||||
"source rows missing");
|
||||
check(v.at("cash") == 500000000 && v.at("market")[0].at("fee") == 123456700,
|
||||
"money scaled incorrectly");
|
||||
check(v.at("own")[0].at("fee").is_null() &&
|
||||
v.at("own")[0].at("games").is_null(),
|
||||
"unknown values invented");
|
||||
check(v.at("strengths").at("active_average") == 25,
|
||||
"source position strength lost");
|
||||
f["positions"] = 1;
|
||||
check(engine_transfer_projection(b, f).at("market").empty(),
|
||||
"position filter ignored");
|
||||
f = engine_transfer_filters();
|
||||
f["query"] = "sYnThEtIc";
|
||||
check(engine_transfer_projection(b, f).at("market").size() == 1,
|
||||
"name filter wrong");
|
||||
f["criteria"]["price_max"] = 123456699;
|
||||
check(engine_transfer_projection(b, f).at("market").empty(),
|
||||
"budget filter scaled incorrectly");
|
||||
Json draft = {{"kind", "buy"},
|
||||
{"player", "player:market"},
|
||||
{"listing", "listing:0"},
|
||||
{"fee", 1234567},
|
||||
{"salary", 12345},
|
||||
{"months", 36},
|
||||
{"bonuses", {1, 2, 3, 4, 5, 6, 7}}};
|
||||
auto c = engine_transfer_command(b, draft, "request:test");
|
||||
check(c.at("payload").at("fee") == money(1234567) &&
|
||||
c.at("payload").at("monthlySalary") == money(12345) &&
|
||||
c.at("payload").at("years") == 3 &&
|
||||
c.at("payload").at("loan") == false,
|
||||
"offer did not preserve exact terms");
|
||||
check(c.at("expectedRevision") == "3" &&
|
||||
c.at("owner").at("managerId") == "manager:test",
|
||||
"command lost owner");
|
||||
check(c.at("payload").at("bonuses") == draft.at("bonuses"), "bonuses lost");
|
||||
auto invalid = draft;
|
||||
invalid["player"] = "player:recycled";
|
||||
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
|
||||
invalid = draft;
|
||||
invalid["fee"] = 100000000;
|
||||
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
|
||||
invalid = draft;
|
||||
invalid["salary"] = -1;
|
||||
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
|
||||
invalid = draft;
|
||||
invalid["months"] = 13;
|
||||
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
|
||||
invalid = draft;
|
||||
invalid["bonuses"][0] = 21;
|
||||
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
|
||||
auto foreign = b;
|
||||
foreign["transfer"]["meta"]["stateRevision"] = "4";
|
||||
rejected([&] {
|
||||
engine_transfer_projection(foreign, engine_transfer_filters());
|
||||
});
|
||||
foreign = b;
|
||||
foreign["transfer"]["data"]["teamId"] = "club:foreign";
|
||||
rejected([&] {
|
||||
engine_transfer_projection(foreign, engine_transfer_filters());
|
||||
});
|
||||
foreign = b;
|
||||
foreign["transfer"]["data"]["listings"].push_back(
|
||||
foreign["transfer"]["data"]["listings"][0]);
|
||||
rejected([&] {
|
||||
engine_transfer_projection(foreign, engine_transfer_filters());
|
||||
});
|
||||
foreign = b;
|
||||
foreign["transfer"]["data"]["cash"]["minorUnits"] = 0;
|
||||
rejected([&] {
|
||||
engine_transfer_projection(foreign, engine_transfer_filters());
|
||||
});
|
||||
auto list = engine_transfer_command(
|
||||
b, {{"kind", "lend"}, {"player", "player:own"}}, "request:list");
|
||||
check(list.at("payload").at("action") == "list" &&
|
||||
list.at("payload").at("loan") == true,
|
||||
"loan listing lost");
|
||||
b["transfer"]["data"]["squad"][0]["listed"] = true;
|
||||
rejected([&] {
|
||||
engine_transfer_command(b, {{"kind", "sell"}, {"player", "player:own"}},
|
||||
"request:list");
|
||||
});
|
||||
std::cout << "transfer projection and command checks passed\n";
|
||||
return 0;
|
||||
} catch (const std::exception &e) {
|
||||
std::cerr << e.what() << '\n';
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "formats/executable_layout.hpp"
|
||||
#include "modern/content/transfer_market.hpp"
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
using namespace bmh;
|
||||
namespace {
|
||||
void check(bool yes, const char *why) {
|
||||
if (!yes)
|
||||
throw std::runtime_error(why);
|
||||
}
|
||||
} // namespace
|
||||
int main() try {
|
||||
for (const bool expanded : {false, true}) {
|
||||
auto layout = classic_world_layout();
|
||||
if (expanded) {
|
||||
uint32_t at = 0;
|
||||
for (size_t i = 0; i < layout.squad_size.size(); ++i) {
|
||||
layout.squad_start[i] = at;
|
||||
layout.squad_size[i] = 24;
|
||||
at += 24;
|
||||
}
|
||||
layout.transfer_list = at;
|
||||
layout.free_agents = at + 44;
|
||||
layout.foreign_offers = at + 124;
|
||||
layout.pool_end = at + 144;
|
||||
layout.total_slots = layout.pool_end + 102;
|
||||
}
|
||||
set_world_layout(layout);
|
||||
modern::ModernState g;
|
||||
g.manager_teams = {0};
|
||||
g.manager_records.resize(0xb0c);
|
||||
g.club_ids = {0};
|
||||
g.club_names = {'T', 0};
|
||||
g.player_name_offsets = {0, 0, 0};
|
||||
g.player_names = {'P', 0};
|
||||
g.players.resize(3);
|
||||
g.players[2].w35c = 80 | (70 << 7) | (60 << 14);
|
||||
g.players[2].w364 = 2 | (10 << 21);
|
||||
g.squad_slots.assign(layout.total_slots, 0xfff);
|
||||
g.squad_slots[0] = 2;
|
||||
g.squad_slots[0xb70] = 1;
|
||||
g.squad_slots[layout.transfer_list] = 2;
|
||||
g.memory.add_block(::bmh::layout::ActiveManager, 1);
|
||||
g.memory.add_block(::bmh::layout::EditorList, 40 * 0x58);
|
||||
for (int i = 0; i < 4; ++i)
|
||||
g.memory.set16(::bmh::layout::EditorList + uint32_t(i) * 2, 0xffff);
|
||||
g.memory.set16(::bmh::layout::EditorList + 8, 0);
|
||||
g.memory.set32(::bmh::layout::EditorList + 0x2c, 800000);
|
||||
g.memory.set32(::bmh::layout::EditorList + 0x30, 12000);
|
||||
const auto slots = g.squad_slots;
|
||||
const auto records = g.manager_records;
|
||||
const auto memory = g.memory.blocks();
|
||||
auto v = modern::project_transfer_market(g, 17);
|
||||
check(v.items.size() == 1 && v.items[0].player == 2 &&
|
||||
v.items[0].source_slot == int(layout.transfer_list),
|
||||
"projection read Classic pool in an expanded world");
|
||||
check(v.squad.size() == 1 && v.squad[0].already_listed,
|
||||
"actual own list membership missing");
|
||||
check(v.items[0].own_listing && v.items[0].asking_fee == 1000000,
|
||||
"actual seller/fee missing");
|
||||
check(v.revision == 17 && v.active_strengths[2] == g.players[2].strength(),
|
||||
"identity/positional strength changed");
|
||||
check(g.squad_slots == slots && g.manager_records == records &&
|
||||
g.memory.blocks() == memory,
|
||||
"read mutated state");
|
||||
g.memory.set16(::bmh::layout::EditorList, 0);
|
||||
g.memory.set8(::bmh::layout::EditorList + 0x34, 0x80 | 24);
|
||||
for (int i = 0; i < 7; ++i)
|
||||
g.memory.set8(::bmh::layout::EditorList + 0x38 + uint32_t(i),
|
||||
uint8_t(i + 1));
|
||||
v = modern::project_transfer_market(g, 18);
|
||||
check(v.items[0].own_bid && v.items[0].own_bid->loan &&
|
||||
v.items[0].own_bid->contract_years == 2 &&
|
||||
v.items[0].own_bid->bonuses[6] == 7,
|
||||
"saved bid term/bonuses lost");
|
||||
}
|
||||
set_world_layout(classic_world_layout());
|
||||
std::cout << "world-relative transfer pool, actual list membership, bid and "
|
||||
"pure reads passed\n";
|
||||
return 0;
|
||||
} catch (const std::exception &e) {
|
||||
std::cerr << e.what() << '\n';
|
||||
return 1;
|
||||
}
|
||||
Reference in new issue
Block a user