Improve makeshift crowbar action description (#54195)

* Add new crowbar item action * Make makeshift crowbar use new action * Create iuse function for makeshift crowbar
CleverRaven · Jan 9, 2022 · e40f1ae · e40f1ae
1 parent 35721ed
commit e40f1ae
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -34,6 +34,11 @@
     "id": "deploy_furn",
     "name": { "str": "Deploy item" }
   },
+  {
+    "type": "item_action",
+    "id": "CROWBAR_WEAK",
+    "name": { "str": "Pry crate or nails" }
+  },
   {
     "type": "item_action",
     "id": "CROWBAR",

diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json
@@ -88,7 +88,7 @@
     "symbol": ";",
     "color": "dark_gray",
     "qualities": [ [ "PRY", 1 ], [ "HAMMER", 1 ] ],
-    "use_action": [ "CROWBAR" ],
+    "use_action": [ "CROWBAR_WEAK" ],
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "BELT_CLIP" ]
   },

diff --git a/src/item_factory.cpp b/src/item_factory.cpp
@@ -1257,6 +1257,7 @@ void Item_factory::init()
     add_iuse( "E_COMBATSAW_ON", &iuse::e_combatsaw_on );
     add_iuse( "CONTACTS", &iuse::contacts );
     add_iuse( "CROWBAR", &iuse::crowbar );
+    add_iuse( "CROWBAR_WEAK", &iuse::crowbar_weak );
     add_iuse( "DATURA", &iuse::datura );
     add_iuse( "DIG", &iuse::dig );
     add_iuse( "DIVE_TANK", &iuse::dive_tank );

diff --git a/src/iuse.cpp b/src/iuse.cpp
@@ -2641,6 +2641,11 @@ cata::optional<int> iuse::hammer( Character *p, item *it, bool, const tripoint &
     return iuse::crowbar( p, it, false, pos );
 }
 
+cata::optional<int> iuse::crowbar_weak( Character *p, item *it, bool, const tripoint &pos )
+{
+    return iuse::crowbar( p, it, false, pos );
+}
+
 cata::optional<int> iuse::crowbar( Character *p, item *it, bool, const tripoint &pos )
 {
     if( p->is_mounted() ) {

diff --git a/src/iuse.h b/src/iuse.h
@@ -96,6 +96,7 @@ cata::optional<int> combatsaw_off( Character *, item *, bool, const tripoint & )
 cata::optional<int> combatsaw_on( Character *, item *, bool, const tripoint & );
 cata::optional<int> contacts( Character *, item *, bool, const tripoint & );
 cata::optional<int> crowbar( Character *, item *, bool, const tripoint & );
+cata::optional<int> crowbar_weak( Character *, item *, bool, const tripoint & );
 cata::optional<int> dig( Character *, item *, bool, const tripoint & );
 cata::optional<int> dig_channel( Character *, item *, bool, const tripoint & );
 cata::optional<int> directional_antenna( Character *, item *, bool, const tripoint & );