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

Adjustments to give more options to do custom emotes, "Khanatization" for the Mac Client, changements to the key system.

Browse source
This commit is contained in:
SIELA1915 2016-01-13 19:26:28 +01:00
parent ac2229d42c
commit 93d2b80966
9 changed files with 5100 additions and 5099 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
code/ryzom/client/client_default.cfg
View file

@ -1,9 +1,9 @@
////////////////////////// //////////////////////////
//////////////////////////
/// CLIENT CONFIG FILE /// /// CLIENT CONFIG FILE ///
////////////////////////// //////////////////////////
////////////////////////// //////////////////////////
//////////////////////////
// If you set this variable to 1, your client.cfg will be overwritten when you quit the client. // If you set this variable to 1, your client.cfg will be overwritten when you quit the client.
// You will loose all the comments and identation in this file. // You will loose all the comments and identation in this file.
@ -15,7 +15,7 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2" Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware // "Auto" will choose the best suited driver depending on hardware
FullScreen = 1; FullScreen = 0;
Width = 0; Width = 0;
Height = 0; Height = 0;
PositionX = 0; PositionX = 0;
@ -39,15 +39,22 @@ Gamma_max = 1.0;
// NETWORK // // NETWORK //
///////////// /////////////
Application = { "ryzom_live", "./client_ryzom_r.exe", "./" }; Application = { "Lirria", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0; BackgroundDownloader = 0;
PatchServer = "http://dl.ryzom.com/patch_live"; PatchWanted = 1;
StartupHost = "shard.ryzom.com:40916"; PatchUrl = "http://lirria.khaganat.net:43435";
RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php";
StartupHost = "lirria.khaganat.net:40916";
StartupPage = "/login/r2_login.php"; StartupPage = "/login/r2_login.php";
InstallStatsUrl = ""; InstallStatsUrl = "http://lirria.khaganat.net:50000/stats/stats.php";
CreateAccountURL = "http://lirria.khaganat.net/ams/?page=register";
EditAccountURL = "http://lirria.khaganat.net/";
ForgetPwdURL = "http://lirria.khaganat.net/ams/index.php?page=forgot_password";
//FreeTrialURL = "http://lirria.khaganat.net/";
LoginSupportURL = "http://lirria.khaganat.net/";
ConditionsTermsURL = "khaganat.net/wikhan/fr:charte";
ConditionsTermsURL = "http://app.ryzom.com/app_forum/index.php?page=topic/view/21885/1&post148782=en#1";
LoginSupportURL = "http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post149889=en#1";
//////////////// ////////////////
@ -332,7 +339,8 @@ SoundGameMusicVolume_max = 1.0;
SoundGameMusicVolume_step = 0.001; SoundGameMusicVolume_step = 0.001;
// MISC // MISC
PreDataPath = { "user", "patch", "data", "examples" }; PreDataPath = { "user", "patch", "examples", "data/patch_lirria.bnp", "data/fonts", "data/gamedev.bnp" };
DataPath = { "data" };
NeedComputeVS = 0; NeedComputeVS = 0;
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" }; NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
@ -391,21 +399,21 @@ SystemInfoColors =
}; };
PrintfCommands = { PrintfCommands = {
"52", "15", "55 55 0 255", "28", "uiChapterV", "624", "52", "15", "55 55 0 255", "28", "uiEonSymbiose", "624",
"428", "0 0 0 255", "18", "", "624", "378", "428", "0 0 0 255", "18", "", "624", "378",
"0 0 0 255", "14", "", "644", "278", "0 0 0 255", "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
"18", "", "52", "17", "255 255 255 255", "28", "18", "", "52", "17", "255 255 255 255", "28",
"uiChapterV", "622", "430", "255 255 255 255", "18", "", "uiEonSymbiose", "622", "430", "255 255 255 255", "18", "",
"622", "380", "255 255 255 255", "14", "", "642", "622", "380", "255 255 255 255", "14", "", "642",
"280", "255 255 255 255", "18", "" "280", "255 255 255 255", "18", ""
}; };
PrintfCommandsFreeTrial = { PrintfCommandsFreeTrial = {
"52", "15", "55 55 0 255", "28", "uiChapterV", "624", "52", "15", "55 55 0 255", "28", "uiEonSymbiose", "624",
"428", "0 0 0 255", "18", "", "624", "378", "428", "0 0 0 255", "18", "", "624", "378",
"0 0 0 255", "14", "", "644", "278", "0 0 0 255", "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
"18", "", "52", "17", "255 255 255 255", "28", "18", "", "52", "17", "255 255 255 255", "28",
"uiChapterV", "622", "430", "255 255 255 255", "18", "", "uiEonSymbiose", "622", "430", "255 255 255 255", "18", "",
"622", "380", "255 255 255 255", "14", "", "642", "622", "380", "255 255 255 255", "14", "", "642",
"280", "255 255 255 255", "18", "" "280", "255 255 255 255", "18", ""
}; };
@ -557,19 +565,19 @@ ScenarioLanguages = {"fr","de","en","other_lang"};
// Map each language to a forum help page // Map each language to a forum help page
HelpPages = HelpPages =
{ {
"fr=http://forums.ryzom.com/forum/showthread.php?t=29130", "fr=http://www.khaganat.net/forum/index.php/board,31.0.html",
"en=http://forums.ryzom.com/forum/showthread.php?t=29129", "en=http://www.khaganat.net/forum/index.php/board,31.0.html",
"wk=http://forums.ryzom.com/forum/showthread.php?t=29129", "wk=http://www.khaganat.net/forum/index.php/board,31.0.html",
"de=http://forums.ryzom.com/forum/showthread.php?t=29131", "de=http://www.khaganat.net/forum/index.php/board,31.0.html",
"es=http://forums.ryzom.com/forum/showthread.php?t=29129", "es=http://www.khaganat.net/forum/index.php/board,31.0.html",
"ru=http://forums.ryzom.com/forum/showthread.php?t=29129" "ru=http://www.khaganat.net/forum/index.php/board,31.0.html"
}; };
WebIgMainDomain = "app.ryzom.com"; WebIgMainDomain = "app.khaganat.net";
WebIgTrustedDomains = { WebIgTrustedDomains = {
"api.ryzom.com", "app.ryzom.com" "api.khaganat.net", "app.khaganat.net", "lirria.khaganat.net"
}; };
PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload"; //PatchletUrl = "";
SelectedSlot = 0; SelectedSlot = 0;

