First aid proficiencies (CleverRaven#53048)

Co-authored-by: Kevin Granade <[email protected]>

data/json/hobbies.json

@@ -551,7 +551,8 @@
     "id": "redcross",
     "description": "You've got training and some experience in dealing with urgent injuries.  In the absence of any medical professionals, that'll have to do.",
     "points": 1,
-    "skills": [ { "level": 2, "name": "firstaid" } ]
+    "skills": [ { "level": 2, "name": "firstaid" } ],
+    "proficiencies": [ "prof_wound_care" ]
   },
   {
     "type": "profession",

data/json/items/book/firstaid.json

@@ -16,6 +16,7 @@
     "required_level": 5,
     "max_level": 8,
     "intelligence": 10,
+    "proficiencies": [ { "proficiency": "prof_wound_care_expert", "time_factor": 0.75, "fail_factor": 0.5 } ],
     "time": "55 m",
     "fun": -1
   },
@@ -35,6 +36,7 @@
     "skill": "firstaid",
     "max_level": 1,
     "intelligence": 6,
+    "proficiencies": [ { "proficiency": "prof_wound_care", "time_factor": 0.75, "fail_factor": 0.5 } ],
     "time": "8 m",
     "fun": 1
   },
@@ -54,6 +56,10 @@
     "skill": "firstaid",
     "max_level": 3,
     "intelligence": 8,
+    "proficiencies": [
+      { "proficiency": "prof_wound_care", "time_factor": 0.75, "fail_factor": 0.5 },
+      { "proficiency": "prof_wound_care_expert", "time_factor": 0.75, "fail_factor": 0.5 }
+    ],
     "time": "20 m"
   },
   {
@@ -71,6 +77,7 @@
     "skill": "firstaid",
     "max_level": 2,
     "intelligence": 6,
+    "proficiencies": [ { "proficiency": "prof_wound_care", "time_factor": 0.75, "fail_factor": 0.5 } ],
     "time": "20 m"
   },
   {
@@ -91,6 +98,7 @@
     "required_level": 3,
     "max_level": 6,
     "intelligence": 8,
+    "proficiencies": [ { "proficiency": "prof_wound_care_expert", "time_factor": 0.75, "fail_factor": 0.5 } ],
     "time": "30 m"
   },
   {

data/json/items/comestibles/med.json

@@ -58,7 +58,7 @@
     "color": "white",
     "charges": 10,
     "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bandages_power": 1, "bleed": 4, "move_cost": 200 }
+    "use_action": { "type": "heal", "bandages_power": 1, "bleed": 4, "move_cost": 750 }
   },
   {
     "id": "adrenaline_injector",
@@ -178,7 +178,7 @@
     "charges": 3,
     "stack_size": 9,
     "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bandages_power": 4, "bleed": 15, "move_cost": 300 }
+    "use_action": { "type": "heal", "bandages_power": 4, "bleed": 15, "move_cost": 6000 }
   },
   {
     "id": "bandages_makeshift",
@@ -188,7 +188,7 @@
     "description": "Simple cloth bandages.  Better than nothing.",
     "price_postapoc": 100,
     "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bandages_power": 2, "bleed": 10, "move_cost": 300 }
+    "use_action": { "type": "heal", "bandages_power": 2, "bleed": 10, "move_cost": 6000 }
   },
   {
     "id": "bandages_makeshift_bleached",
@@ -198,7 +198,7 @@
     "description": "Simple cloth bandages.  It is white, as real bandages should be.",
     "price_postapoc": 150,
     "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bandages_power": 3, "bleed": 10, "move_cost": 300 }
+    "use_action": { "type": "heal", "bandages_power": 3, "bleed": 10, "move_cost": 6000 }
   },
   {
     "id": "bandages_makeshift_boiled",
@@ -208,7 +208,7 @@
     "description": "Simple cloth bandages.  It was boiled to make it more sterile.",
     "price_postapoc": 150,
     "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bandages_power": 3, "bleed": 10, "move_cost": 300 }
