1280 Commits

Author SHA1 Message Date
aa079776e1 merge upstream 2025-05-02 00:28:01 -07:00
8f8bc5b364 fix: don't set G3/Zanuka death marks by default (#1950)
All checks were successful
Build Docker image / docker (push) Successful in 38s
Build / build (push) Successful in 1m32s
These should only be set to true after completing an invasion for the enemy faction. Re #1097

Reviewed-on: #1950
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:55:01 -07:00
a8227ce54c feat: cure vasca virus (#1949)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1946

Reviewed-on: #1949
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:54:50 -07:00
ec9dc2aa5f fix: multiply standing cost by purchase quantity (#1948)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1945

Reviewed-on: #1948
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:54:27 -07:00
f7906c91e3 fix: ignore purchaseQuantity for webui add items (#1944)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1942

Reviewed-on: #1944
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:54:04 -07:00
159598979d fix: don't duplicate level key credits reward (#1940)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1939

Reviewed-on: #1940
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:53:40 -07:00
4983417201 chore: update certificate (#1937)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
This is good for *.faketls.com until March 2026.

Reviewed-on: #1937
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:53:28 -07:00
9b652f5c3c fix: spoof nemesis to avoid script errors in older versions (#1936)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Reviewed-on: #1936
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:53:10 -07:00
19b04533df fix: omit void fissures for U35.1 (#1935)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
This version also has a script error even tho it should know most of the new deimos nodes...

Reviewed-on: #1935
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:52:43 -07:00
cddd4bdf5c fix: filter sortie armor/shields modifier based on mission faction (#1934)
All checks were successful
Build Docker image / docker (push) Successful in 33s
Build / build (push) Successful in 1m35s
Closes #1931

Reviewed-on: #1934
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 13:51:31 -07:00
e0414a78dc merge upstream 2025-05-01 09:24:02 -07:00
51e6bdd89f revert e18ce8b7845d825d0c5a8c264237697fc215bf19
revert Update Dockerfile
2025-05-01 09:23:48 -07:00
e18ce8b784 Update Dockerfile 2025-05-01 09:16:14 -07:00
12b6e5d16e fix: login failure on U31 the new war & U30.5 sisters of parvos (#1943)
All checks were successful
Build Docker image / docker (push) Successful in 35s
Build / build (push) Successful in 1m37s
Reviewed-on: #1943
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-05-01 05:23:25 -07:00
dd0d60c22f merge upstream 2025-05-01 04:13:37 -07:00
8eefd67d79 chore: fix typo
All checks were successful
Build Docker image / docker (push) Successful in 1m8s
Build / build (push) Successful in 1m34s
2025-05-01 13:09:45 +02:00
c4b2248df5 fix: login failure on U31.5 angels of the zariman (#1933)
All checks were successful
Build Docker image / docker (push) Successful in 47s
Build / build (push) Successful in 1m40s
Reviewed-on: #1933
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 23:50:02 -07:00
2c3043f40e fix: login failure on U32 veilbreaker (#1932)
All checks were successful
Build Docker image / docker (push) Successful in 51s
Build / build (push) Successful in 1m35s
Reviewed-on: #1932
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 15:45:42 -07:00
7d02906656 fix: better handling of assassination missions in sorties (#1930)
All checks were successful
Build Docker image / docker (push) Successful in 37s
Build / build (push) Successful in 1m36s
Closes #1918

Reviewed-on: #1930
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 13:28:34 -07:00
ed54e00a03 fix: compatibility with echoes of duviri (#1928)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Reviewed-on: #1928
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 13:28:24 -07:00
3d6c880c96 feat: handle client setting InfestationDate on equipment (#1927)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1919

Reviewed-on: #1927
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 13:28:16 -07:00
660768b53b fix: handle DuviriInfo being absent from inventory (#1926)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1917

Reviewed-on: #1926
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 13:28:01 -07:00
3de68e51d5 fix: properly set Harvestable & DeathSquadable fields (#1925)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1916

Reviewed-on: #1925
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 13:27:47 -07:00
c06abded11 fix: always multiply acquired gear quantity by purchaseQuantity (#1924)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1915

Reviewed-on: #1924
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-30 13:27:36 -07:00
0b1c1d1bf0 merge upstream 2025-04-30 01:14:10 -07:00
9468768947 fix: weapon seed's low dword being sign extended (#1914)
All checks were successful
Build / build (push) Successful in 46s
Build Docker image / docker (push) Successful in 53s
JavaScript's semantics here are incredibly stupid, but basically if the initial DWORD's high WORD's MSB is true, the number would become negative after the shift left by 16. Then when ORing it with the highDword, the initial DWORD would be sign-extended to a QWORD, meaning the high DWORD would become all 1s, basically cancelling out the entire OR operation.

Reviewed-on: #1914
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-29 12:28:01 -07:00
0af7f41201 fix: unset LibraryPersonalTarget after completing it (#1913)
Some checks failed
Build Docker image / docker (push) Waiting to run
Build / build (push) Has been cancelled
Reviewed-on: #1913
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-29 12:27:47 -07:00
de1e2a25f2 fix(webui): ensure that all requests using authz revalidate it (#1911)
Some checks failed
Build Docker image / docker (push) Waiting to run
Build / build (push) Has been cancelled
Closes #1907

Reviewed-on: #1911
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-29 12:27:38 -07:00
1cf7b41d3f chore: note that random element functions could return undefined (#1910)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
We should be explicit about the fact that we expect the arrays to not be empty.

Reviewed-on: #1910
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-29 12:27:25 -07:00
982852f5c4 merge upstream 2025-04-29 04:14:40 -07:00
ab9cc685eb fix: exclude capture as a mission type for sorties (#1909)
All checks were successful
Build Docker image / docker (push) Successful in 37s
Build / build (push) Successful in 1m39s
Closes #1865

Reviewed-on: #1909
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-29 02:05:18 -07:00
74b7f62a54 merge upstream 2025-04-29 00:41:32 -07:00
743b784754 chore(webui): use plural form of "Moa", just to stay consistent with the other categories (#1905)
All checks were successful
Build Docker image / docker (push) Successful in 32s
Build / build (push) Successful in 1m31s
Reviewed-on: #1905
Co-authored-by: Animan8000 <animan8000@noreply.localhost>
Co-committed-by: Animan8000 <animan8000@noreply.localhost>
2025-04-28 14:01:35 -07:00
5df533a7fb chore: auto-generate "daily special" for fish vendors (#1902)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Trying to go a bit more towards an "auto-generate by default" approach, with manual overrides where needed.

Reviewed-on: #1902
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 14:01:17 -07:00
9417aa3c84 fix: only consider market-listed blueprints for login reward (#1900)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1882

Reviewed-on: #1900
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 14:01:02 -07:00
a1872e2b07 chore: simplify getInnateDamageTag (#1899)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Reviewed-on: #1899
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 14:00:51 -07:00
9042e85355 feat: infested lich rewards (#1898)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1884

Reviewed-on: #1898
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 14:00:38 -07:00
66ee550ccd feat: refresh duviri seed when mood changes (#1895)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1887

Reviewed-on: #1895
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 14:00:22 -07:00
7a295a86ec fix: handle boosters in store item utilities (#1894)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
e.g. `/Lotus/Types/StoreItems/Boosters/AffinityBoosterStoreItem`

Reviewed-on: #1894
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 14:00:06 -07:00
88d00eaaa1 feat: weaken nemesis (#1893)
Some checks failed
Build / build (push) Has been cancelled
Build Docker image / docker (push) Has been cancelled
Closes #1885

Reviewed-on: #1893
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 13:59:54 -07:00
1e8f2fc766 chore: comment out mixed fields in inventory (#1892)
Some checks failed
Build Docker image / docker (push) Successful in 1m5s
Build / build (push) Has been cancelled
If they are needed in the future, they schould be properly schema'd.

Reviewed-on: #1892
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-04-28 13:58:39 -07:00
0d842ade90 chore(webui): update German translation (#1904)
All checks were successful
Build Docker image / docker (push) Successful in 1m6s
Build / build (push) Successful in 48s
Reviewed-on: #1904
Co-authored-by: Animan8000 <animan8000@noreply.localhost>
Co-committed-by: Animan8000 <animan8000@noreply.localhost>
2025-04-28 05:14:25 -07:00
de8d91928e Update static/webui/translations/ru.js
All checks were successful
Build / build (pull_request) Successful in 1m23s
2025-04-28 05:13:52 -07:00
ddb346653b Update static/webui/translations/ru.js
All checks were successful
Build / build (pull_request) Successful in 1m38s
2025-04-28 04:55:15 -07:00
9c497ad6c1 Update static/webui/translations/fr.js 2025-04-28 04:54:27 -07:00
16ef91a296 Update static/webui/translations/es.js 2025-04-28 04:54:00 -07:00
c332efd06b Update static/webui/translations/de.js 2025-04-28 04:53:31 -07:00
0d9f32e184 Update static/webui/translations/en.js 2025-04-28 04:53:15 -07:00
4e3a2e17ee chore: removing unnecessary entries in allScans.json (#1903)
All checks were successful
Build Docker image / docker (push) Successful in 40s
Build / build (push) Successful in 1m29s
Reviewed-on: #1903
Co-authored-by: Animan8000 <animan8000@noreply.localhost>
Co-committed-by: Animan8000 <animan8000@noreply.localhost>
2025-04-28 03:36:39 -07:00
61864b2be1 chore(webui): update to Spanish translation (#1901)
All checks were successful
Build Docker image / docker (push) Successful in 48s
Build / build (push) Successful in 1m35s
Reviewed-on: #1901
Co-authored-by: hxedcl <hxedcl@noreply.localhost>
Co-committed-by: hxedcl <hxedcl@noreply.localhost>
2025-04-27 19:39:49 -07:00