333
code/ryzom/client/data/gamedev/interfaces_v3/actions.xml
View file

@ -77,70 +77,51 @@
</template> </template>
<action_category name="player" hardtext="uiPlayer" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="toggle_light" hardtext="uiLightOnOff"/>
<action name="toggle_dodge_parry" hardtext="uiToggleDodgeParry"/>
</action_category>
<action_category name="movement" hardtext="uiMovement" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"> <action_category name="movement" hardtext="uiMovement" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="toggle_sit_stand" hardtext="uiMoveToggleSitStand" contexts="game, r2ed_anim_test"/>
<action name="forward" hardtext="uiMoveForward" macroisable="false" />
<action name="backward" hardtext="uiMoveBackward" macroisable="false" /> <action name="backward" hardtext="uiMoveBackward" macroisable="false" />
<action name="turn_left" hardtext="uiMoveTurnLeft" macroisable="false" /> <action name="forward" hardtext="uiMoveForward" macroisable="false" />
<action name="turn_right" hardtext="uiMoveTurnRight" macroisable="false" />
<action name="strafe_left" hardtext="uiMoveStrafeLeft" macroisable="false" />
<action name="strafe_right" hardtext="uiMoveStrafeRight" macroisable="false" /> <action name="strafe_right" hardtext="uiMoveStrafeRight" macroisable="false" />
<action name="look_up" hardtext="uiMoveLookUp" macroisable="false" /> <action name="strafe_left" hardtext="uiMoveStrafeLeft" macroisable="false" />
<action name="look_down" hardtext="uiMoveLookDown" macroisable="false" /> <action name="turn_right" hardtext="uiMoveTurnRight" macroisable="false" />
<action name="toggle_auto_walk" hardtext="uiMoveToggleAutoWalk" macroisable="false" /> <action name="turn_left" hardtext="uiMoveTurnLeft" macroisable="false" />
<action name="toggle_run_walk" hardtext="uiMoveRunWalk" contexts="game, r2ed_anim_test, r2ed_anim_dm"/> <action name="toggle_run_walk" hardtext="uiMoveRunWalk" contexts="game, r2ed_anim_test, r2ed_anim_dm"/>
<action name="toggle_auto_walk" hardtext="uiMoveToggleAutoWalk" macroisable="false" />
<action name="toggle_sit_stand" hardtext="uiMoveToggleSitStand" contexts="game, r2ed_anim_test"/>
<action name="mount_unmount" hardtext="uiMountUnmount" contexts="game"/> <action name="mount_unmount" hardtext="uiMountUnmount" contexts="game"/>
<action name="camera_turn_left" hardtext="uiCameraTurnLeft" macroisable="false" />
<action name="camera_turn_right" hardtext="uiCameraTurnRight" macroisable="false" />
<action name="camera_turn_center" hardtext="uiCameraTurnCenter" />
</action_category> </action_category>
<action_category name="actions" hardtext="uiActions" contexts="game, r2ed_anim_test"> <action_category name="view" hardtext="uiView" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="command" hardtext="uiDebugCommand" macroisable="false" > <action name="camera_turn_center" hardtext="uiCameraTurnCenter" />
<parameter hardtext="uiShortcutNumber"> <action name="rear_view" hardtext="uiRearView" keyup="1" macroisable="false" />
<value value="a execMemorizedPhrase 0 0" hardtext="uiKey0"/> <action name="toggle_camera" hardtext="uiToggleCamera"/>
<value value="a execMemorizedPhrase 1 0" hardtext="uiKey1"/> <action name="free_mouse" hardtext="uiFreeMouse" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm, r2ed_scenario_creation"/>
<value value="a execMemorizedPhrase 2 0" hardtext="uiKey2"/> <action name="camera_down" hardtext="uiCameraDown" />
<value value="a execMemorizedPhrase 3 0" hardtext="uiKey3"/> <action name="camera_up" hardtext="uiCameraUp" />
<value value="a execMemorizedPhrase 4 0" hardtext="uiKey4"/> <action name="camera_backward" hardtext="uiMoveBackward" />
<value value="a execMemorizedPhrase 5 0" hardtext="uiKey5"/> <action name="camera_foreward" hardtext="uiMoveForward" />
<value value="a execMemorizedPhrase 6 0" hardtext="uiKey6"/> <action name="inc_camera_height" hardtext="uiDebugIncCameraHeight" />
<value value="a execMemorizedPhrase 7 0" hardtext="uiKey7"/> <action name="dec_camera_height" hardtext="uiDebugDecCameraHeight" />
<value value="a execMemorizedPhrase 8 0" hardtext="uiKey8"/> <action name="camera_turn_right" hardtext="uiCameraTurnRight" macroisable="false" />
<value value="a execMemorizedPhrase 9 0" hardtext="uiKey9"/> <action name="camera_turn_left" hardtext="uiCameraTurnLeft" macroisable="false" />
</parameter> <action name="screen_shot_jpg" hardtext="uiScreenShotJPG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
</action> <action name="screen_shot_png" hardtext="uiScreenShotPNG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
<action name="no_target" hardtext="uiNoTarget" /> <action name="screen_shot" hardtext="uiScreenShot" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
<action name="target" hardtext="uiTargetCmd" > <action name="toggle_fly" hardtext="uiDebugToggleFly" />
<parameter hardtext="uiTargetCmdEntity" type="%action_param_user_name" name="entity"/> </action_category>
</action>
<action name="target_teammate_shortcut" hardtext="uiTargetTeammateCmd" contexts="game"> <action_category name="actionbar" hardtext="uiActionbar" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<parameter hardtext="uiTargetTeammateCmdI" type="%action_param_constant" name="indexInTeam" value="1"> <action name="select_shortcut_bar" hardtext="uiSelectShortcutBar" contexts="game, r2ed_anim_test">
<value value="1" hardtext="uiKey1"/> <parameter hardtext="uiShortcutBarNumber">
<value value="2" hardtext="uiKey2"/> <value value="1" hardtext="uiNumber01"/>
<value value="3" hardtext="uiKey3"/> <value value="2" hardtext="uiNumber02"/>
<value value="4" hardtext="uiKey4"/> <value value="3" hardtext="uiNumber03"/>
<value value="5" hardtext="uiKey5"/> <value value="4" hardtext="uiNumber04"/>
<value value="6" hardtext="uiKey6"/> <value value="5" hardtext="uiNumber05"/>
<value value="7" hardtext="uiKey7"/> <value value="6" hardtext="uiNumber06"/>
<value value="8" hardtext="uiKey8"/> <value value="7" hardtext="uiNumber07"/>
</parameter> <value value="8" hardtext="uiNumber08"/>
</action> <value value="9" hardtext="uiNumber09"/>
<action name="assist" hardtext="uiAssistCmd" contexts="game"> <value value="10" hardtext="uiNumber10"/>
<parameter hardtext="uiAssistCmdEntity" type="%action_param_user_name" name="entity"/>
</action>
<action name="assist_target" hardtext="uiAssistTargetCmd" contexts="game, r2ed_anim_test"/>
<action name="self_target" hardtext="uiSelfTarget" contexts="game, r2ed_anim_test"/>
<action name="toggle_combat" hardtext="uiToggleCombat" contexts="game, r2ed_anim_test"/>
<action name="front_selection" hardtext="uiFrontSelection" contexts="game, r2ed_anim_test">
<parameter hardtext="uiFrontSelectionType">
<value value="friend" hardtext="uiFrontSelectionFriend"/>
<value value="ennemy" hardtext="uiFrontSelectionEnnemy"/>
</parameter> </parameter>
</action> </action>
<action name="run_shortcut" hardtext="uiRunShortcut" contexts="game, r2ed_anim_test"> <action name="run_shortcut" hardtext="uiRunShortcut" contexts="game, r2ed_anim_test">
@ -191,119 +172,65 @@
<value value="39" hardtext="uiNumber20"/> <value value="39" hardtext="uiNumber20"/>
</parameter> </parameter>
</action> </action>
<action name="select_shortcut_bar" hardtext="uiSelectShortcutBar" contexts="game, r2ed_anim_test">
<parameter hardtext="uiShortcutBarNumber">
<value value="1" hardtext="uiNumber01"/>
<value value="2" hardtext="uiNumber02"/>
<value value="3" hardtext="uiNumber03"/>
<value value="4" hardtext="uiNumber04"/>
<value value="5" hardtext="uiNumber05"/>
<value value="6" hardtext="uiNumber06"/>
<value value="7" hardtext="uiNumber07"/>
<value value="8" hardtext="uiNumber08"/>
<value value="9" hardtext="uiNumber09"/>
<value value="10" hardtext="uiNumber10"/>
</parameter>
</action>
<action name="select_shortcut_bar_2" hardtext="uiSelectShortcutBar2" contexts="game, r2ed_anim_test">
<parameter hardtext="uiShortcutBarNumber">
<value value="1" hardtext="uiNumber01"/>
<value value="2" hardtext="uiNumber02"/>
<value value="3" hardtext="uiNumber03"/>
<value value="4" hardtext="uiNumber04"/>
<value value="5" hardtext="uiNumber05"/>
<value value="6" hardtext="uiNumber06"/>
<value value="7" hardtext="uiNumber07"/>
<value value="8" hardtext="uiNumber08"/>
<value value="9" hardtext="uiNumber09"/>
<value value="10" hardtext="uiNumber10"/>
</parameter>
</action>
<action name="phrase_cancel_cast" hardtext="uiCancelCast" contexts="game, r2ed_anim_test"/> <action name="phrase_cancel_cast" hardtext="uiCancelCast" contexts="game, r2ed_anim_test"/>
</action_category> </action_category>
<action_category name="chat" hardtext="uiChat" contexts="game, r2ed, r2ed_anim_test"> <!-- not available in r2ed for now --> <action_category name="fight" hardtext="uiFight" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="talk_untalk" hardtext="uiTalkLeave"/> <action name="toggle_combat" hardtext="uiToggleCombat" contexts="game, r2ed_anim_test"/>
<action name="reply_teller" hardtext="uiReplyTeller"/> <action name="target_teammate_shortcut" hardtext="uiTargetTeammateCmd" contexts="game">
<action name="reply_teller_once" hardtext="uiReplyTellerOnce"/> <parameter hardtext="uiTargetTeammateCmdI" type="%action_param_constant" name="indexInTeam" value="1">
<action name="cycle_tell" hardtext="uiCycleTell"/> <value value="1" hardtext="uiKey1"/>
<action name="enter_tell" hardtext="uiEnterTellCmd"> <value value="2" hardtext="uiKey2"/>
<parameter hardtext="uiTellCmdDest" type="%action_param_user_name" name="player"/> <value value="3" hardtext="uiKey3"/>
</action> <value value="4" hardtext="uiKey4"/>
<action name="tell" hardtext="uiTellCmd"> <value value="5" hardtext="uiKey5"/>
<parameter hardtext="uiTellCmdDest" type="%action_param_user_name" name="player"/> <value value="6" hardtext="uiKey6"/>
<parameter hardtext="uiTellCmdMsg" type="%action_param_user" name="text"/> <value value="7" hardtext="uiKey7"/>
</action> <value value="8" hardtext="uiKey8"/>
<action name="enter_talk" hardtext="uiEnterTalkCmd">
<parameter hardtext="uiTalkCmdMode" type="%action_param_constant" name="mode" value="0">
<value value="0" hardtext="uiTalkCmdModeSay"/>
<value value="1" hardtext="uiTalkCmdModeShout"/>
<value value="2" hardtext="uiTalkCmdModeTeam"/>
<value value="3" hardtext="uiTalkCmdModeGuild"/>
<!--<value value="4" hardtext="uiTalkCmdModeCivilisation"/>
<value value="5" hardtext="uiTalkCmdModeTerritory"/>
<value value="6" hardtext="uiTalkCmdModeUniverse"/>-->
<!-- 7 tell
8 player
9 arround
10 system -->
<value value="11" hardtext="uiTalkCmdModeRegion"/>
</parameter> </parameter>
</action> </action>
<action name="talk" hardtext="uiTalkCmd"> <action name="self_target" hardtext="uiSelfTarget" contexts="game, r2ed_anim_test"/>
<parameter hardtext="uiTalkCmdMode" type="%action_param_constant" name="mode" value="0"> <action name="front_selection" hardtext="uiFrontSelection" contexts="game, r2ed_anim_test">
<value value="0" hardtext="uiTalkCmdModeSay"/> <parameter hardtext="uiFrontSelectionType">
<value value="1" hardtext="uiTalkCmdModeShout"/> <value value="friend" hardtext="uiFrontSelectionFriend"/>
<value value="2" hardtext="uiTalkCmdModeTeam"/> <value value="ennemy" hardtext="uiFrontSelectionEnnemy"/>
<value value="3" hardtext="uiTalkCmdModeGuild"/>
<!--<value value="4" hardtext="uiTalkCmdModeCivilisation"/>
<value value="5" hardtext="uiTalkCmdModeTerritory"/>
<value value="6" hardtext="uiTalkCmdModeUniverse"/>-->
<!-- 7 tell
8 player
9 arround
10 system -->
<value value="11" hardtext="uiTalkCmdModeRegion"/>
</parameter>
<parameter hardtext="uiTalkCmdMsg" type="%action_param_user" name="text"/>
</action>
<action name="talk_message" hardtext="uiTalkMem">
<parameter hardtext="uiTalkMemMsg" type="%action_param_constant" value="0">
<value value="00" hardtext="uiTalkMemMsg00"/>
<value value="01" hardtext="uiTalkMemMsg01"/>
<value value="02" hardtext="uiTalkMemMsg02"/>
<value value="03" hardtext="uiTalkMemMsg03"/>
<value value="04" hardtext="uiTalkMemMsg04"/>
<value value="05" hardtext="uiTalkMemMsg05"/>
<value value="06" hardtext="uiTalkMemMsg06"/>
<value value="07" hardtext="uiTalkMemMsg07"/>
<value value="08" hardtext="uiTalkMemMsg08"/>
<value value="09" hardtext="uiTalkMemMsg09"/>
<value value="10" hardtext="uiTalkMemMsg10"/>
<value value="11" hardtext="uiTalkMemMsg11"/>
<value value="12" hardtext="uiTalkMemMsg12"/>
<value value="13" hardtext="uiTalkMemMsg13"/>
<value value="14" hardtext="uiTalkMemMsg14"/>
<value value="15" hardtext="uiTalkMemMsg15"/>
<value value="16" hardtext="uiTalkMemMsg16"/>
<value value="17" hardtext="uiTalkMemMsg17"/>
<value value="18" hardtext="uiTalkMemMsg18"/>
<value value="19" hardtext="uiTalkMemMsg19"/>
</parameter> </parameter>
</action> </action>
<action name="no_target" hardtext="uiNoTarget" />
<action name="toggle_dodge_parry" hardtext="uiToggleDodgeParry"/>
</action_category> </action_category>
<action_category name="view" hardtext="uiView" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"> <action_category name="chat" hardtext="uiChat" contexts="game, r2ed, r2ed_anim_test">
<!-- <action name="toggle_names" hardtext="uiToggleNames" repeat="1" keyup="1" /> --> <action name="cycle_tell" hardtext="uiCycleTell"/>
<action name="toggle_camera" hardtext="uiToggleCamera"/> <action name="talk_untalk" hardtext="uiTalkLeave"/>
<action name="rear_view" hardtext="uiRearView" keyup="1" macroisable="false" /> <action name="reply_teller" hardtext="uiReplyTeller"/>
<action name="toggle_chat" hardtext="uiDebugToggleChat" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"/> </action_category>
<action name="camera_up" hardtext="uiCameraUp" />
<action name="camera_down" hardtext="uiCameraDown" /> <action_category name="edit" hardtext="uiEdit" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="camera_foreward" hardtext="uiMoveForward" /> <action name="edit_goto_line_begin" hardtext="uiEditGotoLineBegin"/>
<action name="camera_backward" hardtext="uiMoveBackward" /> <action name="edit_goto_line_end" hardtext="uiEditGotoLineEnd"/>
<action name="edit_goto_block_begin" hardtext="uiEditGotoBlockBegin"/>
<action name="edit_goto_block_end" hardtext="uiEditGotoBlockEnd"/>
<action name="edit_previous_word" hardtext="uiEditPreviousWord" repeat="1"/>
<action name="edit_next_word" hardtext="uiEditNextWord" repeat="1"/>
<action name="edit_previous_char" hardtext="uiEditPreviousChar" repeat="1"/>
<action name="edit_next_char" hardtext="uiEditNextChar" repeat="1"/>
<action name="edit_previous_line" hardtext="uiEditPreviousLine" repeat="1"/>
<action name="edit_next_line" hardtext="uiEditNextLine" repeat="1"/>
<action name="edit_copy" hardtext="uiEditCopy"/>
<action name="edit_paste" hardtext="uiEditPaste" repeat="1"/>
<action name="edit_cut" hardtext="uiEditCut"/>
<action name="edit_expand_or_cycle_tell" hardtext="uiEditExpandOrCycleTell"/>
<action name="edit_back" hardtext="uiEditBack" repeat="1"/>
<action name="edit_select_to_line_begin" hardtext="uiEditSelectToLineBegin"/>
<action name="edit_select_to_line_end" hardtext="uiEditSelectToLineEnd"/>
<action name="edit_select_to_block_begin" hardtext="uiEditSelectToBlockBegin"/>
<action name="edit_select_to_block_end" hardtext="uiEditSelectToBlockEnd"/>
<action name="edit_select_previous_word" hardtext="uiEditSelectPreviousWord" repeat="1"/>
<action name="edit_select_next_word" hardtext="uiEditSelectNextWord" repeat="1"/>
<action name="edit_select_previous_char" hardtext="uiEditSelectPreviousChar" repeat="1"/>
<action name="edit_select_next_char" hardtext="uiEditSelectNextChar" repeat="1"/>
<action name="edit_select_all" hardtext="uiEditSelectAll"/>
</action_category> </action_category>
<action_category name="windows" hardtext="uiWindows" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"> <action_category name="windows" hardtext="uiWindows" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
@ -354,12 +281,12 @@
</action> </action>
<action name="dock_undock_chat" hardtext="uiDockUndockChat"> <action name="dock_undock_chat" hardtext="uiDockUndockChat">
<parameter hardtext="uiWindowName"> <parameter hardtext="uiWindowName">
<value value="SYSTEM_INFO" hardtext="uiSystemInfo" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" /> <value value="SYSTEM_INFO" hardtext="uiSystemInfo"/>
<value value="AROUND_ME" hardtext="uiAroundMe" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" /> <value value="AROUND_ME" hardtext="uiAroundMe"/>
<value value="TEAM_CHAT" hardtext="uiTeamChat" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" /> <value value="TEAM_CHAT" hardtext="uiTeamChat"/>
<value value="GUILD_CHAT" hardtext="uiGuildChat" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" /> <value value="GUILD_CHAT" hardtext="uiGuildChat"/>
<value value="REGION_CHAT" hardtext="uiREGION" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" /> <value value="REGION_CHAT" hardtext="uiREGION"/>
<value value="UNIVERSE_CHAT" hardtext="uiUNIVERSE" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" /> <value value="UNIVERSE_CHAT" hardtext="uiUNIVERSE"/>
</parameter> </parameter>
</action> </action>
<action name="show_on_press" hardtext="uiShowOnPress" repeat="1" keyup="1" macroisable="false"> <action name="show_on_press" hardtext="uiShowOnPress" repeat="1" keyup="1" macroisable="false">
@ -367,7 +294,6 @@
<instance template="container_window_list"/> <instance template="container_window_list"/>
</parameter> </parameter>
</action> </action>
<!-- in r2 virtual desktop are used for the different mode (edition, dm, test) -->
<action name="set_desktop" hardtext="uiSetDesktop" repeat="1" keyup="1" contexts="game"> <action name="set_desktop" hardtext="uiSetDesktop" repeat="1" keyup="1" contexts="game">
<parameter hardtext="uiDesktopNumber"> <parameter hardtext="uiDesktopNumber">
<value value="0" hardtext="uiKey0"/> <value value="0" hardtext="uiKey0"/>
@ -386,49 +312,34 @@
</action> </action>
</action_category> </action_category>
<action_category name="system" hardtext="uiSystem" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"> <action_category name="miscellaneous" hardtext="uiMiscellaneous" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="quit_game" hardtext="uiQuitGameWithoutWarning" contexts="game, r2ed_scenario_creation"/> <action name="toggle_light" hardtext="uiLightOnOff"/>
<action name="quit_ryzom" hardtext="uiQuitRyzomWithoutWarning" contexts="game, r2ed_scenario_creation"/>
<action name="quit_ryzom_now" hardtext="uiQuitRyzomWithoutWarning" contexts="r2ed, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm, r2ed_scenario_creation"/>
<action name="enter_modal" hardtext="uiQuit">
<parameter value="ui:interface:quit_dialog" name="group" type="%action_param_hidden" />
</action>
<action name="free_mouse" hardtext="uiFreeMouse" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm, r2ed_scenario_creation"/>
<action name="close_help" hardtext="uiCloseHelp" contexts="game"/> <action name="close_help" hardtext="uiCloseHelp" contexts="game"/>
<action name="screen_shot" hardtext="uiScreenShot" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/> <action name="quit_ryzom" hardtext="uiQuitRyzomWithoutWarning" contexts="game, r2ed_scenario_creation"/>
<action name="screen_shot_jpg" hardtext="uiScreenShotJPG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/> <action name="talk_message" hardtext="uiTalkMem">
<action name="screen_shot_png" hardtext="uiScreenShotPNG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/> <parameter hardtext="uiTalkMemMsg" type="%action_param_constant" value="0">
</action_category> <value value="00" hardtext="uiTalkMemMsg00"/>
<value value="01" hardtext="uiTalkMemMsg01"/>
<action_category name="edit" hardtext="uiEdit" macroisable="false" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm, waiting_network, r2ed_scenario_creation"> <value value="02" hardtext="uiTalkMemMsg02"/>
<action name="edit_previous_char" hardtext="uiEditPreviousChar" repeat="1"/> <value value="03" hardtext="uiTalkMemMsg03"/>
<action name="edit_select_previous_char" hardtext="uiEditSelectPreviousChar" repeat="1"/> <value value="04" hardtext="uiTalkMemMsg04"/>
<action name="edit_previous_word" hardtext="uiEditPreviousWord" repeat="1"/> <value value="05" hardtext="uiTalkMemMsg05"/>
<action name="edit_select_previous_word" hardtext="uiEditSelectPreviousWord" repeat="1"/> <value value="06" hardtext="uiTalkMemMsg06"/>
<action name="edit_next_char" hardtext="uiEditNextChar" repeat="1"/> <value value="07" hardtext="uiTalkMemMsg07"/>
<action name="edit_select_next_char" hardtext="uiEditSelectNextChar" repeat="1"/> <value value="08" hardtext="uiTalkMemMsg08"/>
<action name="edit_next_word" hardtext="uiEditNextWord" repeat="1"/> <value value="09" hardtext="uiTalkMemMsg09"/>
<action name="edit_select_next_word" hardtext="uiEditSelectNextWord" repeat="1"/> <value value="10" hardtext="uiTalkMemMsg10"/>
<action name="edit_goto_line_begin" hardtext="uiEditGotoLineBegin"/> <value value="11" hardtext="uiTalkMemMsg11"/>
<action name="edit_select_to_line_begin" hardtext="uiEditSelectToLineBegin"/> <value value="12" hardtext="uiTalkMemMsg12"/>
<action name="edit_goto_block_begin" hardtext="uiEditGotoBlockBegin"/> <value value="13" hardtext="uiTalkMemMsg13"/>
<action name="edit_select_to_block_begin" hardtext="uiEditSelectToBlockBegin"/> <value value="14" hardtext="uiTalkMemMsg14"/>
<action name="edit_goto_line_end" hardtext="uiEditGotoLineEnd"/> <value value="15" hardtext="uiTalkMemMsg15"/>
<action name="edit_select_to_line_end" hardtext="uiEditSelectToLineEnd"/> <value value="16" hardtext="uiTalkMemMsg16"/>
<action name="edit_goto_block_end" hardtext="uiEditGotoBlockEnd"/> <value value="17" hardtext="uiTalkMemMsg17"/>
<action name="edit_select_to_block_end" hardtext="uiEditSelectToBlockEnd"/> <value value="18" hardtext="uiTalkMemMsg18"/>
<action name="edit_previous_line" hardtext="uiEditPreviousLine" repeat="1"/> <value value="19" hardtext="uiTalkMemMsg19"/>
<action name="edit_next_line" hardtext="uiEditNextLine" repeat="1"/> </parameter>
<action name="edit_delete_char" hardtext="uiEditDeleteChar" repeat="1"/> </action>
<action name="edit_copy" hardtext="uiEditCopy"/>
<action name="edit_paste" hardtext="uiEditPaste" repeat="1"/>
<action name="edit_cut" hardtext="uiEditCut"/>
<action name="edit_select_all" hardtext="uiEditSelectAll"/>
<action name="edit_expand" hardtext="uiEditExpand" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm, waiting_network"/>
<action name="edit_expand_or_cycle_tell" hardtext="uiEditExpandOrCycleTell" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm, waiting_network"/>
<action name="edit_back" hardtext="uiEditBack" repeat="1"/>
</action_category> </action_category>
<action_category name="debug" hardtext="uiDebug" macroisable="false" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"> <action_category name="debug" hardtext="uiDebug" macroisable="false" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm">
@ -528,6 +439,4 @@
</action_category> </action_category>
</interface_config> </interface_config>

