New characters start with basic life skills

data/json/hobbies.json

@@ -1,4 +1,59 @@
 [
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "driving_license",
+    "name": "Driving License",
+    "description": "You got your driving license and know how to drive a car.",
+    "points": 0,
+    "skills": [ { "level": 1, "name": "driving" } ]
+  },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "simple_home_cooking",
+    "name": "Simple Home Cooking",
+    "description": "You've been living on your own long enough that you know how to cook basic dishes and feed yourself.",
+    "points": 0,
+    "skills": [ { "level": 1, "name": "cooking" } ],
+    "proficiencies": [ "prof_food_prep" ]
+  },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "computer_literate",
+    "name": "Computer Literate",
+    "description": "Either through school, your job, or from your family, you've learned the basics of how to use a computer.",
+    "points": 0,
+    "skills": [ { "level": 1, "name": "computer" } ]
+  },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "socially_adequate",
+    "name": "Socially Adequate",
+    "description": "You've spent a significant portion of your life living among other people and are familiar with social norms.  You know how to talk with other people, and how to convey your emotions and understand those of others.",
+    "points": 0,
+    "skills": [ { "level": 1, "name": "speech" } ]
+  },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "high_school_graduate",
+    "name": "High School Graduate",
+    "description": "You've graduated from high school and thus know a little bit about applied science and electronics.",
+    "points": 0,
+    "skills": [ { "level": 1, "name": "chemistry" }, { "level": 1, "name": "electronics" } ]
+  },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "mundane_survival",
+    "name": "Mundane Survival",
+    "description": "You've managed to survive modern life in a first world country.  Through your ordeals you've learned how to treat scraps and bruises and how to assemble basic furniture.",
+    "points": 0,
+    "skills": [ { "level": 1, "name": "fabrication" }, { "level": 1, "name": "firstaid" } ]
+  },
   {
     "type": "profession",
     "subtype": "hobby",

src/init.cpp

@@ -80,6 +80,7 @@
 #include "overmap_location.h"
 #include "path_info.h"
 #include "profession.h"
+#include "profession_group.h"
 #include "proficiency.h"
 #include "recipe_dictionary.h"
 #include "recipe_groups.h"
@@ -266,6 +267,7 @@ void DynamicDataLoader::initialize()
     add( "bionic", &bionic_data::load_bionic );
     add( "bionic_migration", &bionic_data::load_bionic_migration );
     add( "profession", &profession::load_profession );
+    add( "profession_group", &profession_group::load_profession_group );
     add( "profession_item_substitutions", &profession::load_item_substitutions );
     add( "proficiency", &proficiency::load_proficiencies );
     add( "proficiency_category", &proficiency_category::load_proficiency_categories );
@@ -815,6 +817,7 @@ void DynamicDataLoader::check_consistency( loading_ui &ui )
             { _( "Constructions" ), &check_constructions },
             { _( "Crafting recipes" ), &recipe_dictionary::check_consistency },
             { _( "Professions" ), &profession::check_definitions },
+            { _( "Profession groups" ), &profession_group::check_profession_group_consistency },
             { _( "Scenarios" ), &scenario::check_definitions },
             { _( "Martial arts" ), &check_martialarts },
             { _( "Mutations" ), &mutation_branch::check_consistency },

src/profession_group.cpp

@@ -0,0 +1,50 @@
+#include "profession_group.h"
+
+#include "assign.h"
+#include "generic_factory.h"
+
+namespace
+{
+generic_factory<profession_group> profession_group_factory( "profession_group" );
+} // namespace
+
+template<>
+const profession_group &string_id<profession_group>::obj() const
+{
+    return profession_group_factory.obj( *this );
+}
+
+template<>
+bool string_id<profession_group>::is_valid() const
+{
+    return profession_group_factory.is_valid( *this );
+}
+
+void profession_group::load_profession_group( const JsonObject &jo, const std::string &src )
+{
+    profession_group_factory.load( jo, src );
+}
+
+void profession_group::load( const JsonObject &jo, const std::string & )
+{
+    assign( jo, "id", id );
+    assign( jo, "professions", professions );
+
+}
+
+const std::vector<profession_group> &profession_group::get_all()
+{
+    return profession_group_factory.get_all();
+}
+
+void profession_group::check_profession_group_consistency()
+{
+    for( const profession_group &prof_grp : get_all() ) {
+        for( const profession_id prof : prof_grp.professions ) {
+            if( !prof.is_valid() ) {
+                debugmsg( "profession_group %s contains invalid profession_id %s", prof_grp.id.c_str(),
+                          prof.c_str() );
+            }
+        }
+    }
+}

src/profession_group.h

@@ -0,0 +1,21 @@
+#pragma once
+#ifndef CATA_SRCPROFESSION_GROUP_H
+#define CATA_SRCPROFESSION_GROUP_H
+
+#include "type_id.h"
+#include "json.h"
+
+class profession_group
+{
+    public:
+        static void load_profession_group( const JsonObject &jo, const std::string &src );
+        void load( const JsonObject &jo, const std::string & );
+        static const std::vector<profession_group> &get_all();
+        static void check_profession_group_consistency();
+        bool was_loaded;
+
+        profession_group_id id;
+        std::vector<profession_id> professions;
+
+};
+#endif

src/type_id.h

@@ -200,6 +200,9 @@ using overmap_special_migration_id = string_id<overmap_special_migration>;
 class profession;
 using profession_id = string_id<profession>;
 
+class profession_group;
+using profession_group_id = string_id<profession_group>;
+
 class recipe;
 using recipe_id = string_id<recipe>;