Commit Graph

3017 Commits

Author SHA1 Message Date
R3ality 6dc35d732d Rebase onto formatted Jsons (conflict resolve) 2025-07-27 11:41:08 +03:00
R3ality 765adcac5e Fix typo in priceThreshholdRub 2025-07-27 11:38:54 +03:00
R3ality 8c52c15d6e Fix typo in handbookPriceMultipier 2025-07-27 11:38:53 +03:00
R3ality 9eaa46e024 Fix typo in skillGainMultiplers 2025-07-27 11:38:35 +03:00
R3ality 08a279c4e4 Fix typo in cultistCircle.craftTimeThreshholds 2025-07-27 11:38:12 +03:00
R3ality 8e20a97d5d Fix typo in cultistCircle.rewardPriceMultiplerMinMax 2025-07-27 11:38:11 +03:00
sp-tarkov-bot b45d5befb1 Format Style Fixes 2025-07-27 08:06:42 +00:00
Chomp f1a46de6f2 Merge pull request #520 from sp-tarkov/json-formatting
Automatic JSON Formatting Workflow
2025-07-27 08:05:53 +00:00
Refringe c5198ccd22 Automatic JSON Formatting Workflow
This change alters the existing format workflow to include another job that handles formatting JSON files. The JSON files are formatted using BiomeJS. The BiomeJS config file is dynamically created before Biome runs and removed after. This uses the existing `.editorconfig` settings as defaults, allowing overwrites and additional Biome configurations within the workflow file.

Current JSON formatting rules:
- end_of_line = lf
- insert_final_newline = true
- indent_style = space
- trim_trailing_whitespace = true
- charset = utf-8
- indent_size = 2
- trailingCommas = none
- bracketSpacing = true
- expand = always

