Bind the six-column Toto coupon to reviewed engine costs and settlement (by Codex)

This commit is contained in:
Codex committed 2026-10-29 04:44:07 +01:00
1 parent eb140cdb1c
commit dfb972abbd
27 files changed
+368 -53

No files matched your search

+7 -3
View File
@@ -336,9 +336,13 @@ J toto(const ModernState& g, int manager) {
const uint32_t matches_at = ::bmh::layout::DeskActions_SubmitPoolsCoupon_RuntimeField;
const int count = mem.has(::bmh::layout::CareerSession_DispatchToto_RuntimeField) ? mem.u8(::bmh::layout::CareerSession_DispatchToto_RuntimeField) : 0;
A matches;
for (int k = 0; k < count && k < 11 && mem.has(matches_at + uint32_t(k) * 4 + 3); ++k)
matches.push_back(O{{"home", club_json(g, mem.u16(matches_at + uint32_t(k) * 4))},
{"away", club_json(g, mem.u16(matches_at + uint32_t(k) * 4 + 2))}});
for (int k = 0; k < count && k < 11 && mem.has(matches_at + uint32_t(k) * 4 + 3); ++k) {
const int home=mem.u16(matches_at+uint32_t(k)*4),away=mem.u16(matches_at+uint32_t(k)*4+2),league=team_league(home);
const auto saved_squad=[&](int team){const auto range=squad_range(team);return range.count&&range.first<=g.squad_slots.size()&&range.count<=g.squad_slots.size()-range.first;};
J suggested=nullptr;
if(saved_squad(home)&&saved_squad(away)){const auto h=team_average(g,home,0xff),a=team_average(g,away,0xff);if(h.players>0&&a.players>0)suggested=h.value>a.value?1:h.value<a.value?2:0;}
matches.push_back(O{{"home",club_json(g,home)},{"away",club_json(g,away)},{"league",league>=0&&league<kLeagueCount?league_json(g,league):J(nullptr)},{"suggested",suggested}});
}
const uint32_t at = ::bmh::layout::Coupon + uint32_t(manager) * 0x14;
uint32_t stake = 0;
A columns;
+39
View File
@@ -0,0 +1,39 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/content/toto_quote.hpp"
#include "modern/content/ui_contract.hpp"
#include "modern/game/desk_actions.hpp"
#include "formats/executable_layout.hpp"
#include <charconv>
#include <limits>
namespace bmh::modern {
std::optional<TotoDraft> parse_toto_draft(const cli::Json &request) {
try {
const auto* object=request.object();if(!object)return {};
const auto* money=object->at("stake").object();const auto* columns=object->at("columns").array();
if(!money||!columns||columns->size()>64||!money->at("currency").string()||*money->at("currency").string()!="EUR"||!money->at("minorUnits").integer()||*money->at("minorUnits").integer()!=2||!money->at("minor").string())return {};
const auto &raw=*money->at("minor").string();int64_t cents=-1;const auto parsed=std::from_chars(raw.data(),raw.data()+raw.size(),cents);
if(raw.empty()||parsed.ec!=std::errc()||parsed.ptr!=raw.data()+raw.size()||cents<0||cents%100||uint64_t(cents/100)>std::numeric_limits<uint32_t>::max()||(cents==0&&!columns->empty()))return {};
TotoDraft out;out.stake=uint32_t(cents/100);
for(const auto &column:*columns){const auto* values=column.array();if(!values||values->size()!=11)return {};std::array<uint8_t,11> row{};for(size_t i=0;i<row.size();++i){const auto* value=(*values)[i].integer();if(!value||*value<0||*value>2)return {};row[i]=uint8_t(*value);}out.columns.push_back(row);}
return out;
}catch(const std::exception&){return {};}
}
cli::Json quote_toto_draft(const ModernState &state,int manager,const cli::Json &request) {
using O=cli::Json::Object;
const auto refused=[](const char *code){return cli::Json(O{{"allowed",false},{"errorCode",code},{"cost",nullptr},{"fee",nullptr}});};
const auto draft=parse_toto_draft(request);if(!draft)return refused("invalid_toto_draft");
if(manager<0||size_t(manager)>=state.manager_teams.size()||state.manager_teams[size_t(manager)]<0||state.manager_teams[size_t(manager)]>=league_clubs())return refused("no_club");
if(!state.memory.has(::bmh::layout::CareerSession_DispatchToto_RuntimeField)||state.memory.u8(::bmh::layout::CareerSession_DispatchToto_RuntimeField)!=11)return refused("toto_coupon_requires_eleven_matches");
ModernState copy=state;
switch(modern::submit_pools_columns(copy,manager,draft->stake,draft->columns)) {
case PoolsColumnsResult::ok:break;
case PoolsColumnsResult::too_many_columns:return refused("too_many_columns");
case PoolsColumnsResult::stake_out_of_range:return refused("stake_out_of_range");
case PoolsColumnsResult::total_too_high:return refused("total_stake_too_high");
case PoolsColumnsResult::duplicate_column:return refused("duplicate_column");
case PoolsColumnsResult::invalid:return refused("invalid_toto_coupon");
}
const int64_t cost=modern::pools_cost(draft->stake,draft->columns.size());
return O{{"allowed",true},{"errorCode",nullptr},{"cost",ui_money(cost)},{"fee",ui_money(cost-int64_t(draft->stake)*int64_t(draft->columns.size()))},{"columnCount",int(draft->columns.size())},{"clearing",draft->stake==0},{"payload",request},{"settlement","end_of_matchday"}};
}
}
+12
View File
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include "cli/json.hpp"
#include "modern/game/modern_state.hpp"
#include <array>
#include <optional>
namespace bmh::modern {
struct TotoDraft {uint32_t stake=0;std::vector<std::array<uint8_t,11>> columns;};
std::optional<TotoDraft> parse_toto_draft(const cli::Json&);
// Executes the existing submission validation on a private state copy, without random streams.
cli::Json quote_toto_draft(const ModernState&,int manager,const cli::Json&);
}
+2
View File
@@ -16,6 +16,7 @@
#include "modern/content/statistics.hpp"
#include "modern/content/world_package.hpp"
#include "modern/content/world_save.hpp"
#include "modern/content/toto_quote.hpp"
#include "modern/game/almanac.hpp"
#include "modern/game/desk_actions.hpp"
#include "modern/game/environment.hpp"
@@ -729,6 +730,7 @@ cli::Json ui_read(const ModernState& g, const UiContext& c, const cli::Json& req
o->erase("ok");
const auto money = [](J& v) { if (v.integer()) v = ui_money(*v.integer()); };
if (kind == "toto") {
if(const auto* draft=field(request,"draft"))(*o)["draftQuote"]=quote_toto_draft(g,c.manager,*draft);
money((*o)["stake"]), money((*o)["cost"]);
auto& last = std::get<O>((*o)["last"].value);
money(last["paid"]), money(last["won"]);