From 9006c8e8c282d6b43dd43d8e9c75927b099e523a Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 21 Feb 2016 17:06:38 +0100
Subject: [PATCH] Merge with develop

---
 .../world_editor_classes.xml                  | 10 +++-
 .../mission_compiler_lib/step_content.cpp     | 60 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
index 117291ef2..fb12350e3 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
+++ b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
@@ -690,6 +690,7 @@
 		<DYNAMIC_CHILD CLASS_NAME="recv_named_item"/>
 		<DYNAMIC_CHILD CLASS_NAME="recv_xp"/>
 		<DYNAMIC_CHILD CLASS_NAME="destroy_item"/>
+		<DYNAMIC_CHILD CLASS_NAME="unlearn_brick"/>
 	</PRIMITIVE>
 
 	
@@ -1028,7 +1029,13 @@
 		<PARAMETER NAME="item/quantity/quality" TYPE="string_array" VISIBLE="true"/>
 		<PARAMETER NAME="guild" TYPE="boolean" VISIBLE="true" />
 	</PRIMITIVE>
-
+	
+	<PRIMITIVE CLASS_NAME="unlearn_brick" TYPE="node" AUTO_INIT="false" DELETABLE="true" NUMBERIZE="false">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="unlearn_brick $action$"/>
+		<PARAMETER NAME="bricks" TYPE="string_array" VISIBLE="true"/>
+		<PARAMETER NAME="npc_name" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="group" TYPE="boolean" VISIBLE="true"/>
+	</PRIMITIVE>
 <!-- Fin actions -->
 
 	<!-- *************************************** -->
@@ -1101,6 +1108,7 @@
 		<DYNAMIC_CHILD CLASS_NAME="recv_named_item"/>
 		<DYNAMIC_CHILD CLASS_NAME="recv_xp"/>
 		<DYNAMIC_CHILD CLASS_NAME="destroy_item"/>
+		<DYNAMIC_CHILD CLASS_NAME="unlearn_brick"/>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="kill" TYPE="node" PARENT_CLASS="objective_parent">
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
index cda6790ae..4751fbe4c 100644
--- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
+++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
@@ -1139,6 +1139,66 @@ public:
 };
 REGISTER_STEP_CONTENT(CActionLearnBrick, "learn_brick");
 
+
+// ---------------------------------------------------------------------------
+class CActionUnlearnBrick : public IStepContent
+{
+	string				_BotGiver;
+	vector<string>		_Bricks;
+	bool				_Group;
+
+	void getPredefParam(uint32 &numEntry, CPhrase::TPredefParams &predef)
+	{
+		numEntry = 0;
+	}
+public:
+	void init(CMissionData &md, IPrimitive *prim)
+	{
+		_BotGiver = md.getProperty(prim, "npc_name", true, false);
+		vector<string> vs;
+		vs = md.getPropertyArray(prim, "bricks", true, false);
+
+		for (uint i=0; i<vs.size(); ++i)
+		{
+			if (!vs[i].empty())
+				_Bricks.push_back(vs[i]);
+		}
+
+		string s;
+		s = md.getProperty(prim, "group", true, false);
+		_Group = (NLMISC::toLower(s) == "true");
+
+		IStepContent::init(md, prim);
+	}
+
+	string genCode(CMissionData &md)
+	{
+		string ret;
+
+//		if (_Bricks.empty())
+//			return ret;
+
+		ret = "unlearn_brick : ";
+		for (uint i=0; i<_Bricks.size(); ++i)
+		{
+			ret += _Bricks[i];
+			if (i < _Bricks.size()-1)
+				ret += "; ";
+		}
+
+		if (!_BotGiver.empty())
+			ret += " : "+_BotGiver;
+		if (_Group)
+			ret += " : group";
+		ret += NL;
+
+		return ret;
+	}
+};
+REGISTER_STEP_CONTENT(CActionUnlearnBrick, "unlearn_brick");
+
+
+
 // ---------------------------------------------------------------------------
 class CActionBotChat : public IStepContent
 {