Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

…into migrate-dig-activities

data/json/npcs/missiondef.json

@@ -582,7 +582,7 @@
     "type": "mission_definition",
     "name": { "str": "Reach The Mansion And Finish This Delivery" },
     "goal": "MGOAL_GO_TO_TYPE",
-    "destination": "mansion_c3_north",
+    "destination": "mansion_c3",
     "difficulty": 1,
     "value": 0,
     "start": { "assign_mission_target": { "om_terrain": "mansion_c3", "om_special": "Mansion_Wild", "search_range": 200 } },

data/json/professions.json

@@ -1061,8 +1061,8 @@
     "points": -1,
     "items": {
       "both": [ "crackpipe", "crack", "crack", "ref_lighter", "tank_top" ],
-      "male": [ "pants", "flip_flops" ],
-      "female": [ "skirt", "heels" ]
+      "male": [ "jeans", "flip_flops" ],
+      "female": [ "jeans", "heels" ]
     },
     "addictions": [ { "intensity": 20, "type": "crack" } ]
   },
@@ -1628,6 +1628,7 @@
     "name": "Shower Victim",
     "description": "You were in the middle of a nice, hot shower when the Cataclysm struck!  You barely managed to escape with some soap and the most massively useful thing ever…  a towel.",
     "points": -1,
+    "flags": [ "NO_BONUS_ITEMS" ],
     "items": { "both": { "items": [ "towel_wet" ], "entries": [ { "item": "soap", "custom-flags": [ "auto_wield" ] } ] } }
   },
   {
@@ -2253,6 +2254,7 @@
     "name": "Lost Submissive",
     "description": "Early in the rush to safety, you were separated from your master by cruel fate.  Now you are on your own with nothing to your name but a suit of really kinky black leather.  Unfortunately, there's no safewords in the apocalypse.",
     "points": -1,
+    "flags": [ "NO_BONUS_ITEMS" ],
     "items": { "both": [ "bondage_suit", "bondage_mask", "boots", "leather_belt", "matches" ] }
   },
   {
@@ -2956,6 +2958,7 @@
       "both": {
         "items": [
           "under_armor_shorts",
+          "purse",
           "under_armor",
           "socks",
           "elbow_pads",

data/mods/DinoMod/dinosaur.json

@@ -952,5 +952,17 @@
       { "monster": "mon_dimorphodon", "freq": 500, "cost_multiplier": 0, "pack_size": [ 2, 4 ] },
       { "monster": "mon_dilophosaurus", "freq": 150, "cost_multiplier": 10, "pack_size": [ 1, 2 ] }
     ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_CENTRAL_LAB",
+    "default": "mon_zombie_scientist",
+    "monsters": [ { "monster": "mon_deinonychus", "freq": 200, "cost_multiplier": 15, "pack_size": [ 2, 3 ] } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_LAB",
+    "default": "mon_zombie_scientist",
+    "monsters": [ { "monster": "mon_deinonychus", "freq": 500, "cost_multiplier": 15, "pack_size": [ 2, 3 ] } ]
   }
 ]

doc/JSON_INFO.md

@@ -965,6 +965,8 @@ player will start with this as a nearby vehicle.
 
 A list of flags. TODO: document those flags here.
 
+- ```NO_BONUS_ITEMS``` Prevent bonus items (such as inhalers with the ASTHMA trait) from being given to this profession 
+
 Mods can modify this via `add:flags` and `remove:flags`.
 
 #### `cbms`

src/point.h

@@ -73,7 +73,7 @@ struct point {
     }
 
 #ifndef CATA_NO_STL
-    inline point abs() const {
+    point abs() const {
         return point( std::abs( x ), std::abs( y ) );
     }
 #endif
@@ -185,7 +185,7 @@ struct tripoint {
     }
 
 #ifndef CATA_NO_STL
-    inline tripoint abs() const {
+    tripoint abs() const {
         return tripoint( std::abs( x ), std::abs( y ), std::abs( z ) );
     }
 #endif

src/profession.cpp

@@ -389,10 +389,12 @@ std::list<item> profession::items( bool male, const std::vector<trait_id> &trait
     result.insert( result.begin(), group_both.begin(), group_both.end() );
     result.insert( result.begin(), group_gender.begin(), group_gender.end() );
 
-    std::vector<itype_id> bonus = item_substitutions.get_bonus_items( traits );
-    for( const itype_id &elem : bonus ) {
-        if( elem != no_bonus ) {
-            result.push_back( item( elem, advanced_spawn_time(), item::default_charges_tag {} ) );
+    if( !has_flag( "NO_BONUS_ITEMS" ) ) {
+        std::vector<itype_id> bonus = item_substitutions.get_bonus_items( traits );
+        for( const itype_id &elem : bonus ) {
+            if( elem != no_bonus ) {
+                result.push_back( item( elem, advanced_spawn_time(), item::default_charges_tag {} ) );
+            }
         }
     }
     for( auto iter = result.begin(); iter != result.end(); ) {

tests/new_character_test.cpp

@@ -116,6 +116,7 @@ TEST_CASE( "starting_items", "[slow]" )
         trait_id( "LACTOSE" ),
         //trait_id( "LEG_TENTACLES" ),
         trait_id( "MEATARIAN" ),
+        trait_id( "ASTHMA" ),
         //trait_id( "RAP_TALONS" ),
         //trait_id( "TAIL_FLUFFY" ),
         //trait_id( "TAIL_LONG" ),