aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-20 16:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged with new things.

Browse source
This commit is contained in:
SIELA1915 2016-01-17 13:36:59 +01:00
commit b46f7cd0cd
21 changed files with 956 additions and 965 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.

BIN
code/ryzom/client/macosx/ryzom.icns
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);

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

@ -5752,7 +5752,74 @@ NLMISC_COMMAND(em, "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(emote, "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(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(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 +5865,11 @@ 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", "")
{
string stext = "Siela1915 blesses you...";
ucstring ucstext = ucstring(stext);
CInterfaceManager::getInstance()->displaySystemInfo(ucstext, "AROUND");
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}

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))