12
code/ryzom/client/data/gamedev/interfaces_v3/hierarchy.xml
View file

@ -110,15 +110,15 @@
<tree node="connection"/> <tree node="connection"/>
<tree node="keys" > <tree node="keys" >
<tree node="keys_player"/>
<tree node="keys_movement"/> <tree node="keys_movement"/>
<tree node="keys_actions"/>
<tree node="keys_chat"/>
<tree node="keys_view"/> <tree node="keys_view"/>
<tree node="keys_windows"/> <tree node="keys_actionbar"/>
<tree node="keys_system"/> <tree node="keys_fight"/>
<tree node="keys_chat"/>
<tree node="keys_edit"/> <tree node="keys_edit"/>
<tree node="keys_debug"/> <tree node="keys_windows"/>
<tree node="keys_miscellaneous"/>
<tree node="keys_debug"
</tree> </tree>
<!-- done with template teditcmd now <tree node="editkey" />--> <!-- done with template teditcmd now <tree node="editkey" />-->

13
code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
View file

@ -207,17 +207,15 @@
<!-- the id must be keys_### where ### is the name of the category --> <!-- the id must be keys_### where ### is the name of the category -->
<!-- dont remember if you add / remove a category to update hierarchy.xml --> <!-- dont remember if you add / remove a category to update hierarchy.xml -->
<instance template="t_all_keys" id="keys_player" title="uiKeysPlayerTitle" />
<instance template="t_all_keys" id="keys_movement" title="uiKeysMovementTitle" /> <instance template="t_all_keys" id="keys_movement" title="uiKeysMovementTitle" />
<instance template="t_all_keys" id="keys_actions" title="uiKeysActionsTitle" />
<instance template="t_all_keys" id="keys_chat" title="uiKeysChatTitle" />
<instance template="t_all_keys" id="keys_view" title="uiKeysViewTitle" /> <instance template="t_all_keys" id="keys_view" title="uiKeysViewTitle" />
<instance template="t_all_keys" id="keys_windows" title="uiKeysWindowsTitle" /> <instance template="t_all_keys" id="keys_actionbar" title="uiKeysActionbarTitle" />
<instance template="t_all_keys" id="keys_system" title="uiKeysSystemTitle" /> <instance template="t_all_keys" id="keys_fight" title="uiKeysFightTitle" />
<instance template="t_all_keys" id="keys_chat" title="uiKeysChatTitle" />
<instance template="t_all_keys" id="keys_edit" title="uiKeysEditTitle" /> <instance template="t_all_keys" id="keys_edit" title="uiKeysEditTitle" />
<instance template="t_all_keys" id="keys_windows" title="uiKeysWindowsTitle" />
<instance template="t_all_keys" id="keys_miscellaneous" title="uiKeysMiscellaneousTitle" />
<instance template="t_all_keys" id="keys_debug" title="uiKeysDebugTitle" /> <instance template="t_all_keys" id="keys_debug" title="uiKeysDebugTitle" />
<instance template="t_all_keys" id="keys_r2ed" title="uiR2EDActionCategory" />
<!-- ************************************************************************************************************************************************ --> <!-- ************************************************************************************************************************************************ -->
<!-- ************************************************************************************************************************************************ --> <!-- ************************************************************************************************************************************************ -->
@ -648,6 +646,7 @@
</group> </group>
<tree node="keys" > <tree node="keys" >
<tree node="keys_camera"/>
<tree node="keys_player"/> <tree node="keys_player"/>
<tree node="keys_movement"/> <tree node="keys_movement"/>
<tree node="keys_actions"/> <tree node="keys_actions"/>

