Corvus/SpaceNinjaServer.CN
1
0
Fork 0
forked from OpenWF/SpaceNinjaServer
Code Pull Requests Activity

Compare commits

base: Corvus:601091f1c03f63bd325a14dbf3d3dcafd6bdcebb
Branches Tags
Corvus:main
OpenWF:main
OpenWF:trailingComma
OpenWF:janisslsm/2013.03.25.11.45
..
compare: Corvus:9286627668e974573f776e15d6dccde673361aa6
Branches Tags
Corvus:main
OpenWF:main
OpenWF:trailingComma
OpenWF:janisslsm/2013.03.25.11.45

No commits in common. "601091f1c03f63bd325a14dbf3d3dcafd6bdcebb" and "9286627668e974573f776e15d6dccde673361aa6" have entirely different histories.
601091f1c0 ... 9286627668

10 changed files with 24 additions and 76 deletions
Show Stats Expand all files Collapse all files

11
src/controllers/api/inventoryController.ts
View File

@ -335,17 +335,6 @@ export const getInventoryResponse = async (
for (const uniqueName in ExportFlavour) {
inventoryResponse.FlavourItems.push({ ItemType: uniqueName });
}
} else if (config.worldState?.baroTennoConRelay) {
[
"/Lotus/Types/Items/Events/TennoConRelay2022EarlyAccess",
"/Lotus/Types/Items/Events/TennoConRelay2023EarlyAccess",
"/Lotus/Types/Items/Events/TennoConRelay2024EarlyAccess",
"/Lotus/Types/Items/Events/TennoConRelay2025EarlyAccess"
].forEach(uniqueName => {
if (!inventoryResponse.FlavourItems.some(x => x.ItemType == uniqueName)) {
inventoryResponse.FlavourItems.push({ ItemType: uniqueName });
}
});
}
if (config.unlockAllSkins) {

1
src/services/configService.ts
View File

@ -82,7 +82,6 @@ export interface IConfig {
affinityBoost?: boolean;
resourceBoost?: boolean;
tennoLiveRelay?: boolean;
baroTennoConRelay?: boolean;
galleonOfGhouls?: number;
starDaysOverride?: boolean;
eidolonOverride?: string;

64
src/services/worldStateService.ts
View File

@ -1157,25 +1157,6 @@ const getIdealTimeSatsifyingConstraints = (constraints: ITimeConstraint[]): numb
return timeSecs;
};
const fullyStockBaro = (vt: IVoidTrader): void => {
for (const armorSet of baro.armorSets) {
if (Array.isArray(armorSet[0])) {
for (const set of armorSet as IVoidTraderOffer[][]) {
for (const item of set) {
vt.Manifest.push(item);
}
}
} else {
for (const item of armorSet as IVoidTraderOffer[]) {
vt.Manifest.push(item);
}
}
}
for (const item of baro.rest) {
vt.Manifest.push(item);
}
};
const getVarziaRotation = (week: number): string => {
const seed = new SRng(week).randomInt(0, 100_000);
const rng = new SRng(seed);
@ -1421,33 +1402,6 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
Node: "TennoConBHUB6"
});
}
if (config.worldState?.baroTennoConRelay) {
worldState.Goals.push({
_id: { $oid: "687bb2f00000000000000000" },
Activation: { $date: { $numberLong: "1752937200000" } },
Expiry: { $date: { $numberLong: "2000000000000" } },
Count: 0,
Goal: 0,
Success: 0,
Personal: true,
//"Faction": "FC_GRINEER",
Desc: "/Lotus/Language/Locations/RelayStationTennoCon",
ToolTip: "/Lotus/Language/Locations/RelayStationTennoConDesc",
Icon: "/Lotus/Interface/Icons/Categories/IconTennoConSigil.png",
Tag: "TennoConRelay",
Node: "TennoConHUB2"
});
const vt: IVoidTrader = {
_id: { $oid: "687809030379266d790495c6" },
Activation: { $date: { $numberLong: "1752937200000" } },
Expiry: { $date: { $numberLong: "2000000000000" } },
Character: "Baro'Ki Teel",
Node: "TennoConHUB2",
Manifest: []
};
worldState.VoidTraders.push(vt);
fullyStockBaro(vt);
}
const isFebruary = date.getUTCMonth() == 1;
if (config.worldState?.starDaysOverride ?? isFebruary) {
worldState.Goals.push({
@ -1679,8 +1633,24 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
};
worldState.VoidTraders.push(vt);
if (isBeforeNextExpectedWorldStateRefresh(timeMs, baroActualStart)) {
vt.Manifest = [];
if (config.baroFullyStocked) {
fullyStockBaro(vt);
for (const armorSet of baro.armorSets) {
if (Array.isArray(armorSet[0])) {
for (const set of armorSet as IVoidTraderOffer[][]) {
for (const item of set) {
vt.Manifest.push(item);
}
}
} else {
for (const item of armorSet as IVoidTraderOffer[]) {
vt.Manifest.push(item);
}
}
}
for (const item of baro.rest) {
vt.Manifest.push(item);
}
} else {
const rng = new SRng(new SRng(baroIndex).randomInt(0, 100_000));
// TOVERIFY: Constraint for upgrades amount?

4
static/webui/index.html
View File

@ -929,10 +929,6 @@
<input class="form-check-input" type="checkbox" id="worldState.tennoLiveRelay" />
<label class="form-check-label" for="worldState.tennoLiveRelay" data-loc="worldState_tennoLiveRelay"></label>
</div>
<div class="form-check">
<input class="form-check-input" type="checkbox" id="worldState.baroTennoConRelay" />
<label class="form-check-label" for="worldState.baroTennoConRelay" data-loc="worldState_baroTennoConRelay"></label>
</div>
<div class="form-check">
<input class="form-check-input" type="checkbox" id="worldState.varziaFullyStocked" />
<label class="form-check-label" for="worldState.varziaFullyStocked" data-loc="worldState_varziaFullyStocked"></label>

1
static/webui/translations/de.js
View File

@ -243,7 +243,6 @@ dict = {
worldState_affinityBoost: `Event Booster: Erfahrung`,
worldState_resourceBoost: `Event Booster: Ressourcen`,
worldState_tennoLiveRelay: `[UNTRANSLATED] TennoLive Relay`,
worldState_baroTennoConRelay: `[UNTRANSLATED] Baro's TennoCon Relay`,
worldState_starDays: `Sternen-Tage`,
worldState_galleonOfGhouls: `Galeone der Ghule`,
enabled: `[UNTRANSLATED] Enabled`,

7
static/webui/translations/en.js
View File

@ -242,7 +242,6 @@ dict = {
worldState_affinityBoost: `Affinity Boost`,
worldState_resourceBoost: `Resource Boost`,
worldState_tennoLiveRelay: `TennoLive Relay`,
worldState_baroTennoConRelay: `Baro's TennoCon Relay`,
worldState_starDays: `Star Days`,
worldState_galleonOfGhouls: `Galleon of Ghouls`,
enabled: `Enabled`,
@ -250,9 +249,9 @@ dict = {
worldState_we1: `Weekend 1`,
worldState_we2: `Weekend 2`,
worldState_we3: `Weekend 3`,
worldState_eidolonOverride: `Eidolon/Deimos Override`,
worldState_day: `Day/Fass`,
worldState_night: `Night/Vome`,
worldState_eidolonOverride: `Eidolon Override`,
worldState_day: `Day`,
worldState_night: `Night`,
worldState_vallisOverride: `Orb Vallis Override`,
worldState_warm: `Warm`,
worldState_cold: `Cold`,

1
static/webui/translations/es.js
View File

@ -243,7 +243,6 @@ dict = {
worldState_affinityBoost: `Potenciador de Afinidad`,
worldState_resourceBoost: `Potenciador de Recursos`,
worldState_tennoLiveRelay: `[UNTRANSLATED] TennoLive Relay`,
worldState_baroTennoConRelay: `[UNTRANSLATED] Baro's TennoCon Relay`,
worldState_starDays: `Días estelares`,
worldState_galleonOfGhouls: `Galeón de Gules`,
enabled: `[UNTRANSLATED] Enabled`,

1
static/webui/translations/fr.js
View File

@ -243,7 +243,6 @@ dict = {
worldState_affinityBoost: `Booster d'Affinité`,
worldState_resourceBoost: `Booster de Ressource`,
worldState_tennoLiveRelay: `[UNTRANSLATED] TennoLive Relay`,
worldState_baroTennoConRelay: `[UNTRANSLATED] Baro's TennoCon Relay`,
worldState_starDays: `Jours Stellaires`,
worldState_galleonOfGhouls: `Galion des Goules`,
enabled: `[UNTRANSLATED] Enabled`,

7
static/webui/translations/ru.js
View File

@ -243,7 +243,6 @@ dict = {
worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
worldState_tennoLiveRelay: `[UNTRANSLATED] TennoLive Relay`,
worldState_baroTennoConRelay: `[UNTRANSLATED] Baro's TennoCon Relay`,
worldState_starDays: `[UNTRANSLATED] Star Days`,
worldState_galleonOfGhouls: `[UNTRANSLATED] Galleon of Ghouls`,
enabled: `[UNTRANSLATED] Enabled`,
@ -251,9 +250,9 @@ dict = {
worldState_we1: `[UNTRANSLATED] Weekend 1`,
worldState_we2: `[UNTRANSLATED] Weekend 2`,
worldState_we3: `[UNTRANSLATED] Weekend 3`,
worldState_eidolonOverride: `[UNTRANSLATED] Eidolon/Deimos Override`,
worldState_day: `[UNTRANSLATED] Day/Fass`,
worldState_night: `[UNTRANSLATED] Night/Vome`,
worldState_eidolonOverride: `[UNTRANSLATED] Eidolon Override`,
worldState_day: `[UNTRANSLATED] Day`,
worldState_night: `[UNTRANSLATED] Night`,
worldState_vallisOverride: `[UNTRANSLATED] Orb Vallis Override`,
worldState_warm: `[UNTRANSLATED] Warm`,
worldState_cold: `[UNTRANSLATED] Cold`,

3
static/webui/translations/zh.js
View File

@ -243,10 +243,9 @@ dict = {
worldState_affinityBoost: `经验加成`,
worldState_resourceBoost: `资源加成`,
worldState_tennoLiveRelay: `TennoLive 中继站`,
worldState_baroTennoConRelay: `[UNTRANSLATED] Baro's TennoCon Relay`,
worldState_starDays: `活动：星日`,
worldState_galleonOfGhouls: `战术警报：尸鬼的帆船战舰`,
enabled: `启用`,
enabled: `[UNTRANSLATED] Enabled`,
disabled: `关闭/取消配置`,
worldState_we1: `活动阶段：第一周`,
worldState_we2: `活动阶段：第二周`,