Merge pull request #79243 from Maleclypse/Default-backgrounds-opt-out…

…-flag SKIP_DEFAULT_BACKGROUND
CleverRaven · Jan 21, 2025 · 953dbcf · 953dbcf
2 parents fc3f0e4 + 1505ae7
commit 953dbcf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/data/json/professions.json b/data/json/professions.json
@@ -994,7 +994,7 @@
       { "level": 3, "name": "cooking" }
     ],
     "traits": [ "PROF_CHURL", "ILLITERATE" ],
-    "flags": [ "SCEN_ONLY" ]
+    "flags": [ "SCEN_ONLY", "SKIP_DEFAULT_BACKGROUND" ]
   },
   {
     "type": "profession",

diff --git a/data/mods/Xedra_Evolved/player/professions.json b/data/mods/Xedra_Evolved/player/professions.json
@@ -220,6 +220,7 @@
     "points": 7,
     "proficiencies": [ "prof_wp_netherium_abomination", "prof_unarmed_familiar", "prof_traps" ],
     "skills": [ { "level": 2, "name": "gun" }, { "level": 3, "name": "rifle" }, { "level": 1, "name": "survival" } ],
+    "flags": [ "SKIP_DEFAULT_BACKGROUND" ],
     "items": {
       "both": {
         "entries": [
@@ -597,7 +598,7 @@
       },
       "female": { "entries": [ { "item": "chestwrap" } ] }
     },
-    "flags": [ "SCEN_ONLY" ]
+    "flags": [ "SCEN_ONLY", "SKIP_DEFAULT_BACKGROUND" ]
   },
   {
     "type": "profession",
@@ -624,7 +625,7 @@
       },
       "female": { "entries": [ { "item": "chestwrap" } ] }
     },
-    "flags": [ "SCEN_ONLY" ]
+    "flags": [ "SCEN_ONLY", "SKIP_DEFAULT_BACKGROUND" ]
   },
   {
     "type": "profession",
@@ -651,7 +652,7 @@
       },
       "female": { "entries": [ { "item": "chestwrap" } ] }
     },
-    "flags": [ "SCEN_ONLY" ]
+    "flags": [ "SCEN_ONLY", "SKIP_DEFAULT_BACKGROUND" ]
   },
   {
     "type": "profession",
@@ -678,7 +679,7 @@
       },
       "female": { "entries": [ { "item": "chestwrap" } ] }
     },
-    "flags": [ "SCEN_ONLY" ]
+    "flags": [ "SCEN_ONLY", "SKIP_DEFAULT_BACKGROUND" ]
   },
   {
     "type": "profession",
@@ -705,7 +706,7 @@
       },
       "female": { "entries": [ { "item": "chestwrap" } ] }
     },
-    "flags": [ "SCEN_ONLY" ]
+    "flags": [ "SCEN_ONLY", "SKIP_DEFAULT_BACKGROUND" ]
   },
   {
     "type": "profession",
@@ -732,7 +733,7 @@
       },
       "female": { "entries": [ { "item": "chestwrap" } ] }
     },
-    "flags": [ "SCEN_ONLY" ]
+    "flags": [ "SCEN_ONLY", "SKIP_DEFAULT_BACKGROUND" ]
   },
   {
     "type": "profession",

diff --git a/doc/JSON/JSON_FLAGS.md b/doc/JSON/JSON_FLAGS.md
@@ -1402,6 +1402,7 @@ The purpose of these flags is to allow reuse of blueprints to create the "same"
 ### Profession
 
 - ```SCEN_ONLY``` Profession can be chosen only as part of the appropriate scenario.
+- ```SKIP_DEFAULT_BACKGROUND``` This profession will not add the default background package of hobbies (`adult_basic_background`).
 
 
 ### Starting Location

diff --git a/src/newcharacter.cpp b/src/newcharacter.cpp
@@ -75,6 +75,7 @@
 static const std::string flag_CHALLENGE( "CHALLENGE" );
 static const std::string flag_CITY_START( "CITY_START" );
 static const std::string flag_SECRET( "SECRET" );
+static const std::string flag_SKIP_DEFAULT_BACKGROUND( "SKIP_DEFAULT_BACKGROUND" );
 
 static const flag_id json_flag_auto_wield( "auto_wield" );
 static const flag_id json_flag_no_auto_equip( "no_auto_equip" );
@@ -800,7 +801,8 @@ bool avatar::create( character_type type, const std::string &tempname )
     }
 
     // Don't apply the default backgrounds on a template
-    if( type != character_type::TEMPLATE ) {
+    if( type != character_type::TEMPLATE &&
+        !get_scenario()->has_flag( flag_SKIP_DEFAULT_BACKGROUND ) ) {
         add_default_background();
     }