aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-26 02:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-21 17:06:38 +01:00
commit 89f4131e8d
2 changed files with 69 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
View file

@ -690,6 +690,7 @@
<DYNAMIC_CHILD CLASS_NAME="recv_named_item"/> <DYNAMIC_CHILD CLASS_NAME="recv_named_item"/>
<DYNAMIC_CHILD CLASS_NAME="recv_xp"/> <DYNAMIC_CHILD CLASS_NAME="recv_xp"/>
<DYNAMIC_CHILD CLASS_NAME="destroy_item"/> <DYNAMIC_CHILD CLASS_NAME="destroy_item"/>
<DYNAMIC_CHILD CLASS_NAME="unlearn_brick"/>
</PRIMITIVE> </PRIMITIVE>
@ -1029,6 +1030,12 @@
<PARAMETER NAME="guild" TYPE="boolean" VISIBLE="true" /> <PARAMETER NAME="guild" TYPE="boolean" VISIBLE="true" />
</PRIMITIVE> </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 --> <!-- Fin actions -->
<!-- *************************************** --> <!-- *************************************** -->
@ -1101,6 +1108,7 @@
<DYNAMIC_CHILD CLASS_NAME="recv_named_item"/> <DYNAMIC_CHILD CLASS_NAME="recv_named_item"/>
<DYNAMIC_CHILD CLASS_NAME="recv_xp"/> <DYNAMIC_CHILD CLASS_NAME="recv_xp"/>
<DYNAMIC_CHILD CLASS_NAME="destroy_item"/> <DYNAMIC_CHILD CLASS_NAME="destroy_item"/>
<DYNAMIC_CHILD CLASS_NAME="unlearn_brick"/>
</PRIMITIVE> </PRIMITIVE>
<PRIMITIVE CLASS_NAME="kill" TYPE="node" PARENT_CLASS="objective_parent"> <PRIMITIVE CLASS_NAME="kill" TYPE="node" PARENT_CLASS="objective_parent">

60
code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
View file

@ -1139,6 +1139,66 @@ public:
}; };
REGISTER_STEP_CONTENT(CActionLearnBrick, "learn_brick"); 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 class CActionBotChat : public IStepContent
{ {