+    "use_action": { "type": "heal", "bandages_power": 3, "bleed": 10, "move_cost": 6000 }
   },
   {
     "id": "bfipowder",
@@ -219,15 +219,15 @@
     "weight": "6 g",
     "volume": "250 ml",
     "price": 900,
-    "price_postapoc": 4000,
+    "price_postapoc": 2000,
     "charges": 4,
     "stack_size": 40,
     "material": [ "powder" ],
     "symbol": "!",
     "color": "white",
     "container": "bottle_plastic_small",
     "flags": [ "NO_INGEST", "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 100 }
+    "use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 2000 }
   },
   {
     "id": "caff_gum",
@@ -312,7 +312,7 @@
     "phase": "liquid",
     "container": "bottle_plastic_small",
     "flags": [ "NO_INGEST", "WATER_DISSOLVE" ],
-    "use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 100 }
+    "use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 2000 }
   },
   {
     "id": "cig",
@@ -487,7 +487,7 @@
     "color": "white",
     "container": "bag_plastic",
     "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bandages_power": 2, "bleed": 3, "move_cost": 300 }
+    "use_action": { "type": "heal", "bandages_power": 2, "bleed": 3, "move_cost": 3000 }
   },
   {
     "id": "crack",
@@ -555,7 +555,7 @@
     "phase": "liquid",
     "container": "bottle_plastic_small",
     "flags": [ "NO_INGEST", "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE" ],
-    "use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 100 }
+    "use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 3000 }
   },
   {
     "id": "disinfectant_makeshift",
@@ -565,7 +565,7 @@
     "copy-from": "disinfectant",
     "description": "Makeshift antiseptic made from ethanol.  Can be used to disinfect a wound.",
     "flags": [ "NO_INGEST", "WATER_DISSOLVE" ],
-    "use_action": { "type": "heal", "disinfectant_power": 3, "bite": 0.95, "move_cost": 100 }
+    "use_action": { "type": "heal", "disinfectant_power": 3, "bite": 0.95, "move_cost": 3000 }
   },
   {
     "id": "alcohol_wipes",
@@ -1205,7 +1205,7 @@
     "symbol": ",",
     "color": "white",
     "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bandages_power": 4, "bleed": 5, "move_cost": 200 }
+    "use_action": { "type": "heal", "bandages_power": 4, "bleed": 5, "move_cost": 6000 }
   },
   {
     "id": "meth",
@@ -1556,7 +1556,7 @@
     "color": "light_gray",
     "container": "bag_plastic",
     "flags": [ "NO_INGEST", "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
-    "use_action": { "type": "heal", "bleed": 20, "move_cost": 100 }
+    "use_action": { "type": "heal", "bleed": 20, "move_cost": 2000 }
   },
   {
     "id": "saline",
@@ -1611,7 +1611,7 @@
     "phase": "liquid",
     "spoils_in": "28 days",
     "flags": [ "NO_INGEST" ],
-    "use_action": { "type": "heal", "disinfectant_power": 3, "bite": 0.95, "move_cost": 100 }
+    "use_action": { "type": "heal", "disinfectant_power": 3, "bite": 0.95, "move_cost": 3000 }
   },
   {
     "id": "tobacco",
@@ -1942,7 +1942,7 @@
       "type": "heal",
       "disinfectant_power": 2,
       "bite": 0.5,
-      "move_cost": 200,
+      "move_cost": 6000,
       "used_up_item": { "id": "rag", "quantity": 1, "flags": [ "FILTHY" ] }
     }
   },
@@ -1966,7 +1966,7 @@
       "type": "heal",
       "disinfectant_power": 3,
       "bite": 0.66,
-      "move_cost": 300,
+      "move_cost": 6000,
       "used_up_item": { "id": "cotton_ball", "quantity": 1, "charges": 1, "flags": [ "FILTHY" ] }
     }
   },
@@ -2056,7 +2056,7 @@
       "type": "heal",
       "disinfectant_power": 3,
       "bite": 0.75,
-      "move_cost": 100,
+      "move_cost": 3000,
       "effects": [ { "id": "pkill1", "duration": 720 } ]
     }
   },
@@ -2098,6 +2098,6 @@
     "addiction_potential": 5,
     "addiction_type": "cocaine",
     "flags": [ "NO_INGEST", "WATER_DISSOLVE" ],
