Skip to content

Commit

Permalink
Adjusted casings_handle() to work on tools. Changed the item type of …
Browse files Browse the repository at this point in the history
…Disorder to "tool" instead of "generic" (#59323)
  • Loading branch information
catdach authored Jul 24, 2022
1 parent 1ec7b52 commit c2b61d6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion data/json/items/gun/artisan_guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"id": "pulverizer",
"copy-from": "hammer_sledge",
"name": { "str": "the Disorder" },
"type": "GENERIC",
"type": "TOOL",
"description": "A large, heavy sledge hammer converted for use as a weapon. It features a notable safety on the side, and the back of the head has a firing mechanism that can be loaded with rifle blanks. When the head impacts and the safety is off, the blanks are engaged, sending the moving piston forward and causing massive damage. Etched into the head are the words 'she's lost control'.",
"proportional": { "weight": 1.2 },
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "powder_blank": 1 } } ],
Expand Down
2 changes: 1 addition & 1 deletion src/item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11290,7 +11290,7 @@ int item::casings_count() const

void item::casings_handle( const std::function<bool( item & )> &func )
{
if( !is_gun() ) {
if( !is_gun() && !is_tool() ) {
return;
}
contents.casings_handle( func );
Expand Down

0 comments on commit c2b61d6

Please sign in to comment.