Skip to content

Commit

Permalink
Merge branch '3.10.4-DEV' into fix-insured-gear
Browse files Browse the repository at this point in the history
  • Loading branch information
chompDev authored Dec 23, 2024
2 parents a04028e + 74e1119 commit cdad690
Show file tree
Hide file tree
Showing 81 changed files with 21,620 additions and 21,603 deletions.
4,538 changes: 2,269 additions & 2,269 deletions project/assets/database/bots/types/assault.json

Large diffs are not rendered by default.

530 changes: 266 additions & 264 deletions project/assets/database/bots/types/bossboar.json

Large diffs are not rendered by default.

332 changes: 166 additions & 166 deletions project/assets/database/bots/types/bossboarsniper.json

Large diffs are not rendered by default.

456 changes: 228 additions & 228 deletions project/assets/database/bots/types/bossbully.json

Large diffs are not rendered by default.

526 changes: 263 additions & 263 deletions project/assets/database/bots/types/bossgluhar.json

Large diffs are not rendered by default.

446 changes: 223 additions & 223 deletions project/assets/database/bots/types/bosskilla.json

Large diffs are not rendered by default.

482 changes: 241 additions & 241 deletions project/assets/database/bots/types/bossknight.json

Large diffs are not rendered by default.

1,166 changes: 583 additions & 583 deletions project/assets/database/bots/types/bosskojaniy.json

Large diffs are not rendered by default.

