Stadium: back to the edition's block limits (Diamond 3.7: 96,000 places)
The extension to 144,000 places of 1.0.3 is withdrawn: the match broadcast of the original has no room for attendances of 100,000 and more and showed them wrongly. Limits, unit prices and construction weeks now come from the edition unchanged (3.7: 8/18/8/14 thousand per block, 30/37/30/25 weeks). A savegame with a larger stadium keeps its places but cannot extend such a block further. Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
1 parent
d9d408069e
commit
a503fff55f
6 files changed
+48
-50
No files matched your search
@@ -70,25 +70,20 @@ bool valid_resolved_offer(const StandBlockOffer& offer, const StadiumBlockExpans
|
||||
} // namespace
|
||||
|
||||
StadiumBlockExpansionConstants stadium_block_expansion_constants(const LeImage& image) {
|
||||
// OpenBMH deviates from the original: allow 144,000 standard places and
|
||||
// size-aware construction times while retaining edition-owned unit prices.
|
||||
static constexpr std::array<uint32_t, 8> minima{
|
||||
14000, 24000, 14000, 20000, 14000, 24000, 14000, 20000};
|
||||
// The limits, prices and construction periods of the edition, unchanged: Diamond 3.7 allows
|
||||
// 8/18/8/14 thousand places per block (A-D and E-H), 96,000 in total. Versions 1.0.3 to 1.0.12
|
||||
// raised the limits to 144,000; that is withdrawn, because the match broadcast of the original
|
||||
// has no room for attendances of 100,000 and more and showed them wrongly.
|
||||
StadiumBlockExpansionConstants out;
|
||||
uint32_t total = 0;
|
||||
for (size_t i = 0; i < minima.size(); ++i) {
|
||||
for (size_t i = 0; i < out.max_places.size(); ++i) {
|
||||
out.price_per_1000[i] = image.u32(
|
||||
layout::CareerSession_DispatchStadium_RuntimeField + uint32_t((i + 8) * 4));
|
||||
const auto original = uint32_t(image.u8(
|
||||
out.max_places[i] = uint32_t(image.u8(
|
||||
layout::CareerSession_Invalid_RuntimeField + uint32_t(i))) * 1000;
|
||||
out.max_places[i] = std::max(original, minima[i]);
|
||||
total += out.max_places[i];
|
||||
const auto source_weeks = image.u8(
|
||||
out.weeks[i] = image.u8(
|
||||
layout::CareerSession_DispatchStadium_RuntimeField2 + uint32_t((i + 22) * 5));
|
||||
const auto weeks = std::max<uint32_t>(source_weeks, 2 * (out.max_places[i] / 1000));
|
||||
if (weeks > 255)
|
||||
throw FormatError("stadium: expanded construction period exceeds saved byte");
|
||||
out.weeks[i] = uint8_t(weeks);
|
||||
}
|
||||
if (total > 255000)
|
||||
throw FormatError("stadium: combined stand limits exceed saved capacity byte");
|
||||
|
||||
@@ -23,8 +23,9 @@ struct StadiumBlockExpansionConstants {
|
||||
std::array<uint32_t, 8> max_places{};
|
||||
};
|
||||
|
||||
// OpenBMH1.0.3 expands standard A-H limits to at least144k total. Prices
|
||||
// still come from the edition; larger blocks have at least2weeks per1000places.
|
||||
// The edition's limits (thousands of places per block A-H), unit prices and construction weeks,
|
||||
// exactly as supplied: Diamond 3.7 gives 8/18/8/14 twice = 96,000 places. (1.0.3 to 1.0.12 raised
|
||||
// the limits to 144,000; withdrawn in 1.0.13, see stadium_blocks.cpp.)
|
||||
StadiumBlockExpansionConstants stadium_block_expansion_constants(const LeImage&);
|
||||
|
||||
// An immutable quote binds the Source owner and every record/table value that
|
||||
|
||||
Reference in new issue
Block a user