Skip to content

Commit

Permalink
Adds the Taurus Judge (CleverRaven#74115)
Browse files Browse the repository at this point in the history
* Taurus Judge

* Add itemgroups

* Adjust spawn rates

* Add Judge to item_demographics

* Spawn empty judges, not loaded

* Update data/mods/TEST_DATA/item_demographics.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Adds blacklist/migration to mods

* Update gg_firearms_migration.json

* Update name

* Remove space

* New name

* Add Taurus to the identifier blacklist

* Missed an underscore

* Add stuff and things

* Undo blacklist changes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
Holli-Git and github-actions[bot] authored May 28, 2024
1 parent cdd1820 commit def88e8
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 5 deletions.
4 changes: 2 additions & 2 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
{
"type": "item_group",
"id": "guns_pistol_common_other",
"items": [ { "group": "nested_kp32", "prob": 5 } ]
"items": [ { "group": "nested_kp32", "prob": 5 }, { "group": "nested_taurus_judge", "prob": 9 } ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -257,7 +257,7 @@
{
"type": "item_group",
"id": "guns_pistol_common_display_other",
"items": [ { "item": "kp32", "prob": 5 } ]
"items": [ { "item": "kp32", "prob": 5 }, { "item": "taurus_judge", "prob": 9 } ]
},
{
"type": "item_group",
Expand Down
8 changes: 8 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -2727,5 +2727,13 @@
{ "item": "clip_77mm_arisaka", "prob": 50 },
{ "group": "on_hand_77mm_arisaka" }
]
},
{
"id": "nested_taurus_judge",
"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_judge", "charges": [ 0, 5 ] }, { "group": "on_hand_410shot" } ]
}
]
36 changes: 36 additions & 0 deletions data/json/items/gun/45colt.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,41 @@
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 6 } } ],
"melee_damage": { "bash": 8 }
},
{
"id": "taurus_judge",
"copy-from": "pistol_revolver",
"looks_like": "sw_619",
"type": "GUN",
"name": { "str_sp": ".45/.410 shotshell revolver" },
"description": "A stainless steel 5 shot revolver, capable of firing .410 shells or 45 Colt cartridges.",
"variant_type": "gun",
"variants": [
{
"id": "taurus_judge",
"name": { "str": "Taurus Judge" },
"description": "Marketed for home defense, the Taurus Judge is a 5 shot cylinder revolver, capable of firing .410 shotshells or .45 Colt cartridges out of it's 3 inch barrel. While it doesn't compete ballistically with a proper rifle, or even a full length revolver, it's still a handy handgun against the undead and soon to be."
}
],
"weight": "822 g",
"volume": "563 ml",
"longest_side": "274 mm",
"barrel_length": "140 mm",
"//": "76.2 + 63.5 for barrel length and chamber length, revolvers just built different",
"price": "564 USD",
"price_postapoc": "20 USD",
"to_hit": -2,
"ammo": [ "410shot", "45colt" ],
"dispersion": 280,
"clip_size": 5,
"pocket_data": [
{
"pocket_type": "MAGAZINE",
"holster": true,
"ammo_restriction": { "410shot": 5, "45colt": 5 },
"allowed_speedloaders": [ "454_speedloader5" ]
}
],
"melee_damage": { "bash": 6 }
}
]
2 changes: 1 addition & 1 deletion data/mods/Generic_Guns/firearms/gg_firearms_migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"replace": "pistol_pipe_smg"
},
{
"id": [ "cop_38", "model_10_revolver", "ruger_lcr_38", "sw_610", "bond_410", "colt_saa", "m47a1" ],
"id": [ "cop_38", "model_10_revolver", "ruger_lcr_38", "sw_610", "bond_410", "colt_saa", "m47a1", "taurus_judge" ],
"type": "MIGRATION",
"replace": "pistol_revolver"
},
Expand Down
6 changes: 5 additions & 1 deletion data/mods/TEST_DATA/item_demographics.json
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,11 @@
"weight": 8,
"items": { "combination_gun": 1, "browning_blr": 1, "garand": 1, "m1903": 1, "m1918": 1, "remington_700": 1, "ruger_m77": 1 }
},
{ "type": "45colt", "weight": 8, "items": { "colt_lightning": 1, "colt_saa": 1, "bond_410": 1 } },
{
"type": "45colt",
"weight": 8,
"items": { "colt_lightning": 1, "colt_saa": 1, "bond_410": 1, "taurus_judge": 1 }
},
{ "type": "762R", "weight": 4, "items": { "mosin44": 1, "mosin91_30": 1, "psl": 1 } },
{ "type": "270win", "weight": 3, "items": { "remington700_270": 1 } },
{ "type": "410shot", "weight": 3, "items": { "saiga_410": 1, "shotgun_410": 1 } },
Expand Down
3 changes: 2 additions & 1 deletion data/mods/classic_zombies/items/blacklists.json
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,8 @@
"wine_mycus",
"STI_DS_10",
"xd_10",
"xd_10_mag"
"xd_10_mag",
"taurus_judge"
]
}
]

0 comments on commit def88e8

Please sign in to comment.