470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,353 Commits 5 Branches 94 Tags 118 MiB
2bfa9ab40c
Commit Graph

549 Commits

Author SHA1 Message Date
Dev
bba169127c Merge branch '3.8.1-DEV' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.9.0-DEV 
# Conflicts:
#	project/assets/configs/bot.json
#	project/assets/configs/core.json
#	project/assets/database/bots/types/arenafighterevent.json
#	project/assets/database/bots/types/assault.json
#	project/assets/database/bots/types/bear.json
#	project/assets/database/bots/types/bossboar.json
#	project/assets/database/bots/types/bossboarsniper.json
#	project/assets/database/bots/types/bossbully.json
#	project/assets/database/bots/types/bossgluhar.json
#	project/assets/database/bots/types/bosskilla.json
#	project/assets/database/bots/types/bossknight.json
#	project/assets/database/bots/types/bosskojaniy.json
#	project/assets/database/bots/types/bosskolontay.json
#	project/assets/database/bots/types/bosssanitar.json
#	project/assets/database/bots/types/bosstagilla.json
#	project/assets/database/bots/types/bosszryachiy.json
#	project/assets/database/bots/types/exusec.json
#	project/assets/database/bots/types/followerbigpipe.json
#	project/assets/database/bots/types/followerbirdeye.json
#	project/assets/database/bots/types/followerboar.json
#	project/assets/database/bots/types/followerboarclose1.json
#	project/assets/database/bots/types/followerboarclose2.json
#	project/assets/database/bots/types/followerbully.json
#	project/assets/database/bots/types/followergluharassault.json
#	project/assets/database/bots/types/followergluharscout.json
#	project/assets/database/bots/types/followergluharsecurity.json
#	project/assets/database/bots/types/followerkojaniy.json
#	project/assets/database/bots/types/followerkolontayassault.json
#	project/assets/database/bots/types/followerkolontaysecurity.json
#	project/assets/database/bots/types/followerzryachiy.json
#	project/assets/database/bots/types/gifter.json
#	project/assets/database/bots/types/marksman.json
#	project/assets/database/bots/types/peacefullzryachiyevent.json
#	project/assets/database/bots/types/pmcbot.json
#	project/assets/database/bots/types/ravangezryachiyevent.json
#	project/assets/database/bots/types/sectantpriest.json
#	project/assets/database/bots/types/sectantwarrior.json
#	project/assets/database/bots/types/shooterbtr.json
#	project/assets/database/bots/types/usec.json
#	project/assets/database/globals.json
#	project/assets/database/locales/global/ch.json
#	project/assets/database/locales/global/cz.json
#	project/assets/database/locales/global/en.json
#	project/assets/database/locales/global/es-mx.json
#	project/assets/database/locales/global/es.json
#	project/assets/database/locales/global/fr.json
#	project/assets/database/locales/global/ge.json
#	project/assets/database/locales/global/hu.json
#	project/assets/database/locales/global/it.json
#	project/assets/database/locales/global/jp.json
#	project/assets/database/locales/global/kr.json
#	project/assets/database/locales/global/pl.json
#	project/assets/database/locales/global/po.json
#	project/assets/database/locales/global/ro.json
#	project/assets/database/locales/global/ru.json
#	project/assets/database/locales/global/sk.json
#	project/assets/database/locales/global/tu.json
#	project/assets/database/templates/achievements.json
#	project/assets/database/templates/handbook.json
#	project/src/generators/BotLootGenerator.ts
#	project/src/generators/LootGenerator.ts
#	project/src/models/eft/common/tables/IBotType.ts
#	project/src/models/spt/bots/IBotLootCache.ts
#	project/src/servers/HttpServer.ts
#	project/src/services/BotLootCacheService.ts
#	project/src/services/FenceService.ts
#	project/tests/controllers/InsuranceController.test.ts
 2024-04-20 23:29:54 +01:00
Dev
b305ffdc24 Add currency to generation configuration for each bot 
Fix various missing properties in some bot jsons
 2024-04-18 11:56:45 +01:00
haze
688e2b77cd fix assort.json syntax inconsistencies (!296) 
Two lines changed - removed two sets of quotation marks for int-typed variables

Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/296
Co-authored-by: haze <haze@noreply.dev.sp-tarkov.com>
Co-committed-by: haze <haze@noreply.dev.sp-tarkov.com>
 2024-04-18 07:51:40 +00:00
Dev
e2492e9162 Update quest data 2024-04-15 15:04:22 +01:00
Dev
82003b24ff Update JSONs for 29704 
MISSING:
quests
trader assorts
usec ragman clothing
 2024-04-15 14:39:49 +01:00
Dev
8cbc51d20e Revert "Merge branch '3.9.0-DEV' into 3.8.1-DEV" 
This reverts commit 6121e65b4e, reversing
changes made to 10b1b2b3aa.
 2024-04-15 09:00:52 +01:00
chomp
687436ab8b update 3.9.0 with 3.8.1 changes (!289) 
Co-authored-by: Refringe <me@refringe.com>
Co-authored-by: Dev <dev@dev.sp-tarkov.com>
Co-authored-by: Terkoiz <terkoiz@spt.dev>
Co-authored-by: Refringe <refringe@noreply.dev.sp-tarkov.com>
Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/289
 2024-04-15 07:59:33 +00:00
