Skip to content

Commit

Permalink
Merge pull request #87 from project-fika/spt-3.10
Browse files Browse the repository at this point in the history
dev > main
  • Loading branch information
Lacyway authored Nov 26, 2024
2 parents 82ed9ea + a82cdc8 commit 8f4353d
Show file tree
Hide file tree
Showing 379 changed files with 5,645 additions and 2,991 deletions.
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

0 comments on commit 8f4353d

Please sign in to comment.