138 changes: 69 additions & 69 deletions project/assets/database/bots/types/bosskolontay.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,23 @@
"TacticalVest": {},
"Backpack": {},
"FirstPrimaryWeapon": {
"65268d8ecb944ff1e90ea385": 21850,
"5e848cc2988a8701445df1e8": 32850,
"5a0ec13bfcdbcb00165aa685": 33100,
"57d14d2524597714373db789": 7143,
"6513ef33e06849f06c0957ca": 21700,
"57dc2fa62459775949412633": 32770,
"57f4c844245977379d5c14d1": 7117,
"661ceb1b9311543c7104149b": 7219,
"644674a13d52156624001fbc": 1394,
"65fb023261d5829b2d090755": 7117
"65268d8ecb944ff1e90ea385": 24930,
"5e848cc2988a8701445df1e8": 37350,
"5a0ec13bfcdbcb00165aa685": 37660,
"57d14d2524597714373db789": 8163,
"6513ef33e06849f06c0957ca": 24660,
"57dc2fa62459775949412633": 37370,
"57f4c844245977379d5c14d1": 8151,
"661ceb1b9311543c7104149b": 8214,
"644674a13d52156624001fbc": 1592,
"65fb023261d5829b2d090755": 8146
},
"SecondPrimaryWeapon": {},
"Holster": {
"5448bd6b4bdc2dfc2f8b4569": 5361,
"5a17f98cfcdbcb0980087290": 5421,
"602a9740da11d6478d5a06dc": 5376,
"668fe5a998b5ad715703ddd6": 1069
"5448bd6b4bdc2dfc2f8b4569": 6111,
"5a17f98cfcdbcb0980087290": 6161,
"602a9740da11d6478d5a06dc": 6131,
"668fe5a998b5ad715703ddd6": 1221
},
"Scabbard": {
"6540d2162ae6d96b540afcaf": 1
Expand All @@ -127,47 +127,47 @@
},
"Ammo": {
"Caliber762x39": {
"64b7af434b75259c590fa893": 5150,
"59e4cf5286f7741778269d8a": 2090,
"5656d7c34bdc2d9d198b4587": 795,
"601aa3d2b2bcb34913271e6d": 41,
"59e0d99486f7744a32234762": 930
"64b7af434b75259c590fa893": 11700,
"59e4cf5286f7741778269d8a": 4760,
"5656d7c34bdc2d9d198b4587": 1810,
"601aa3d2b2bcb34913271e6d": 93,
"59e0d99486f7744a32234762": 2130
},
"Caliber9x18PM": {
"573719df2459775a626ccbc2": 3500,
"573718ba2459775a75491131": 2720,
"573720e02459776143012541": 2720,
"57371aab2459775a77142f22": 149
"573719df2459775a626ccbc2": 3200,
"573718ba2459775a75491131": 2500,
"573720e02459776143012541": 2480,
"57371aab2459775a77142f22": 137
},
"Caliber23x75": {
"5e85aa1a988a8701445df1f5": 127,
"5e85a9a6eacf8c039e4e2ac1": 100,
"5f647f31b6238e5dd066e196": 100
"5e85aa1a988a8701445df1f5": 24,
"5e85a9a6eacf8c039e4e2ac1": 19,
"5f647f31b6238e5dd066e196": 19
},
"Caliber9x19PARA": {
"56d59d3ad2720bdb418b4577": 10800,
"5efb0da7a29a85116f6ea05f": 4420,
"58864a4f2459770fcc257101": 813
"56d59d3ad2720bdb418b4577": 12400,
"5efb0da7a29a85116f6ea05f": 5040,
"58864a4f2459770fcc257101": 921
},
"Caliber127x33": {
"668fe62ac62660a5d8071446": 1
},
"Caliber545x39": {
"56dff2ced2720bb4668b4567": 2080,
"56dff061d2720bb5668b4567": 3810,
"56dfef82d2720bbd668b4567": 3030,
"5c0d5e4486f77478390952fe": 733,
"61962b617c6c7b169525f168": 167
"56dff2ced2720bb4668b4567": 1190,
"56dff061d2720bb5668b4567": 2170,
"56dfef82d2720bbd668b4567": 1720,
"5c0d5e4486f77478390952fe": 420,
"61962b617c6c7b169525f168": 97
},
"Caliber762x51": {
"58dd3ad986f77403051cba8f": 639,
"5a608bf24f39f98ffc77720e": 401,
"5a6086ea4f39f99cd479502f": 249
"58dd3ad986f77403051cba8f": 730,
"5a608bf24f39f98ffc77720e": 456,
"5a6086ea4f39f99cd479502f": 285
},
"Caliber9x39": {
"61962d879bb3d20b0946d385": 565,
"57a0e5022459774d1673f889": 83,
"5c0d688c86f77413ae3407b2": 48
"61962d879bb3d20b0946d385": 3860,
"57a0e5022459774d1673f889": 585,
"5c0d688c86f77413ae3407b2": 324
}
},
"mods": {
Expand Down Expand Up @@ -821,24 +821,24 @@
"items": {
"TacticalVest": {},
"Pockets": {
"6513f0a194c72326990a3868": 10000,
"5448c12b4bdc2d02308b456f": 10000,
"60098ad7c2240c0fe85c570a": 10000,
"5e85aa1a988a8701445df1f5": 10000,
"59d6272486f77466146386ff": 7861,
"5a17fb03fcdbcbcae668728f": 10000,
"57d1519e24597714373db79d": 10000,
"602286df23506e50807090c6": 10000,
"5e85a9a6eacf8c039e4e2ac1": 8525,
"668fe5c5f35310705d02b696": 8996,
"55d481904bdc2d8c2f8b456a": 10000,
"5b1fb3e15acfc4001637f068": 9794,
"5f647f31b6238e5dd066e196": 8497,
"660ea4453786cc0af808a1be": 10000,
"59e5f5a486f7746c530b3ce2": 9940,
"6450ec2e7da7133e5a09ca96": 1188,
"5aaa4194e5b5b055d06310a5": 10000,
"67449b6c89d5e1ddc603f504": 4
"6513f0a194c72326990a3868": 7188,
"5448c12b4bdc2d02308b456f": 7684,
"60098ad7c2240c0fe85c570a": 9290,
"5e85aa1a988a8701445df1f5": 5592,
"59d6272486f77466146386ff": 5482,
"5a17fb03fcdbcbcae668728f": 7666,
"57d1519e24597714373db79d": 5698,
"602286df23506e50807090c6": 7722,
"5e85a9a6eacf8c039e4e2ac1": 5458,
"668fe5c5f35310705d02b696": 5508,
"55d481904bdc2d8c2f8b456a": 5980,
"5b1fb3e15acfc4001637f068": 5576,
"5f647f31b6238e5dd066e196": 5516,
"660ea4453786cc0af808a1be": 5706,
"59e5f5a486f7746c530b3ce2": 5570,
"6450ec2e7da7133e5a09ca96": 835,
"5aaa4194e5b5b055d06310a5": 5728,
"67449b6c89d5e1ddc603f504": 2
},
"Backpack": {},
"SecuredContainer": {
Expand All @@ -850,25 +850,25 @@
"5e85a9a6eacf8c039e4e2ac1": 100000,
"573720e02459776143012541": 100000,
"59e4cf5286f7741778269d8a": 100000,
"668fe62ac62660a5d8071446": 9746,
"668fe62ac62660a5d8071446": 10000,
"5efb0da7a29a85116f6ea05f": 10000,
"56dff2ced2720bb4668b4567": 100000,
"5f647f31b6238e5dd066e196": 100000,
"56dff061d2720bb5668b4567": 100000,
"5656d7c34bdc2d9d198b4587": 100000,
"58dd3ad986f77403051cba8f": 100000,
"601aa3d2b2bcb34913271e6d": 14900,
"61962d879bb3d20b0946d385": 31070,
"601aa3d2b2bcb34913271e6d": 17060,
"61962d879bb3d20b0946d385": 35780,
"5a608bf24f39f98ffc77720e": 100000,
"59e0d99486f7744a32234762": 100000,
"56dfef82d2720bbd668b4567": 100000,
"5c0d5e4486f77478390952fe": 66420,
"5a6086ea4f39f99cd479502f": 76080,
"61962b617c6c7b169525f168": 15260,
"58864a4f2459770fcc257101": 2473,
"57371aab2459775a77142f22": 54300,
"57a0e5022459774d1673f889": 4678,
"5c0d688c86f77413ae3407b2": 2685
"5c0d5e4486f77478390952fe": 77160,
"5a6086ea4f39f99cd479502f": 88050,
"61962b617c6c7b169525f168": 17900,
"58864a4f2459770fcc257101": 2835,
"57371aab2459775a77142f22": 63180,
"57a0e5022459774d1673f889": 5548,
"5c0d688c86f77413ae3407b2": 3045
},
"SpecialLoot": {}
}
Expand Down Expand Up @@ -3158,7 +3158,7 @@
"mod_tactical_002": 9,
"mod_tactical_000": 58,
"mod_mount": 100,
"mod_mount_003": 86,
"mod_mount_003": 85,
"mod_stock_000": 6,
"mod_tactical_003": 0,
"mod_mount_001": 0
Expand Down
Loading

0 comments on commit cdad690

Please sign in to comment.