Node highlighting.
[oweals/minetest.git] / src / craftdef.cpp
index ab78e7560d50b90cbfa591bed42043c20c154e3a..9cd1d8c7ef12f2823c1e6622ce1bf787638c260d 100644 (file)
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -23,9 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include <sstream>
 #include <set>
+#include <algorithm>
 #include "gamedef.h"
 #include "inventory.h"
 #include "util/serialize.h"
+#include "strfnd.h"
+#include "exceptions.h"
 
 // Check if input matches recipe
 // Takes recipe groups into account
@@ -38,9 +41,17 @@ static bool inputItemMatchesRecipe(const std::string &inp_name,
 
        // Group
        if(rec_name.substr(0,6) == "group:" && idef->isKnown(inp_name)){
-               std::string rec_group = rec_name.substr(6);
                const struct ItemDefinition &def = idef->get(inp_name);
-               if(itemgroup_get(def.groups, rec_group) != 0)
+               Strfnd f(rec_name.substr(6));
+               bool all_groups_match = true;
+               do{
+                       std::string check_group = f.next(",");
+                       if(itemgroup_get(def.groups, check_group) == 0){
+                               all_groups_match = false;
+                               break;
+                       }
+               }while(!f.atend());
+               if(all_groups_match)
                        return true;
        }
 
@@ -140,20 +151,6 @@ static bool craftGetBounds(const std::vector<std::string> &items, unsigned int w
        return success;
 }
 
-// Convert a list of item names to a multiset
-static std::multiset<std::string> craftMakeMultiset(const std::vector<std::string> &names)
-{
-       std::multiset<std::string> set;
-       for(std::vector<std::string>::const_iterator
-                       i = names.begin();
-                       i != names.end(); i++)
-       {
-               if(*i != "")
-                       set.insert(*i);
-       }
-       return set;
-}
-
 // Removes 1 from each item stack
 static void craftDecrementInput(CraftInput &input, IGameDef *gamedef)
 {
@@ -508,17 +505,48 @@ bool CraftDefinitionShapeless::check(const CraftInput &input, IGameDef *gamedef)
 {
        if(input.method != CRAFT_METHOD_NORMAL)
                return false;
+       
+       // Filter empty items out of input
+       std::vector<std::string> input_filtered;
+       for(std::vector<ItemStack>::const_iterator
+                       i = input.items.begin();
+                       i != input.items.end(); i++)
+       {
+               if(i->name != "")
+                       input_filtered.push_back(i->name);
+       }
 
-       // Get input item multiset
-       std::vector<std::string> inp_names = craftGetItemNames(input.items, gamedef);
-       std::multiset<std::string> inp_names_multiset = craftMakeMultiset(inp_names);
+       // If there is a wrong number of items in input, no match
+       if(input_filtered.size() != recipe.size()){
+               /*dstream<<"Number of input items ("<<input_filtered.size()
+                               <<") does not match recipe size ("<<recipe.size()<<") "
+                               <<"of recipe with output="<<output<<std::endl;*/
+               return false;
+       }
 
-       // Get recipe item multiset
-       std::vector<std::string> rec_names = craftGetItemNames(recipe, gamedef);
-       std::multiset<std::string> rec_names_multiset = craftMakeMultiset(rec_names);
+       // Try with all permutations of the recipe
+       std::vector<std::string> recipe_copy = craftGetItemNames(recipe, gamedef);
+       // Start from the lexicographically first permutation (=sorted)
+       std::sort(recipe_copy.begin(), recipe_copy.end());
+       //while(std::prev_permutation(recipe_copy.begin(), recipe_copy.end())){}
+       do{
+               // If all items match, the recipe matches
+               bool all_match = true;
+               //dstream<<"Testing recipe (output="<<output<<"):";
+               for(size_t i=0; i<recipe.size(); i++){
+                       //dstream<<" ("<<input_filtered[i]<<" == "<<recipe_copy[i]<<")";
+                       if(!inputItemMatchesRecipe(input_filtered[i], recipe_copy[i],
+                                       gamedef->idef())){
+                               all_match = false;
+                               break;
+                       }
+               }
+               //dstream<<" -> match="<<all_match<<std::endl;
+               if(all_match)
+                       return true;
+       }while(std::next_permutation(recipe_copy.begin(), recipe_copy.end()));
 
-       // Recipe is matched when the multisets coincide
-       return inp_names_multiset == rec_names_multiset;
+       return false;
 }
 
 CraftOutput CraftDefinitionShapeless::getOutput(const CraftInput &input, IGameDef *gamedef) const
@@ -694,16 +722,26 @@ bool CraftDefinitionCooking::check(const CraftInput &input, IGameDef *gamedef) c
        if(input.method != CRAFT_METHOD_COOKING)
                return false;
 
-       // Get input item multiset
-       std::vector<std::string> inp_names = craftGetItemNames(input.items, gamedef);
-       std::multiset<std::string> inp_names_multiset = craftMakeMultiset(inp_names);
-
-       // Get recipe item multiset
-       std::multiset<std::string> rec_names_multiset;
-       rec_names_multiset.insert(craftGetItemName(recipe, gamedef));
+       // Filter empty items out of input
+       std::vector<std::string> input_filtered;
+       for(std::vector<ItemStack>::const_iterator
+                       i = input.items.begin();
+                       i != input.items.end(); i++)
+       {
+               if(i->name != "")
+                       input_filtered.push_back(i->name);
+       }
 
-       // Recipe is matched when the multisets coincide
-       return inp_names_multiset == rec_names_multiset;
+       // If there is a wrong number of items in input, no match
+       if(input_filtered.size() != 1){
+               /*dstream<<"Number of input items ("<<input_filtered.size()
+                               <<") does not match recipe size (1) "
+                               <<"of cooking recipe with output="<<output<<std::endl;*/
+               return false;
+       }
+       
+       // Check the single input item
+       return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
 }
 
 CraftOutput CraftDefinitionCooking::getOutput(const CraftInput &input, IGameDef *gamedef) const
@@ -765,16 +803,26 @@ bool CraftDefinitionFuel::check(const CraftInput &input, IGameDef *gamedef) cons
        if(input.method != CRAFT_METHOD_FUEL)
                return false;
 
-       // Get input item multiset
-       std::vector<std::string> inp_names = craftGetItemNames(input.items, gamedef);
-       std::multiset<std::string> inp_names_multiset = craftMakeMultiset(inp_names);
-
-       // Get recipe item multiset
-       std::multiset<std::string> rec_names_multiset;
-       rec_names_multiset.insert(craftGetItemName(recipe, gamedef));
+       // Filter empty items out of input
+       std::vector<std::string> input_filtered;
+       for(std::vector<ItemStack>::const_iterator
+                       i = input.items.begin();
+                       i != input.items.end(); i++)
+       {
+               if(i->name != "")
+                       input_filtered.push_back(i->name);
+       }
 
-       // Recipe is matched when the multisets coincide
-       return inp_names_multiset == rec_names_multiset;
+       // If there is a wrong number of items in input, no match
+       if(input_filtered.size() != 1){
+               /*dstream<<"Number of input items ("<<input_filtered.size()
+                               <<") does not match recipe size (1) "
+                               <<"of fuel recipe with burntime="<<burntime<<std::endl;*/
+               return false;
+       }
+       
+       // Check the single input item
+       return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
 }
 
 CraftOutput CraftDefinitionFuel::getOutput(const CraftInput &input, IGameDef *gamedef) const
