Merge pull request #40147 from KorGgenT/fix-profession-test

fix profession test
CleverRaven · May 5, 2020 · 1a0052a · 1a0052a
2 parents f2dbab6 + cfd4571
commit 1a0052a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/data/json/items/armor/belts.json b/data/json/items/armor/belts.json
@@ -120,7 +120,7 @@
     "pocket_data": [
       {
         "holster": true,
-        "max_contains_volume": "500 ml",
+        "max_contains_volume": "1 L",
         "max_contains_weight": "400 g",
         "moves": 60,
         "flag_restriction": [ "BELT_CLIP" ]

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -311,11 +311,6 @@
     "item": "thorazine",
     "bonus": { "present": [ "SCHIZOPHRENIC" ] }
   },
-  {
-    "type": "profession_item_substitutions",
-    "item": "cookbook_human",
-    "bonus": { "present": [ "CANNIBAL" ] }
-  },
   {
     "type": "profession_item_substitutions",
     "item": "teleumbrella",
@@ -3217,7 +3212,7 @@
     ],
     "items": {
       "both": {
-        "items": [ "stockings", "pockknife", "matches", "pipe_tobacco", "tobacco" ],
+        "items": [ "stockings", "pockknife", "matches", "pipe_tobacco", "tobacco", "backpack" ],
         "entries": [ { "group": "charged_cell_phone" } ]
       },
       "male": {
@@ -3271,7 +3266,7 @@
     ],
     "items": {
       "both": {
-        "items": [ "stockings", "pockknife", "matches", "pipe_tobacco", "tobacco" ],
+        "items": [ "stockings", "pockknife", "matches", "pipe_tobacco", "tobacco", "backpack" ],
         "entries": [ { "group": "charged_cell_phone" } ]
       },
       "male": [

diff --git a/tests/new_character_test.cpp b/tests/new_character_test.cpp
@@ -101,7 +101,7 @@ struct less<failure> {
 /**
  * Disabled temporarily because 3169 profession combinations do not work and need to be fixed in json
  */
-TEST_CASE( "starting_items", "[.][slow]" )
+TEST_CASE( "starting_items", "[slow]" )
 {
     // Every starting trait that interferes with food/clothing
     const std::vector<trait_id> mutations = {
@@ -110,7 +110,6 @@ TEST_CASE( "starting_items", "[.][slow]" )
         trait_id( "ANTIWHEAT" ),
         //trait_id( "ARM_TENTACLES" ),
         //trait_id( "BEAK" ),
-        trait_id( "CANNIBAL" ),
         //trait_id( "CARNIVORE" ),
         //trait_id( "HERBIVORE" ),
         //trait_id( "HOOVES" ),