Merge pull request #74514 from anothersimulacrum/crying

Fix loading of inline EoCs, enchantments, and allow recipe_categories to extend

build-scripts/get_all_mods.py

@@ -11,8 +11,7 @@
 mods_this_time = []
 
 exclusions = [
-    # #74443 - incompatibility between mindovermatter and aftershock due to bug
-    ('mindovermatter', 'aftershock')
+    # Tuple of (mod_id, mod_id) - these two mods will be incompatible
 ]
 
 

data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json

@@ -1120,7 +1120,7 @@
           "case": 7,
           "effect": {
             "run_eocs": [
-              { "id": "EOC_PORTAL_DUNGEON_REWARD_ITEM" },
+              "EOC_PORTAL_DUNGEON_REWARD_ITEM",
               {
                 "id": "EOC_PORTAL_DEPENDENT_DUNGEON_FINAL",
                 "condition": { "u_has_trait": "PORTAL_DEPENDENT" },

data/json/npcs/missiondef.json

@@ -330,9 +330,7 @@
     "end": {
       "effect": [
         "stop_following",
-        {
-          "weighted_list_eocs": [ [ { "id": "get_katana" }, 5 ], [ { "id": "get_deagle_44" }, 10 ], [ { "id": "get_m4_carbine" }, 6 ] ]
-        }
+        { "weighted_list_eocs": [ [ "get_katana", 5 ], [ "get_deagle_44", 10 ], [ "get_m4_carbine", 6 ] ] }
       ]
     },
     "origins": [ "ORIGIN_SECONDARY" ],

data/json/recipes/recipes.json

@@ -3,6 +3,7 @@
     "type": "recipe_category",
     "id": "CC_*",
     "//": "This is just a dummy category. No recipes should be added in here.",
+    "is_wildcard": true,
     "recipe_subcategories": [ "CSC_*_FAVORITE", "CSC_*_RECENT", "CSC_*_HIDDEN", "CSC_*_NESTED" ]
   },
   {
@@ -125,11 +126,13 @@
     "type": "recipe_category",
     "id": "CC_BUILDING",
     "recipe_subcategories": [ "CSC_ALL", "CSC_BUILDING_BASES", "CSC_BUILDING_EXPANSIONS" ],
+    "is_building": true,
     "is_hidden": true
   },
   {
     "type": "recipe_category",
     "id": "CC_PRACTICE",
+    "is_practice": true,
     "recipe_subcategories": [
       "CSC_ALL",
       "CSC_PRACTICE_SCIENCE",

data/mods/Aftershock/effects_on_condition.json

@@ -71,11 +71,6 @@
       { "u_teleport": { "global_val": "new_map" }, "force": true }
     ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_AFS_ESCAPE_POD_CARGO_TP",
-    "effect": [ { "u_teleport": { "global_val": "new_map" }, "force": true } ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_CRASHING_SHIP_SETUP",

data/mods/Aftershock/recipes/recipes_categories.json

@@ -2,36 +2,13 @@
   {
     "type": "recipe_category",
     "id": "CC_ELECTRONIC",
-    "recipe_subcategories": [
-      "CSC_ALL",
-      "CSC_ELECTRONIC_CBMS",
-      "CSC_ELECTRONIC_TOOLS",
-      "CSC_ELECTRONIC_PARTS",
-      "CSC_ELECTRONIC_LIGHTING",
-      "CSC_ELECTRONIC_COMPONENTS",
-      "CSC_ELECTRONIC_OTHER"
-    ]
+    "copy-from": "CC_ELECTRONIC",
+    "extend": { "recipe_subcategories": [ "CSC_ELECTRONIC_CBMS" ] }
   },
   {
     "type": "recipe_category",
     "id": "CC_PRACTICE",
-    "recipe_subcategories": [
-      "CSC_ALL",
-      "CSC_PRACTICE_SCIENCE",
-      "CSC_PRACTICE_ELECTRONICS",
-      "CSC_PRACTICE_FABRICATION",
-      "CSC_PRACTICE_FOOD",
-      "CSC_PRACTICE_SURVIVAL",
-      "CSC_PRACTICE_TAILORING",
-      "CSC_PRACTICE_ATHLETICS",
-      "CSC_PRACTICE_COMPUTERS",
-      "CSC_PRACTICE_DEVICES",
-      "CSC_PRACTICE_HEALTH",
-      "CSC_PRACTICE_MECHANICS",
-      "CSC_PRACTICE_SOCIAL",
-      "CSC_PRACTICE_MELEE",
-      "CSC_PRACTICE_RANGED",
-      "CSC_PRACTICE_PSI"
-    ]
+    "copy-from": "CC_PRACTICE",
+    "extend": { "recipe_subcategories": [ "CSC_PRACTICE_PSI" ] }
   }
 ]

data/mods/DinoMod/recipes/recipes.json

@@ -2,15 +2,7 @@
   {
     "type": "recipe_category",
     "id": "CC_ANIMALS",
-    "recipe_subcategories": [
-      "CSC_ALL",
-      "CSC_ANIMALS_BOVINE ARMOR",
-      "CSC_ANIMALS_CANINE ARMOR",
-      "CSC_ANIMALS_EQUINE ARMOR",
-      "CSC_ANIMALS_ELEPHANT ARMOR",
-      "CSC_ANIMALS_OSTRICH ARMOR",
-      "CSC_ANIMALS_BEAR ARMOR",
-      "CSC_ANIMALS_EQUINE STORAGE"
-    ]
+    "copy-from": "CC_ANIMALS",
+    "extend": { "recipe_subcategories": [ "CSC_ANIMALS_ELEPHANT ARMOR", "CSC_ANIMALS_OSTRICH ARMOR", "CSC_ANIMALS_BEAR ARMOR" ] }
   }
 ]

data/mods/MindOverMatter/recipes/psionics_practice.json

@@ -2,24 +2,8 @@
   {
     "type": "recipe_category",
     "id": "CC_PRACTICE",
-    "recipe_subcategories": [
-      "CSC_ALL",
-      "CSC_PRACTICE_SCIENCE",
-      "CSC_PRACTICE_ELECTRONICS",
-      "CSC_PRACTICE_FABRICATION",
-      "CSC_PRACTICE_FOOD",
-      "CSC_PRACTICE_SURVIVAL",
-      "CSC_PRACTICE_TAILORING",
-      "CSC_PRACTICE_ATHLETICS",
-      "CSC_PRACTICE_COMPUTERS",
-      "CSC_PRACTICE_DEVICES",
-      "CSC_PRACTICE_HEALTH",
-      "CSC_PRACTICE_MECHANICS",
-      "CSC_PRACTICE_SOCIAL",
-      "CSC_PRACTICE_MELEE",
-      "CSC_PRACTICE_RANGED",
-      "CSC_PRACTICE_METAPHYSICS"
-    ]
+    "copy-from": "CC_PRACTICE",
+    "extend": { "recipe_subcategories": [ "CSC_PRACTICE_METAPHYSICS" ] }
   },
   {
     "id": "prac_psionics_begin",

src/activity_actor.cpp

@@ -36,6 +36,7 @@
 #include "contents_change_handler.h"
 #include "coordinates.h"
 #include "craft_command.h"
+#include "crafting_gui.h"
 #include "creature.h"
 #include "creature_tracker.h"
 #include "debug.h"
@@ -3768,7 +3769,7 @@ void craft_activity_actor::canceled( player_activity &/*act*/, Character &/*who*
     }
     const recipe item_recipe = craft->get_making();
     // practice recipe items with no components can be safely removed
-    if( item_recipe.category == "CC_PRACTICE" && craft->components.empty() ) {
+    if( item_recipe.category->is_practice && craft->components.empty() ) {
         craft_item.remove_item();
     }
 }

src/crafting.cpp

@@ -157,7 +157,7 @@ static bool crafting_allowed( const Character &p, const recipe &rec )
         return false;
     }
 
-    if( rec.category == "CC_BUILDING" ) {
+    if( rec.category->is_building ) {
         add_msg( m_info, _( "Overmap terrain building recipes are not implemented yet!" ) );
         return false;
     }