Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev > main #87

Merged
merged 128 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
e683314
Update types
seionmoya Jul 31, 2024
528111f
Bump supported spt version
seionmoya Jul 31, 2024
a31609a
Fix missing SelectedMemberCategory
seionmoya Jul 31, 2024
109b3ef
Rework loot generation
seionmoya Jul 31, 2024
44fded6
Inject DatabaseService, ProfileHelper & TimeUtil
ArchangelWTF Aug 1, 2024
c8e44d2
Merge branch 'main' into spt-3.10
ArchangelWTF Aug 15, 2024
04a0169
Merge branch 'main' into spt-3.10
ArchangelWTF Aug 20, 2024
cbfb662
Update types
Lacyway Aug 21, 2024
597ccf0
Feature: Fix duplicate insurance
nexus4880 Jul 8, 2024
cc7b92a
Update search to also nuke helmet inserts
ArchangelWTF Aug 29, 2024
10e44cf
Handle raids ending without finishing
ArchangelWTF Aug 29, 2024
cf40b4f
Return if player & nextPlayer have not finished the raid
ArchangelWTF Aug 29, 2024
2183419
Update comment
ArchangelWTF Aug 29, 2024
4a9d007
Remove unused insuranceService
ArchangelWTF Aug 29, 2024
39d3b00
Remove friends that cannot be found
Lacyway Aug 31, 2024
24567e5
Bump version
Lacyway Aug 31, 2024
b04c4f7
If matchId isn't found, immediately return back to SPT endLocalRaid
ArchangelWTF Aug 31, 2024
bc3d367
Handle checking for match in onEndLocalRaidRequest
ArchangelWTF Aug 31, 2024
c7b7dfa
Update comment
ArchangelWTF Aug 31, 2024
5491d77
typo
ArchangelWTF Aug 31, 2024
14d19f8
Allow scavs to also be processed through the InsuranceService so that…
ArchangelWTF Sep 3, 2024
49f338a
Store sent items for 7 days instead of 2
ArchangelWTF Sep 5, 2024
ce745a8
Remove editions in LauncherController instead of FikaDatabaseService
ArchangelWTF Sep 11, 2024
f788b8c
Remove unused logger
ArchangelWTF Sep 11, 2024
8900eba
Allow FikaServerTools to support Linux
ArchangelWTF Sep 20, 2024
3064d81
Pass correct data to favoriteItems
ArchangelWTF Sep 20, 2024
806b1f8
Add customization of time
Lacyway Sep 20, 2024
e69c488
Update types
ArchangelWTF Sep 20, 2024
7315155
Remove code to convert favoriteItems as this is now in SPT
ArchangelWTF Sep 20, 2024
e5d2ffc
Keep check for dedicated consistent with other checks
ArchangelWTF Sep 20, 2024
9122d83
Update locales
Lacyway Sep 20, 2024
3a75c00
Update locales
Lacyway Sep 22, 2024
be6dcad
Update types
Lacyway Sep 27, 2024
e33ef7b
Update types
Lacyway Sep 27, 2024
e448479
Remove unused service
Lacyway Oct 1, 2024
0aff7a4
Update types
Lacyway Oct 3, 2024
9ae7d50
Revert "Remove unused service"
Lacyway Oct 3, 2024
cf02568
Update types
Lacyway Oct 3, 2024
31736b8
Improve LocationLifecycleService override
Lacyway Oct 3, 2024
16a0f1e
Remove unused imports
Lacyway Oct 3, 2024
018f99d
Update locales
Lacyway Oct 4, 2024
7f2e93a
Cleanup dedicated web socket
ArchangelWTF Oct 7, 2024
7869343
Update types
Lacyway Oct 8, 2024
c87dafa
Update LocationLifecycleServiceOverride
Lacyway Oct 8, 2024
8fd4bab
Merge branch 'spt-3.10' of https://github.com/project-fika/Fika-Serve…
Lacyway Oct 8, 2024
3522cc6
Use new item interface
ArchangelWTF Oct 9, 2024
ecdefa5
Initial implementation Server WS notifications
ArchangelWTF Oct 8, 2024
e755fae
Cleanup, add todo's
ArchangelWTF Oct 8, 2024
2c7d3ec
Handle if websocket has no authorization header
ArchangelWTF Oct 9, 2024
182af7d
Fixes
ArchangelWTF Oct 9, 2024
6f09c2d
Use locale for item
ArchangelWTF Oct 9, 2024
1abcec5
Merge pull request #78 from project-fika/feature/ws-notifications
Lacyway Oct 10, 2024
c105db4
Join as spectator concept
trippyone Oct 11, 2024
185c9e8
cleanup
trippyone Oct 11, 2024
5b4c8ae
Improve logic of spectator player detection
trippyone Oct 11, 2024
02b23c6
Update LocationLifecycleService.ts
trippyone Oct 11, 2024
5b49d77
Ensure to call the original method whether the player is found or not
trippyone Oct 11, 2024
6e07ec1
Merge pull request #79 from project-fika/join-as-spectator
Lacyway Oct 13, 2024
46143be
Send raw data for local localization in client
Lacyway Oct 14, 2024
ce1266b
Formatting
Lacyway Oct 14, 2024
090309c
Biome cleanup
ArchangelWTF Oct 14, 2024
09a22f0
Implement player presence for main menu UI
ArchangelWTF Oct 14, 2024
cb1375f
handlePushNotification -> handleGetPresence
ArchangelWTF Oct 14, 2024
3df218e
Delete sessionID out of Presence interface
ArchangelWTF Oct 14, 2024
5ad5c00
Update response and interface
Lacyway Oct 14, 2024
267dcad
Merge branch 'spt-3.10' of https://github.com/project-fika/Fika-Serve…
Lacyway Oct 14, 2024
9cb85f0
Update service
Lacyway Oct 14, 2024
b1eeceb
Put new interfaces in models
ArchangelWTF Oct 14, 2024
3d8fd4b
Update types
ArchangelWTF Oct 14, 2024
7aef004
Pass UNIX timestamp when user starts raid in Raid presence
ArchangelWTF Oct 14, 2024
e2b140a
Set default values for raidInformation
ArchangelWTF Oct 14, 2024
f6fc3f7
Dont set null as a secondary parameter
ArchangelWTF Oct 14, 2024
8a46463
Use null
Lacyway Oct 14, 2024
6ba4da0
Fix nullref exception
Lacyway Oct 15, 2024
aaa36f0
Update bool check
Lacyway Oct 15, 2024
fec2870
Make changes to the Fika presence models
ArchangelWTF Oct 15, 2024
567bea0
activityStarted -> activityStartedTimestamp
ArchangelWTF Oct 15, 2024
4adfd48
Push new endpoints
ArchangelWTF Oct 15, 2024
a50d9bd
Set E prefix to all enums
ArchangelWTF Oct 15, 2024
0a020cb
Revert this file
ArchangelWTF Oct 15, 2024
84d0cb1
Formatting fixes
ArchangelWTF Oct 15, 2024
b1e5785
Move IFikaInsurancePlayer to it's own model
ArchangelWTF Oct 15, 2024
90c517a
Stop people from sending friend requests to bots
ArchangelWTF Oct 15, 2024
d75ecb8
getProfile -> profileExists
ArchangelWTF Oct 15, 2024
65ebb5d
Add nullable
Lacyway Oct 15, 2024
8d89441
Add more nullable
ArchangelWTF Oct 15, 2024
716c7fe
Add IN_HIDEOUT
ArchangelWTF Oct 15, 2024
ddd7211
Do correct response
ArchangelWTF Oct 15, 2024
23677e4
Update methods
Lacyway Oct 15, 2024
a95b869
Merge branch 'spt-3.10' of https://github.com/project-fika/Fika-Serve…
Lacyway Oct 15, 2024
c1aef14
Revert 'Update methods'
ArchangelWTF Oct 15, 2024
e0d5992
Pass IFikaSetPresence to updatePlayerPresence
ArchangelWTF Oct 15, 2024
2dfa438
Update method name
Lacyway Oct 15, 2024
879499d
Cleanup
ArchangelWTF Oct 16, 2024
c52342c
Small refactor to the Notification websocket
ArchangelWTF Oct 16, 2024
12bf752
Send received item notification to individual rather than broadcast
ArchangelWTF Oct 16, 2024
0cd1ba4
Get rid of errors due to protected methods
ArchangelWTF Oct 16, 2024
8cb174d
Update biome ignore
ArchangelWTF Oct 16, 2024
981f40b
Change accessability
ArchangelWTF Oct 16, 2024
0e04054
Use same authentication for dedicated as the Notification Manager
ArchangelWTF Oct 16, 2024
e37b08c
Add new presence
Lacyway Oct 16, 2024
3860fc1
chore: Cleanup duplicate call to the configHandler
ItsDyze Oct 19, 2024
3580009
fix: Prevent listing an empty mod in the lists
ItsDyze Oct 19, 2024
e671bad
fix: Prevent listing an empty mod in the lists
ItsDyze Oct 19, 2024
68e949a
fix: Prevent whitespace in the modlists
ItsDyze Oct 19, 2024
2a6e792
fix: Removed the inline method
ItsDyze Oct 19, 2024
cc63b65
Merge pull request #82 from ItsDyze/Issue81-RequiredModCheckSanitize
ArchangelWTF Oct 19, 2024
92a3111
update SPT types
ArchangelWTF Oct 19, 2024
27d4e4e
Update imports
ArchangelWTF Oct 19, 2024
f2afbbd
Cleanup unused
ArchangelWTF Oct 19, 2024
cb66cde
Add github workflow
ArchangelWTF Oct 19, 2024
5faa74c
Update parameter name
ArchangelWTF Oct 19, 2024
a3a0757
Revert "chore: Cleanup duplicate call to the configHandler"
ArchangelWTF Oct 19, 2024
bce945c
Re-add config
ArchangelWTF Oct 19, 2024
cc8b3f0
Add boolean to check if changes to the mod configuration have been made
ArchangelWTF Oct 19, 2024
25e7340
Check required & optional array, change naming
ArchangelWTF Oct 19, 2024
60b8923
Allow disabling of RaidSettings
Lacyway Oct 21, 2024
c9b9239
Fix player relations
Lacyway Oct 29, 2024
9559c03
Merge pull request #85 from project-fika/fix-player-relations
Lacyway Oct 29, 2024
76329d4
Update types
Lacyway Nov 1, 2024
789d4f3
Update types
ArchangelWTF Nov 18, 2024
cbd5e69
Fix loot regen on transit
Lacyway Nov 22, 2024
db873e5
User raid counter to determine whether to regen loot
Lacyway Nov 22, 2024
4c3f3ca
Update locales
Lacyway Nov 24, 2024
7afae29
Get chatbots from the original Dialog Controller
ArchangelWTF Nov 25, 2024
8873f06
Remove code that is now handled by SPT
ArchangelWTF Nov 25, 2024
17ca2dc
Remove unused constant
ArchangelWTF Nov 25, 2024
a82cdc8
Update locales
Lacyway Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 33 additions & 0 deletions .github/workflows/build_lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: NPM Build & Lint