chomp
6121e65b4e Merge branch '3.9.0-DEV' into 3.8.1-DEV 2024-04-15 07:57:24 +00:00
Dev
61d63d9ca6 Slightly reduce mp7a1/2 weighting on PMCs 2024-04-12 09:33:17 +01:00
Terkoiz
6f98d0c696 Fixed bad name 2024-04-10 21:38:25 +03:00
Terkoiz
341a99f883 Adjusted PMC names list 2024-04-10 21:30:50 +03:00
Dev
f73802ec17 Updated USEC EoD profile to match live 2024-04-08 13:31:05 +01:00
Dev
ef2442178a Implement weights for food/drink on bots 2024-04-08 12:31:51 +01:00
Dev
6d2c17596b Updated Bear EoD profile to match live 2024-04-08 10:52:37 +01:00
Dev
00fce2bc9d
Update bot difficulty values + add event bot stubs (clone of raiders) 2024-04-06 11:25:11 -04:00
Dev
6690704208
29577 2024-04-06 11:25:04 -04:00
Dev
2dd4d91438 Add extra PMC names 2024-04-01 16:02:11 +01:00
Dev
8419c0deae Update dutch / Hungarian lcoales 2024-04-01 15:55:13 +01:00
Dev
4d5788f169 Bot weight adjustments 2024-04-01 10:57:33 +01:00
Dev
27aceb7de5 Fixed duplicate PMC name prefix 2024-03-31 15:43:00 +01:00
Dev
a751ae1f48 Adjusted bot loot levels 2024-03-31 14:44:16 +01:00
Dev
179ee052e4 Update flea prices 2024-03-31 13:48:03 +01:00
Dev
3603658231 Remove extra newline 2024-03-31 10:04:15 +01:00
Dev
e1609363c1 Update server locales 2024-03-30 22:22:32 +00:00
Dev
50f580858d * Removed broken requirement from Signal part 3 2024-03-29 20:54:47 +00:00
Dev
26484b643c Add Spear assort 2024-03-28 18:59:12 +00:00
Dev
3acf98d803 * Quest updates: 
* Signal part 3
* Trust regain
 * Make an impression
 * Trouble in the big city
 * Overseas trust part 1
 2024-03-28 17:56:55 +00:00
Dev
755e7ec0f6 Remove PMC name 2024-03-28 14:33:34 +00:00
Dev
6309c0b419 Bot data update 2024-03-28 14:17:18 +00:00
Dev
4e923c2378 Remove redundant CounditionCounters property from new profiles 2024-03-25 14:33:17 +00:00
Dev
4f3fecac61 Update server locales 2024-03-24 22:41:35 +00:00
Dev
e147b90293 Update flea prices and remove 0 valued items 2024-03-24 21:56:58 +00:00
Dev
e5142c0c54 JSON updates 2024-03-24 21:44:29 +00:00
Dev
28d40d9443 Log IP of request when not a local address 2024-03-23 09:41:36 +00:00
Kaeno
8e4c9848ca Update more boss chances 2024-03-22 17:30:12 +00:00
Dev
2633d22de1 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-03-20 13:07:02 +00:00
Dev
0118a4be24 Adjusted boss spawn chance values 2024-03-20 13:06:51 +00:00
DrakiaXYZ
a29902b980 Add a new allExtracts property to locations database, and use it for daily quest generation (!266) 
- Dumped from the client using an aki-debugging patch
- Contains all extracts according to the map data, with a side indicator
- Cleaned up ILocation vs ILocationData duplication

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/266
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
 2024-03-20 09:43:51 +00:00
Dev
bd0cb15596 Include damage ammo boxes in prices.json 2024-03-18 11:06:39 +00:00
Dev
1afe3daf32 Added additional AI PMC heads from func_brush 2024-03-17 21:10:35 +00:00
Cj
0a935651f5 Add mod enabled text for the disclaimer window (!264) 
Add another variation stating mods are enabled for the beta disclaimer window

![image](/attachments/af517b44-e613-4fd4-81fd-c2434d6478b5)

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/264
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
 2024-03-17 08:55:02 +00:00
Kaeno
22976d4ca3 Give RevengeZryachhi his weapon back 2024-03-14 22:16:17 +00:00
Dev
e4d81b43b6 Update flea prices 2024-03-14 15:40:26 +00:00
Dev
42704bb4cd Update PMC names 2024-03-14 15:24:47 +00:00
Dev
42c4b6bd4d Update JSONs 2024-03-14 14:35:37 +00:00
Cj
8397e4690b Add server mod check to cool debug message (!258) 
needs merged with: https://dev.sp-tarkov.com/SPT-AKI/Modules/pulls/95

Get a bool from the server to indicate server mods being present and send to the client

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/258
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
 2024-03-11 22:03:14 +00:00
Dev
38b96f43b0 Update server locales 2024-03-11 10:35:32 +00:00
Dev
5343f8982c Add IDEA rig to rig slots on PMCs 2024-03-09 11:49:20 +00:00
Dev
75a8007842 Fix issue with PMC name causing formatting issues inside of client + lint 2024-03-09 08:44:40 +00:00
Cj
d4ee8f64d4 Implement IRelease interface, add new route action and data to core.json (!249) 
This will need merged with: https://dev.sp-tarkov.com/SPT-AKI/Modules/pulls/90

Added
- IRelease interface
- betaDisclaimer: Beta text to be shown in the client
- betaDisclaimerTimeoutDelay: delay before the client exits if `OK` isnt pressed
- releaseSummary: a place to add release notes shown on first run, or if version has changed.

- new route for the client to request beta and changelog information

Im not the most familiar with the server, so if any of this needs moved to a different class or a new class made for it, ping me and let me know and I'll adjust it accordingly.

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/249
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
 2024-03-07 18:16:55 +00:00