BIN
code/ryzom/client/macosx/khanat.icns Normal file
View file

Binary file not shown.

10
code/ryzom/client/src/CMakeLists.txt
View file

@ -51,11 +51,11 @@ IF(WITH_RYZOM_CLIENT)
# on Mac, create a .App Bundle # on Mac, create a .App Bundle
if(APPLE) if(APPLE)
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom") SET(MACOSX_BUNDLE_INFO_STRING "Khanat")
SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns") SET(MACOSX_BUNDLE_ICON_FILE "khanat.icns")
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom") SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.khaganat.khanat")
SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION}) SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION})
SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom") SET(MACOSX_BUNDLE_BUNDLE_NAME "Khanat")
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION}) SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION})
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0") SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
SET(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT}) SET(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT})
@ -72,7 +72,7 @@ IF(WITH_RYZOM_CLIENT)
SET_TARGET_PROPERTIES(ryzom_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist) SET_TARGET_PROPERTIES(ryzom_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist)
ADD_CUSTOM_COMMAND(TARGET ryzom_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR}) ADD_CUSTOM_COMMAND(TARGET ryzom_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR}) ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/ryzom.icns ${RYZOM_RESOURCES_DIR}) ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/khanat.icns ${RYZOM_RESOURCES_DIR})
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR}) ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR})
# remove any present installscript_osx.vdf before signing # remove any present installscript_osx.vdf before signing