on:
workflow_dispatch:
push:
paths-ignore:
- '**/*.md'
pull_request:
paths-ignore:
- '**/*.md'

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'

- name: Install dependencies
run: npm install

- name: Build
run: npm run build

- name: Lint
run: npm run lint

5 changes: 3 additions & 2 deletions assets/configs/fika.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"optional": []
},
"useInertia": true,
"sharedQuestProgression": false
"sharedQuestProgression": false,
"canEditRaidSettings": true
},
"server": {
"giftedItemsLoseFIR": true,
Expand All @@ -40,4 +41,4 @@
"enable": true,
"easteregg": false
}
}
}
14 changes: 11 additions & 3 deletions assets/database/locales/global/ch.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"F_SendItem_Header": "选择一个玩家",
"F_SendItem_SendButton": "发送",
"F_MMUI_RaidsHeader": "行动",
"F_MMUI_HostRaidButton": "主持一個行動",
"F_MMUI_HostRaidButton": "主持一个行动",
"F_MMUI_JoinButton": "加入",
"F_MMUI_SelectAmountHeader": "选择一个数量",
"F_MMUI_SelectAmountDescription": "将有多少人(包括您) 在玩?",
Expand All @@ -48,7 +48,7 @@
"F_UI_CannotJoinRaidPMCAsScav": "你不能以SCAV身份加入PMC行动",
"F_UI_HostStillLoading": "主机仍在加载中。",
"F_UI_RaidInProgress": "游戏已经开始了!",
"F_UI_ReJoinRaid": "點擊以重新加入",
"F_UI_ReJoinRaid": "点击以重新加入",
"F_UI_CannotReJoinRaidDied": "不能重新加入你已經陣亡的行動",
"F_UI_JoinRaid": "點擊以加入行動",
"F_UI_ErrorConnecting": "连接错误",
Expand Down Expand Up @@ -85,5 +85,13 @@
"F_UI_WaitForPlayer": "正在等待 {0} 位玩家",
"F_UI_WaitForPlayers": "正在等待 {0} 位玩家",
"F_UI_ToSLong": "欢迎来到Fika!\n\nFika 是一个SPT的合作模组,允许您与朋友一起玩。 如果您为此付了钱,说明你被骗了,Fika是免费的。 您也不允许建立付费或需要捐赠的公共服务器。\n\n等待此消息自动消失来接受我们的服务条款。\n\n您可以在这里加入我们的Discord: https://discord.gg/project-fika",
"F_UI_ToSShort": "欢迎来到Fika!\n\nFika 是一个SPT的合作模组,允许您与朋友一起玩。 如果您为此付了钱,说明你被骗了,Fika是免费的。 您也不允许建立付费或需要捐赠的公共服务器。\n\n您可以在这里加入我们的Discord: https://discord.gg/project-fika"
"F_UI_ToSShort": "欢迎来到Fika!\n\nFika 是一个SPT的合作模组,允许您与朋友一起玩。 如果您为此付了钱,说明你被骗了,Fika是免费的。 您也不允许建立付费或需要捐赠的公共服务器。\n\n您可以在这里加入我们的Discord: https://discord.gg/project-fika",
"F_UI_RaidSettingsDescription": "在此模式下,您可以与好友一起游玩在线合作游戏,而无需担心遇见其他玩家。\\n合作模式中的所有游戏机制(天气、AI、Boss 等)与在线机制相同。\\n仅主机设置才会生效。",
"F_UI_CoopGameMode": "Fika联机 游戏模式",
"F_UI_CoopRaidSettings": "Fika联机 战局设置",
"F_UI_FikaAlwaysCoop": "Fika 永远是 PVE",
"F_UI_UpnpFailed": "UPnP 映射失败。请确保所选端口尚未打开!\\n如果您正在使用 VPN,请禁用 UPnP。",
"F_UI_InitWeather": "正在生成天气...",
"F_Notification_RaidStarted": "{0} 开始了 {1} 行动",
"F_Notification_ItemReceived": "你收到了来自玩家 {1} 发送的 {0}"
}
10 changes: 9 additions & 1 deletion assets/database/locales/global/cz.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,13 @@
"F_UI_WaitForPlayer": "Čekání na {0} hráče",
"F_UI_WaitForPlayers": "Čekání na {0} hráčů",
"F_UI_ToSLong": "Vítejte u Fika!\n\nFika je kooperativní mod pro SPT, který vám umožňuje hrát s přáteli. Fika je a vždy bude zdarma, pokud jste za ni zaplatili, byli jste podvedeni. Také není dovoleno provozovat veřejné servery s monetizací nebo přijímáním darů.\n\n\"Počkejte, až tato zpráva zmizí, abyste přijali naše podmínky služby.\"\n\nMůžete se připojit na náš Discord zde: https://discord.gg/project-fika",
"F_UI_ToSShort": "Vítejte u Fika!\n\nFika je kooperativní mod pro SPT, který vám umožňuje hrát s přáteli. Fika je a vždy bude zdarma, pokud jste za ni zaplatili, byli jste podvedeni. Také není dovoleno provozovat veřejné servery s monetizací nebo přijímáním darů.\n\nMůžete se připojit na náš Discord zde: https://discord.gg/project-fika"
"F_UI_ToSShort": "Vítejte u Fika!\n\nFika je kooperativní mod pro SPT, který vám umožňuje hrát s přáteli. Fika je a vždy bude zdarma, pokud jste za ni zaplatili, byli jste podvedeni. Také není dovoleno provozovat veřejné servery s monetizací nebo přijímáním darů.\n\nMůžete se připojit na náš Discord zde: https://discord.gg/project-fika",
"F_UI_RaidSettingsDescription": "In this mode, you can play online co-op with your friends without the risk of meeting others.\\nAll game mechanics in the co-op mode (weather, bots, bosses, etc.) are identical to the online mechanics.\\nOnly the hosts settings will take effect.",
"F_UI_CoopGameMode": "Fika Co-op Game Mode",
"F_UI_CoopRaidSettings": "Fika Co-op Raid Settings",
"F_UI_FikaAlwaysCoop": "Co-op is always enabled in Fika",
"F_UI_UpnpFailed": "UPnP mapping failed. Make sure the selected port is not already open!\\nDisable UPnP if you are using a VPN.",
"F_UI_InitWeather": "Generating weather...",
"F_Notification_RaidStarted": "{0} started a raid on {1}",
"F_Notification_ItemReceived": "You received a {0} from {1}"
}
13 changes: 11 additions & 2 deletions assets/database/locales/global/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,14 @@
"F_UI_WaitForPlayer": "Waiting for {0} player",
"F_UI_WaitForPlayers": "Waiting for {0} players",
"F_UI_ToSLong": "Welcome to Fika!\r\n\r\nFika is a co-op mod for SPT, allowing you to play with your friends. Fika is and will always be free, if you paid for it you got scammed. You are also not allowed to host public servers with monetization or donations.\r\n\r\nWait for this message to fade to accept our Terms of Service.\r\n\r\nYou can join our Discord here: https://discord.gg/project-fika",
"F_UI_ToSShort": "Welcome to Fika!\r\n\r\nFika is a co-op mod for SPT, allowing you to play with your friends. Fika is and will always be free, if you paid for it you got scammed. You are also not allowed to host public servers with monetization or donations.\r\n\r\nYou can join our Discord here: https://discord.gg/project-fika"
}
"F_UI_ToSShort": "Welcome to Fika!\r\n\r\nFika is a co-op mod for SPT, allowing you to play with your friends. Fika is and will always be free, if you paid for it you got scammed. You are also not allowed to host public servers with monetization or donations.\r\n\r\nYou can join our Discord here: https://discord.gg/project-fika",
"F_UI_RaidSettingsDescription": "In this mode, you can play online co-op with your friends without the risk of meeting others.\nAll game mechanics in the co-op mode (weather, bots, bosses, etc.) are identical to the online mechanics.\nOnly the hosts settings will take effect.",
"F_UI_CoopGameMode": "Fika Co-op Game Mode",
"F_UI_CoopRaidSettings": "Fika Co-op Raid Settings",
"F_UI_FikaAlwaysCoop": "Co-op is always enabled in Fika",
"F_UI_UpnpFailed": "UPnP mapping failed. Make sure the selected port is not already open!\nDisable UPnP if you are using a VPN.",
"F_UI_InitWeather": "Generating weather...",
"F_Notification_RaidStarted": "{0} started a raid on {1}",
"F_Notification_ItemReceived": "You received a {0} from {1}",
"F_Notification_RaidSettingsDisabled": "Editing of RaidSettings is disabled by the server host"
}
20 changes: 14 additions & 6 deletions assets/database/locales/global/es-mx.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,18 @@
"F_UI_SyncWindows": "Sincronizando ventanas...",
"F_UI_ReceiveOwnPlayer": "Recibiendo su propio jugador...",
"F_UI_FinishReconnect": "Finalizando la reconexión...",
"F_Client_FreeCamInputDisabled": "Free cam input disabled",
"F_Client_FreeCamInputEnabled": "Free cam input enabled",
"F_UI_WaitForPlayer": "Waiting for {0} player",
"F_UI_WaitForPlayers": "Waiting for {0} players",
"F_UI_ToSLong": "Welcome to Fika!\r\n\r\nFika is a co-op mod for SPT, allowing you to play with your friends. Fika is and will always be free, if you paid for it you got scammed. You are also not allowed to host public servers with monetization or donations.\r\n\r\nWait for this message to fade to accept our Terms of Service.\r\n\r\nYou can join our Discord here: https://discord.gg/project-fika",
"F_UI_ToSShort": "Welcome to Fika!\r\n\r\nFika is a co-op mod for SPT, allowing you to play with your friends. Fika is and will always be free, if you paid for it you got scammed. You are also not allowed to host public servers with monetization or donations.\r\n\r\nYou can join our Discord here: https://discord.gg/project-fika"
"F_Client_FreeCamInputDisabled": "Entrada de la cámara libre deshabilitada",
"F_Client_FreeCamInputEnabled": "Entrada de la cámara libre habilitada",
"F_UI_WaitForPlayer": "Esperando a {0} jugador",
"F_UI_WaitForPlayers": "Esperando a {0} jugadores",
"F_UI_ToSLong": "¡Bienvenido a Fika!\n\nFika es un mod cooperativo para SPT, permitiéndote jugar con tus amigos. Fika es y siempre será gratis, si pagaste por él, has sido estafado. No se permite alojar servidores públicos con monetización o donaciones.\n\nEspera a que este mensaje desaparezca para aceptar nuestros Términos de Servicio.\n\nPuedes unirte a nuestro Discord aquí: https://discord.gg/project-fika",
"F_UI_ToSShort": "¡Bienvenido a Fika!\n\nFika es un mod cooperativo para SPT, permitiéndote jugar con tus amigos. Fika es y siempre será gratis, si pagaste por él, has sido estafado. No se permite alojar servidores públicos con monetización o donaciones.\n\nPuedes unirte a nuestro Discord aquí: https://discord.gg/project-fika",
"F_UI_RaidSettingsDescription": "In this mode, you can play online co-op with your friends without the risk of meeting others.\\nAll game mechanics in the co-op mode (weather, bots, bosses, etc.) are identical to the online mechanics.\\nOnly the hosts settings will take effect.",
"F_UI_CoopGameMode": "Fika Co-op Game Mode",
"F_UI_CoopRaidSettings": "Fika Co-op Raid Settings",
"F_UI_FikaAlwaysCoop": "Co-op is always enabled in Fika",
"F_UI_UpnpFailed": "UPnP mapping failed. Make sure the selected port is not already open!\\nDisable UPnP if you are using a VPN.",
"F_UI_InitWeather": "Generating weather...",
"F_Notification_RaidStarted": "{0} started a raid on {1}",
"F_Notification_ItemReceived": "You received a {0} from {1}"
}
Loading