Bind stadium construction and historical data to scoped engine offers (by Codex)

This commit is contained in:
Codex committed 2026-10-29 06:09:10 +01:00
1 parent dfb972abbd
commit 0edf208405
22 files changed
+1037 -40

No files matched your search

+26 -17
View File
@@ -9141,33 +9141,38 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
const auto& f = st.investments[i];
facilities.push_back(O{{"id", std::string("facility:") + kFacilities[i]}, {"name", text(734 + i)},
{"level", int(f.current_level)}, {"maxLevel", i == 2 || i == 3 ? 2 : 4},
{"constructionWeeks", int(f.construction_weeks)}, {"upgradeAvailable", f.available}});
{"constructionWeeks", int(f.construction_weeks)}, {"plannedLevel", int(f.construction_weeks?((f.current_status>>4)&7):f.current_level)}, {"upgradeAvailable", f.available}});
}
for (size_t b = 0; b < st.blocks.size(); ++b) {
const auto& k = st.blocks[b];
blocks.push_back(O{{"id", "block:" + std::string(1, char('a' + b))}, {"name", text(742 + b)},
{"places", int64_t(k.capacity_level) * 1000},
{"maxPlaces", int64_t(exe_.u8(::bmh::layout::CareerSession_Invalid_RuntimeField + uint32_t(b))) * 1000},
{"seats", (k.flags & 1) != 0}, {"roof", (k.flags & 2) != 0},
{"seats", (k.flags & 1) != 0}, {"roof", (k.flags & 2) != 0}, {"seatsAfterConstruction", (k.flags & (k.construction_weeks?0x10:1)) != 0}, {"roofAfterConstruction", (k.flags & (k.construction_weeks?0x20:2)) != 0},
{"constructionWeeks", int(k.construction_weeks)}, {"placesAfterConstruction", int64_t(k.capacity) * 1000}});
}
A history,table;
for(size_t curve=0;curve<6;++curve){A values,absolute,relative;for(const auto value:data.series[curve])values.push_back(int64_t(value));auto graph=data;bool absolute_ok=true,relative_ok=true;try{graph.flags=0x7f;for(const auto& [x,y]:ui::stadium_data_points(graph,exe_,int(curve)))absolute.push_back(A{cli::Json(x),cli::Json(y)});}catch(const std::exception&){absolute_ok=false;}try{graph.flags=0xbf;for(const auto& [x,y]:ui::stadium_data_points(graph,exe_,int(curve)))relative.push_back(A{cli::Json(x),cli::Json(y)});}catch(const std::exception&){relative_ok=false;}history.push_back(O{{"name",ui::original_to_utf8(exe_.cstring(exe_.u32(::bmh::layout::Analytics_FormatError_ExecutableField+(6+uint32_t(curve))*4)))},{"values",std::move(values)},{"absolute",std::move(absolute)},{"relative",std::move(relative)},{"absoluteAvailable",absolute_ok},{"relativeAvailable",relative_ok}});}
for(size_t row=0;row<data.table.size();++row){A cells;for(const auto& value:data.table[row]){auto text=ui::original_to_utf8(value);if(row!=1&&row!=3)text.erase(0,text.find_first_not_of("% "));cells.push_back(std::move(text));}table.push_back(std::move(cells));}
std::string stadium_name;const size_t name_at=size_t(team)*2;if(name_at+1<g_.club_heap_bc.size()){const size_t offset=size_t(g_.club_heap_bc[name_at])|(size_t(g_.club_heap_bc[name_at+1])<<8);if(offset<g_.stadium_names.size())for(size_t at=offset;at<g_.stadium_names.size()&&g_.stadium_names[at];++at)stadium_name.push_back(char(g_.stadium_names[at]));}stadium_name=ui::original_to_utf8(stadium_name);if(stadium_name.empty())stadium_name="Stadion";
// the open offer of the stadium dialog (quote.request), answered by stadium.commit
cli::Json quote = nullptr;
if (stadium_.opened && stadium_.manager == manager) {
const std::string id = "quote:stadium-" + std::to_string(stadium_.scope);
if (stadium_.periphery_quote)
quote = O{{"id", id}, {"kind", "periphery"}, {"objectId", "periphery:" + std::to_string(stadium_.periphery_quote->first)},
{"price", modern::ui_money(stadium_.periphery_quote->second)}};
else if (stadium_.investment && stadium_.option)
quote = O{{"id", id}, {"kind", "facility"}, {"facilityId", std::string("facility:") + kFacilities[size_t(*stadium_.investment)]},
{"toLevel", int(stadium_.option->target_level)}, {"price", modern::ui_money(stadium_.option->base_price)},
{"weeks", int(stadium_.option->base_weeks)}, {"tipPercent", O{{"min", 6}, {"max", 14}}}};
{"price", modern::ui_money(stadium_.periphery_quote->second)},{"weeks",modern::periphery_build_weeks(stadium_.periphery_quote->first)}};
else if (stadium_.investment && stadium_.option) {
StadiumInvestmentConstants constants;for(unsigned i=0;i<8;++i){constants.price[i]=exe_.u32(::bmh::layout::CareerSession_DispatchStadium_RuntimeField+i*4);constants.weeks[i]=exe_.u8(::bmh::layout::CareerSession_DispatchStadium_RuntimeField2+(14+i)*5);}
A options;for(const auto& option:modern::stadium_investment_options_source(g_,manager,*stadium_.investment,stadium_.price_percent,constants))options.push_back(O{{"toLevel",int(option.target_level)},{"price",modern::ui_money(option.base_price)},{"weeks",int(option.base_weeks)}});
quote=O{{"id",id},{"kind","facility"},{"facilityId",std::string("facility:")+kFacilities[size_t(*stadium_.investment)]},{"toLevel",int(stadium_.option->target_level)},{"price",modern::ui_money(stadium_.option->base_price)},{"pricePercent",stadium_.price_percent},{"weeks",int(stadium_.option->base_weeks)},{"options",std::move(options)},{"tipPercent",O{{"min",6},{"max",14}}}};
}
else if (stadium_.block_expansion) {
const auto& q = stadium_.block_expansion->quote;
quote = O{{"id", id}, {"kind", "block"}, {"blockId", "block:" + std::string(1, char('a' + int(q.slot)))},
{"places", int64_t(q.total_target_places)}, {"maxPlaces", int64_t(q.max_places)}, {"newPlaces", int64_t(q.new_places)},
{"seats", (stadium_.block_expansion->desired_features & 1) != 0}, {"roof", (stadium_.block_expansion->desired_features & 2) != 0},
{"price", modern::ui_money(q.base_price)},
{"price", modern::ui_money(q.base_price)}, {"pricePercent",stadium_.price_percent},
{"breakdown", A{O{{"code", "places"}, {"amount", modern::ui_money(q.new_places_cost)}},
O{{"code", "seats"}, {"amount", modern::ui_money(q.seats_cost)}},
O{{"code", "roof"}, {"amount", modern::ui_money(q.roof_cost)}}}},
@@ -9175,9 +9180,9 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
}
}
return modern::ui_snapshot(g_, context, request_id,
O{{"kind", "stadium"}, {"teamId", modern::ui_team_id(g_, team)}, {"quote", std::move(quote)}, {"periphery", std::move(periphery)},
O{{"kind", "stadium"}, {"name",stadium_name}, {"teamId", modern::ui_team_id(g_, team)}, {"quote", std::move(quote)}, {"periphery", std::move(periphery)},
{"facilities", std::move(facilities)}, {"blocks", std::move(blocks)},
{"ticketPrice", modern::ui_money(data.ticket_price)}, {"ticketPriceRange", O{{"min", modern::ui_money(8)}, {"max", modern::ui_money(25)}}}});
{"history",std::move(history)},{"table",std::move(table)},{"requiredAttendanceText",ui::original_to_utf8(data.required_attendance_text)},{"ticketPrice", modern::ui_money(data.ticket_price)}, {"ticketPriceRange", O{{"min", modern::ui_money(8)}, {"max", modern::ui_money(25)}}}});
}
if (kind == "advertising") {
// the 14 boards, the shirt and the TV rights with their contract, the open offers per place,
@@ -9941,18 +9946,20 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
static constexpr const char* kFacilities[8] = {"floodlights", "scoreboard", "pitch_heating", "vip_lounge", "pitch", "comfort", "condition", "safety"};
if (kind == "quote.request" && ui_text(*payload, "kind") == "block") {
// {blockId: "block:a".."block:h", places: target total, seats?, roof?}
if (stadium_.opened && (stadium_.periphery_quote || stadium_.investment || stadium_.block_expansion))
return refuse("quote_open", "Ein Stadionangebot ist noch offen (stadium.commit).");
const auto quote_id=ui_text(*payload,"quoteId");const bool updating=!quote_id.empty();
if(updating){if(!stadium_.opened||!stadium_.block_expansion||quote_id!="quote:stadium-"+std::to_string(stadium_.scope))return refuse("stale_quote","Dieses Stadionangebot gilt nicht mehr.");}
else if(stadium_.opened&&(stadium_.periphery_quote||stadium_.investment||stadium_.block_expansion))return refuse("quote_open","Ein Stadionangebot ist noch offen (stadium.commit).");
const std::string id = ui_text(*payload, "blockId");
const int slot = id.size() == 7 && id.starts_with("block:") && id[6] >= 'a' && id[6] <= 'h' ? id[6] - 'a' : -1;
const cli::Json* places = ui_field(*payload, "places");
if (slot < 0 || !places || !places->integer() || *places->integer() < 0) return refuse("invalid_payload", "blockId und places nötig.");
if (slot < 0 || !places || !places->integer() || (*places->integer() < 0 || *places->integer()>UINT32_MAX)) return refuse("invalid_payload", "blockId und places nötig.");
const auto flag = [&](const char* key) {
const cli::Json* v = ui_field(*payload, key);
return v && std::holds_alternative<bool>(v->value) && std::get<bool>(v->value);
};
if(updating&&int(stadium_.block_expansion->quote.slot)!=slot)return refuse("stale_quote","Das Angebot gehört zu einem anderen Block.");
if (!stadium_.opened) step(ui::StadiumRequestKind::open);
block_step(ui::StadiumRequestKind::expansion_select, slot, 0, 0);
if(!updating)block_step(ui::StadiumRequestKind::expansion_select, slot, 0, 0);
if (ok) {
auto& d = *stadium_.block_expansion;
const uint32_t total = uint32_t(*places->integer());
@@ -9972,8 +9979,9 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
answer = modern::ui_command_result(request_id, previous, revision, {"stadium"}, "Angebot liegt vor.");
std::get<cli::Json::Object>(answer.value)["outcome"] = "offer_pending";
} else if (kind == "quote.request") {
if (stadium_.opened && (stadium_.periphery_quote || stadium_.investment || stadium_.block_expansion))
return refuse("quote_open", "Ein Stadionangebot ist noch offen (stadium.commit).");
const auto quote_id=ui_text(*payload,"quoteId");const bool updating=!quote_id.empty();
if(updating){if(ui_text(*payload,"kind")!="facility"||!stadium_.opened||!stadium_.investment||!stadium_.option||quote_id!="quote:stadium-"+std::to_string(stadium_.scope))return refuse("stale_quote","Dieses Stadionangebot gilt nicht mehr.");}
else if(stadium_.opened&&(stadium_.periphery_quote||stadium_.investment||stadium_.block_expansion))return refuse("quote_open","Ein Stadionangebot ist noch offen (stadium.commit).");
if (!stadium_.opened) step(ui::StadiumRequestKind::open);
if (ui_text(*payload, "kind") == "periphery") {
int object = -1;
@@ -9989,7 +9997,8 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
if (facility < 0 || !inc || !inc->integer() || *inc->integer() < 1 || *inc->integer() > 3) {
restore(); return refuse("invalid_payload", "facilityId und increment (1 bis 3) nötig.");
}
step(ui::StadiumRequestKind::select_investment, facility);
if(updating&&int(*stadium_.investment)!=facility)return refuse("stale_quote","Das Angebot gehört zu einer anderen Ausstattung.");
if(!updating)step(ui::StadiumRequestKind::select_investment, facility);
if (ok) {
StadiumInvestmentConstants constants;
for (unsigned i = 0; i < 8; ++i) {