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
@@ -6,6 +6,7 @@
|
||||
#include "modern/content/world_expand.hpp"
|
||||
#include "modern/content/world_package.hpp"
|
||||
#include "modern/content/toto_quote.hpp"
|
||||
#include "modern/content/transfer_market.hpp"
|
||||
#include "modern/content/world_save.hpp"
|
||||
#include "modern/game/balance_plan.hpp"
|
||||
#include "modern/game/bank_credit.hpp"
|
||||
@@ -9089,31 +9090,46 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
|
||||
// the transfer list (listed players with seller, asking fee, salary reference, offers, the own
|
||||
// bid), the own squad (listed or not), account and credit line
|
||||
ui::TransferMarketState mk;
|
||||
try { mk = ui::transfer_market_from_game(g_, revision); } catch (const std::exception&) {
|
||||
try { mk = modern::project_transfer_market(g_, revision); } catch (const std::exception&) {
|
||||
return modern::ui_error(request_id, "transfer_unavailable", "Der Transfermarkt ist hier nicht verfügbar.", revision, false);
|
||||
}
|
||||
static constexpr const char* kPositions[4] = {"gk", "def", "mid", "fwd"};
|
||||
A listings, squad;
|
||||
const auto details = [&](int player) -> cli::Json {
|
||||
const auto& p = g_.players.at(size_t(player));
|
||||
A skills; for (const auto skill : {Player::CORNER, Player::FREE_KICK, Player::TACKLING, Player::PASSING, Player::SHOOTING, Player::SPEED, Player::TEAMPLAY}) skills.push_back(p.skill(skill));
|
||||
const auto id = modern::ui_player_id(g_, player);
|
||||
const auto* world = modern::current_world(); const auto* person = world ? world->player(id) : nullptr;
|
||||
const std::string first = size_t(player)<g_.player_first.size()?g_.player_first[size_t(player)]:std::string{};
|
||||
const std::string last = size_t(player)<g_.player_last.size()?g_.player_last[size_t(player)]:std::string{};
|
||||
const std::string nation = size_t(player)<g_.player_nation.size()?g_.player_nation[size_t(player)]:std::string{};
|
||||
return O{{"name",last.empty()?ui::original_to_utf8(g_.player_name(player)):first.empty()?last:first+" "+last},
|
||||
{"condition",p.condition()},{"technique",p.technique()},{"form",p.form()},{"skills",std::move(skills)},
|
||||
{"nationId",nation.empty()?cli::Json(nullptr):cli::Json(nation)},
|
||||
{"photoAssetId",person&&!person->photo.empty()?cli::Json(person->photo):cli::Json(nullptr)}};
|
||||
};
|
||||
for (const auto& it : mk.items) {
|
||||
cli::Json bid = nullptr;
|
||||
if (it.own_bid)
|
||||
bid = O{{"fee", modern::ui_money(it.own_bid->fee)}, {"annualSalary", modern::ui_money(it.own_bid->annual_salary)},
|
||||
{"years", int(it.own_bid->contract_years)}};
|
||||
bid = O{{"fee", modern::ui_money(it.own_bid->fee)}, {"annualSalary", modern::ui_money(it.own_bid->annual_salary)}, {"monthlySalary", modern::ui_money(it.own_bid->annual_salary)},
|
||||
{"years", int(it.own_bid->contract_years)}, {"loan",it.own_bid->loan}, {"bonuses", [&]{A a;for(auto b:it.own_bid->bonuses)a.push_back(int(b));return cli::Json(std::move(a));}()}};
|
||||
listings.push_back(O{{"id", "listing:" + std::to_string(it.list_entry)}, {"playerId", modern::ui_player_id(g_, it.player)},
|
||||
{"name", ui::original_to_utf8(it.name)}, {"age", it.age}, {"position", kPositions[it.position & 3]},
|
||||
{"strength", it.strength},
|
||||
{"sellerId", it.seller >= 0 ? cli::Json(modern::ui_team_id(g_, it.seller)) : cli::Json(nullptr)},
|
||||
{"seller", ui::original_to_utf8(it.seller_name)}, {"askingFee", modern::ui_money(it.asking_fee)},
|
||||
{"salaryReference", modern::ui_money(it.salary_reference)},
|
||||
{"salaryReference", modern::ui_money(it.salary_reference)}, {"salaryReferencePeriod","month"},
|
||||
{"salaryDemandPercent", int(it.salary_demand_percent)}, {"offers", it.offers},
|
||||
{"ownListing", it.own_listing}, {"ownBidPending", it.own_bid_pending}, {"ownBid", std::move(bid)}});
|
||||
{"offerTerms",O{{"buy",O{{"fee",modern::ui_money(it.asking_fee)},{"maximumFee",modern::ui_money(int64_t(it.asking_fee)*2)}}},{"loan",O{{"fee",modern::ui_money(it.asking_fee/4)},{"maximumFee",modern::ui_money(int64_t(it.asking_fee/4)*2)}}},{"maximumMonthlySalary",modern::ui_money(200000)}}}, {"loanAvailable",it.seller>=0&&it.seller<league_clubs()}, {"ownListing", it.own_listing}, {"ownBidPending", it.own_bid_pending}, {"ownBid", std::move(bid)}, {"details",details(it.player)}});
|
||||
}
|
||||
for (const auto& s : mk.squad)
|
||||
squad.push_back(O{{"playerId", modern::ui_player_id(g_, s.player)}, {"name", ui::original_to_utf8(s.name)}, {"age", s.age},
|
||||
{"position", kPositions[s.position & 3]}, {"strength", s.strength}, {"listed", s.already_listed}});
|
||||
{"position", kPositions[s.position & 3]}, {"strength", s.strength}, {"listed", s.already_listed}, {"details",details(s.player)}});
|
||||
return modern::ui_snapshot(g_, context, request_id,
|
||||
O{{"kind", "transfer"}, {"teamId", modern::ui_team_id(g_, team)}, {"listings", std::move(listings)}, {"squad", std::move(squad)},
|
||||
{"cash", modern::ui_money(mk.balance)}, {"creditLine", modern::ui_money(mk.credit_line)}});
|
||||
{"cash", modern::ui_money(mk.balance)}, {"creditLine", modern::ui_money(mk.credit_line)},
|
||||
{"activeStrengths", [&]{A a;for(auto n:mk.active_strengths)a.push_back(int(n));return cli::Json(std::move(a));}()},
|
||||
{"teamStrengths", [&]{A a;for(auto n:mk.team_strengths)a.push_back(int(n));return cli::Json(std::move(a));}()}});
|
||||
}
|
||||
if (kind == "stadium") {
|
||||
// the periphery (14 objects; the traffic access has three stages), the eight facilities with
|
||||
@@ -10197,7 +10213,7 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
|
||||
HumanBuyerSaleHooks hooks;
|
||||
hooks.notice = [&](const GameState&, const HumanBuyerSaleNotice& n) { notices.push_back(ui::original_to_utf8(n.original_message)); };
|
||||
hooks.confirm = [&](const GameState&, int, const std::string&) -> bool { question = true; throw std::runtime_error("question"); };
|
||||
const ui::TransferMarketState m = ui::transfer_market_from_game(g_, revision);
|
||||
const ui::TransferMarketState m = modern::project_transfer_market(g_, revision);
|
||||
std::string feedback;
|
||||
bool bid_pending = false;
|
||||
try {
|
||||
@@ -10212,7 +10228,9 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
|
||||
r.manager_slot = m.manager_slot, r.runtime_club = m.runtime_club, r.revision = m.revision;
|
||||
r.squad_row = item->row, r.expected_player = item->player;
|
||||
r.selected_players.push_back({-1, m.roster.squad_start_offset + item->row, item->player, m.runtime_club, item->row});
|
||||
if (!dispatch_transfer_market(r, hooks, revision, error)) { restore(); return refuse("transfer_refused", error); }
|
||||
const auto listed_result=dispatch_transfer_market(r, hooks, revision, error);
|
||||
if (!listed_result) { restore(); return refuse("transfer_refused", error); }
|
||||
if(listed_result->status!=TransferActionStatus::accepted) {restore();return refuse("listing_refused","Der Spieler konnte nicht auf die Transferliste gesetzt werden.");}
|
||||
feedback = loan ? "Der Spieler wird zum Verleih angeboten." : "Der Spieler steht auf der Transferliste.";
|
||||
} else if (action == "bid") {
|
||||
int entry = -1;
|
||||
@@ -10222,12 +10240,20 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
|
||||
if (item->own_listing) return refuse("own_player", "Das ist ein eigener Spieler.");
|
||||
const auto money_of = [&](const char* key) -> int64_t {
|
||||
const cli::Json* v = ui_field(*payload, key);
|
||||
try { return v ? std::stoll(ui_text(*v, "minor")) : -1; } catch (const std::exception&) { return -1; }
|
||||
try {
|
||||
if(!v||ui_text(*v,"currency")!="EUR")return -1;
|
||||
const auto* units=ui_field(*v,"minorUnits");if(!units||!units->integer()||*units->integer()!=2)return -1;
|
||||
const auto text=ui_text(*v,"minor");size_t end=0;const auto amount=std::stoll(text,&end);
|
||||
return end==text.size()&&amount>=0&&amount/100<=std::numeric_limits<uint32_t>::max()?amount:-1;
|
||||
} catch (const std::exception&) { return -1; }
|
||||
};
|
||||
const int64_t fee = money_of("fee"), salary = money_of("monthlySalary");
|
||||
const cli::Json* years = ui_field(*payload, "years");
|
||||
if (fee < 0 || fee % 100 || salary < 0 || salary % 100 || !years || !years->integer() || *years->integer() < 1 || *years->integer() > 4)
|
||||
if (fee < 0 || fee % 100 || fee/100>std::numeric_limits<int32_t>::max() || salary < 0 || salary % 100 || salary/100>std::numeric_limits<int32_t>::max()/12 || !years || !years->integer() || *years->integer() < 1 || *years->integer() > 4)
|
||||
return refuse("invalid_payload", "fee, monthlySalary (Money, ganze Euro) und years 1-4 nötig.");
|
||||
const auto* bonuses=ui_field(*payload,"bonuses");
|
||||
if(bonuses&&(!bonuses->array()||bonuses->array()->size()!=7||std::any_of(bonuses->array()->begin(),bonuses->array()->end(),[](const auto& b){return !b.integer()||*b.integer()<0||*b.integer()>255;})))return refuse("invalid_payload","bonuses benötigt sieben ganze Werte zwischen 0 und 255.");
|
||||
if(bonuses)for(size_t i=0;i<7;++i)if(*(*bonuses->array())[i].integer()>(i<3?20:200))return refuse("invalid_payload","Die Prämie überschreitet das Originalmaximum.");
|
||||
ui::TransferMarketRequest open;
|
||||
open.kind = ui::TransferMarketRequestKind::open_offer;
|
||||
open.offer_is_loan = loan;
|
||||
@@ -10263,6 +10289,7 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
|
||||
e.duration_years = uint8_t(*years->integer());
|
||||
ok = bool(edit(ui::OutgoingTransferRequestKind::quote_change, ui::OutgoingTransferField::duration_years, e.duration_years));
|
||||
}
|
||||
if(ok&&bonuses)for(size_t i=0;i<7&&ok;++i){const auto value=uint8_t(*(*bonuses->array())[i].integer());if(e.bonuses[i]!=value){e.bonuses[i]=value;ok=bool(edit(ui::OutgoingTransferRequestKind::quote_change,ui::OutgoingTransferField(int(ui::OutgoingTransferField::bonus_0)+int(i)),uint32_t(value)*(i<3?1u:5u)));}}
|
||||
std::optional<TransferOfferEditorDispatch> sent;
|
||||
if (ok) sent = edit(ui::OutgoingTransferRequestKind::submit, ui::OutgoingTransferField::fee, e.fee);
|
||||
if (!sent) { restore(); return refuse("transfer_refused", error); }
|
||||
|
||||
Reference in new issue
Block a user