-    "use_action": { "type": "heal", "bleed": 20, "move_cost": 100, "effects": [ { "id": "pkill1", "duration": 720 } ] }
+    "use_action": { "type": "heal", "bleed": 20, "move_cost": 3000, "effects": [ { "id": "pkill1", "duration": 720 } ] }
   }
 ]

data/json/professions.json

@@ -1149,6 +1149,7 @@
     "description": "Fresh out of med school, you've got little in the way of practical experience and just a handful of first-aid supplies.  You just hope it will be enough if 'physician, heal thyself' turns out to be more literal than you expected.",
     "points": 2,
     "skills": [ { "level": 4, "name": "firstaid" } ],
+    "proficiencies": [ "prof_wound_care", "prof_wound_care_expert" ],
     "traits": [ "PROF_MED" ],
     "items": {
       "both": {
@@ -1258,6 +1259,7 @@
     "description": "You went on providing in-home care for the elderly even as the whole world fell apart around you.  You can only pray that you don't see your former clients among the walking dead…",
     "points": 1,
     "skills": [ { "level": 2, "name": "firstaid" }, { "level": 1, "name": "cooking" } ],
+    "proficiencies": [ "prof_wound_care" ],
     "items": {
       "both": [
         "pants",
@@ -1839,6 +1841,7 @@
     "description": "On your way to respond to an emergency call, you nearly drove straight into a riot in the city.  Turning off of the burning, debris-covered streets, you took a long detour only to find yourself lost.  That call will have to wait - you're in an emergency of your own now.",
     "points": 5,
     "skills": [ { "level": 3, "name": "firstaid" }, { "level": 3, "name": "driving" }, { "level": 1, "name": "electronics" } ],
+    "proficiencies": [ "prof_wound_care" ],
     "vehicle": "fire_engine",
     "items": {
       "both": {
@@ -3795,6 +3798,7 @@
       { "level": 1, "name": "electronics" },
       { "level": 3, "name": "firstaid" }
     ],
+    "proficiencies": [ "prof_wound_care", "prof_wound_care_expert" ],
     "traits": [ "PROF_MED" ],
     "vehicle": "ambulance",
     "items": {
@@ -3813,6 +3817,7 @@
     "description": "You were separated from your partner while out on a call.  You managed to hang onto some medical supplies, but it's looking like the only life that needs saving now is yours.",
     "points": 3,
     "skills": [ { "level": 2, "name": "driving" }, { "level": 1, "name": "mechanics" }, { "level": 5, "name": "firstaid" } ],
+    "proficiencies": [ "prof_wound_care", "prof_wound_care_expert" ],
     "traits": [ "PROF_MED" ],
     "items": {
       "both": {
@@ -3852,7 +3857,7 @@
       { "level": 4, "name": "firstaid" }
     ],
     "traits": [ "PROF_MED" ],
-    "proficiencies": [ "prof_spotting" ],
+    "proficiencies": [ "prof_spotting", "prof_wound_care", "prof_wound_care_expert" ],
     "items": {
       "both": {
         "items": [
@@ -4005,6 +4010,7 @@
     "description": "You were deployed to autopsy one of the rioters showing feral behavior before being put down.  When they got back up, you knew this was out of your job description.",
     "points": 5,
     "skills": [ { "level": 5, "name": "firstaid" } ],
+    "proficiencies": [ "prof_wound_care", "prof_wound_care_expert" ],
     "traits": [ "PROF_MED" ],
     "items": {
       "both": {

data/json/proficiencies/health_care.json

@@ -0,0 +1,23 @@
+[
+  {
+    "type": "proficiency",
+    "id": "prof_wound_care",
+    "name": { "str": "Wound Care" },
+    "description": "You know how to bandage wounds and understand basic principles of wound care.",
+    "can_learn": true,
+    "default_time_multiplier": 2,
+    "default_fail_multiplier": 1.5,
+    "time_to_learn": "2 h"
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_wound_care_expert",
+    "name": { "str": "Wound Care Expert" },
+    "description": "Your extensive field experience in bandaging and wound care is on par with that of a paramedic.",
+    "can_learn": true,
+    "default_time_multiplier": 2,
+    "default_fail_multiplier": 1.25,
+    "time_to_learn": "14 h",
+    "required_proficiencies": [ "prof_firstaid" ]
+  }
+]

data/json/recipes/practice/health.json

@@ -0,0 +1,51 @@
+[
+  {
+    "id": "prac_health_care_beg",
+    "type": "practice",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_PRACTICE",
+    "subcategory": "CSC_PRACTICE_HEALTH",
+    "name": "bandaging (beginner)",
+    "description": "Practice bandaging imaginary wounds while making sure your bandage won't fall off during activities.",
+    "skill_used": "firstaid",
+    "time": "1 h",
+    "practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 1 },
+    "proficiencies": [ { "proficiency": "prof_wound_care", "fail_multiplier": 1, "time_multiplier": 1 } ],
+    "autolearn": [ [ "firstaid", 0 ] ],
+    "flags": [ "BLIND_HARD" ],
+    "components": [
+      [
+        [ "bandages", 1 ],
+        [ "bandages_makeshift", 1 ],
+        [ "bandages_makeshift_bleached", 1 ],
+        [ "bandages_makeshift_boiled", 1 ]
+      ]
+    ],
+    "byproducts": [ [ "rag", 1 ] ]
+  },
+  {
+    "id": "prac_health_care_int",
+    "type": "practice",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_PRACTICE",
+    "subcategory": "CSC_PRACTICE_HEALTH",
+    "name": "bandaging (advanced)",
+    "description": "Practice bandaging different limbs and less accessible parts of your body using both hands and each of your hands alone.",
+    "skill_used": "firstaid",
+    "time": "1 h",
+    "practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 },
+    "proficiencies": [ { "proficiency": "prof_wound_care_expert", "fail_multiplier": 1, "time_multiplier": 1 } ],
+    "autolearn": [ [ "firstaid", 1 ] ],
+    "flags": [ "BLIND_HARD" ],
+    "book_learn": [ [ "booklet_firstaid", 0 ], [ "mag_firstaid", 0 ], [ "pocket_firstaid", 0 ], [ "manual_first_aid", 0 ] ],
+    "components": [
+      [
+        [ "bandages", 2 ],
+        [ "bandages_makeshift", 2 ],
+        [ "bandages_makeshift_bleached", 2 ],
+        [ "bandages_makeshift_boiled", 2 ]
+      ]
+    ],
+    "byproducts": [ [ "rag", 2 ] ]
+  }
+]

data/mods/package_bionic_professions/bionic_professions.json

@@ -243,7 +243,7 @@
     "description": "When bionics first emerged, you were quick to make them into your career, and spent your days overseeing their installation.  That makes you one of the few non-zombies in the world that can calibrate an Autodoc, which might come in handy.",
     "points": 4,
     "skills": [ { "level": 4, "name": "firstaid" }, { "level": 4, "name": "electronics" } ],
-    "proficiencies": [ "prof_intro_biology", "prof_physiology" ],
+    "proficiencies": [ "prof_intro_biology", "prof_physiology", "prof_wound_care" ],
     "traits": [ "PROF_AUTODOC" ],
     "items": {
       "both": {
@@ -274,7 +274,7 @@
     "points": 6,
     "CBMs": [ "bio_surgical_razor", "bio_flashlight", "bio_batteries", "bio_power_storage_mkII" ],
     "skills": [ { "level": 8, "name": "firstaid" } ],
-    "proficiencies": [ "prof_intro_biology", "prof_physiology" ],
+    "proficiencies": [ "prof_intro_biology", "prof_physiology", "prof_wound_care", "prof_wound_care_expert" ],
     "traits": [ "PROF_MED" ],
     "items": {
       "both": {

doc/PROFICIENCY_LIST.md

@@ -124,6 +124,9 @@
 | prof_spotting | Spotting and Awareness | You are skilled at spotting things out of the ordinary, like traps or ambushes. | None
 | |
 | prof_parkour | Parkour Expert | You're skilled at clearing obstacles; terrain like railings or counters are as easy for you to move on as solid ground. | None
+| |
+| prof_wound_care | Wound Care | You know how to bandage wounds and understand basic principles of wound care. | None
+| prof_wound_care_expert | Wound Care Expert | Your extensive field experience in bandaging and wound care is on par with that of a paramedic. | prof_wound_care
 
 ## Magiclysm proficiencies