2
code/ryzom/client/src/client.cpp
View file

@ -376,7 +376,7 @@ int main(int argc, char **argv)
// if client_default.cfg is not in current directory, use application default directory // if client_default.cfg is not in current directory, use application default directory
if (!CFile::isExists("client_default.cfg")) if (!CFile::isExists("client_default.cfg"))
{ {
std::string currentPath = CPath::getApplicationDirectory("Ryzom"); std::string currentPath = CPath::getApplicationDirectory("Khanat");
if (!CFile::isExists(currentPath)) CFile::createDirectory(currentPath); if (!CFile::isExists(currentPath)) CFile::createDirectory(currentPath);

453
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,10 +1323,22 @@ 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!!
} }
@ -1571,8 +1583,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
@ -1581,10 +1593,10 @@ NLMISC_COMMAND( displayDBModifs, "display server database modification in the ch
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
@ -1593,15 +1605,15 @@ NLMISC_COMMAND( hideDBModifs, "stop displaying server database modification in t
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>")
@ -1838,8 +1850,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;
@ -1870,7 +1882,7 @@ NLMISC_COMMAND(drop,"drop an item to the ground","<id>")
}* }*
return true; return true;
} }
*/ */
@ -1900,6 +1912,7 @@ 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)
{ {
@ -2530,26 +2543,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
{ {
@ -2603,7 +2616,7 @@ NLMISC_COMMAND(magic, "Cast a spell", "\n"
// 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"
@ -2996,39 +3009,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)
@ -3253,19 +3266,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)
@ -3325,7 +3338,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;
@ -3339,7 +3352,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;
} }
@ -3576,7 +3589,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;
@ -3603,7 +3616,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>]")
{ {
@ -3613,7 +3626,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;
@ -3645,11 +3658,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;
@ -3684,11 +3697,11 @@ NLMISC_COMMAND( createPerso, "create a new character", "Parameters:\n-Character
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;
@ -3712,7 +3725,7 @@ NLMISC_COMMAND( add_role, "add role to character", "<Role( MeleeFighter, RangeFi
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, "", "")
@ -3805,7 +3818,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);
} }
//----------------------------------------------- //-----------------------------------------------
@ -3813,7 +3826,7 @@ NLMISC_COMMAND(dist2front, "Change the distance to the front for a given sheet."
//----------------------------------------------- //-----------------------------------------------
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);
} }
//----------------------------------------------- //-----------------------------------------------
@ -3821,7 +3834,7 @@ NLMISC_COMMAND(dist2back, "Change the distance to the back for a given sheet.",
//----------------------------------------------- //-----------------------------------------------
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);
} }
@ -3829,79 +3842,79 @@ NLMISC_COMMAND(dist2side, "Change the distance to the side for a given sheet.",
// 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;
} }
@ -4530,14 +4543,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)
@ -4545,25 +4558,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]")
@ -4858,7 +4871,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() ||
@ -4868,7 +4881,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;
@ -5535,7 +5548,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;
@ -5576,7 +5589,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;
} }
@ -5752,8 +5765,74 @@ NLMISC_COMMAND(em, "emote command", "<emote phrase>")
return false; return false;
} }
NLMISC_COMMAND(emote, "emote command (1)", "<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(m, "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(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>")
{ {
@ -5798,3 +5877,9 @@ NLMISC_COMMAND(time, "Shows information about the current time", "")
CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND"); CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
return true; return true;
} }
NLMISC_COMMAND(easteregg_siela1915.khanat, "Miscellaneous", "")
{
CInterfaceManager::getInstance()->displaySystemInfo("Siela1915 blesses you...");
return true;
}

2
code/ryzom/tools/client/client_patcher/main.cpp
View file

@ -159,7 +159,7 @@ int main(int argc, char *argv[])
// if client.cfg is not in current directory, use client.cfg from user directory // if client.cfg is not in current directory, use client.cfg from user directory
if (!CFile::isExists(config)) if (!CFile::isExists(config))
config = CPath::getApplicationDirectory("Ryzom") + config; config = CPath::getApplicationDirectory("Khanat") + config;
// if client.cfg is not in current directory, use client_default.cfg // if client.cfg is not in current directory, use client_default.cfg
if (!CFile::isExists(config)) if (!CFile::isExists(config))