Merge branch 'CleverRaven:master' into monster_conditions

CleverRaven · Dec 24, 2024 · f53a347 · f53a347
2 parents 80e7873 + 44b3817
commit f53a347
Show file tree

Hide file tree

Showing 28 changed files with 423 additions and 208 deletions.
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
@@ -224,11 +224,7 @@
     "name": { "str_sp": "chamomile tea" },
     "copy-from": "tea",
     "color": "green",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Can be used to treat insomnia.",
-      "effect_on_conditions": [ "EOC_MINOR_SLEEP" ]
-    },
+    "sleepiness_mod": -20,
     "stim": 0,
     "spoils_in": "10 days",
     "comestible_type": "MED",

diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
@@ -1488,11 +1488,8 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
     "addiction_potential": 40,
     "addiction_type": "sleeping pill",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Can be used to treat insomnia.",
-      "effect_on_conditions": [ "EOC_SLEEP" ]
-    }
+    "use_action": { "type": "consume_drug", "activation_message": "You take a %s." },
+    "sleepiness_mod": -40
   },
   {
     "id": "poppy_pain",
@@ -1531,13 +1528,10 @@
     "symbol": "!",
     "color": "magenta",
     "healthy": -2,
-    "addiction_type": "opiate",
+    "addiction_type": [ "sleeping pill", "opiate" ],
     "flags": [ "EDIBLE_FROZEN" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Can be used to treat insomnia.",
-      "effect_on_conditions": [ "EOC_SLEEP" ]
-    }
+    "use_action": { "type": "consume_drug", "activation_message": "You take a %s." },
+    "sleepiness_mod": -40
   },
   {
     "id": "poppysyrup",
@@ -1557,7 +1551,7 @@
     "stim": -3,
     "healthy": -1,
     "addiction_potential": 15,
-    "addiction_type": "sleeping pill",
+    "addiction_type": [ "sleeping pill", "opiate" ],
     "use_action": [ "FLUSLEEP" ]
   },
   {

diff --git a/data/json/uncraft/recipe_deconstruction.json b/data/json/uncraft/recipe_deconstruction.json
@@ -2426,6 +2426,22 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [ [ [ "thread_canvas", 1 ] ] ]
   },
+  {
+    "result": "sheet_denim",
+    "type": "uncraft",
+    "activity_level": "NO_EXERCISE",
+    "time": "30 s",
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "denim_patch", 8 ] ] ]
+  },
+  {
+    "result": "sheet_denim_patchwork",
+    "type": "uncraft",
+    "activity_level": "NO_EXERCISE",
+    "time": "10 s",
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "denim_patch", 8 ] ] ]
+  },
   {
     "result": "felt_patch",
     "type": "uncraft",

diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp
@@ -1500,8 +1500,7 @@ static std::vector<std::tuple<tripoint_bub_ms, itype_id, int>> requirements_map(
         already_there_spots.push_back( elem );
         combined_spots.push_back( elem );
     }
-    // TODO: fix point types
-    for( const tripoint &elem : mgr.get_point_set_loot(
+    for( const tripoint_bub_ms &elem : mgr.get_point_set_loot(
              you.get_location(), distance, you.is_npc(), _fac_id( you ) ) ) {
         // if there is a loot zone that's already near the work spot, we don't want it to be added twice.
         if( std::find( already_there_spots.begin(), already_there_spots.end(),
@@ -2804,8 +2803,7 @@ static requirement_check_result generic_multi_activity_check_requirement(
         requirement_id what_we_need;
         std::vector<tripoint_bub_ms> loot_zone_spots;
         std::vector<tripoint_bub_ms> combined_spots;
-        // TODO: fix point types
-        for( const tripoint &elem : mgr.get_point_set_loot(
+        for( const tripoint_bub_ms &elem : mgr.get_point_set_loot(
                  abspos, ACTIVITY_SEARCH_DISTANCE, you.is_npc(), _fac_id( you ) ) ) {
             loot_zone_spots.emplace_back( elem );
             combined_spots.emplace_back( elem );