diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-04-29 19:36:45 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-04-29 19:36:45 -0700 |
| commit | 2ce607f12a57890c898706f1d4a6ae23226b9bec (patch) | |
| tree | 345e2871317dfe5d186496542094fa99f1842164 | |
| parent | Add accessories to the M27 (diff) | |
| download | cataclysm-dda-mod_hk-loadout-2ce607f12a57890c898706f1d4a6ae23226b9bec.tar.xz | |
Drop the CAWS 20 round belt mag
Fix the 000shot drop tables
Fix some usp drop rates
| -rw-r--r-- | json/itemgroups/Weapons_Mods_Ammo/ammo.json | 12 | ||||
| -rw-r--r-- | json/itemgroups/Weapons_Mods_Ammo/magazines.json | 7 | ||||
| -rw-r--r-- | json/items/migration.json | 7 |
3 files changed, 11 insertions, 15 deletions
diff --git a/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/json/itemgroups/Weapons_Mods_Ammo/ammo.json index 2a563d7..831a4be 100644 --- a/json/itemgroups/Weapons_Mods_Ammo/ammo.json +++ b/json/itemgroups/Weapons_Mods_Ammo/ammo.json @@ -10,20 +10,12 @@ }, { "type": "item_group", - "id": "ammo_shotgun_rare", - "//": "Less common shotgun ammo including that only used by police/paramilitary forces.", - "subtype": "distribution", - "entries": [ - { "item": "shot_000", "prob": 40 }, - { "item": "shot_000_slug", "prob": 20 } - ] - }, - { - "type": "item_group", "id": "ammo_shotgun_milspec", "//": "Military specification shotgun ammo found at military sites.", "subtype": "distribution", "entries": [ + { "item": "shot_000", "prob": 100 }, + { "item": "shot_000_slug", "prob": 100 }, { "item": "shot_000_flechette", "prob": 100 } ] } diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json index a9fab0d..982acad 100644 --- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -5,8 +5,7 @@ "//": "Current military specification magazines.", "items": [ [ "hk_g11_mag", 20 ], - [ "hk_caws_mag", 15 ], - [ "hk_caws_belt", 10 ] + [ "hk_caws_mag", 15 ] ] }, { @@ -14,7 +13,7 @@ "id": "mags_military", "//": "_DEPRECATED_ Older military magazines still in service.", "items": [ - [ "usp40mag", 9 ] + [ "usp40mag", 10 ] ] }, { @@ -22,7 +21,7 @@ "id": "mags_swat", "//": "Magazines issued to paramilitary forces in addition to standard police issue.", "items": [ - [ "usp40mag", 12 ] + [ "usp40mag", 10 ] ] }, { diff --git a/json/items/migration.json b/json/items/migration.json index 184db76..f15abc9 100644 --- a/json/items/migration.json +++ b/json/items/migration.json @@ -3,5 +3,10 @@ "id": "hk_ucp", "type": "MIGRATION", "replace": "hk_ucp" - } + }, + { + "id": "hk_caws_belt", + "type": "MIGRATION", + "replace": "hk_caws_mag" + }, ] |