Skip to content

test #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

test #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
709f9c5
Gun removal
Holli-Git Oct 20, 2024
2dbb6c5
Re-add M90
Holli-Git Oct 20, 2024
dba174c
Add 410 saiga to GG
Holli-Git Oct 20, 2024
a72175a
re-add saiga 410 to to hit blacklist
Holli-Git Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
{
"type": "item_group",
"id": "c96_mods",
"//": "Default possible mods for the C96 and M714.",
"//": "Default possible mods for the C96.",
"subtype": "distribution",
"entries": [ { "item": "stock_mauser", "prob": 40 } ]
},
Expand Down
5 changes: 2 additions & 3 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@
{ "item": "px4", "prob": 5, "charges": [ 0, -1 ] },
{ "item": "hi_power_9mm", "prob": 2, "charges": [ 0, -1 ] },
{ "item": "walther_ppq_9mm", "prob": 4, "charges": [ 0, -1 ] },
{ "item": "kpf9", "prob": 24, "charges": [ 0, -1 ] },
{ "item": "hptc9", "prob": 2, "charges": [ 0, -1 ] },
{ "item": "cz75", "prob": 7, "charges": [ 0, -1 ] },
{ "item": "walther_ccp", "prob": 2, "charges": [ 0, -1 ] },
Expand Down Expand Up @@ -540,7 +539,7 @@
{
"type": "item_group",
"id": "guns_rifle_common_9mm",
"items": [ { "group": "nested_ksub2000", "prob": 100 }, { "group": "nested_cx4", "prob": 1 } ]
"items": [ { "group": "nested_ksub2000", "prob": 100 } ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -701,7 +700,7 @@
{
"type": "item_group",
"id": "guns_rifle_common_display_9mm",
"items": [ { "item": "ksub2000", "prob": 100 }, { "item": "cx4", "prob": 1 } ]
"items": [ { "item": "ksub2000", "prob": 100 } ]
},
{
"type": "item_group",
Expand Down
7 changes: 0 additions & 7 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,6 @@
"//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
"items": [ { "item": "p08mag_8rd", "prob": 500 }, { "item": "p08mag_32rd", "prob": 3 } ]
},
{
"type": "item_group",
"subtype": "distribution",
"id": "magazines_9mm_mauser",
"//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
"items": [ { "item": "mausermag_10rd", "prob": 500 }, { "item": "mausermag_20rd", "prob": 50 } ]
},
{
"type": "item_group",
"subtype": "distribution",
Expand Down
3 changes: 0 additions & 3 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@
{ "item": "ppq9mag_10rd", "prob": 1, "charges": [ 0, 10 ] },
{ "item": "ppq9mag_15rd", "prob": 1, "charges": [ 0, 15 ] },
{ "item": "ppq9mag_17rd", "prob": 1, "charges": [ 0, 17 ] },
{ "item": "ppq40mag_10rd", "prob": 1, "charges": [ 0, 10 ] },
{ "item": "ppq40mag_12rd", "prob": 1, "charges": [ 0, 12 ] },
{ "item": "ppq40mag_14rd", "prob": 1, "charges": [ 0, 14 ] },
{ "item": "ppq45mag", "prob": 1, "charges": [ 0, 12 ] }
]
},
Expand Down
1 change: 0 additions & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@
"items": [
{ "group": "magazines_9mm_calico", "prob": 1 },
{ "group": "magazines_9mm_luger", "prob": 60 },
{ "group": "magazines_9mm_mauser", "prob": 20 },
{ "group": "magazines_9mm_mp40", "prob": 60 },
{ "group": "magazines_9mm_sten", "prob": 40 },
{ "group": "magazines_9mm_tec9", "prob": 60 },
Expand Down
181 changes: 0 additions & 181 deletions data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,19 +155,6 @@
{ "group": "on_hand_10mm" }
]
},
{
"id": "nested_STI_DS_10",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "STI_DS_10", "charges": [ 0, 7 ] },
{ "item": "2011_17_mag" },
{ "item": "2011_17_mag", "prob": 50 },
{ "group": "on_hand_10mm" }
]
},
{
"id": "nested_m9",
"type": "item_group",
Expand Down Expand Up @@ -325,19 +312,6 @@
{ "item": "38_speedloader6", "prob": 50 }
]
},
{
"id": "nested_taurus_spectrum",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "taurus_spectrum", "charges": [ 0, 6 ] },
{ "item": "taurus_spectrum_mag" },
{ "item": "taurus_spectrum_mag", "prob": 50 },
{ "group": "on_hand_380" }
]
},
{
"id": "nested_p220_10",
"type": "item_group",
Expand Down Expand Up @@ -429,19 +403,6 @@
{ "group": "on_hand_32" }
]
},
{
"id": "nested_kp3at",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "kp3at", "charges": [ 0, 6 ] },
{ "item": "kp3atmag" },
{ "item": "kp3atmag", "prob": 50 },
{ "group": "on_hand_380" }
]
},
{
"id": "nested_rugerlcp",
"type": "item_group",
Expand All @@ -455,19 +416,6 @@
{ "group": "on_hand_380" }
]
},
{
"id": "nested_kpf9",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "kpf9", "charges": [ 0, 7 ] },
{ "item": "kpf9mag" },
{ "item": "kpf9mag", "prob": 50 },
{ "group": "on_hand_9mm" }
]
},
{
"id": "nested_hi_power_9mm",
"type": "item_group",
Expand Down Expand Up @@ -520,19 +468,6 @@
{ "group": "on_hand_9mm" }
]
},
{
"id": "nested_walther_ppq_40",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "walther_ppq_40", "charges": [ 0, 14 ] },
{ "item": "ppq40mag_10rd" },
{ "item": "ppq40mag_10rd", "prob": 50 },
{ "group": "on_hand_40" }
]
},
{
"id": "nested_walther_ppq_45",
"type": "item_group",
Expand Down Expand Up @@ -689,19 +624,6 @@
{ "group": "on_hand_9mm" }
]
},
{
"id": "nested_90two40",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "90two40", "charges": [ 0, 12 ] },
{ "item": "90two40mag" },
{ "item": "90two40mag", "prob": 50 },
{ "group": "on_hand_40" }
]
},
{
"id": "nested_bond_410",
"type": "item_group",
Expand Down Expand Up @@ -825,19 +747,6 @@
{ "group": "on_hand_40" }
]
},
{
"id": "nested_sig_p230",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "sig_p230", "charges": [ 0, 8 ] },
{ "item": "sigp230mag" },
{ "item": "sigp230mag", "prob": 50 },
{ "group": "on_hand_32" }
]
},
{
"id": "nested_sw_500",
"type": "item_group",
Expand Down Expand Up @@ -1505,19 +1414,6 @@
{ "group": "on_hand_300BLK" }
]
},
{
"id": "nested_cx4",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "cx4", "charges": [ 0, 15 ] },
{ "item": "m9mag" },
{ "item": "m9mag", "prob": 50 },
{ "group": "on_hand_9mm" }
]
},
{
"id": "nested_ksub2000",
"type": "item_group",
Expand Down Expand Up @@ -2149,19 +2045,6 @@
"ammo": 100,
"entries": [ { "item": "win70_458", "charges": [ 0, 3 ] }, { "group": "on_hand_458wm" } ]
},
{
"id": "nested_arx160",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "arx160", "charges": [ 0, 30 ] },
{ "item": "akmag10" },
{ "item": "akmag10", "prob": 50 },
{ "group": "on_hand_762" }
]
},
{
"id": "nested_mossberg_500",
"type": "item_group",
Expand Down Expand Up @@ -2456,19 +2339,6 @@
{ "group": "on_hand_shot" }
]
},
{
"id": "nested_saiga_410",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "saiga_410", "charges": [ 0, 10 ] },
{ "item": "saiga410mag_10rd" },
{ "item": "saiga410mag_10rd", "prob": 50 },
{ "group": "on_hand_410shot" }
]
},
{
"id": "nested_p50",
"type": "item_group",
Expand Down Expand Up @@ -2508,18 +2378,6 @@
{ "group": "on_hand_57" }
]
},
{
"id": "nested_m714",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"entries": [
{ "item": "mauser_m714", "charges": [ 0, 20 ] },
{ "item": "mausermag_20rd" },
{ "item": "mausermag_20rd", "prob": 50 },
{ "group": "on_hand_9mm" }
]
},
{
"id": "nested_m1carbine",
"type": "item_group",
Expand Down Expand Up @@ -2559,19 +2417,6 @@
{ "group": "on_hand_223" }
]
},
{
"id": "nested_minidraco556",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "minidraco556", "charges": [ 0, 30 ] },
{ "item": "zpap85mag" },
{ "item": "zpap85mag", "prob": 50 },
{ "group": "on_hand_223" }
]
},
{
"id": "nested_ak308",
"type": "item_group",
Expand All @@ -2585,32 +2430,6 @@
{ "group": "on_hand_308" }
]
},
{
"id": "nested_zpapm90",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "ak556", "variant": "zpapm90", "charges": [ 0, 30 ] },
{ "item": "zpap85mag" },
{ "item": "zpap85mag", "prob": 50 },
{ "group": "on_hand_223" }
]
},
{
"id": "nested_zpap85",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "item": "minidraco556", "variant": "zpap85", "charges": [ 0, 30 ] },
{ "item": "zpap85mag" },
{ "item": "zpap85mag", "prob": 50 },
{ "group": "on_hand_223" }
]
},
{
"id": "nested_papm77",
"type": "item_group",
Expand Down
34 changes: 0 additions & 34 deletions data/json/items/gun/10mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,39 +322,5 @@
"min_cycle_recoil": 675,
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "103 ml", "item_restriction": [ "glock_20mag", "tdi_10mm_mag" ] } ]
},
{
"id": "STI_DS_10",
"copy-from": "pistol_base",
"looks_like": "m1911_10",
"type": "GUN",
"name": { "str": "double-stack 10mm 1911 pistol" },
"description": "An updated version of the M1911 pistol, chambered in 10mm Auto, that uses double-stack magazines for greater capacity.",
"variant_type": "gun",
"variants": [
{
"id": "STI_DS_10",
"name": { "str": "STI Tactical 2011 DS 10mm pistol" },
"description": "A next-gen model of the venerable 1911, ready to win World War Z. Modernized and manufactured by Staccato, sporting a double-stack magwell, sleek solid-steel frame, and ergonomic grip; favored by certain dog-loving assassins. This model is chambered in 10mm Auto.",
"weight": 1
}
],
"weight": "1191 g",
"volume": "430 ml",
"longest_side": "231 mm",
"barrel_length": "127 mm",
"price": "2 kUSD 699 USD",
"price_postapoc": "30 USD",
"material": [ "steel" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "10mm",
"dispersion": 460,
"durability": 6,
"min_cycle_recoil": 570,
"blackpowder_tolerance": 48,
"flags": [ "ALLOWS_BODY_BLOCK" ],
"pocket_data": [ { "magazine_well": "60 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "2011_17_mag", "2011_22_mag" ] } ],
"melee_damage": { "bash": 12 }
}
]
Loading
Loading