Skip to content

Commit

Permalink
fix profession test
Browse files Browse the repository at this point in the history
  • Loading branch information
KorGgenT committed May 4, 2020
1 parent 11714a3 commit a7ee594
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion data/json/items/armor/belts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
9 changes: 2 additions & 7 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion tests/new_character_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit a7ee594

Please sign in to comment.