@@ -923,6 +971,43 @@ public:
                }
                return false;
        }
+       virtual std::vector<CraftDefinition*> getCraftRecipes(CraftOutput &output,
+                       IGameDef *gamedef) const
+       {
+               std::vector<CraftDefinition*> recipes_list;
+               CraftInput input;
+               CraftOutput tmpout;
+               tmpout.item = "";
+               tmpout.time = 0;
+
+               for(std::vector<CraftDefinition*>::const_reverse_iterator
+                               i = m_craft_definitions.rbegin();
+                               i != m_craft_definitions.rend(); i++)
+               {
+                       CraftDefinition *def = *i;
+
+                       /*infostream<<"Checking "<<input.dump()<<std::endl
+                                       <<" against "<<def->dump()<<std::endl;*/
+
+                       try {
+                               tmpout = def->getOutput(input, gamedef);
+                               if(tmpout.item.substr(0,output.item.length()) == output.item)
+                               {
+                                       // Get output, then decrement input (if requested)
+                                       input = def->getInput(output, gamedef);
+                                       recipes_list.push_back(*i);
+                               }
+                       }
+                       catch(SerializationError &e)
+                       {
+                               errorstream<<"getCraftResult: ERROR: "
+                                               <<"Serialization error in recipe "
+                                               <<def->dump()<<std::endl;
+                               // then go on with the next craft definition
+                       }
+               }
+               return recipes_list;
+       }
        virtual std::string dump() const
        {
                std::ostringstream os(std::ios::binary);