OpenWF/SpaceNinjaServer
28
29
Fork 35
Code Issues 23 Pull Requests 1 Actions Packages Projects Releases Activity

chore(webui): use consistent/correct year order for Wolf Hunt dropdown menu #2890

Closed
Animan8000 wants to merge 2 commits from Animan8000:wolfOrder into main
pull from: Animan8000:wolfOrder
merge into: OpenWF:main
Conversation 3 Commits 2 Files Changed 2 +43 -43
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/services/worldStateService.ts
View File

@ -2365,47 +2365,6 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
if (config.worldState?.wolfHunt != undefined) { if (config.worldState?.wolfHunt != undefined) {
if (config.worldState.wolfHunt == 0) { if (config.worldState.wolfHunt == 0) {
worldState.Goals.push({
_id: {
$oid: "67ed7672798d6466172e3b9c"
},
Activation: {
$date: {
$numberLong: "1743616800000"
}
},
Expiry: {
$date: {
$numberLong: "2000000000000"
}
},
Count: 0,
Goal: 1,
BonusGoal: 2,
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"
]
}
});
} else if (config.worldState.wolfHunt == 1) {
worldState.Goals.push({ worldState.Goals.push({
_id: { _id: {
$oid: "67ed7672798d6466172e3b9d" $oid: "67ed7672798d6466172e3b9d"
@ -2464,6 +2423,47 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
] ]
} }
}); });
} else if (config.worldState.wolfHunt == 1) {
worldState.Goals.push({
_id: {
$oid: "67ed7672798d6466172e3b9c"
},
Activation: {
$date: {
$numberLong: "1743616800000"
}
},
Expiry: {
$date: {
$numberLong: "2000000000000"
}
},
Count: 0,
Goal: 1,
BonusGoal: 2,
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"
]
}
});
} }
} }

4
static/webui/index.html
View File

@ -1212,8 +1212,8 @@
<abbr data-loc-inc="worldState_galleonOfGhouls|worldState_orphixVenom|worldState_anniversary"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><path d="M320 576C461.4 576 576 461.4 576 320C576 178.6 461.4 64 320 64C178.6 64 64 178.6 64 320C64 461.4 178.6 576 320 576zM320 200C333.3 200 344 210.7 344 224L344 336C344 349.3 333.3 360 320 360C306.7 360 296 349.3 296 336L296 224C296 210.7 306.7 200 320 200zM293.3 416C292.7 406.1 297.6 396.7 306.1 391.5C314.6 386.4 325.3 386.4 333.8 391.5C342.3 396.7 347.2 406.1 346.6 416C347.2 425.9 342.3 435.3 333.8 440.5C325.3 445.6 314.6 445.6 306.1 440.5C297.6 435.3 292.7 425.9 293.3 416z"/></svg></abbr> <abbr data-loc-inc="worldState_galleonOfGhouls|worldState_orphixVenom|worldState_anniversary"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><path d="M320 576C461.4 576 576 461.4 576 320C576 178.6 461.4 64 320 64C178.6 64 64 178.6 64 320C64 461.4 178.6 576 320 576zM320 200C333.3 200 344 210.7 344 224L344 336C344 349.3 333.3 360 320 360C306.7 360 296 349.3 296 336L296 224C296 210.7 306.7 200 320 200zM293.3 416C292.7 406.1 297.6 396.7 306.1 391.5C314.6 386.4 325.3 386.4 333.8 391.5C342.3 396.7 347.2 406.1 346.6 416C347.2 425.9 342.3 435.3 333.8 440.5C325.3 445.6 314.6 445.6 306.1 440.5C297.6 435.3 292.7 425.9 293.3 416z"/></svg></abbr>
<select class="form-control" id="worldState.wolfHunt" data-default="null"> <select class="form-control" id="worldState.wolfHunt" data-default="null">
<option value="null" data-loc="disabled"></option> <option value="null" data-loc="disabled"></option>
<option value="0" data-loc="worldState_from_year" data-loc-replace="2019"></option> <option value="0" data-loc="worldState_from_year" data-loc-replace="2025"></option>
<option value="1" data-loc="worldState_from_year" data-loc-replace="2025"></option> <option value="1" data-loc="worldState_from_year" data-loc-replace="2019"></option>
</select> </select>
</div> </div>
<div class="form-group mt-2 d-flex gap-2"> <div class="form-group mt-2 d-flex gap-2">