diff --git a/config-vanilla.json b/config-vanilla.json index fef4a021..4b208195 100644 --- a/config-vanilla.json +++ b/config-vanilla.json @@ -31,7 +31,7 @@ "baroAlwaysAvailable": false, "baroFullyStocked": false, "varziaFullyStocked": false, - "wolfHunt": false, + "wolfHunt": null, "orphixVenom": false, "longShadow": false, "hallowedFlame": false, diff --git a/src/services/configService.ts b/src/services/configService.ts index 0eface6b..72095378 100644 --- a/src/services/configService.ts +++ b/src/services/configService.ts @@ -41,7 +41,7 @@ export interface IConfig { baroAlwaysAvailable?: boolean; baroFullyStocked?: boolean; varziaFullyStocked?: boolean; - wolfHunt?: boolean; + wolfHunt?: number; orphixVenom?: boolean; longShadow?: boolean; hallowedFlame?: boolean; diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 0c2a4f4c..7b2256e0 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -2479,6 +2479,18 @@ const goalMessagesByKey: Record { Personal: true, Bounty: true, ClampNodeScores: true, - Node: "EventNode28", // Incompatible with Wolf Hunt (2025), Orphix Venom, Warframe Anniversary + Node: "EventNode28", // Incompatible with Wolf Hunt, Orphix Venom, Warframe Anniversary MissionKeyName: "/Lotus/Types/Keys/GalleonRobberyAlertB", Desc: "/Lotus/Language/Events/GalleonRobberyEventMissionTitle", Icon: "/Lotus/Interface/Icons/Player/GalleonRobberiesEvent.png", @@ -2035,7 +2035,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => { } if (config.worldState?.anniversary != undefined) { - // Incompatible with: Use Tag from Warframe Anniversary for old Events, Wolf Hunt (2025), Galleon Of Ghouls, Hallowed Flame, Hallowed Nightmares, Dog Days, Proxy Rebellion, Long Shadow + // Incompatible with: Use Tag from Warframe Anniversary for old Events, Wolf Hunt, Galleon Of Ghouls, Hallowed Flame, Hallowed Nightmares, Dog Days, Proxy Rebellion, Long Shadow const goalsByWeek: Partial[][] = [ [ { @@ -2254,65 +2254,111 @@ export const getWorldState = (buildLabel?: string): IWorldState => { }); } - if (config.worldState?.wolfHunt) { - worldState.Goals.push({ - _id: { - $oid: "67ed7672798d6466172e3b9d" - }, - Activation: { - $date: { - $numberLong: "1743616800000" - } - }, - Expiry: { - $date: { - $numberLong: "2000000000000" - } - }, - Count: 0, - Goal: 3, - InterimGoals: [1, 2], - BonusGoal: 4, - Success: 0, - Personal: true, - Bounty: true, - ClampNodeScores: true, - Node: "EventNode29", - ConcurrentMissionKeyNames: [ - "/Lotus/Types/Keys/WolfTacAlertReduxB", - "/Lotus/Types/Keys/WolfTacAlertReduxC", - "/Lotus/Types/Keys/WolfTacAlertReduxD" - ], - ConcurrentNodeReqs: [1, 2, 3], - ConcurrentNodes: ["EventNode28", "EventNode39", "EventNode40"], // Incompatible with Galleon Of Ghouls, Orphix Venom, Warframe Anniversary - MissionKeyName: "/Lotus/Types/Keys/WolfTacAlertReduxA", - Faction: "FC_GRINEER", - Desc: "/Lotus/Language/Alerts/WolfAlert", - Icon: "/Lotus/Interface/Icons/Npcs/Seasonal/WolfStalker.png", - Tag: "WolfHuntRedux", - InterimRewards: [ - { - credits: 50000, - items: ["/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/ThrowingHammerHandle"] + if (config.worldState?.wolfHunt != undefined) { + const year = config.worldState.wolfHunt; + console.log(year); + if (year == 0) { + worldState.Goals.push({ + _id: { + $oid: "67ed7672798d6466172e3b9c" }, - { - credits: 50000, - items: ["/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/ThrowingHammerHead"] + Activation: { + $date: { + $numberLong: "1743616800000" + } + }, + Expiry: { + $date: { + $numberLong: "2000000000000" + } + }, + Count: 0, + Goal: 1, + BonusGoal: 1, + Success: 0, + Personal: true, + Bounty: true, + ClampNodeScores: true, + Node: "EventNode29", + ConcurrentMissionKeyNames: ["/Lotus/Types/Keys/WolfTacAlertB"], + ConcurrentNodeReqs: [1], + ConcurrentNodes: ["EventNode28"], // Incompatible with Galleon Of Ghouls, Orphix Venom, Warframe Anniversary + MissionKeyName: "/Lotus/Types/Keys/WolfTacAlertA", + Faction: "FC_GRINEER", + Desc: "/Lotus/Language/Alerts/WolfAlert", + Icon: "/Lotus/Interface/Icons/Npcs/Seasonal/WolfStalker.png", + Tag: "WolfHuntRedux", // unfaithful + + Reward: { + countedItems: [{ ItemType: "/Lotus/Types/Items/MiscItems/Alertium", ItemCount: 10 }] + }, + BonusReward: { + items: [ + "/Lotus/StoreItems/Upgrades/Mods/Randomized/RawRifleRandomMod", + "/Lotus/StoreItems/Upgrades/Skins/Clan/BountyHunterBadgeItem" + ] } - ], - Reward: { - credits: 50000, - items: ["/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/ThrowingHammerMotor"] - }, - BonusReward: { - credits: 50000, - items: [ - "/Lotus/StoreItems/Types/Recipes/Weapons/ThrowingHammerBlueprint", - "/Lotus/StoreItems/Types/Items/MiscItems/OrokinCatalyst", - "/Lotus/StoreItems/Upgrades/Skins/Clan/BountyHunterBadgeItem" - ] - } - }); + }); + } else if (year == 1) { + worldState.Goals.push({ + _id: { + $oid: "67ed7672798d6466172e3b9d" + }, + Activation: { + $date: { + $numberLong: "1743616800000" + } + }, + Expiry: { + $date: { + $numberLong: "2000000000000" + } + }, + Count: 0, + Goal: 3, + InterimGoals: [1, 2], + BonusGoal: 4, + Success: 0, + Personal: true, + Bounty: true, + ClampNodeScores: true, + Node: "EventNode29", + ConcurrentMissionKeyNames: [ + "/Lotus/Types/Keys/WolfTacAlertReduxB", + "/Lotus/Types/Keys/WolfTacAlertReduxC", + "/Lotus/Types/Keys/WolfTacAlertReduxD" + ], + ConcurrentNodeReqs: [1, 2, 3], + ConcurrentNodes: ["EventNode28", "EventNode39", "EventNode40"], // Incompatible with Galleon Of Ghouls, Orphix Venom, Warframe Anniversary + MissionKeyName: "/Lotus/Types/Keys/WolfTacAlertReduxA", + Faction: "FC_GRINEER", + Desc: "/Lotus/Language/Alerts/WolfAlert", + Icon: "/Lotus/Interface/Icons/Npcs/Seasonal/WolfStalker.png", + Tag: "WolfHuntRedux", + InterimRewards: [ + { + credits: 50000, + items: ["/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/ThrowingHammerHandle"] + }, + { + credits: 50000, + items: ["/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/ThrowingHammerHead"] + } + ], + Reward: { + credits: 50000, + items: ["/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/ThrowingHammerMotor"] + }, + BonusReward: { + credits: 50000, + items: [ + "/Lotus/StoreItems/Types/Recipes/Weapons/ThrowingHammerBlueprint", + "/Lotus/StoreItems/Types/Items/MiscItems/OrokinCatalyst", + "/Lotus/StoreItems/Upgrades/Skins/Clan/BountyHunterBadgeItem" + ] + } + }); + } } const tagsForOlderGoals: string[] = [ @@ -2713,7 +2759,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => { Success: 0, Personal: true, Best: true, - Node: "EventNode28", // Incompatible with Galleon Of Ghouls, Wolf Hunt (2025) + Node: "EventNode28", // Incompatible with Galleon Of Ghouls, Wolf Hunt MissionKeyName: "/Lotus/Types/Keys/MechSurvivalGrineerGalleon", Faction: "FC_SENTIENT", Desc: "/Lotus/Language/Events/MechEventMissionTier2", diff --git a/static/webui/index.html b/static/webui/index.html index 247b38dc..3c14b9ef 100644 --- a/static/webui/index.html +++ b/static/webui/index.html @@ -1169,11 +1169,6 @@ -
- - - -
@@ -1189,6 +1184,15 @@
+
+ + + +
diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index 540de36f..5c64378a 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -278,7 +278,7 @@ dict = { worldState_plagueStar: `Plagenstern`, worldState_dogDays: `Hitzefrei`, worldState_dogDaysRewards: `[UNTRANSLATED] Dog Days Rewards`, - worldState_wolfHunt: `Wolfsjagd (2025)`, + worldState_wolfHunt: `Wolfsjagd`, worldState_voidCorruption: `[UNTRANSLATED] Void Corruption (|VAL|)`, worldState_orphixVenom: `Orphix Gift`, worldState_longShadow: `Lange Schatten`, diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index 33ae5fa7..f5029b77 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -277,7 +277,7 @@ dict = { worldState_plagueStar: `Plague Star`, worldState_dogDays: `Dog Days`, worldState_dogDaysRewards: `Dog Days Rewards`, - worldState_wolfHunt: `Wolf Hunt (2025)`, + worldState_wolfHunt: `Wolf Hunt`, worldState_voidCorruption: `Void Corruption (|VAL|)`, worldState_orphixVenom: `Orphix Venom`, worldState_longShadow: `Long Shadow`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index 267e66c3..ac232806 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -278,7 +278,7 @@ dict = { worldState_plagueStar: `Estrella Infestada`, worldState_dogDays: `Canícula`, worldState_dogDaysRewards: `Recompensas de Canícula`, - worldState_wolfHunt: `Cacería del Lobo (2025)`, + worldState_wolfHunt: `Cacería del Lobo`, worldState_voidCorruption: `Corrupción del Vacío (|VAL|)`, worldState_orphixVenom: `Veneno de Orphix`, worldState_longShadow: `Sombra Prolongada`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index 3e7e2434..2f4d6422 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -278,7 +278,7 @@ dict = { worldState_plagueStar: `Fléau Céleste`, worldState_dogDays: `Bataille d'Eau`, worldState_dogDaysRewards: `Récompenses de la Bataille d'Eau`, - worldState_wolfHunt: `Chasse au Loup (2025)`, + worldState_wolfHunt: `Chasse au Loup`, worldState_voidCorruption: `[UNTRANSLATED] Void Corruption (|VAL|)`, worldState_orphixVenom: `Venin Orphix`, worldState_longShadow: `La Propagation des Ombres`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index c4ab0386..1981b172 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -278,7 +278,7 @@ dict = { worldState_plagueStar: `Чумная звезда`, worldState_dogDays: `Знойные дни`, worldState_dogDaysRewards: `Награды Знойных дней`, - worldState_wolfHunt: `Волчья Охота (2025)`, + worldState_wolfHunt: `Волчья Охота`, worldState_voidCorruption: `[UNTRANSLATED] Void Corruption (|VAL|)`, worldState_orphixVenom: `Яд Орфикса`, worldState_longShadow: `Длинная Тень`, diff --git a/static/webui/translations/uk.js b/static/webui/translations/uk.js index ffb3d11a..5ed05b56 100644 --- a/static/webui/translations/uk.js +++ b/static/webui/translations/uk.js @@ -278,7 +278,7 @@ dict = { worldState_plagueStar: `Морова зірка`, worldState_dogDays: `Спекотні дні`, worldState_dogDaysRewards: `Нагороди Спекотних днів`, - worldState_wolfHunt: `Полювання на Вовка (2025)`, + worldState_wolfHunt: `Полювання на Вовка`, worldState_voidCorruption: `[UNTRANSLATED] Void Corruption (|VAL|)`, worldState_orphixVenom: `Орфіксова отрута`, worldState_longShadow: `Довга тінь`, diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js index 0230716e..f3233bf2 100644 --- a/static/webui/translations/zh.js +++ b/static/webui/translations/zh.js @@ -278,7 +278,7 @@ dict = { worldState_plagueStar: `瘟疫之星`, worldState_dogDays: `三伏天`, worldState_dogDaysRewards: `三伏天奖励设置`, - worldState_wolfHunt: `恶狼狩猎 (2025)`, + worldState_wolfHunt: `恶狼狩猎`, worldState_voidCorruption: `[UNTRANSLATED] Void Corruption (|VAL|)`, worldState_orphixVenom: `奥影之毒`, worldState_longShadow: `暗夜长影`,