Skip to content

Commit f2d6647

Browse files
321nickTheGoatGod
andauthored
[Experimental] Artyoms/LnL prices, lengths, speedloader (#175)
Co-authored-by: TheGoatGod <[email protected]>
1 parent 5c15c30 commit f2d6647

File tree

18 files changed

+490
-112
lines changed

18 files changed

+490
-112
lines changed

data/Maintained_mods/mods/Locked_and_Loaded/itemgroups/guns.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"type": "item_group",
55
"items": [
66
{ "item": "AWM", "prob": 20, "charges-min": 0, "charges-max": 5 },
7-
{ "item": "SVD", "prob": 30, "charges-min": 0, "charges-max": 10 },
87
{ "item": "CTI", "prob": 10, "charges-min": 0, "charges-max": 7 },
98
{ "item": "M82", "prob": 18, "charges-min": 0, "charges-max": 10 },
109
{ "item": "AW50", "prob": 20, "charges-min": 0, "charges-max": 5 },

data/Maintained_mods/mods/Locked_and_Loaded/itemgroups/magazines.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"type": "item_group",
55
"items": [
66
[ "AWM_mag", 10 ],
7-
[ "SVD_mag", 10 ],
87
[ "CTI_mag", 10 ],
98
[ "M82_mag", 5 ],
109
[ "XM8_mag", 30 ],

data/Maintained_mods/mods/Locked_and_Loaded/items/guns/revolvers/357mag/python.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"looks_like": "sw_619",
66
"type": "GUN",
77
"name": "Colt Python",
8-
"description": "The Colt Python was designed and manufactured by Colt and was intended for the premium revolver market. The Python is built on Colt's I frame and is renowned for its accuracy, smooth trigger pull, and its tight locking cylinder.",
8+
"description": "The Colt Python was designed and manufactured by Colt and was intended for the premium revolver market. The Python is built on Colt's I frame and is renowned for its accuracy, smooth trigger pull, and its tight locking cylinder. This one is in 38/357",
99
"weight": "1150 g",
1010
"volume": "750 ml",
1111
"price": 82900,

data/Maintained_mods/mods/Locked_and_Loaded/items/guns/rifles/winchester/model_1873.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": "The successor to the model 1866, the model 1877 is perhaps the most popular Lever Action rifle. It has been depicted in many forms of popculture and is marketed as, 'The Gun That Won The West.' The rifle was so popular that the Miroku Corporation started to reproduce the gun in 2013. This one happeens to be chambered in .44-40.",
99
"weight": "4218 g",
1010
"volume": "3 L",
11-
"price": 150000,
11+
"price": "100 USD",
1212
"bashing": 8,
1313
"to_hit": -2,
1414
"material": [ "steel", "wood" ],
@@ -47,7 +47,7 @@
4747
"description": "The successor to the model 1866, the model 1877 is perhaps the most popular Lever Action rifle. It has been depicted in many forms of popculture and is marketed as, 'The Gun That Won The West.' The rifle was so popular that the Miroku Corporation started to reproduce the gun in 2013. This one happens to be chambered in .38-40.",
4848
"weight": "4218 g",
4949
"volume": "3 L",
50-
"price": 150000,
50+
"price": "100 USD",
5151
"bashing": 8,
5252
"to_hit": -2,
5353
"material": [ "steel", "wood" ],
@@ -86,7 +86,7 @@
8686
"description": "The successor to the model 1866, the model 1877 is perhaps the most popular Lever Action rifle. It has been depicted in many forms of popculture and is marketed as, 'The Gun That Won The West.' The rifle was so popular that the Miroku Corporation started to reproduce the gun in 2013. This one happens to be chambered in .32-20.",
8787
"weight": "4218 g",
8888
"volume": "3 L",
89-
"price": 150000,
89+
"price": "100 USD",
9090
"bashing": 8,
9191
"to_hit": -2,
9292
"material": [ "steel", "wood" ],

data/Maintained_mods/mods/Locked_and_Loaded/items/guns/shotgun/pump/887.json

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"dispersion": 305,
1818
"durability": 8,
1919
"clip_size": 5,
20+
"longest_side": "1230 mm",
2021
"valid_mod_locations": [ [ "accessories", 2 ], [ "mechanism", 4 ], [ "sling", 1 ], [ "barrel", 1 ], [ "brass catcher", 1 ] ],
2122
"flags": [ "RELOAD_ONE" ],
2223
"barrel_volume": "236 ml",
@@ -35,6 +36,7 @@
3536
"price": 53000,
3637
"to_hit": -2,
3738
"bashing": 10,
39+
"longest_side": "990 mm",
3840
"material": [ "steel", "plastic" ],
3941
"ranged_damage": { "damage_type": "stab", "amount": 1 },
4042
"dispersion": 300,

data/Maintained_mods/mods/Locked_and_Loaded/items/guns/shotgun/pump/nova.json

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"dispersion": 280,
1818
"durability": 8,
1919
"clip_size": 5,
20+
"longest_side": "1155 mm",
2021
"valid_mod_locations": [ [ "accessories", 2 ], [ "mechanism", 4 ], [ "sling", 1 ], [ "barrel", 1 ], [ "brass catcher", 1 ] ],
2122
"flags": [ "RELOAD_ONE" ],
2223
"barrel_volume": "660 ml",
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
3-
"id": [ "american_180" ],
3+
"id": [ "american180" ],
44
"type": "MIGRATION",
5-
"replace": "american180"
5+
"replace": "american_180"
66
}
77
]

data/Unleash_The_Mods/Working_mods/Artyom_Emporium/art_magazines.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,8 @@
206206
"symbol": "#",
207207
"color": "dark_gray",
208208
"ammo_type": [ "45" ],
209-
"capacity": 10,
210209
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 10 } } ],
211-
"reload_time": 125,
212-
"flags": [ "MAG_COMPACT" ]
210+
"flags": [ "SPEEDLOADER" ]
213211
},
214212
{
215213
"id": "stripperclip_9",
@@ -223,10 +221,8 @@
223221
"symbol": "#",
224222
"color": "dark_gray",
225223
"ammo_type": [ "9mm" ],
226-
"capacity": 10,
227224
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 10 } } ],
228-
"reload_time": 125,
229-
"flags": [ "MAG_COMPACT" ]
225+
"flags": [ "SPEEDLOADER" ]
230226
},
231227
{
232228
"id": "p08_9mag",

0 commit comments

Comments
 (0)