The existing Csharpier job runs at the same time as the new Biome job. The results (changes made) in each job are compressed into an artifact and downloaded into a final job that combines them and commits them back into the project (if there are changes, and if the workflow is not triggered within a PR).
2025-07-26 19:21:15 -04:00
Chomp b74adca201 Merge pull request #519 from R3ality/json-adjustments
Json adjustments (duplicate entries, minor file rename)
2025-07-26 21:44:36 +00:00
R3ality 2280d0db3e File name capitalization change for consistency 2025-07-26 22:52:50 +03:00
R3ality 5f252f8a46 Remove duplicate K/V in lootMaxSpawnLimits.bigmap 2025-07-26 22:52:50 +03:00
R3ality 6d43e46814 Remove duplicate assignment for laboratory in mapInfectionAmount 2025-07-26 22:52:49 +03:00
Chomp 96be35d2c1 FIxed skill check error in GetCompleteProfile 2025-07-26 12:54:46 +01:00
Chomp bfd616e7c3 Converted rewards data into dictionary - reduced need for reflection
Moved clone outside of `UpdateQuestsForGameEdition`
2025-07-26 12:53:56 +01:00
Chomp 8aff434933 Merge pull request #517 from CJ-SPT/skill-fix
Fix sending invalid skill information to client
2025-07-26 09:32:56 +00:00
Chomp 56a6bde1e1 Refactored how fence assorts are generated
Removed root items from pool as they're picked
Removed unnecessary ToList()
Added exit when there's no more root items to pick
2025-07-26 10:29:15 +01:00
Chomp 26d17d7413 Added AR-15 5.56x45 Magpul PMAG D-60 STANAG 60-round magazine to fence single stack list 2025-07-26 10:24:58 +01:00
Cj a9c20e57a3 Check skills when sending profile to client 2025-07-26 00:24:48 -04:00
Chomp 40b478b08c Revert debug logging 2025-07-25 22:33:35 +01:00
Chomp 526c3f6c44 string > mongoid
added nullguard
2025-07-25 21:12:37 +01:00
Chomp 68c89fcc00 Added ak50 to PMCs level 50+ 2025-07-25 21:11:13 +01:00
Chomp b1cdf99688 Flagged effects as possibly null 2025-07-25 20:23:39 +01:00
Chomp 1cf5a6283c Improved MongoId Equals logic 2025-07-25 20:22:15 +01:00
Chomp 6209f55baf Simplified .Contains/.Add use 2025-07-25 20:19:29 +01:00
Chomp ef50c3fea1 Condensed code with use of ?? 2025-07-25 20:15:52 +01:00
Chomp 5cfb1421c7 Removed unnecessary ?? 2025-07-25 20:13:50 +01:00
Chomp b1aa8f0942 Removed unnecessary ?? 2025-07-25 20:09:07 +01:00
Chomp 8a7690e13b Improved performance of GetRandomElement when processing IEnnumerables 2025-07-25 18:26:09 +01:00
Chomp 834666a403 Created overload of ItemHasBaseClass that accepts one base type input, faster for 70% of use cases 2025-07-25 17:22:59 +01:00
Chomp 457a135a91 Improved performance of root node check by caching root nodes as hashset 2025-07-25 15:58:52 +01:00
Chomp 856fa0633d List to IEnumerable changes
Removed use of tolist()
2025-07-25 15:57:57 +01:00
Chomp 4d35f639ef Merge pull request #515 from sp-tarkov/converter-fixes
Converter fixes
2025-07-25 14:45:20 +00:00
Chomp 84691bf122 Added missing comma 2025-07-25 15:29:21 +01:00
Archangel a2ddd7ae17 Converter fixes
- Various nullability warnings removed
- Made CanConvert on a few of them a bit more strict
2025-07-25 16:28:22 +02:00
qingchun a70a6eba05 fix(hideout.json): Synced with wiki and fixed incorrect recipes (#514)
* fix(hideout.json): Synced with wiki and fixed incorrect recipes

* add(hideout.json): add Maska-1SCh face shield (Killa Edition)

* Revert "add(hideout.json): add Maska-1SCh face shield (Killa Edition)"

This reverts commit a9a35151c3e81fc021f2c60a28468dd65f50f142.

* Fix formatting

* style(hideout.json): Reorder

---------

Co-authored-by: Archangel <jesse@archangel.wtf>
2025-07-25 14:16:20 +00:00
Chomp 24bc16a2f8 Added recipe quest id maps 2025-07-25 13:42:56 +01:00
Chomp cc1b38d4f1 Improved HideoutCraftQuestIdGenerator logging 2025-07-25 13:42:22 +01:00
Chomp 9b4249b580 Merge pull request #513 from RuKira/develop
Fixed Cultist Circle Recipes
2025-07-25 11:43:08 +00:00
Chomp e2f8d03897 Don't perform 2 exists check before returning profile 2025-07-25 12:42:02 +01:00
Chomp ab770e795f Improved stale offer processing
Pass offer creation info into methods for quicker checking

Removed unused methods
2025-07-25 12:41:41 +01:00
Chomp 34bd002876 list to ienumerable changes
Removed unused methods

strong to mongoId changes
2025-07-25 12:28:40 +01:00
RuKira 83c7864bc3 Fixed Cultist Circle Recipes
- Added Cultist Fig -> Spooky skull mask
- - Was Spooky skull mask -> Cultist Fig
- Added 5x Cultist Fig -> Cultist Knife
- - Was 5x Spooky skull mask -> Cultist Knife
- Added WD-40 (400ml) -> WD-40 (100ml)
- Updated "repeatable" values for some recipes

I will likely make another PR a bit later with a few more updates, I need to verify some more repeatable values.

Thanks to @qingchunnh for pointing this out!
2025-07-25 04:32:38 -04:00
Chomp d90bb73996 Merge pull request #512 from sp-tarkov/dev
Make ItemLacksSlotsCartridgesAndChambers more robust, migrate to extension
2025-07-24 20:51:41 +00:00
Archangel 384381f57e Make ItemLacksSlotsCartridgesAndChambers more robust, migrate to extension 2025-07-24 22:46:23 +02:00
sp-tarkov-bot b0f0e76f08 .NET Format Style Fixes 2025-07-24 19:31:31 +00:00
Chomp 66efb4093a Merge pull request #511 from BlueXTX/bugfix/510
Fixed collection modification exceptions during item removal
2025-07-24 20:30:59 +01:00
bluextx 4095da3e2b Fixed collection modification exceptions during item removal. Added unit tests to ensure functionality. 2025-07-24 21:36:24 +03:00
Chomp 1f6231ce6b Improved readability of GetRelativePmcBotLevelRange 2025-07-24 18:16:13 +01:00
Chomp a886575cff Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop 2025-07-24 16:09:16 +01:00