(by Codex) Fix seller transfer review and fresh-arrival contract flags

This commit is contained in:
Codex committed 2026-11-01 17:57:55 +01:00
1 parent d57b6b5a96
commit 8baf80564a
19 files changed
+461 -28

No files matched your search

+4 -1
View File
@@ -461,7 +461,10 @@ Image IncomingTransferScreen::render_at_elapsed(uint64_t elapsed_ms) const {
std::string(text_at(texts_, ::bmh::layout::IncomingTransfer_RenderAtElapsed_TextPointer14)) + source_number(state_.quoted_years, 1, false) +
std::string(text_at(texts_, ::bmh::layout::Contracts_Out_ExecutableField15)) + (state_.quoted_years == 1 ? "" : exe_.cstring(::bmh::layout::Fltd_Layout_TextPointer3)) +
exe_.cstring(::bmh::layout::IncomingTransfer_RenderAtElapsed_TextPointer);
centered(0, 319, 32, quote, 0x6a);
// Early listing review has no newly rolled quote. Explain its input instead
// of presenting a fabricated zero-year, zero-price valuation.
centered(0, 319, 32, state_.quoted_years ? quote :
"Angebot anklicken. Rechtsklick: zurueck.", 0x6a);
shadow_text(7, 123, std::string(text_at(texts_, ::bmh::layout::IncomingTransfer_RenderAtElapsed_TextPointer10)) +
source_money(state_.asking_fee, 7, state_.currency_numerator, state_.currency_denominator), 0x6a);
shadow_text(170, 123, std::string(text_at(texts_, ::bmh::layout::IncomingTransfer_RenderAtElapsed_TextPointer11)) +
+40 -11
View File
@@ -282,7 +282,8 @@ std::string transfer_market_request_json(const TransferMarketRequest& r) {
r.kind == TransferMarketRequestKind::list_player ? "list_player" :
r.kind == TransferMarketRequestKind::open_offer ? "open_offer" :
r.kind == TransferMarketRequestKind::preview_quote ? "preview_quote" :
r.kind == TransferMarketRequestKind::open_poach ? "open_poach" : "none";
r.kind == TransferMarketRequestKind::open_poach ? "open_poach" :
r.kind == TransferMarketRequestKind::review_offers ? "review_offers" : "none";
std::ostringstream out;
out << "{\"kind\":\"" << kind << "\",\"manager_slot\":" << r.manager_slot
<< ",\"runtime_club\":" << r.runtime_club << ",\"revision\":" << r.revision
@@ -520,6 +521,16 @@ Image TransferMarketScreen::render() const {
sprite_font_.draw(out,SpriteFont::centered_title_x(sprite_font_.text_width(title)),13,title);
sprite_font_.draw(out,5,235,original_to_utf8(state_.club_name));
draw_market_overview(out);
if (!feedback_.empty()) {
rect(out, 1, 227, 318, 12, 0x39);
auto line = feedback_;
while (!line.empty() && sprite_font_.text_width(line) > 310) {
size_t at = line.size() - 1;
while (at > 0 && (uint8_t(line[at]) & 0xc0) == 0x80) --at;
line.resize(at);
}
sprite_font_.draw(out, 5, 235, line);
}
return out;
}
@@ -553,13 +564,17 @@ TransferMarketRequest TransferMarketScreen::make_bid() {
TransferMarketRequest TransferMarketScreen::make_listing(bool loan) {
if (pending_ || !selected_squad_) return {};
const auto& item = state_.squad.at(size_t(*selected_squad_));
if (item.already_listed) { feedback_ = "Spieler steht bereits auf der Liste"; return {}; }
if (item.already_listed) {
const auto listing = std::find_if(state_.items.begin(), state_.items.end(),
[&](const auto& row) { return row.player == item.player && row.own_listing; });
if (listing != state_.items.end()) return make_review(*listing);
feedback_ = "Spieler steht bereits auf der Liste"; return {};
}
TransferMarketRequest request;
request.kind = TransferMarketRequestKind::list_player;request.offer_is_loan=loan;
request.manager_slot = state_.manager_slot; request.runtime_club = state_.runtime_club; request.revision = state_.revision;
request.squad_row = item.row; request.expected_player = item.player;
for(size_t n=0;n<state_.squad.size();++n) {if(std::find(marked_squad_.begin(),marked_squad_.end(),int(n))==marked_squad_.end())continue;const auto& marked=state_.squad[n];request.selected_players.push_back({-1,state_.roster.squad_start_offset+marked.row,marked.player,state_.runtime_club,marked.row});}
if(request.selected_players.empty())request.selected_players.push_back({-1,state_.roster.squad_start_offset+item.row,item.player,state_.runtime_club,item.row});
request.selected_players.push_back({-1,state_.roster.squad_start_offset+item.row,item.player,state_.runtime_club,item.row});
pending_ = request; feedback_.clear();
return request;
}
@@ -589,18 +604,27 @@ TransferMarketRequest TransferMarketScreen::make_preview(bool purchase) {
}
pending_=request;preview_.reset();return request;
}
TransferMarketRequest TransferMarketScreen::make_review(const TransferMarketItem& item) {
if (pending_) return {};
if (item.offers == 0) { feedback_ = "Noch keine Angebote für diesen Spieler."; return {}; }
TransferMarketRequest request;
request.kind = TransferMarketRequestKind::review_offers;
request.manager_slot = state_.manager_slot; request.runtime_club = state_.runtime_club;
request.revision = state_.revision; request.bid.manager = state_.manager_slot;
request.bid.list_entry = item.list_entry; request.bid.player = item.player;
request.bid.source_slot = item.source_slot;
pending_ = request; feedback_.clear(); return request;
}
TransferMarketRequest TransferMarketScreen::make_open_offer(bool loan) {
if(pending_||!selected_item_)return {};
const auto& item=state_.items.at(size_t(*selected_item_));
if(item.own_listing)return {};
if(item.own_listing)return make_review(item);
TransferMarketRequest request;request.kind=TransferMarketRequestKind::open_offer;request.offer_is_loan=loan;
request.manager_slot=state_.manager_slot;request.runtime_club=state_.runtime_club;request.revision=state_.revision;
if(item.own_bid)request.bid=*item.own_bid;
request.bid.manager=state_.manager_slot;request.bid.list_entry=item.list_entry;request.bid.player=item.player;
request.bid.source_slot=item.source_slot;
for(size_t n=0;n<state_.squad.size();++n){if(std::find(marked_squad_.begin(),marked_squad_.end(),int(n))==marked_squad_.end())continue;const auto& marked=state_.squad[n];request.selected_players.push_back({-1,state_.roster.squad_start_offset+marked.row,marked.player,state_.runtime_club,marked.row});}
for(int n:market_order()) {if(std::find(marked_items_.begin(),marked_items_.end(),n)==marked_items_.end())continue;const auto& marked=state_.items.at(size_t(n));request.selected_players.push_back({marked.list_entry,marked.source_slot,marked.player,marked.seller,-1});}
if(request.selected_players.empty())request.selected_players.push_back({item.list_entry,item.source_slot,item.player,item.seller,-1});
request.selected_players.push_back({item.list_entry,item.source_slot,item.player,item.seller,-1});
pending_=request;return request;
}
TransferMarketRequest TransferMarketScreen::move(int x,int y) {
@@ -669,14 +693,17 @@ TransferMarketRequest TransferMarketScreen::click(int x,int y,bool right) {
if(x>=201&&x<=297&&y>=25&&y<115) {
const size_t row=size_t((y-25)/15),index=first+row;
if(index<order.size()&&row<6) {
const int item=order[index];auto marked=std::find(marked_items_.begin(),marked_items_.end(),item);
marked_squad_.clear();
const int item=order[index];
marked_items_.erase(std::remove_if(marked_items_.begin(),marked_items_.end(),[&](int n){return n!=item;}),marked_items_.end());
auto marked=std::find(marked_items_.begin(),marked_items_.end(),item);
if(marked==marked_items_.end())marked_items_.push_back(item);else marked_items_.erase(marked);
return move(x,y);
}
}
if(y>=202&&y<=212&&x>=185&&x<=318) {
if(!marked_items_.empty()){selected_item_=marked_items_.front();selected_squad_.reset();selected_snapshot_.reset();return make_open_offer(x>=254);}
if(!marked_squad_.empty()){selected_squad_=marked_squad_.front();selected_item_.reset();return make_listing(x>=254);}
if(!marked_items_.empty()){selected_item_=marked_items_.back();selected_squad_.reset();selected_snapshot_.reset();return make_open_offer(x>=254);}
if(!marked_squad_.empty()){selected_squad_=marked_squad_.back();selected_item_.reset();return make_listing(x>=254);}
view_flags_^=0x1800;preview_.reset();return {};
}
}
@@ -686,6 +713,8 @@ TransferMarketRequest TransferMarketScreen::click(int x,int y,bool right) {
const auto found=std::find_if(state_.squad.begin(),state_.squad.end(),[&](const auto& item){return item.row==player.physical_row;});
if(found==state_.squad.end())return {};
const int index=int(found-state_.squad.begin());
marked_items_.clear();
marked_squad_.erase(std::remove_if(marked_squad_.begin(),marked_squad_.end(),[&](int n){return n!=index;}),marked_squad_.end());
auto marked=std::find(marked_squad_.begin(),marked_squad_.end(),index);
if(marked==marked_squad_.end())marked_squad_.push_back(index);else marked_squad_.erase(marked);
return move(x,y);
+2 -1
View File
@@ -65,7 +65,7 @@ TransferMarketState transfer_market_from_game(const GameState&, uint64_t revisio
std::string transfer_market_state_json(const TransferMarketState&);
TaxDialogProjection poach_notice_from_game(const GameState&,const PoachStart&,std::string original_message);
enum class TransferMarketRequestKind { none, submit_bid, list_player, open_offer, preview_quote, open_poach };
enum class TransferMarketRequestKind { none, submit_bid, list_player, open_offer, preview_quote, open_poach, review_offers };
struct TransferMarketSelection {
int list_entry=-1,source_slot=-1,player=-1,seller=-1,squad_row=-1;
};
@@ -147,6 +147,7 @@ private:
bool close_requested_ = false;
void draw_text(Image&, int x, int y, std::string_view, uint8_t color) const;
void commit_numeric_field();
TransferMarketRequest make_review(const TransferMarketItem&);
TransferMarketRequest make_bid();
TransferMarketRequest make_listing(bool loan=false);
TransferMarketRequest make_open_offer(bool loan=false);
+30
View File
@@ -70,6 +70,36 @@ int main(int argc,char** argv){
check(request.kind==TransferMarketRequestKind::list_player&&request.squad_row==0&&request.expected_player==0,"existing listing request retains physical row stale-validation boundary");
screen.reject_action("Für Müller: Aktion offen");check(screen.state_json().find("Für Müller")!=std::string::npos,"host feedback remains UTF8");
const auto rejected_frame = screen.render();
screen.key("V");
screen.reject_action("Anderer sichtbarer Hinweis");
check(screen.render().pixels != rejected_frame.pixels, "host rejection is actually rendered in the footer");
TransferMarketScreen selected(argv[1],s);
auto marked_market=selected.click(210,28);selected.acknowledge_preview(s,quote(marked_market));
auto marked_squad=selected.click(20,32);selected.acknowledge_preview(s,quote(marked_squad));
auto sale=selected.click(200,206);
check(sale.kind==TransferMarketRequestKind::list_player&&sale.selected_players.size()==1&&sale.expected_player==0,
"latest clicked squad selection replaces an old marked market row");
auto listed=s;listed.items[0].own_listing=true;listed.items[0].seller=listed.runtime_club;
listed.items[0].player=0;listed.squad[0].already_listed=true;listed.items[0].offers=1;
TransferMarketScreen review(argv[1],listed);
auto hover_listing=review.click(20,32);review.acknowledge_preview(listed,quote(hover_listing));
auto inspect=review.click(200,206);
check(inspect.kind==TransferMarketRequestKind::review_offers&&inspect.bid.player==0&&inspect.bid.list_entry==4&&
transfer_market_request_json(inspect).find("review_offers")!=std::string::npos,
"selling an already listed own squad player requests guarded incoming offer review");
review.acknowledge_unchanged();
listed.items[0].offers=0;TransferMarketScreen waiting(argv[1],listed);
auto hover_waiting=waiting.click(20,32);waiting.acknowledge_preview(listed,quote(hover_waiting));
check(waiting.key("V").kind==TransferMarketRequestKind::none&&
waiting.state_json().find("Noch keine Angebote")!=std::string::npos,
"an own listing without incoming offers gives visible feedback");
auto expired=fixture();expired.squad_slots[2932]=0x0fff;
check(!transfer_market_from_game(expired,5).squad[0].already_listed,
"cleared rejected/expired pool entry immediately makes the player listable again");
auto all=s;all.items.clear();for(int n=0;n<40;++n){auto item=s.items[0];item.list_entry=n;item.source_slot=2928+n;item.player=100+n;item.name="P"+std::to_string(n);item.position=n%4;item.strength=60+n%7;all.items.push_back(item);}
TransferMarketScreen pages(argv[1],all);const auto first=visible(pages);std::set<int> reached;
for(int page=0;page<7;++page){const auto rows=visible(pages);check(rows.size()==size_t(page==6?4:6),"six original rows per page with final four");reached.insert(rows.begin(),rows.end());pages.click(210,45,true);}