Merge pull request #77354 from RenechCDDA/cotton_patch_can_stop_bleeding

Fix cotton patch being unusable to stop bleeding
CleverRaven · Oct 27, 2024 · d515611 · d515611
2 parents 93eee86 + c7c599a
commit d515611
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/data/json/items/tool/toiletries.json b/data/json/items/tool/toiletries.json
@@ -140,7 +140,12 @@
     "qualities": [ [ "SIEVE", 1 ], [ "STRAIN", 2 ] ],
     "color": "white",
     "use_action": [
-      { "type": "heal", "move_cost": 200, "used_up_item": { "id": "cotton_patchwork", "quantity": 1, "flags": [ "FILTHY" ] } },
+      {
+        "type": "heal",
+        "move_cost": 200,
+        "bleed": 1,
+        "used_up_item": { "id": "cotton_patchwork", "quantity": 1, "flags": [ "FILTHY" ] }
+      },
       "WASH_HARD_ITEMS"
     ],
     "flags": [ "NO_SALVAGE" ]

diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json
@@ -165,7 +165,12 @@
     "symbol": ",",
     "color": "white",
     "use_action": [
-      { "type": "heal", "move_cost": 200, "used_up_item": { "id": "cotton_patchwork", "quantity": 1, "flags": [ "FILTHY" ] } },
+      {
+        "type": "heal",
+        "move_cost": 200,
+        "bleed": 1,
+        "used_up_item": { "id": "cotton_patchwork", "quantity": 1, "flags": [ "FILTHY" ] }
+      },
       "WASH_HARD_ITEMS"
     ],
     "flags": [ "NO_SALVAGE" ]

diff --git a/data/mods/innawood/items/tool_tailoring.json b/data/mods/innawood/items/tool_tailoring.json
@@ -139,6 +139,7 @@
       {
         "type": "heal",
         "move_cost": 200,
+        "bleed": 1,
         "used_up_item": { "id": "fibercloth_patchwork", "quantity": 1, "flags": [ "FILTHY" ] }
       },
       "WASH_HARD_ITEMS"

diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
@@ -3328,6 +3328,11 @@ void heal_actor::load( const JsonObject &obj, const std::string & )
         }
     }
 
+    if( !bandages_power && !disinfectant_power && !bleed && !bite && !infect &&
+        !obj.has_array( "effects" ) ) {
+        obj.throw_error( _( "Heal actor is missing any valid healing effect" ) );
+    }
+
     if( obj.has_string( "used_up_item" ) ) {
         obj.read( "used_up_item", used_up_item_id, true );
     } else if( obj.has_object( "used_up_item" ) ) {