forked from OpenWF/SpaceNinjaServer
rename waterFight
to dogDays
This commit is contained in:
parent
ed82225ec1
commit
7a60b86c11
@ -87,8 +87,8 @@ export interface IConfig {
|
|||||||
ghoulEmergenceOverride?: boolean;
|
ghoulEmergenceOverride?: boolean;
|
||||||
plagueStarOverride?: boolean;
|
plagueStarOverride?: boolean;
|
||||||
starDaysOverride?: boolean;
|
starDaysOverride?: boolean;
|
||||||
waterFightOverride?: boolean;
|
dogDaysOverride?: boolean;
|
||||||
waterFightRewardsOverride?: number;
|
dogDaysRewardsOverride?: number;
|
||||||
eidolonOverride?: string;
|
eidolonOverride?: string;
|
||||||
vallisOverride?: string;
|
vallisOverride?: string;
|
||||||
duviriOverride?: string;
|
duviriOverride?: string;
|
||||||
|
@ -1633,19 +1633,16 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
|
|||||||
|
|
||||||
const firstAugustWeekday = new Date(Date.UTC(date.getUTCFullYear(), 7, 1)).getUTCDay();
|
const firstAugustWeekday = new Date(Date.UTC(date.getUTCFullYear(), 7, 1)).getUTCDay();
|
||||||
const firstAugustWednesdayOffset = (3 - firstAugustWeekday + 7) % 7;
|
const firstAugustWednesdayOffset = (3 - firstAugustWeekday + 7) % 7;
|
||||||
const waterFightStart = Date.UTC(date.getUTCFullYear(), 7, 1 + firstAugustWednesdayOffset, 15);
|
const dogDaysStart = Date.UTC(date.getUTCFullYear(), 7, 1 + firstAugustWednesdayOffset, 15);
|
||||||
|
|
||||||
const firstSeptemberWeekday = new Date(Date.UTC(date.getUTCFullYear(), 8, 1)).getUTCDay();
|
const firstSeptemberWeekday = new Date(Date.UTC(date.getUTCFullYear(), 8, 1)).getUTCDay();
|
||||||
const firstSeptemberWednesdayOffset = (3 - firstSeptemberWeekday + 7) % 7;
|
const firstSeptemberWednesdayOffset = (3 - firstSeptemberWeekday + 7) % 7;
|
||||||
const waterFightEnd = Date.UTC(date.getUTCFullYear(), 8, 1 + firstSeptemberWednesdayOffset, 15);
|
const dogDaysEnd = Date.UTC(date.getUTCFullYear(), 8, 1 + firstSeptemberWednesdayOffset, 15);
|
||||||
|
|
||||||
const isWaterFightActive = timeMs >= waterFightStart && timeMs < waterFightEnd;
|
const isDogDaysActive = timeMs >= dogDaysStart && timeMs < dogDaysEnd;
|
||||||
logger.debug(isWaterFightActive);
|
if (config.worldState?.dogDaysOverride ?? isDogDaysActive) {
|
||||||
if (config.worldState?.waterFightOverride ?? isWaterFightActive) {
|
const activationTimeStamp = config.worldState?.dogDaysOverride ? "1699372800000" : dogDaysStart.toString();
|
||||||
const activationTimeStamp = config.worldState?.waterFightOverride
|
const expiryTimeStamp = config.worldState?.dogDaysOverride ? "2000000000000" : dogDaysEnd.toString();
|
||||||
? "1699372800000"
|
|
||||||
: waterFightStart.toString();
|
|
||||||
const expiryTimeStamp = config.worldState?.waterFightOverride ? "2000000000000" : waterFightEnd.toString();
|
|
||||||
const rewards = [
|
const rewards = [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
@ -1793,11 +1790,11 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
|
|||||||
]
|
]
|
||||||
];
|
];
|
||||||
|
|
||||||
const year = config.worldState?.waterFightRewardsOverride ?? 3;
|
const year = config.worldState?.dogDaysRewardsOverride ?? 3;
|
||||||
|
|
||||||
worldState.Goals.push({
|
worldState.Goals.push({
|
||||||
_id: {
|
_id: {
|
||||||
$oid: ((waterFightStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "c57487c3768936df"
|
$oid: ((dogDaysStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "c57487c3768936df"
|
||||||
},
|
},
|
||||||
Activation: { $date: { $numberLong: activationTimeStamp } },
|
Activation: { $date: { $numberLong: activationTimeStamp } },
|
||||||
Expiry: { $date: { $numberLong: expiryTimeStamp } },
|
Expiry: { $date: { $numberLong: expiryTimeStamp } },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user