Commit Graph

403 Commits

Author SHA1 Message Date
CWX f9eb5cd136 change for lastOrDefault, return null 2025-06-01 23:43:11 +01:00
CWX 1b82d0641e change the invariantCulture on factory 2025-06-01 21:35:28 +01:00
CWX cc6f116e18 Value is now not an object, give it straight to it and no double to string to double shenanigans 2025-06-01 21:35:10 +01:00
hulkhan22 44332cf785 Fixes Usec armbands being lootable and skill rewards resetting to 0 2025-06-01 18:31:02 +02:00
GrooveypenguinX f4428deccf fixed missing import for customitemservice, added bundle loading sequence in the program.cs (#333)
* Added missing import for reflection /bonk

* Implemented bundles.json loading directly into program.cs

`IsBundleMod` is now read from all loaded mods metadata, and if set to true the bundles.json is read from the mod directory.

* re-assign the sorted valid mods to the loadedMods list

since ValidateMods returns the sortedLoadedMods, this is the list of mods we should be passing to our other spots

---------

Co-authored-by: Chomp <27521899+chompDev@users.noreply.github.com>
2025-06-01 15:34:14 +01:00
Chomp 2357fd4a4f Fixed build 2025-06-01 15:29:05 +01:00
Chomp 4ae4715df7 Merge pull request #327 from hulkhan22/test/fix-failing-tests
test: Fix for tests randomly failing when run altogether
2025-06-01 14:31:17 +01:00
GrooveypenguinX 3e9c557a89 Fixed overrideproperties not applying in customitemservice
Swapped out the old method with new logic that sets the properties using reflection, and can also handle fields.

(cherry picked from commit 026c8dec5fa5cffd09de438e43d74e18a480d907)
2025-06-01 14:26:52 +01:00
hulkhan22 ae8fc2504f Merge branch 'develop' into test/fix-failing-tests 2025-06-01 15:08:56 +02:00
clodanSPT a1c8980f8c Added virtuosity to Core project (#329)
Co-authored-by: Alex <clodanSPT@hotmail.com>
2025-06-01 12:08:20 +01:00
hulkhan22 210bdb2d60 Fix for tests randomly failing when run altogether 2025-06-01 02:33:19 +02:00
clodanSPT e084d1889c Removed reflections dependency from Core (#326)
Co-authored-by: Alex <clodanSPT@hotmail.com>
2025-06-01 00:18:59 +01:00
Jesse aafe24eafb Move Router, Callbacks and GetResponse over to ValueTask (#325)
* Move Router, Callbacks and GetResponse over to ValueTask

* Assign empty deserializedObject for now, keep todo

* Cleanup GetResponse

* Re-add logger for request
2025-05-31 20:30:41 +01:00
hulkhan22 18bd0957fd Fix the damn tests 2025-05-31 01:40:47 +02:00
Chomp a2d2a44a2f Improved logic flow inside AddItemsToInventory 2025-05-30 20:05:51 +01:00
Chomp 7ebafa402b Improved where logic inside RemoveFiRStatusFromItemsInContainer 2025-05-30 20:05:39 +01:00
Chomp 0f3411d656 Merge pull request #321 from sp-tarkov/remove-appcontext
Remove appcontext
2025-05-30 19:23:59 +01:00
Archangel 6a9d323957 Add ServiceLocator so patches can access DI 2025-05-30 19:37:03 +02:00
Archangel 4e3c755e90 Remove AppContext, store profile related data in ProfileActivityService 2025-05-30 19:36:23 +02:00
clodanSPT f895267748 Added injection override feature for modders (#320)
Co-authored-by: Alex <alex@dm-me-for-questions.com>
2025-05-30 18:19:57 +01:00
Chomp 57c1935db6 Merge pull request #317 from sp-tarkov/cleanup-dbimporter
Cleanup DatabaseImporter & ImporterUtil
2025-05-30 14:59:11 +01:00
Archangel ba9c57d699 Cleanup DatabaseImporter & ImporterUtil 2025-05-30 15:54:25 +02:00
Chomp 6ee32bc257 Merge pull request #315 from sp-tarkov/async-deserialize
Small async changes
2025-05-30 14:53:45 +01:00
Chomp 0690ffc803 Merge pull request #316 from CJ-SPT/json-util-refactor
Json util refactor
2025-05-30 14:52:50 +01:00
Chomp fedfe1bf8e Renamed method: RemoveFiRStatusFromItems`` 2025-05-30 14:32:07 +01:00
Cj f30dda24e3 Json util refactor 2025-05-30 09:10:52 -04:00
Archangel 7497ed8f9f Cleanup importerutil, remove unecessary FileStream read 2025-05-30 14:46:34 +02:00
Archangel f5c1fe7384 Add async deserialization methods 2025-05-30 14:46:07 +02:00
Chomp 88c9f71f8c Fixed AdjustWeighting not correctly ignoring items in the edit list not found at the destination
Added nullguards
Added missing comment
Simplified if statement
2025-05-30 12:47:01 +01:00
Chomp 4f01dc54bd Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop 2025-05-30 12:36:46 +01:00
Chomp 866a5fd24c Minor bot equipment code changes
Assume player is level 1, not 0
Nullcheck bot equipment config prior to using it
2025-05-30 12:35:23 +01:00
clodanSPT ee51e1fcab Refactored pre spt mod loader to user IOnLoad, moved Watermark to IOnLoad as well (#313)
Co-authored-by: Alex <alex@dm-me-for-questions.com>
2025-05-30 11:03:08 +01:00
Chomp 1aa9bc3f2f Merge pull request #304 from sp-tarkov/async-refactor
Program initialization change & webserver async
2025-05-30 10:00:53 +01:00
Chomp a12deb3839 Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop 2025-05-30 09:25:51 +01:00
Chomp d2e80d7b5d Updated GetItemRewardPool to ignore items from the db without a parent id when gathering blacklist 2025-05-30 09:24:43 +01:00
clodanSPT a491b8de1b OnLoadOrder sort (#311)
Co-authored-by: Alex <alex@dm-me-for-questions.com>
2025-05-30 09:04:50 +01:00
Archangel 7d0c8dfc38 Rename parameters with underscore 2025-05-29 23:50:06 +02:00
Archangel cc4f1f2964 Remove assignments as requested 2025-05-29 23:50:06 +02:00
Archangel 8e69bd4aec Await disposal 2025-05-29 23:50:06 +02:00
Archangel 5ddeee30bb Fix issue with renaming 2025-05-29 23:50:06 +02:00
Archangel fa1368fb47 Move more initialization, mod loading and http requests over to async 2025-05-29 23:50:06 +02:00
Archangel c930197942 Cleanup AppContext 2025-05-29 23:50:06 +02:00
Archangel 6f3244362c Make sure value is not null 2025-05-29 23:50:06 +02:00
Chomp b07fb37312 Merge pull request #309 from cp89gamedev/fix-broken-test
theres a chance that 0 equals 0
2025-05-29 22:18:43 +01:00
Chris Adamson 1946199f61 theres a chance that 0 equals 0 2025-05-29 15:48:59 -05:00
Chomp bd1326b708 Merge pull request #308 from cp89gamedev/fix-broken-test
fix for broken math test
2025-05-29 21:19:55 +01:00
Chris Adamson ff43f72b53 yuck math 2025-05-29 14:47:42 -05:00
Chomp ad999a81d2 Merge pull request #306 from cp89gamedev/fix-broken-test
fixed issue with setter not handling null values exposed by failing u…
2025-05-29 20:44:06 +01:00
Chris Adamson 5db0fd575b fixed issue with setter not handling null values exposed by failing unit test 2025-05-29 14:01:16 -05:00
Cj 74cc1ac300 Move repeatable quest code into repeatable controller 2025-05-29 14:56:14 -04:00