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

merge upstream

Browse Source
This commit is contained in:
Animan8000 2025-08-02 05:10:30 -07:00
commit fd99d5f4c9
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/controllers/custom/getItemListsController.ts
View File

@ -153,18 +153,21 @@ const getItemListsController: RequestHandler = (req, response) => {
} }
for (const [uniqueName, item] of Object.entries(ExportWeapons)) { for (const [uniqueName, item] of Object.entries(ExportWeapons)) {
if (item.partType) { if (item.partType) {
if (!uniqueName.startsWith("/Lotus/Types/Items/Deimos/")) { if (!item.excludeFromCodex) {
res.ModularParts.push({ // not a pvp variant
uniqueName, if (!uniqueName.startsWith("/Lotus/Types/Items/Deimos/")) {
name: getString(item.name, lang), res.ModularParts.push({
partType: item.partType uniqueName,
}); name: getString(item.name, lang),
} partType: item.partType
if (uniqueName.split("/")[5] != "SentTrainingAmplifier") { });
res.miscitems.push({ }
uniqueName: uniqueName, if (uniqueName.split("/")[5] != "SentTrainingAmplifier") {
name: getString(item.name, lang) res.miscitems.push({
}); uniqueName: uniqueName,
name: getString(item.name, lang)
});
}
} }
} else if (item.totalDamage !== 0) { } else if (item.totalDamage !== 0) {
if ( if (

10
static/webui/index.html
View File

@ -388,11 +388,11 @@
<div class="card" style="height: 400px;"> <div class="card" style="height: 400px;">
<h5 class="card-header" data-loc="inventory_hoverboards"></h5> <h5 class="card-header" data-loc="inventory_hoverboards"></h5>
<div class="card-body overflow-auto"> <div class="card-body overflow-auto">
<form class="input-group mb-3" onsubmit="doAcquireModularEquipment('HoverBoards');return false;"> <form class="input-group mb-3" onsubmit="doAcquireModularEquipment('Hoverboards');return false;">
<input class="form-control" id="acquire-type-HoverBoards-HB_DECK" list="datalist-ModularParts-HB_DECK" /> <input class="form-control" id="acquire-type-Hoverboards-HB_DECK" list="datalist-ModularParts-HB_DECK" />
<input class="form-control" id="acquire-type-HoverBoards-HB_ENGINE" list="datalist-ModularParts-HB_ENGINE" /> <input class="form-control" id="acquire-type-Hoverboards-HB_ENGINE" list="datalist-ModularParts-HB_ENGINE" />
<input class="form-control" id="acquire-type-HoverBoards-HB_FRONT" list="datalist-ModularParts-HB_FRONT" /> <input class="form-control" id="acquire-type-Hoverboards-HB_FRONT" list="datalist-ModularParts-HB_FRONT" />
<input class="form-control" id="acquire-type-HoverBoards-HB_JET" list="datalist-ModularParts-HB_JET" /> <input class="form-control" id="acquire-type-Hoverboards-HB_JET" list="datalist-ModularParts-HB_JET" />
<button class="btn btn-primary" type="submit" data-loc="general_addButton"></button> <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
</form> </form>
<table class="table table-hover w-100"> <table class="table table-hover w-100">

3
static/webui/script.js
View File

@ -28,7 +28,8 @@ const sendAuth = isRegister => {
}; };
function openWebSocket() { function openWebSocket() {
window.ws = new WebSocket("/custom/ws"); const wsProto = location.protocol === "https:" ? "wss://" : "ws://";
window.ws = new WebSocket(wsProto + location.host + "/custom/ws");
window.ws.onopen = () => { window.ws.onopen = () => {
ws_is_open = true; ws_is_open = true;
sendAuth(false); sendAuth(false);

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

@ -242,8 +242,8 @@ dict = {
worldState_creditBoost: `现金加成`, worldState_creditBoost: `现金加成`,
worldState_affinityBoost: `经验加成`, worldState_affinityBoost: `经验加成`,
worldState_resourceBoost: `资源加成`, worldState_resourceBoost: `资源加成`,
worldState_tennoLiveRelay: `TennoLive 中继站`, worldState_tennoLiveRelay: `TennoLive中继站`,
worldState_baroTennoConRelay: `[UNTRANSLATED] Baro's TennoCon Relay`, worldState_baroTennoConRelay: `Baro的TennoCon中继站`,
worldState_starDays: `活动：星日`, worldState_starDays: `活动：星日`,
worldState_galleonOfGhouls: `战术警报：尸鬼的帆船战舰`, worldState_galleonOfGhouls: `战术警报：尸鬼的帆船战舰`,
enabled: `启用`, enabled: `启用`,