Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed icons for Unix and name.

Browse source
This commit is contained in:
SIELA1915 2016-01-16 17:31:54 +01:00
parent cd19784bff
commit cf9cd1c239
12 changed files with 4210 additions and 4220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

438
code/ryzom/client/src/commands.cpp
View file

@ -224,7 +224,7 @@ NLMISC_COMMAND(afk, "Set the player as 'away from keyboard'","[<custom text>]")
if (UserEntity != NULL) if (UserEntity != NULL)
UserEntity->setAFK(true,customText); UserEntity->setAFK(true,customText);
/* /*
CBitMemStream out; CBitMemStream out;
if(!GenericMsgHeaderMngr.pushNameToStream("DEBUG:AFK", out)) if(!GenericMsgHeaderMngr.pushNameToStream("DEBUG:AFK", out))
{ {
@ -232,7 +232,7 @@ NLMISC_COMMAND(afk, "Set the player as 'away from keyboard'","[<custom text>]")
return false; return false;
} }
NetMngr.push(out); NetMngr.push(out);
*/ */
return true; return true;
} }
@ -341,7 +341,7 @@ NLMISC_COMMAND(random, "Roll a dice and say the result around","[<min>] <max>")
//----------------------------------------------- //-----------------------------------------------
NLMISC_COMMAND(dumpShapePos, "Dump Last Added Shape Pos.", "") NLMISC_COMMAND(dumpShapePos, "Dump Last Added Shape Pos.", "")
{ {
#if FINAL_VERSION #if FINAL_VERSION
if (!hasPrivilegeDEV() && if (!hasPrivilegeDEV() &&
!hasPrivilegeSGM() && !hasPrivilegeSGM() &&
!hasPrivilegeGM() && !hasPrivilegeGM() &&
@ -351,7 +351,7 @@ NLMISC_COMMAND(dumpShapePos, "Dump Last Added Shape Pos.", "")
!hasPrivilegeEM() && !hasPrivilegeEM() &&
!hasPrivilegeEG()) !hasPrivilegeEG())
return true; return true;
#endif // FINAL_VERSION #endif // FINAL_VERSION
if (ShapeAddedByCommand.empty()) if (ShapeAddedByCommand.empty())
{ {
@ -369,7 +369,7 @@ NLMISC_COMMAND(dumpShapePos, "Dump Last Added Shape Pos.", "")
//----------------------------------------------- //-----------------------------------------------
NLMISC_COMMAND(clearShape, "Remove all shapes added with the 'shape' command.", "") NLMISC_COMMAND(clearShape, "Remove all shapes added with the 'shape' command.", "")
{ {
#if FINAL_VERSION #if FINAL_VERSION
/*if (!hasPrivilegeDEV() && /*if (!hasPrivilegeDEV() &&
!hasPrivilegeSGM() && !hasPrivilegeSGM() &&
!hasPrivilegeGM() && !hasPrivilegeGM() &&
@ -379,7 +379,7 @@ NLMISC_COMMAND(clearShape, "Remove all shapes added with the 'shape' command.",
!hasPrivilegeEM() && !hasPrivilegeEM() &&
!hasPrivilegeEG()) !hasPrivilegeEG())
return true;*/ return true;*/
#endif // FINAL_VERSION #endif // FINAL_VERSION
if (ShapeAddedByCommand.empty()) if (ShapeAddedByCommand.empty())
{ {
@ -401,7 +401,7 @@ NLMISC_COMMAND(clearShape, "Remove all shapes added with the 'shape' command.",
//----------------------------------------------------- //-----------------------------------------------------
NLMISC_COMMAND(setShapeX, "Set X position for last created shape.", "<x coordinate>") NLMISC_COMMAND(setShapeX, "Set X position for last created shape.", "<x coordinate>")
{ {
#if FINAL_VERSION #if FINAL_VERSION
/*if (!hasPrivilegeDEV() && /*if (!hasPrivilegeDEV() &&
!hasPrivilegeSGM() && !hasPrivilegeSGM() &&
!hasPrivilegeGM() && !hasPrivilegeGM() &&
@ -411,7 +411,7 @@ NLMISC_COMMAND(setShapeX, "Set X position for last created shape.", "<x coordina
!hasPrivilegeEM() && !hasPrivilegeEM() &&
!hasPrivilegeEG()) !hasPrivilegeEG())
return true;*/ return true;*/
#endif // FINAL_VERSION #endif // FINAL_VERSION
if (args.size() != 1) return false; if (args.size() != 1) return false;
if (ShapeAddedByCommand.empty()) if (ShapeAddedByCommand.empty())
@ -445,7 +445,7 @@ NLMISC_COMMAND(setShapeX, "Set X position for last created shape.", "<x coordina
//----------------------------------------------------- //-----------------------------------------------------
NLMISC_COMMAND(setShapeY, "Set Y position for last created shape.", "<y coordinate>") NLMISC_COMMAND(setShapeY, "Set Y position for last created shape.", "<y coordinate>")
{ {
#if FINAL_VERSION #if FINAL_VERSION
/*if (!hasPrivilegeDEV() && /*if (!hasPrivilegeDEV() &&
!hasPrivilegeSGM() && !hasPrivilegeSGM() &&
!hasPrivilegeGM() && !hasPrivilegeGM() &&
@ -455,7 +455,7 @@ NLMISC_COMMAND(setShapeY, "Set Y position for last created shape.", "<y coordina
!hasPrivilegeEM() && !hasPrivilegeEM() &&
!hasPrivilegeEG()) !hasPrivilegeEG())
return true;*/ return true;*/
#endif // FINAL_VERSION #endif // FINAL_VERSION
if (args.size() != 1) return false; if (args.size() != 1) return false;
if (ShapeAddedByCommand.empty()) if (ShapeAddedByCommand.empty())
@ -489,7 +489,7 @@ NLMISC_COMMAND(setShapeY, "Set Y position for last created shape.", "<y coordina
//----------------------------------------------------- //-----------------------------------------------------
NLMISC_COMMAND(setShapeZ, "Set Z position for last created shape.", "<z coordinate>") NLMISC_COMMAND(setShapeZ, "Set Z position for last created shape.", "<z coordinate>")
{ {
#if FINAL_VERSION #if FINAL_VERSION
/*if (!hasPrivilegeDEV() && /*if (!hasPrivilegeDEV() &&
!hasPrivilegeSGM() && !hasPrivilegeSGM() &&
!hasPrivilegeGM() && !hasPrivilegeGM() &&
@ -499,7 +499,7 @@ NLMISC_COMMAND(setShapeZ, "Set Z position for last created shape.", "<z coordina
!hasPrivilegeEM() && !hasPrivilegeEM() &&
!hasPrivilegeEG()) !hasPrivilegeEG())
return true;*/ return true;*/
#endif // FINAL_VERSION #endif // FINAL_VERSION
if (args.size() != 1) return false; if (args.size() != 1) return false;
if (ShapeAddedByCommand.empty()) if (ShapeAddedByCommand.empty())
@ -534,7 +534,7 @@ NLMISC_COMMAND(setShapeZ, "Set Z position for last created shape.", "<z coordina
//----------------------------------------------------- //-----------------------------------------------------
NLMISC_COMMAND(setShapeDir, "Set direction angle for last created shape.", "<angle>") NLMISC_COMMAND(setShapeDir, "Set direction angle for last created shape.", "<angle>")
{ {
#if FINAL_VERSION #if FINAL_VERSION
/*if (!hasPrivilegeDEV() && /*if (!hasPrivilegeDEV() &&
!hasPrivilegeSGM() && !hasPrivilegeSGM() &&
!hasPrivilegeGM() && !hasPrivilegeGM() &&
@ -544,7 +544,7 @@ NLMISC_COMMAND(setShapeDir, "Set direction angle for last created shape.", "<ang
!hasPrivilegeEM() && !hasPrivilegeEM() &&
!hasPrivilegeEG()) !hasPrivilegeEG())
return true;*/ return true;*/
#endif // FINAL_VERSION #endif // FINAL_VERSION
if (args.size() != 1) return false; if (args.size() != 1) return false;
if (ShapeAddedByCommand.empty()) if (ShapeAddedByCommand.empty())
@ -577,8 +577,8 @@ NLMISC_COMMAND(setShapeDir, "Set direction angle for last created shape.", "<ang
//----------------------------------------------- //-----------------------------------------------
NLMISC_COMMAND(shape, "Add a shape in the scene.", "<shape file>") NLMISC_COMMAND(shape, "Add a shape in the scene.", "<shape file>")
{ {
#if FINAL_VERSION #if FINAL_VERSION
/* if (!hasPrivilegeDEV() && /* if (!hasPrivilegeDEV() &&
!hasPrivilegeSGM() && !hasPrivilegeSGM() &&
!hasPrivilegeGM() && !hasPrivilegeGM() &&
!hasPrivilegeVG() && !hasPrivilegeVG() &&
@ -587,7 +587,7 @@ NLMISC_COMMAND(shape, "Add a shape in the scene.", "<shape file>")
!hasPrivilegeEM() && !hasPrivilegeEM() &&
!hasPrivilegeEG()) !hasPrivilegeEG())
return true;*/ return true;*/
#endif // FINAL_VERSION #endif // FINAL_VERSION
if(args.size() < 1) if(args.size() < 1)
{ {
@ -703,16 +703,16 @@ NLMISC_COMMAND(bugReport, "Call the bug report tool with dump", "<AddScreenshot>
// must put \r\n each line // must put \r\n each line
fprintf(fp, "%s", res.c_str()); fprintf(fp, "%s", res.c_str());
// // must put \r\n each line // // must put \r\n each line
// fprintf (fp, "UserId: %u\r\n", NetMngr.getUserId()); // fprintf (fp, "UserId: %u\r\n", NetMngr.getUserId());
// fprintf (fp, "Player Name: '%s'.\r\n", UserEntity->getName().toString().c_str()); // fprintf (fp, "Player Name: '%s'.\r\n", UserEntity->getName().toString().c_str());
// fprintf (fp, "UserPosition: %.2f %.2f %.2f\r\n", UserEntity->pos().x, UserEntity->pos().y, UserEntity->pos().z); // fprintf (fp, "UserPosition: %.2f %.2f %.2f\r\n", UserEntity->pos().x, UserEntity->pos().y, UserEntity->pos().z);
// fprintf (fp, "ViewPosition: %.2f %.2f %.2f\r\n", View.viewPos().x, View.viewPos().y, View.viewPos().z); // fprintf (fp, "ViewPosition: %.2f %.2f %.2f\r\n", View.viewPos().x, View.viewPos().y, View.viewPos().z);
// time_t ts; time( &ts ); // time_t ts; time( &ts );
// fprintf (fp, "LocalTime: %s\r\n", NLMISC::IDisplayer::dateToHumanString( ts ) ); // fprintf (fp, "LocalTime: %s\r\n", NLMISC::IDisplayer::dateToHumanString( ts ) );
// fprintf (fp, "ServerTick: %u\r\n", NetMngr.getCurrentServerTick()); // fprintf (fp, "ServerTick: %u\r\n", NetMngr.getCurrentServerTick());
// fprintf (fp, "ConnectState: %s\r\n", NetMngr.getConnectionStateCStr()); // fprintf (fp, "ConnectState: %s\r\n", NetMngr.getConnectionStateCStr());
// fprintf (fp, "LocalAddress: %s\r\n", NetMngr.getAddress().asString().c_str()); // fprintf (fp, "LocalAddress: %s\r\n", NetMngr.getAddress().asString().c_str());
fclose (fp); fclose (fp);
@ -1323,22 +1323,10 @@ NLMISC_COMMAND(setMissingDynstringText, "set text of missing dynamic string"," <
NLMISC_COMMAND(ah, "Launch an action handler", "<ActionHandler> <AHparam>") NLMISC_COMMAND(ah, "Launch an action handler", "<ActionHandler> <AHparam>")
{ {
<<<<<<< local
if (args.size() == 0) if (args.size() == 0)
return false; return false;
if (!ClientCfg.AllowDebugLua && toLower(args[0]) == "lua") if (!ClientCfg.AllowDebugLua && toLower(args[0]) == "lua")
||||||| base
if (args.size() == 0)
return false;
if (!ClientCfg.AllowDebugLua && strlwr(args[0]) == "lua")
=======
if (args.size() == 0)
return false;
if (!ClientCfg.AllowDebugLua && toLower(args[0]) == "lua")
>>>>>>> other
{ {
return false; // not allowed!! return false; // not allowed!!
} }
@ -1583,8 +1571,8 @@ NLMISC_COMMAND(missionProgress, "debug"," ")
} }
/* /*
NLMISC_COMMAND( displayDBModifs, "display server database modification in the chat window"," ") NLMISC_COMMAND( displayDBModifs, "display server database modification in the chat window"," ")
{ {
if ( VerboseDatabase ) if ( VerboseDatabase )
CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("the database is already in verbose mode"),CRGBA(255,255,255,255)); CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("the database is already in verbose mode"),CRGBA(255,255,255,255));
else else
@ -1593,10 +1581,10 @@ NLMISC_COMMAND(missionProgress, "debug"," ")
VerboseDatabase = true; VerboseDatabase = true;
} }
return true; return true;
} }
NLMISC_COMMAND( hideDBModifs, "stop displaying server database modification in the chat window"," ") NLMISC_COMMAND( hideDBModifs, "stop displaying server database modification in the chat window"," ")
{ {
if ( !VerboseDatabase ) if ( !VerboseDatabase )
CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("the database is already not in verbose mode"),CRGBA(255,255,255,255)); CInterfaceManager::getInstance()->getChatOutput()->addTextChild(ucstring("the database is already not in verbose mode"),CRGBA(255,255,255,255));
else else
@ -1605,15 +1593,15 @@ NLMISC_COMMAND(missionProgress, "debug"," ")
VerboseDatabase = false; VerboseDatabase = false;
} }
return true; return true;
} }
*/ */
/* /*
NLMISC_COMMAND(save_sentences, "save sentences"," ") NLMISC_COMMAND(save_sentences, "save sentences"," ")
{ {
CSentenceDisplayer::saveSentences(); CSentenceDisplayer::saveSentences();
return true; return true;
} }
*/ */
NLMISC_COMMAND(getSheetId, "get_sheet_id","<sheet file name>") NLMISC_COMMAND(getSheetId, "get_sheet_id","<sheet file name>")
@ -1850,8 +1838,8 @@ NLMISC_COMMAND(cancelAllPhrases, "cancel all the phrases being executed", "")
/* /*
NLMISC_COMMAND(drop,"drop an item to the ground","<id>") NLMISC_COMMAND(drop,"drop an item to the ground","<id>")
{ {
if( args.size() < 1 ) if( args.size() < 1 )
{ {
return false; return false;
@ -1882,7 +1870,7 @@ NLMISC_COMMAND(cancelAllPhrases, "cancel all the phrases being executed", "")
}* }*
return true; return true;
} }
*/ */
@ -1912,7 +1900,6 @@ NLMISC_COMMAND(pos, "Change the position of the user (in local only)", "<x, y, (
return true; return true;
} }
} }
}
// Teleport to anywhere. // Teleport to anywhere.
else if(args.size() == 2 || args.size() == 3) else if(args.size() == 2 || args.size() == 3)
{ {
@ -2543,26 +2530,26 @@ NLMISC_COMMAND(behaviour, "Change the behaviour for an entity in a slot", "<Slot
} }
/* /*
NLMISC_COMMAND(magic, "Cast a spell", "\n" NLMISC_COMMAND(magic, "Cast a spell", "\n"
"<Slot> : the one who cast the spell\n" "<Slot> : the one who cast the spell\n"
"<type> : 0->GOOD 1->Bad 2->NEUTRAL\n" "<type> : 0->GOOD 1->Bad 2->NEUTRAL\n"
"<success> : 0->success 1->Fail 2->Fumble\n" "<success> : 0->success 1->Fail 2->Fumble\n"
"<Spell Power> : \n" "<Spell Power> : \n"
"<Impact Intensity> : \n" "<Impact Intensity> : \n"
"<resist> : 0->not resisted, any other->resisted.\n") "<resist> : 0->not resisted, any other->resisted.\n")
{ {
CInterfaceManager *IM = CInterfaceManager::getInstance (); CInterfaceManager *IM = CInterfaceManager::getInstance ();
// Check parameters. // Check parameters.
if(args.size() != 6) if(args.size() != 6)
{ {
// Help // Help
// CInterfaceManager::getInstance()->displaySystemInfo(ucstring("This command need 2 or 3 paramters :")); // CInterfaceManager::getInstance()->displaySystemInfo(ucstring("This command need 2 or 3 paramters :"));
// CInterfaceManager::getInstance()->displaySystemInfo(ucstring(" <Slot> : the slot number of the entity to change")); // CInterfaceManager::getInstance()->displaySystemInfo(ucstring(" <Slot> : the slot number of the entity to change"));
// CInterfaceManager::getInstance()->displaySystemInfo(ucstring(" <Behaviour> : the behaviour to play for the entity, one of the following number :")); // CInterfaceManager::getInstance()->displaySystemInfo(ucstring(" <Behaviour> : the behaviour to play for the entity, one of the following number :"));
// for(uint i = 0; i<MBEHAV::EMOTE_BEGIN; ++i) // for(uint i = 0; i<MBEHAV::EMOTE_BEGIN; ++i)
// CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString(" %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i)))); // CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString(" %d - %s", i, MBEHAV::behaviourToString((MBEHAV::EBehaviour)i))));
// CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString(" %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END))); // CInterfaceManager::getInstance()->displaySystemInfo(ucstring(NLMISC::toString(" %d-%d - Emotes", MBEHAV::EMOTE_BEGIN, MBEHAV::EMOTE_END)));
} }
else else
{ {
@ -2616,7 +2603,7 @@ NLMISC_COMMAND(behaviour, "Change the behaviour for an entity in a slot", "<Slot
// Command well done. // Command well done.
return true; return true;
} }
*/ */
NLMISC_COMMAND(spell, "Cast a spell", "\n" NLMISC_COMMAND(spell, "Cast a spell", "\n"
"<Slot> : the one who cast the spell\n" "<Slot> : the one who cast the spell\n"
@ -3009,39 +2996,39 @@ NLMISC_COMMAND(playAnim, "Try to play the animation to the target", "<anim name>
} }
NLMISC_COMMAND(vP, "Modify the Visual Property", NLMISC_COMMAND(vP, "Modify the Visual Property",
"\n" "\n"
"<slot> of the entity to change.\n" "<slot> of the entity to change.\n"
"<type> the property to change :\n" "<type> the property to change :\n"
" 0->CHEST (0~511)\n" " 0->CHEST (0~511)\n"
" 1->LEG (0~255)\n" " 1->LEG (0~255)\n"
" 2->ARM (0~255)\n" " 2->ARM (0~255)\n"
" 3->HEAD (0~127)\n" " 3->HEAD (0~127)\n"
" 4->WEAPON_R (0~2047)\n" " 4->WEAPON_R (0~2047)\n"
" 5->WEAPON_L (0~255)\n" " 5->WEAPON_L (0~255)\n"
" 6->FEET (0~511)\n" " 6->FEET (0~511)\n"
" 7->HAND (0~511)\n" " 7->HAND (0~511)\n"
" 8->EYES COLOR (0~7)\n" " 8->EYES COLOR (0~7)\n"
" 9->SEX (0: Male, 1: Female)\n" " 9->SEX (0: Male, 1: Female)\n"
" 10->TATOO (0~31)\n" " 10->TATOO (0~31)\n"
" 11->CHEST COLOR (0~7)\n" " 11->CHEST COLOR (0~7)\n"
" 12->LEG COLOR (0~7)\n" " 12->LEG COLOR (0~7)\n"
" 13->ARM COLOR (0~7)\n" " 13->ARM COLOR (0~7)\n"
" 14->HAIR COLOR (0~7)\n" " 14->HAIR COLOR (0~7)\n"
" 15->HAND COLOR (0~7)\n" " 15->HAND COLOR (0~7)\n"
" 16->FEET COLOR (0~7)\n" " 16->FEET COLOR (0~7)\n"
" 17->MORPH 1 (0~7)\n" " 17->MORPH 1 (0~7)\n"
" 18->MORPH 2 (0~7)\n" " 18->MORPH 2 (0~7)\n"
" 19->MORPH 3 (0~7)\n" " 19->MORPH 3 (0~7)\n"
" 20->MORPH 4 (0~7)\n" " 20->MORPH 4 (0~7)\n"
" 21->MORPH 5 (0~7)\n" " 21->MORPH 5 (0~7)\n"
" 22->MORPH 6 (0~7)\n" " 22->MORPH 6 (0~7)\n"
" 23->MORPH 7 (0~7)\n" " 23->MORPH 7 (0~7)\n"
" 24->CHARACTER HEIGHT (0~15)\n" " 24->CHARACTER HEIGHT (0~15)\n"
" 25->TORSO WIDTH (0~15)\n" " 25->TORSO WIDTH (0~15)\n"
" 26->ARMS WIDTH (0~15)\n" " 26->ARMS WIDTH (0~15)\n"
" 27->LEGS WIDTH (0~15)\n" " 27->LEGS WIDTH (0~15)\n"
" 28->BREASTS SIZE (0~15)\n" " 28->BREASTS SIZE (0~15)\n"
"<value> for the property.\n") "<value> for the property.\n")
{ {
// Check parameters // Check parameters
if(args.size() != 3) if(args.size() != 3)
@ -3266,19 +3253,19 @@ NLMISC_COMMAND(altLook, "Modify the Alternative Look Property",
} }
NLMISC_COMMAND(color, "Command to color an entity", NLMISC_COMMAND(color, "Command to color an entity",
"\n" "\n"
"<Slot>: whole number (if <0 slot will be the current selection)\n" "<Slot>: whole number (if <0 slot will be the current selection)\n"
"<UserColor>: whole number\n" "<UserColor>: whole number\n"
"<Hair>: whole number\n" "<Hair>: whole number\n"
"<Eyes>: whole number\n" "<Eyes>: whole number\n"
"[<Part>]: whole number\n" "[<Part>]: whole number\n"
" default=the whole body\n" " default=the whole body\n"
" 0=CHEST\n" " 0=CHEST\n"
" 1=LEG\n" " 1=LEG\n"
" 2=HEAD\n" " 2=HEAD\n"
" 3=ARMS\n" " 3=ARMS\n"
" 4=HANDS\n" " 4=HANDS\n"
" 5=FEET\n") " 5=FEET\n")
{ {
// Check parameters. // Check parameters.
if(args.size() != 4 && args.size() != 5) if(args.size() != 4 && args.size() != 5)
@ -3338,7 +3325,7 @@ NLMISC_COMMAND(harvestDeposit, "harvest a deposit", "")
// no parameter needed // no parameter needed
// Create the message for the server // Create the message for the server
/* CBitMemStream out; /* CBitMemStream out;
if(GenericMsgHeaderMngr.pushNameToStream("HARVEST:DEPOSIT", out)) if(GenericMsgHeaderMngr.pushNameToStream("HARVEST:DEPOSIT", out))
{ {
uint16 skill = SKILLS::digging; uint16 skill = SKILLS::digging;
@ -3352,7 +3339,7 @@ NLMISC_COMMAND(harvestDeposit, "harvest a deposit", "")
} }
else else
nlwarning("command : unknown message name : 'HARVEST:DEPOSIT'"); nlwarning("command : unknown message name : 'HARVEST:DEPOSIT'");
*/ */
return true; return true;
} }
@ -3589,7 +3576,7 @@ NLMISC_COMMAND(learnPhrase, "learn all bricks of a specified phrase (only in loc
} }
/*NLMISC_COMMAND(xp, "To gain XP in a given Skill","<Amount Xp> <Skill> [<Speciality>]") /*NLMISC_COMMAND(xp, "To gain XP in a given Skill","<Amount Xp> <Skill> [<Speciality>]")
{ {
// Check parameters. // Check parameters.
if( args.size() < 2 || args.size() > 3 ) if( args.size() < 2 || args.size() > 3 )
return false; return false;
@ -3616,7 +3603,7 @@ NLMISC_COMMAND(learnPhrase, "learn all bricks of a specified phrase (only in loc
// Done. // Done.
return true; return true;
}*/ }*/
NLMISC_COMMAND(money, "To earn Money (only in local mode)","<very big seed> [<big seed>] [<medium seed>] [<small seed>]") NLMISC_COMMAND(money, "To earn Money (only in local mode)","<very big seed> [<big seed>] [<medium seed>] [<small seed>]")
{ {
@ -3626,7 +3613,7 @@ NLMISC_COMMAND(money, "To earn Money (only in local mode)","<very big seed> [<bi
CInterfaceManager *im = CInterfaceManager::getInstance(); CInterfaceManager *im = CInterfaceManager::getInstance();
NLGUI::CDBManager::getInstance()->getDbProp("SERVER:INVENTORY:MONEY")->setValue64(money); NLGUI::CDBManager::getInstance()->getDbProp("SERVER:INVENTORY:MONEY")->setValue64(money);
return true; return true;
/* /*
sint32 a = 0; sint32 a = 0;
sint32 b = 0; sint32 b = 0;
sint32 c = 0; sint32 c = 0;
@ -3658,11 +3645,11 @@ NLMISC_COMMAND(money, "To earn Money (only in local mode)","<very big seed> [<bi
NLGUI::CDBManager::getInstance()->getDbProp(bs + ":QUANTITY")->setValue32(c); NLGUI::CDBManager::getInstance()->getDbProp(bs + ":QUANTITY")->setValue32(c);
NLGUI::CDBManager::getInstance()->getDbProp(vbs + ":QUANTITY")->setValue32(d); NLGUI::CDBManager::getInstance()->getDbProp(vbs + ":QUANTITY")->setValue32(d);
return true; return true;
*/ */
} }
/* /*
NLMISC_COMMAND( createPerso, "create a new character", "Parameters:\n-Character name\n-Race( Fyros, Tryker...)\n-gender(Male, Female)\n-Role( MeleeFighter, RangeFighter, AttackCaster, BufferCaster, HealerCaster...)\n-Level (1-25 (but more accepted)>" ) NLMISC_COMMAND( createPerso, "create a new character", "Parameters:\n-Character name\n-Race( Fyros, Tryker...)\n-gender(Male, Female)\n-Role( MeleeFighter, RangeFighter, AttackCaster, BufferCaster, HealerCaster...)\n-Level (1-25 (but more accepted)>" )
{ {
// Check parameters. // Check parameters.
if(args.size() < 5) return false; if(args.size() < 5) return false;
@ -3697,11 +3684,11 @@ NLMISC_COMMAND(money, "To earn Money (only in local mode)","<very big seed> [<bi
nlwarning("<create_perso> unknown message name : CHEAT:CREATE_CHARACTER"); nlwarning("<create_perso> unknown message name : CHEAT:CREATE_CHARACTER");
} }
return true; return true;
} }
*/ */
/* /*
NLMISC_COMMAND( add_role, "add role to character", "<Role( MeleeFighter, RangeFighter, AttackCaster, BufferCaster, HealerCaster...), Level (1-25 (but more accepted))>" ) NLMISC_COMMAND( add_role, "add role to character", "<Role( MeleeFighter, RangeFighter, AttackCaster, BufferCaster, HealerCaster...), Level (1-25 (but more accepted))>" )
{ {
// Check parameters. // Check parameters.
if(args.size() < 2) return false; if(args.size() < 2) return false;
@ -3725,7 +3712,7 @@ NLMISC_COMMAND(money, "To earn Money (only in local mode)","<very big seed> [<bi
nlwarning("<add_role> unknown message name : CHEAT:ADD_ROLE"); nlwarning("<add_role> unknown message name : CHEAT:ADD_ROLE");
} }
return true; return true;
} }
*/ */
NLMISC_COMMAND(test, "", "") NLMISC_COMMAND(test, "", "")
@ -3818,7 +3805,7 @@ NLMISC_COMMAND(test, "", "")
//----------------------------------------------- //-----------------------------------------------
NLMISC_COMMAND(dist2front, "Change the distance to the front for a given sheet.", "<form> <dist>") NLMISC_COMMAND(dist2front, "Change the distance to the front for a given sheet.", "<form> <dist>")
{ {
DIST_TO_COMMAND(dist2front, DistToFront); DIST_TO_COMMAND(dist2front, DistToFront);
} }
//----------------------------------------------- //-----------------------------------------------
@ -3826,7 +3813,7 @@ DIST_TO_COMMAND(dist2front, DistToFront);
//----------------------------------------------- //-----------------------------------------------
NLMISC_COMMAND(dist2back, "Change the distance to the back for a given sheet.", "<form> <dist>") NLMISC_COMMAND(dist2back, "Change the distance to the back for a given sheet.", "<form> <dist>")
{ {
DIST_TO_COMMAND(dist2back, DistToBack); DIST_TO_COMMAND(dist2back, DistToBack);
} }
//----------------------------------------------- //-----------------------------------------------
@ -3834,7 +3821,7 @@ DIST_TO_COMMAND(dist2back, DistToBack);
//----------------------------------------------- //-----------------------------------------------
NLMISC_COMMAND(dist2side, "Change the distance to the side for a given sheet.", "<form> <dist>") NLMISC_COMMAND(dist2side, "Change the distance to the side for a given sheet.", "<form> <dist>")
{ {
DIST_TO_COMMAND(dist2side, DistToSide); DIST_TO_COMMAND(dist2side, DistToSide);
} }
@ -3842,79 +3829,79 @@ DIST_TO_COMMAND(dist2side, DistToSide);
// Change the parent of an entity. 'parent slot' not defined remove the current parent. // Change the parent of an entity. 'parent slot' not defined remove the current parent.
NLMISC_COMMAND(parent, "Change the parent of an entity.", "<slot> [<parent slot>]") NLMISC_COMMAND(parent, "Change the parent of an entity.", "<slot> [<parent slot>]")
{ {
CLFECOMMON::TCLEntityId parentSlot = CLFECOMMON::INVALID_SLOT; CLFECOMMON::TCLEntityId parentSlot = CLFECOMMON::INVALID_SLOT;
// Check parameters. // Check parameters.
switch(args.size()) switch(args.size())
{ {
// Set the target for the entity. // Set the target for the entity.
case 2: case 2:
fromString(args[1], parentSlot); fromString(args[1], parentSlot);
// Remove the target for the entity. // Remove the target for the entity.
case 1: case 1:
{ {
uint entitySlot; uint entitySlot;
fromString(args[0], entitySlot); fromString(args[0], entitySlot);
CEntityCL *entity = EntitiesMngr.entity(entitySlot); CEntityCL *entity = EntitiesMngr.entity(entitySlot);
if(entity) if(entity)
{ {
entity->parent(parentSlot); entity->parent(parentSlot);
entity->pos(CVectorD::Null); entity->pos(CVectorD::Null);
} }
else else
nlwarning("command 'parent': there is no entity in the slot %d", entitySlot); nlwarning("command 'parent': there is no entity in the slot %d", entitySlot);
} }
break; break;
// Bad command. // Bad command.
default: default:
return false; return false;
} }
// Well done. // Well done.
return true; return true;
} }
NLMISC_COMMAND(displayInventoryCounter, "display the Inventory counter to compare with db counter", "") NLMISC_COMMAND(displayInventoryCounter, "display the Inventory counter to compare with db counter", "")
{ {
CInterfaceManager *pIM= CInterfaceManager::getInstance(); CInterfaceManager *pIM= CInterfaceManager::getInstance();
uint srvVal= NLGUI::CDBManager::getInstance()->getDbProp("SERVER:INVENTORY:COUNTER")->getValue32(); uint srvVal= NLGUI::CDBManager::getInstance()->getDbProp("SERVER:INVENTORY:COUNTER")->getValue32();
uint locVal= pIM->getLocalSyncActionCounter() ; uint locVal= pIM->getLocalSyncActionCounter() ;
srvVal&= pIM->getLocalSyncActionCounterMask(); srvVal&= pIM->getLocalSyncActionCounterMask();
locVal&= pIM->getLocalSyncActionCounterMask(); locVal&= pIM->getLocalSyncActionCounterMask();
pIM->displaySystemInfo(ucstring( "ServerCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) ); pIM->displaySystemInfo(ucstring( "ServerCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) );
// Well done. // Well done.
return true; return true;
} }
NLMISC_COMMAND(displayActionCounter, "display the action counters", "") NLMISC_COMMAND(displayActionCounter, "display the action counters", "")
{ {
CInterfaceManager *pIM= CInterfaceManager::getInstance(); CInterfaceManager *pIM= CInterfaceManager::getInstance();
CSPhraseManager *pPM= CSPhraseManager::getInstance(); CSPhraseManager *pPM= CSPhraseManager::getInstance();
// next // next
uint srvVal= NLGUI::CDBManager::getInstance()->getDbProp(PHRASE_DB_COUNTER_NEXT)->getValue32(); uint srvVal= NLGUI::CDBManager::getInstance()->getDbProp(PHRASE_DB_COUNTER_NEXT)->getValue32();
uint locVal= pPM->getPhraseNextExecuteCounter() ; uint locVal= pPM->getPhraseNextExecuteCounter() ;
srvVal&= PHRASE_EXECUTE_COUNTER_MASK; srvVal&= PHRASE_EXECUTE_COUNTER_MASK;
locVal&= PHRASE_EXECUTE_COUNTER_MASK; locVal&= PHRASE_EXECUTE_COUNTER_MASK;
pIM->displaySystemInfo(ucstring( "NextCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) ); pIM->displaySystemInfo(ucstring( "NextCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) );
// cycle // cycle
srvVal= NLGUI::CDBManager::getInstance()->getDbProp(PHRASE_DB_COUNTER_CYCLE)->getValue32(); srvVal= NLGUI::CDBManager::getInstance()->getDbProp(PHRASE_DB_COUNTER_CYCLE)->getValue32();
locVal= pPM->getPhraseCycleExecuteCounter() ; locVal= pPM->getPhraseCycleExecuteCounter() ;
srvVal&= PHRASE_EXECUTE_COUNTER_MASK; srvVal&= PHRASE_EXECUTE_COUNTER_MASK;
locVal&= PHRASE_EXECUTE_COUNTER_MASK; locVal&= PHRASE_EXECUTE_COUNTER_MASK;
pIM->displaySystemInfo(ucstring( "CycleCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) ); pIM->displaySystemInfo(ucstring( "CycleCounter: " + toString(srvVal) + "/ LocalCounter: " + toString(locVal)) );
return true; return true;
} }
@ -4543,14 +4530,14 @@ std::string extendWildcard(const std::string &in)
// macros to reload Sheets // macros to reload Sheets
#define CMD_RELOAD_SHEET(_cmd_name, _filter, _type) \ #define CMD_RELOAD_SHEET(_cmd_name, _filter, _type) \
NLMISC_COMMAND(_cmd_name, #_cmd_name, "") \ NLMISC_COMMAND(_cmd_name, #_cmd_name, "") \
{ \ { \
if (args.size()>1) return false; \ if (args.size()>1) return false; \
string wildcardFilter; \ string wildcardFilter; \
if (args.size()>=1) \ if (args.size()>=1) \
wildcardFilter= extendWildcard(args[0]); \ wildcardFilter= extendWildcard(args[0]); \
return reloadSheets<_type>(_filter, wildcardFilter); \ return reloadSheets<_type>(_filter, wildcardFilter); \
} }
// Important ones // Important ones
CMD_RELOAD_SHEET(reloadCreature, "creature", CCharacterSheet) CMD_RELOAD_SHEET(reloadCreature, "creature", CCharacterSheet)
CMD_RELOAD_SHEET(reloadSbrick, "sbrick", CSBrickSheet) CMD_RELOAD_SHEET(reloadSbrick, "sbrick", CSBrickSheet)
@ -4558,25 +4545,25 @@ CMD_RELOAD_SHEET(reloadSphrase, "sphrase", CSPhraseSheet)
CMD_RELOAD_SHEET(reloadSitem, "sitem", CItemSheet) CMD_RELOAD_SHEET(reloadSitem, "sitem", CItemSheet)
// Not tested ones // Not tested ones
/* /*
CMD_RELOAD_SHEET(reloadPlayer, "player", CPlayerSheet) CMD_RELOAD_SHEET(reloadPlayer, "player", CPlayerSheet)
CMD_RELOAD_SHEET(reloadFx, "fx", CFXSheet) CMD_RELOAD_SHEET(reloadFx, "fx", CFXSheet)
CMD_RELOAD_SHEET(reloadBuilding, "building", CBuildingSheet) CMD_RELOAD_SHEET(reloadBuilding, "building", CBuildingSheet)
CMD_RELOAD_SHEET(reloadDeath_impact, "death_impact", CPactSheet) CMD_RELOAD_SHEET(reloadDeath_impact, "death_impact", CPactSheet)
CMD_RELOAD_SHEET(reloadMission, "mission", CMissionSheet) CMD_RELOAD_SHEET(reloadMission, "mission", CMissionSheet)
CMD_RELOAD_SHEET(reloadRace_stats, "race_stats", CRaceStatsSheet) CMD_RELOAD_SHEET(reloadRace_stats, "race_stats", CRaceStatsSheet)
CMD_RELOAD_SHEET(reloadLight_cycle, "light_cycle", CLightCycleSheet) CMD_RELOAD_SHEET(reloadLight_cycle, "light_cycle", CLightCycleSheet)
CMD_RELOAD_SHEET(reloadContinent, "continent", CContinentSheet) CMD_RELOAD_SHEET(reloadContinent, "continent", CContinentSheet)
CMD_RELOAD_SHEET(reloadWorld, "world", CWorldSheet) CMD_RELOAD_SHEET(reloadWorld, "world", CWorldSheet)
CMD_RELOAD_SHEET(reloadMission_icon, "mission_icon", CMissionIconSheet) CMD_RELOAD_SHEET(reloadMission_icon, "mission_icon", CMissionIconSheet)
CMD_RELOAD_SHEET(reloadSkill_tree, "skill_tree", CSkillsTreeSheet) CMD_RELOAD_SHEET(reloadSkill_tree, "skill_tree", CSkillsTreeSheet)
CMD_RELOAD_SHEET(reloadTitles, "titles", CUnblockTitlesSheet) CMD_RELOAD_SHEET(reloadTitles, "titles", CUnblockTitlesSheet)
CMD_RELOAD_SHEET(reloadSucces_chances_table, "succes_chances_table", CSuccessTableSheet) CMD_RELOAD_SHEET(reloadSucces_chances_table, "succes_chances_table", CSuccessTableSheet)
CMD_RELOAD_SHEET(reloadAutomaton_list, "automaton_list", CAutomatonListSheet) CMD_RELOAD_SHEET(reloadAutomaton_list, "automaton_list", CAutomatonListSheet)
CMD_RELOAD_SHEET(reloadAnimset_list, "animset_list", CAnimationSetListSheet) CMD_RELOAD_SHEET(reloadAnimset_list, "animset_list", CAnimationSetListSheet)
CMD_RELOAD_SHEET(reloadAnimation_fx, "animation_fx", CAnimationFXSheet) CMD_RELOAD_SHEET(reloadAnimation_fx, "animation_fx", CAnimationFXSheet)
CMD_RELOAD_SHEET(reloadEmot, "emot", CEmotListSheet) CMD_RELOAD_SHEET(reloadEmot, "emot", CEmotListSheet)
CMD_RELOAD_SHEET(reloadForage_source, "forage_source", CForageSourceSheet) CMD_RELOAD_SHEET(reloadForage_source, "forage_source", CForageSourceSheet)
CMD_RELOAD_SHEET(reloadText_emotes, "text_emotes", CTextEmotListSheet) CMD_RELOAD_SHEET(reloadText_emotes, "text_emotes", CTextEmotListSheet)
*/ */
NLMISC_COMMAND(vprop, "Flush the Visual Property (local only). you must write to the DB before (but if you give the value in the 3rd arg)", "slot propId [val]") NLMISC_COMMAND(vprop, "Flush the Visual Property (local only). you must write to the DB before (but if you give the value in the 3rd arg)", "slot propId [val]")
@ -4871,7 +4858,7 @@ NLMISC_COMMAND(setLightHour, "force the light hour, (negative value to reset to
if( hour < LightCycleManager.getLightDesc().NumHours ) if( hour < LightCycleManager.getLightDesc().NumHours )
{ {
// check for privileges if this is the final build // check for privileges if this is the final build
#if FINAL_VERSION #if FINAL_VERSION
// test that user has privilege // test that user has privilege
if (hasPrivilegeDEV() || if (hasPrivilegeDEV() ||
hasPrivilegeSGM() || hasPrivilegeSGM() ||
@ -4881,7 +4868,7 @@ NLMISC_COMMAND(setLightHour, "force the light hour, (negative value to reset to
hasPrivilegeG() || hasPrivilegeG() ||
hasPrivilegeEM() || hasPrivilegeEM() ||
hasPrivilegeEG()) hasPrivilegeEG())
#endif #endif
{ {
ForcedDayNightCycleHour = hour; ForcedDayNightCycleHour = hour;
return true; return true;
@ -5548,7 +5535,7 @@ NLMISC_COMMAND(tickToDate, "convert a tick value into a readable ryzom time", ""
NLMISC_COMMAND(dumpShapeMaxDist, "dump max dist for shapes", "") NLMISC_COMMAND(dumpShapeMaxDist, "dump max dist for shapes", "")
{ {
/* /*
std::set<std::string> shapeSet; std::set<std::string> shapeSet;
typedef CHashMultiMap<float, std::string> TShapeMap; typedef CHashMultiMap<float, std::string> TShapeMap;
TShapeMap shapes; TShapeMap shapes;
@ -5589,7 +5576,7 @@ NLMISC_COMMAND(dumpShapeMaxDist, "dump max dist for shapes", "")
{ {
nlwarning("Dist = %f, shape = %s", it->first, it->second.c_str()); nlwarning("Dist = %f, shape = %s", it->first, it->second.c_str());
} }
*/ */
return true; return true;
} }
@ -5765,7 +5752,30 @@ NLMISC_COMMAND(em, "emote command", "<emote phrase>")
return false; return false;
} }
NLMISC_COMMAND(emote, "emote command (1)", "<emote phrase>") NLMISC_COMMAND(me, "emote command", "<emote phrase>")
{
if (args.size() < 1) return false;
CInterfaceManager *pIM = CInterfaceManager::getInstance();
if( pIM )
{
string emotePhrase;
if( args.size() > 0 )
{
emotePhrase = args[0];
}
for(uint i = 1; i < args.size(); ++i )
{
emotePhrase += " ";
emotePhrase += args[i];
}
CAHManager::getInstance()->runActionHandler("emote", NULL, "nb=0|behav=255|custom_phrase="+emotePhrase);
return true;
}
return false;
}
NLMISC_COMMAND(emote, "emote command", "<emote phrase>")
{ {
if (args.size() < 1) return false; if (args.size() < 1) return false;
@ -5811,28 +5821,6 @@ NLMISC_COMMAND(m, "emote command", "<emote phrase>")
return false; return false;
} }
NLMISC_COMMAND(me, "emote command", "<emote phrase>")
{
if (args.size() < 1) return false;
CInterfaceManager *pIM = CInterfaceManager::getInstance();
if( pIM )
{
string emotePhrase;
if( args.size() > 0 )
{
emotePhrase = args[0];
}
for(uint i = 1; i < args.size(); ++i )
{
emotePhrase += " ";
emotePhrase += args[i];
}
CAHManager::getInstance()->runActionHandler("emote", NULL, "nb=0|behav=255|custom_phrase="+emotePhrase);
return true;
}
return false;
}
NLMISC_COMMAND(guildmotd, "Set or see the guild message of the day","<msg of the day>") NLMISC_COMMAND(guildmotd, "Set or see the guild message of the day","<msg of the day>")
{ {
@ -5878,8 +5866,10 @@ NLMISC_COMMAND(time, "Shows information about the current time", "")
return true; return true;
} }
NLMISC_COMMAND(easteregg_siela1915.khanat, "Miscellaneous", "") NLMISC_COMMAND(easteregg_siela1915_khanat, "Miscellaneous", "")
{ {
CInterfaceManager::getInstance()->displaySystemInfo("Siela1915 blesses you..."); string stext = "Siela1915 blesses you...";
ucstring ucstext = ucstring(stext);
CInterfaceManager::getInstance()->displaySystemInfo(ucstext, "AROUND");
return true; return true;
} }

BIN
code/ryzom/client/unix/khanat_128x128.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
code/ryzom/client/unix/khanat_16x16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
code/ryzom/client/unix/khanat_22x22.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
code/ryzom/client/unix/khanat_24x24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
code/ryzom/client/unix/khanat_256x256.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
code/ryzom/client/unix/khanat_32x32.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
code/ryzom/client/unix/khanat_48x48.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
code/ryzom/client/unix/khanat_64x64.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
code/ryzom/client/unix/khanat_client.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
code/ryzom/client/unix/khanat_logo_color.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 62 KiB

8
code/ryzom/client/unix/ryzom_client.desktop.in
View file

@ -1,11 +1,11 @@
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=0.1
Name=Ryzom Name=Khanat
Name[ru]=Ризом Name[ru]=Ризом
Type=Application Type=Application
GenericName=Game client GenericName=Game client
Comment=Ryzom client Comment=Khanat client
Comment[fr_FR]=Client Ryzom Comment[fr_FR]=Client Khanat
TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
Exec=${RYZOM_GAMES_PREFIX}/ryzom_client Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
Icon=${RYZOM_CLIENT_ICON} Icon=${RYZOM_CLIENT_ICON}