Read the original edition calendar for gameplay, desktop and saves (by Codex)
Prepare verified release / draft (push) Canceled after 0s
Prepare verified release / draft (push) Canceled after 0s
This commit is contained in:
1 parent
f0ef79a119
commit
d43d09a378
16 files changed
+130
-11
No files matched your search
@@ -0,0 +1,23 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "game/calendar.hpp"
|
||||
#include "formats/executable_layout.hpp"
|
||||
#include "formats/le.hpp"
|
||||
namespace bmh {
|
||||
namespace { CalendarEpoch installed_epoch{2026, 2}; }
|
||||
CalendarEpoch calendar_epoch_from_executable(const LeImage& exe) {
|
||||
constexpr auto setup = layout::CalendarDateSetup;
|
||||
constexpr uint8_t weekday_prefix[] = {0xc6,0x44,0x24,0x04};
|
||||
constexpr uint8_t month_and_year_prefix[] = {0xc6,0x44,0x24,0x0c,0x07,0xc7,0x04,0x24};
|
||||
if (!exe.contains(setup) || !exe.contains(setup + 16))
|
||||
throw FormatError("calendar: missing original date setup");
|
||||
for (uint32_t i=0;i<sizeof weekday_prefix;++i)
|
||||
if(exe.u8(setup+i)!=weekday_prefix[i])throw FormatError("calendar: unverified weekday setup");
|
||||
for (uint32_t i=0;i<sizeof month_and_year_prefix;++i)
|
||||
if(exe.u8(setup+5+i)!=month_and_year_prefix[i])throw FormatError("calendar: unverified year setup");
|
||||
const auto year=exe.u32(setup+13);const int weekday=exe.u8(setup+4);
|
||||
if(year<1600||year>9999||weekday>6)throw FormatError("calendar: invalid original epoch");
|
||||
return {int(year),weekday};
|
||||
}
|
||||
void install_calendar_rules(const LeImage& exe) { installed_epoch=calendar_epoch_from_executable(exe); }
|
||||
CalendarEpoch calendar_epoch() { return installed_epoch; }
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#pragma once
|
||||
namespace bmh {
|
||||
class LeImage;
|
||||
struct CalendarEpoch { int year; int weekday; };
|
||||
// Read verified original date-setup operands; unknown routines are rejected.
|
||||
CalendarEpoch calendar_epoch_from_executable(const LeImage& exe);
|
||||
void install_calendar_rules(const LeImage& exe);
|
||||
// Isolated authored states default to the established synthetic calendar.
|
||||
CalendarEpoch calendar_epoch();
|
||||
}
|
||||
+3
-2
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "formats/executable_layout.hpp"
|
||||
#include "game/save.hpp"
|
||||
#include "game/calendar.hpp"
|
||||
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
@@ -25,7 +26,7 @@ void put32(Bytes& d, size_t at, uint32_t x) {
|
||||
for (int i = 0; i < 4 && at + size_t(i) < d.size(); i++) d[at + size_t(i)] = uint8_t(x >> (8 * i));
|
||||
}
|
||||
|
||||
// DeskDate2(date, buffer, 0): "TT.MM.JJJJ" of a day counter (day 0 = 1 July 2026; a
|
||||
// DeskDate2(date, buffer, 0): "TT.MM.JJJJ" of a day counter (day 0 = 1 July of the supplied edition; a
|
||||
// four-year leap cycle that starts with the third year).
|
||||
std::string date_text(uint32_t counter) {
|
||||
static const int kDays[13] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
|
||||
@@ -45,7 +46,7 @@ std::string date_text(uint32_t counter) {
|
||||
if (++month == 13) month = 1, ++years;
|
||||
}
|
||||
char buf[16];
|
||||
std::snprintf(buf, sizeof buf, "%02d.%02d.%04d", day, month, 2026 + years);
|
||||
std::snprintf(buf, sizeof buf, "%02d.%02d.%04d", day, month, calendar_epoch().year + years);
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "formats/executable_layout.hpp"
|
||||
#include "game/week.hpp"
|
||||
#include "game/calendar.hpp"
|
||||
|
||||
#include "game/matchday.hpp"
|
||||
#include "game/lineup.hpp"
|
||||
@@ -93,9 +94,7 @@ int attribute(Player& p, int area, bool write, int delta, int max) {
|
||||
} // namespace
|
||||
|
||||
int weekday_code(uint32_t date) {
|
||||
int c = int(date % 7) + 2;
|
||||
if (c > 6) c = int(date % 7) - 5;
|
||||
return c;
|
||||
return int((date % 7 + uint32_t(calendar_epoch().weekday)) % 7);
|
||||
}
|
||||
|
||||
void familiarity_decay(GameState& g, GameRandom& game, WatcomRandom& rand) {
|
||||
|
||||
Reference in new issue
Block a user