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

591 Commits

Author SHA1 Message Date
Dev
d95423b0f1 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.9.0-DEV 
# Conflicts:
#	project/assets/configs/core.json
#	project/package.json
#	project/src/models/eft/common/IGlobals.ts
#	project/src/routers/dynamic/BundleDynamicRouter.ts
 2024-05-15 16:39:41 +01:00
Dev
10cee6a923 Add JSONs 2024-05-15 14:10:20 +01:00
Dev
d608e8b690 Update JSONs 2024-05-15 11:40:12 +01:00
DrakiaXYZ
7e4ec0bc53 Fix LFS association for sandbox files (!331) 
Resolves "Encountered 8 files that should have been pointers" issue, hopefully

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/331
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
 2024-05-13 19:20:21 +00:00
Dev
600195224a Updated trader base JSONs 2024-05-13 20:16:27 +01:00
Dev
0d00fb5370 Added unheard edition profile + EN locale description 2024-05-13 20:07:35 +01:00
Dev
f2c7e938cc Updated various JSONs 2024-05-13 17:05:04 +01:00
Dev
01783e295b Updated french locale 2024-05-13 09:52:33 +01:00
Dev
4b7682383c Updated locales with latest Crowdin data 2024-05-12 15:26:22 +01:00
Dev
d5f57d74f5 Made bear/usec PMC jsons match 2024-05-12 15:20:34 +01:00
Dev
879d19d912 Adjusted PMC mod chance values 2024-05-12 10:03:22 +01:00
Dev
111da41ec8 Update flea prices 2024-05-11 12:20:24 +01:00
Dev
a2f6d8b9bb Add PMC names 2024-05-08 08:25:53 +01:00
Refringe
ba1ac09b0b
Merge branch '3.8.2-DEV' into 3.9.0-DEV 
# Conflicts:
#	project/src/callbacks/ItemEventCallbacks.ts
#	project/src/models/eft/common/IGlobals.ts
#	project/src/models/eft/common/ILocation.ts
#	project/src/models/eft/common/ILocationBase.ts
#	project/src/models/eft/common/tables/ILootBase.ts
#	project/src/models/eft/common/tables/ITemplateItem.ts
#	project/src/models/eft/weather/IWeatherData.ts
#	project/src/models/spt/bots/BotGenerationDetails.ts
#	project/src/models/spt/config/IPmcConfig.ts
#	project/src/models/spt/config/IWeatherConfig.ts
#	project/src/models/spt/server/IDatabaseTables.ts
#	project/src/models/spt/server/ILocations.ts
#	project/src/servers/http/IHttpListener.ts
 2024-05-08 00:21:12 -04:00
Dev
3bf887341f Added PMC name 2024-05-07 09:49:36 +01:00
Dev
509e208fb9 Merge branch '3.8.1-DEV' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.9.0-DEV 
# Conflicts:
#	project/assets/configs/pmc.json
#	project/src/helpers/ItemHelper.ts
#	project/src/models/spt/config/IPmcConfig.ts
 2024-05-04 21:41:44 +01:00
Dev
d32d1cb50b Removed non-ammo items from PMC secures 2024-05-03 21:09:51 +01:00
Dev
3125e768f7 Updated locales 2024-05-03 17:28:55 +01:00
Dev
2ba5358f39 Update locales with data from crowdin 2024-05-01 21:39:58 +01:00
Dev
ae0b7f83ec Fixed incorrect locale tag 2024-05-01 16:32:59 +01:00
Dev
d6cd99b8ab Reduce sandbox to max level 20 2024-04-30 20:31:00 +01:00
Dev
923ca0226b Fixed incorrect data structure of base.json inside sandbox_high 2024-04-30 20:30:49 +01:00
Dev
267efdc7ea Merge branch '3.8.1-DEV' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.9.0-DEV 2024-04-29 21:50:12 +01:00
Dev
6ec3ed55bc Update map loot 2024-04-29 20:36:56 +01:00
Dev
3e99f6761f Add missing base json for sandbox_high 2024-04-29 16:30:48 +01:00
Dev
619137417b Adjusted PMC loot/stam values due to earlier fixes to loot generation 2024-04-29 14:25:24 +01:00
Dev
15348cec35 Fixed water bottles lacking a FoodDrink property in EoD profiles 2024-04-28 22:42:39 +01:00
Dev
cee7ef2e47 Updated all maps with new loot data structure 2024-04-28 15:31:37 +01:00
Dev
ddd5d69eda Added 2 additional pmc kill messages 2024-04-28 14:33:30 +01:00
kiobu
44583f40ac fixes to get in raid (customs only) (!310) 
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/310
Co-authored-by: kiobu <kiobu@sdf.org>
Co-committed-by: kiobu <kiobu@sdf.org>
 2024-04-28 08:01:27 +00:00
Dev
b59283e5b5 Added missing 68x51 ammo to bigmap json 2024-04-27 23:18:07 +01:00
Dev
9dff3e0790 Merge branch '3.8.1-DEV' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.9.0-DEV 2024-04-27 22:58:05 +01:00
Dev
30ee6de4a2 Added 2 additional PMC responses 2024-04-27 22:02:06 +01:00
Dev
d7a8e1558a Fixed missing mod_mount data in PMCs, should reduce chance of seeing low level PMCs with helmet attachments 
Reduced chance of mount on equipment to 1 for level 1-14 PMCs
 2024-04-27 10:22:41 +01:00
Dev
7f56cee388 29862 2024-04-25 21:37:22 +01:00
Dev
8f4919a9c7 Update Quest and Trader assort data 2024-04-24 21:36:30 +01:00
Dev
f07637cf63 Merge branch '3.8.1-DEV' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.9.0-DEV 2024-04-24 21:23:14 +01:00
Dev
76db8ca5e8 Add assaultGroup bot with their settings from game client 2024-04-24 12:39:49 +01:00
Terkoiz
d41a40b2d2 Updated the PMC name list with more modders and prominent community members (!303) 
Co-authored-by: Terkoiz <terkoiz@spt.dev>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/303
Co-authored-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com>
Co-committed-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com>
 2024-04-23 19:16:56 +00:00
Dev
8761462acd Update server locales with data from crowdin 2024-04-23 17:14:21 +01:00
Dev
57557d6063 Migrate loot generation code to use per-map static data - ONLY WORKS WITH CUSTOMS (other maps to follow later) 2024-04-23 10:27:09 +01:00
Dev
fc544379e4 29774 - Update JSONs 2024-04-21 11:31:41 +01:00
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