mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-17 13:01:42 +00:00
merged
This commit is contained in:
SIELA1915
commit
223139d53c
37 changed files with 1052 additions and 1063 deletions
|
|
@ -1,9 +1,9 @@
|
|||
//////////////////////////
|
||||
//////////////////////////
|
||||
/// CLIENT CONFIG FILE ///
|
||||
//////////////////////////
|
||||
//////////////////////////
|
||||
|
||||
//////////////////////////
|
||||
|
||||
// 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.
|
||||
|
|
@ -15,7 +15,7 @@ SaveConfig = 1;
|
|||
|
||||
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
|
||||
// "Auto" will choose the best suited driver depending on hardware
|
||||
FullScreen = 1;
|
||||
FullScreen = 0;
|
||||
Width = 0;
|
||||
Height = 0;
|
||||
PositionX = 0;
|
||||
|
|
@ -39,14 +39,22 @@ Gamma_max = 1.0;
|
|||
// NETWORK //
|
||||
/////////////
|
||||
|
||||
Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
|
||||
Application = { "Lirria", "./client_ryzom_r.exe", "./" };
|
||||
BackgroundDownloader = 0;
|
||||
PatchServer = "http://dl.ryzom.com/patch_live";
|
||||
StartupHost = "shard.ryzom.com:40916";
|
||||
PatchWanted = 1;
|
||||
PatchUrl = "http://lirria.khaganat.net:43435";
|
||||
RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php";
|
||||
StartupHost = "lirria.khaganat.net:40916";
|
||||
StartupPage = "/login/r2_login.php";
|
||||
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";
|
||||
|
||||
|
||||
////////////////
|
||||
|
|
@ -331,7 +339,8 @@ SoundGameMusicVolume_max = 1.0;
|
|||
SoundGameMusicVolume_step = 0.001;
|
||||
|
||||
// MISC
|
||||
PreDataPath = { "user", "patch", "data", "examples" };
|
||||
PreDataPath = { "user", "patch", "examples", "data/patch_lirria.bnp", "data/fonts", "data/gamedev.bnp" };
|
||||
DataPath = { "data" };
|
||||
NeedComputeVS = 0;
|
||||
|
||||
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
|
||||
|
|
@ -390,21 +399,21 @@ SystemInfoColors =
|
|||
};
|
||||
|
||||
PrintfCommands = {
|
||||
"52", "15", "55 55 0 255", "28", "uiChapterV", "624",
|
||||
"52", "15", "55 55 0 255", "28", "uiEon", "624",
|
||||
"428", "0 0 0 255", "18", "", "624", "378",
|
||||
"0 0 0 255", "14", "", "644", "278", "0 0 0 255",
|
||||
"18", "", "52", "17", "255 255 255 255", "28",
|
||||
"uiChapterV", "622", "430", "255 255 255 255", "18", "",
|
||||
"uiEon", "622", "430", "255 255 255 255", "18", "",
|
||||
"622", "380", "255 255 255 255", "14", "", "642",
|
||||
"280", "255 255 255 255", "18", ""
|
||||
};
|
||||
|
||||
PrintfCommandsFreeTrial = {
|
||||
"52", "15", "55 55 0 255", "28", "uiChapterV", "624",
|
||||
"52", "15", "55 55 0 255", "28", "uiEon", "624",
|
||||
"428", "0 0 0 255", "18", "", "624", "378",
|
||||
"0 0 0 255", "14", "", "644", "278", "0 0 0 255",
|
||||
"18", "", "52", "17", "255 255 255 255", "28",
|
||||
"uiChapterV", "622", "430", "255 255 255 255", "18", "",
|
||||
"uiEon", "622", "430", "255 255 255 255", "18", "",
|
||||
"622", "380", "255 255 255 255", "14", "", "642",
|
||||
"280", "255 255 255 255", "18", ""
|
||||
};
|
||||
|
|
@ -556,19 +565,19 @@ ScenarioLanguages = {"fr","de","en","other_lang"};
|
|||
// Map each language to a forum help page
|
||||
HelpPages =
|
||||
{
|
||||
"fr=http://forums.ryzom.com/forum/showthread.php?t=29130",
|
||||
"en=http://forums.ryzom.com/forum/showthread.php?t=29129",
|
||||
"wk=http://forums.ryzom.com/forum/showthread.php?t=29129",
|
||||
"de=http://forums.ryzom.com/forum/showthread.php?t=29131",
|
||||
"es=http://forums.ryzom.com/forum/showthread.php?t=29129",
|
||||
"ru=http://forums.ryzom.com/forum/showthread.php?t=29129"
|
||||
"fr=http://www.khaganat.net/forum/index.php/board,31.0.html",
|
||||
"en=http://www.khaganat.net/forum/index.php/board,31.0.html",
|
||||
"wk=http://www.khaganat.net/forum/index.php/board,31.0.html",
|
||||
"de=http://www.khaganat.net/forum/index.php/board,31.0.html",
|
||||
"es=http://www.khaganat.net/forum/index.php/board,31.0.html",
|
||||
"ru=http://www.khaganat.net/forum/index.php/board,31.0.html"
|
||||
};
|
||||
|
||||
WebIgMainDomain = "app.ryzom.com";
|
||||
WebIgMainDomain = "app.khaganat.net";
|
||||
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;
|
||||
|
||||
|
|
|
|||
|
|
@ -77,70 +77,51 @@
|
|||
</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 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="turn_left" hardtext="uiMoveTurnLeft" macroisable="false" />
|
||||
<action name="turn_right" hardtext="uiMoveTurnRight" macroisable="false" />
|
||||
<action name="strafe_left" hardtext="uiMoveStrafeLeft" macroisable="false" />
|
||||
<action name="forward" hardtext="uiMoveForward" macroisable="false" />
|
||||
<action name="strafe_right" hardtext="uiMoveStrafeRight" macroisable="false" />
|
||||
<action name="look_up" hardtext="uiMoveLookUp" macroisable="false" />
|
||||
<action name="look_down" hardtext="uiMoveLookDown" macroisable="false" />
|
||||
<action name="toggle_auto_walk" hardtext="uiMoveToggleAutoWalk" macroisable="false" />
|
||||
<action name="strafe_left" hardtext="uiMoveStrafeLeft" macroisable="false" />
|
||||
<action name="turn_right" hardtext="uiMoveTurnRight" 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_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="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 name="actions" hardtext="uiActions" contexts="game, r2ed_anim_test">
|
||||
<action name="command" hardtext="uiDebugCommand" macroisable="false" >
|
||||
<parameter hardtext="uiShortcutNumber">
|
||||
<value value="a execMemorizedPhrase 0 0" hardtext="uiKey0"/>
|
||||
<value value="a execMemorizedPhrase 1 0" hardtext="uiKey1"/>
|
||||
<value value="a execMemorizedPhrase 2 0" hardtext="uiKey2"/>
|
||||
<value value="a execMemorizedPhrase 3 0" hardtext="uiKey3"/>
|
||||
<value value="a execMemorizedPhrase 4 0" hardtext="uiKey4"/>
|
||||
<value value="a execMemorizedPhrase 5 0" hardtext="uiKey5"/>
|
||||
<value value="a execMemorizedPhrase 6 0" hardtext="uiKey6"/>
|
||||
<value value="a execMemorizedPhrase 7 0" hardtext="uiKey7"/>
|
||||
<value value="a execMemorizedPhrase 8 0" hardtext="uiKey8"/>
|
||||
<value value="a execMemorizedPhrase 9 0" hardtext="uiKey9"/>
|
||||
</parameter>
|
||||
</action>
|
||||
<action name="no_target" hardtext="uiNoTarget" />
|
||||
<action name="target" hardtext="uiTargetCmd" >
|
||||
<parameter hardtext="uiTargetCmdEntity" type="%action_param_user_name" name="entity"/>
|
||||
</action>
|
||||
<action name="target_teammate_shortcut" hardtext="uiTargetTeammateCmd" contexts="game">
|
||||
<parameter hardtext="uiTargetTeammateCmdI" type="%action_param_constant" name="indexInTeam" value="1">
|
||||
<value value="1" hardtext="uiKey1"/>
|
||||
<value value="2" hardtext="uiKey2"/>
|
||||
<value value="3" hardtext="uiKey3"/>
|
||||
<value value="4" hardtext="uiKey4"/>
|
||||
<value value="5" hardtext="uiKey5"/>
|
||||
<value value="6" hardtext="uiKey6"/>
|
||||
<value value="7" hardtext="uiKey7"/>
|
||||
<value value="8" hardtext="uiKey8"/>
|
||||
</parameter>
|
||||
</action>
|
||||
<action name="assist" hardtext="uiAssistCmd" contexts="game">
|
||||
<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"/>
|
||||
<action_category name="view" hardtext="uiView" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
<action name="camera_turn_center" hardtext="uiCameraTurnCenter" />
|
||||
<action name="rear_view" hardtext="uiRearView" keyup="1" macroisable="false" />
|
||||
<action name="toggle_camera" hardtext="uiToggleCamera"/>
|
||||
<action name="free_mouse" hardtext="uiFreeMouse" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm, r2ed_scenario_creation"/>
|
||||
<action name="camera_down" hardtext="uiCameraDown" />
|
||||
<action name="camera_up" hardtext="uiCameraUp" />
|
||||
<action name="camera_backward" hardtext="uiMoveBackward" />
|
||||
<action name="camera_foreward" hardtext="uiMoveForward" />
|
||||
<action name="inc_camera_height" hardtext="uiDebugIncCameraHeight" />
|
||||
<action name="dec_camera_height" hardtext="uiDebugDecCameraHeight" />
|
||||
<action name="camera_turn_right" hardtext="uiCameraTurnRight" macroisable="false" />
|
||||
<action name="camera_turn_left" hardtext="uiCameraTurnLeft" macroisable="false" />
|
||||
<action name="screen_shot_jpg" hardtext="uiScreenShotJPG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
|
||||
<action name="screen_shot_png" hardtext="uiScreenShotPNG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
|
||||
<action name="screen_shot" hardtext="uiScreenShot" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
|
||||
<action name="toggle_fly" hardtext="uiDebugToggleFly" />
|
||||
</action_category>
|
||||
|
||||
<action_category name="actionbar" hardtext="uiActionbar" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
<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="run_shortcut" hardtext="uiRunShortcut" contexts="game, r2ed_anim_test">
|
||||
|
|
@ -191,119 +172,65 @@
|
|||
<value value="39" hardtext="uiNumber20"/>
|
||||
</parameter>
|
||||
</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_category>
|
||||
|
||||
<action_category name="chat" hardtext="uiChat" contexts="game, r2ed, r2ed_anim_test"> <!-- not available in r2ed for now -->
|
||||
<action name="talk_untalk" hardtext="uiTalkLeave"/>
|
||||
<action name="reply_teller" hardtext="uiReplyTeller"/>
|
||||
<action name="reply_teller_once" hardtext="uiReplyTellerOnce"/>
|
||||
<action name="cycle_tell" hardtext="uiCycleTell"/>
|
||||
<action name="enter_tell" hardtext="uiEnterTellCmd">
|
||||
<parameter hardtext="uiTellCmdDest" type="%action_param_user_name" name="player"/>
|
||||
</action>
|
||||
<action name="tell" hardtext="uiTellCmd">
|
||||
<parameter hardtext="uiTellCmdDest" type="%action_param_user_name" name="player"/>
|
||||
<parameter hardtext="uiTellCmdMsg" type="%action_param_user" name="text"/>
|
||||
</action>
|
||||
<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"/>
|
||||
|
||||
<action_category name="fight" hardtext="uiFight" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
<action name="toggle_combat" hardtext="uiToggleCombat" contexts="game, r2ed_anim_test"/>
|
||||
<action name="target_teammate_shortcut" hardtext="uiTargetTeammateCmd" contexts="game">
|
||||
<parameter hardtext="uiTargetTeammateCmdI" type="%action_param_constant" name="indexInTeam" value="1">
|
||||
<value value="1" hardtext="uiKey1"/>
|
||||
<value value="2" hardtext="uiKey2"/>
|
||||
<value value="3" hardtext="uiKey3"/>
|
||||
<value value="4" hardtext="uiKey4"/>
|
||||
<value value="5" hardtext="uiKey5"/>
|
||||
<value value="6" hardtext="uiKey6"/>
|
||||
<value value="7" hardtext="uiKey7"/>
|
||||
<value value="8" hardtext="uiKey8"/>
|
||||
</parameter>
|
||||
</action>
|
||||
<action name="talk" hardtext="uiTalkCmd">
|
||||
<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 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"/>
|
||||
<action name="self_target" hardtext="uiSelfTarget" 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>
|
||||
</action>
|
||||
<action name="no_target" hardtext="uiNoTarget" />
|
||||
<action name="toggle_dodge_parry" hardtext="uiToggleDodgeParry"/>
|
||||
</action_category>
|
||||
|
||||
<action_category name="view" hardtext="uiView" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
<!-- <action name="toggle_names" hardtext="uiToggleNames" repeat="1" keyup="1" /> -->
|
||||
<action name="toggle_camera" hardtext="uiToggleCamera"/>
|
||||
<action name="rear_view" hardtext="uiRearView" keyup="1" macroisable="false" />
|
||||
<action name="toggle_chat" hardtext="uiDebugToggleChat" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
|
||||
<action name="camera_up" hardtext="uiCameraUp" />
|
||||
<action name="camera_down" hardtext="uiCameraDown" />
|
||||
<action name="camera_foreward" hardtext="uiMoveForward" />
|
||||
<action name="camera_backward" hardtext="uiMoveBackward" />
|
||||
<action_category name="chat" hardtext="uiChat" contexts="game, r2ed, r2ed_anim_test">
|
||||
<action name="cycle_tell" hardtext="uiCycleTell"/>
|
||||
<action name="talk_untalk" hardtext="uiTalkLeave"/>
|
||||
<action name="reply_teller" hardtext="uiReplyTeller"/>
|
||||
</action_category>
|
||||
|
||||
<action_category name="edit" hardtext="uiEdit" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
<action name="edit_goto_line_begin" hardtext="uiEditGotoLineBegin"/>
|
||||
<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 name="windows" hardtext="uiWindows" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
|
|
@ -354,12 +281,12 @@
|
|||
</action>
|
||||
<action name="dock_undock_chat" hardtext="uiDockUndockChat">
|
||||
<parameter hardtext="uiWindowName">
|
||||
<value value="SYSTEM_INFO" hardtext="uiSystemInfo" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" />
|
||||
<value value="AROUND_ME" hardtext="uiAroundMe" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" />
|
||||
<value value="TEAM_CHAT" hardtext="uiTeamChat" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" />
|
||||
<value value="GUILD_CHAT" hardtext="uiGuildChat" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" />
|
||||
<value value="REGION_CHAT" hardtext="uiREGION" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" />
|
||||
<value value="UNIVERSE_CHAT" hardtext="uiUNIVERSE" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm" />
|
||||
<value value="SYSTEM_INFO" hardtext="uiSystemInfo"/>
|
||||
<value value="AROUND_ME" hardtext="uiAroundMe"/>
|
||||
<value value="TEAM_CHAT" hardtext="uiTeamChat"/>
|
||||
<value value="GUILD_CHAT" hardtext="uiGuildChat"/>
|
||||
<value value="REGION_CHAT" hardtext="uiREGION"/>
|
||||
<value value="UNIVERSE_CHAT" hardtext="uiUNIVERSE"/>
|
||||
</parameter>
|
||||
</action>
|
||||
<action name="show_on_press" hardtext="uiShowOnPress" repeat="1" keyup="1" macroisable="false">
|
||||
|
|
@ -367,7 +294,6 @@
|
|||
<instance template="container_window_list"/>
|
||||
</parameter>
|
||||
</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">
|
||||
<parameter hardtext="uiDesktopNumber">
|
||||
<value value="0" hardtext="uiKey0"/>
|
||||
|
|
@ -386,49 +312,34 @@
|
|||
</action>
|
||||
</action_category>
|
||||
|
||||
<action_category name="system" hardtext="uiSystem" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
<action name="quit_game" hardtext="uiQuitGameWithoutWarning" contexts="game, r2ed_scenario_creation"/>
|
||||
<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_category name="miscellaneous" hardtext="uiMiscellaneous" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
|
||||
<action name="toggle_light" hardtext="uiLightOnOff"/>
|
||||
<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="screen_shot_jpg" hardtext="uiScreenShotJPG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
|
||||
<action name="screen_shot_png" hardtext="uiScreenShotPNG" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm"/>
|
||||
</action_category>
|
||||
|
||||
<action_category name="edit" hardtext="uiEdit" macroisable="false" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm, waiting_network, r2ed_scenario_creation">
|
||||
<action name="edit_previous_char" hardtext="uiEditPreviousChar" repeat="1"/>
|
||||
<action name="edit_select_previous_char" hardtext="uiEditSelectPreviousChar" repeat="1"/>
|
||||
<action name="edit_previous_word" hardtext="uiEditPreviousWord" repeat="1"/>
|
||||
<action name="edit_select_previous_word" hardtext="uiEditSelectPreviousWord" repeat="1"/>
|
||||
<action name="edit_next_char" hardtext="uiEditNextChar" repeat="1"/>
|
||||
<action name="edit_select_next_char" hardtext="uiEditSelectNextChar" repeat="1"/>
|
||||
<action name="edit_next_word" hardtext="uiEditNextWord" repeat="1"/>
|
||||
<action name="edit_select_next_word" hardtext="uiEditSelectNextWord" repeat="1"/>
|
||||
<action name="edit_goto_line_begin" hardtext="uiEditGotoLineBegin"/>
|
||||
<action name="edit_select_to_line_begin" hardtext="uiEditSelectToLineBegin"/>
|
||||
<action name="edit_goto_block_begin" hardtext="uiEditGotoBlockBegin"/>
|
||||
<action name="edit_select_to_block_begin" hardtext="uiEditSelectToBlockBegin"/>
|
||||
<action name="edit_goto_line_end" hardtext="uiEditGotoLineEnd"/>
|
||||
<action name="edit_select_to_line_end" hardtext="uiEditSelectToLineEnd"/>
|
||||
<action name="edit_goto_block_end" hardtext="uiEditGotoBlockEnd"/>
|
||||
<action name="edit_select_to_block_end" hardtext="uiEditSelectToBlockEnd"/>
|
||||
<action name="edit_previous_line" hardtext="uiEditPreviousLine" repeat="1"/>
|
||||
<action name="edit_next_line" hardtext="uiEditNextLine" repeat="1"/>
|
||||
<action name="edit_delete_char" hardtext="uiEditDeleteChar" 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_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 name="quit_ryzom" hardtext="uiQuitRyzomWithoutWarning" contexts="game, r2ed_scenario_creation"/>
|
||||
<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>
|
||||
</action>
|
||||
</action_category>
|
||||
|
||||
<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>
|
||||
|
||||
|
||||
|
||||
|
||||
</interface_config>
|
||||
|
|
|
|||
|
|
@ -110,15 +110,15 @@
|
|||
<tree node="connection"/>
|
||||
|
||||
<tree node="keys" >
|
||||
<tree node="keys_player"/>
|
||||
<tree node="keys_movement"/>
|
||||
<tree node="keys_actions"/>
|
||||
<tree node="keys_chat"/>
|
||||
<tree node="keys_view"/>
|
||||
<tree node="keys_windows"/>
|
||||
<tree node="keys_system"/>
|
||||
<tree node="keys_actionbar"/>
|
||||
<tree node="keys_fight"/>
|
||||
<tree node="keys_chat"/>
|
||||
<tree node="keys_edit"/>
|
||||
<tree node="keys_debug"/>
|
||||
<tree node="keys_windows"/>
|
||||
<tree node="keys_miscellaneous"/>
|
||||
<tree node="keys_debug"
|
||||
</tree>
|
||||
<!-- done with template teditcmd now <tree node="editkey" />-->
|
||||
|
||||
|
|
|
|||
|
|
@ -207,17 +207,15 @@
|
|||
|
||||
<!-- the id must be keys_### where ### is the name of the category -->
|
||||
<!-- 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_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_windows" title="uiKeysWindowsTitle" />
|
||||
<instance template="t_all_keys" id="keys_system" title="uiKeysSystemTitle" />
|
||||
<instance template="t_all_keys" id="keys_actionbar" title="uiKeysActionbarTitle" />
|
||||
<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_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_r2ed" title="uiR2EDActionCategory" />
|
||||
|
||||
|
||||
<!-- ************************************************************************************************************************************************ -->
|
||||
<!-- ************************************************************************************************************************************************ -->
|
||||
|
|
@ -648,6 +646,7 @@
|
|||
</group>
|
||||
|
||||
<tree node="keys" >
|
||||
<tree node="keys_camera"/>
|
||||
<tree node="keys_player"/>
|
||||
<tree node="keys_movement"/>
|
||||
<tree node="keys_actions"/>
|
||||
|
|
|
|||
BIN
code/ryzom/client/macosx/khanat.icns
Normal file
BIN
code/ryzom/client/macosx/khanat.icns
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -51,11 +51,11 @@ IF(WITH_RYZOM_CLIENT)
|
|||
|
||||
# on Mac, create a .App Bundle
|
||||
if(APPLE)
|
||||
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom")
|
||||
SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
|
||||
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
|
||||
SET(MACOSX_BUNDLE_INFO_STRING "Khanat")
|
||||
SET(MACOSX_BUNDLE_ICON_FILE "khanat.icns")
|
||||
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.khaganat.khanat")
|
||||
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_BUNDLE_VERSION "1.0")
|
||||
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)
|
||||
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}/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})
|
||||
|
||||
# remove any present installscript_osx.vdf before signing
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ int main(int argc, char **argv)
|
|||
// if client_default.cfg is not in current directory, use application default directory
|
||||
if (!CFile::isExists("client_default.cfg"))
|
||||
{
|
||||
std::string currentPath = CPath::getApplicationDirectory("Ryzom");
|
||||
std::string currentPath = CPath::getApplicationDirectory("Khanat");
|
||||
|
||||
// append config ID to directory
|
||||
if (Args.haveArg("c"))
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ END
|
|||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDI_MAIN_ICON ICON DISCARDABLE "ryzom.ico"
|
||||
IDI_MAIN_ICON ICON DISCARDABLE "khanat.ico"
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
@ -86,10 +86,10 @@ END
|
|||
|
||||
IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
|
||||
CAPTION "Ryzom information"
|
||||
CAPTION "Khanat information"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
LTEXT "Ryzom has detected that the last game session has not quit properly. You have experienced :",
|
||||
LTEXT "Khanat has detected that the last game session has not quit properly. You have experienced :",
|
||||
IDC_STATIC,7,7,172,27
|
||||
PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29
|
||||
PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29
|
||||
|
|
@ -182,14 +182,14 @@ BEGIN
|
|||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "FileDescription", "Ryzom client"
|
||||
VALUE "FileDescription", "Khanat client"
|
||||
VALUE "FileVersion", RYZOM_VERSION
|
||||
VALUE "LegalCopyright", COPYRIGHT
|
||||
#if defined(FINAL_VERSION) && (FINAL_VERSION == 1)
|
||||
#ifdef _DEBUG
|
||||
VALUE "OriginalFilename", "ryzom_client_d.exe"
|
||||
VALUE "OriginalFilename", "khanat_client_d.exe"
|
||||
#else
|
||||
VALUE "OriginalFilename", "ryzom_client_r.exe"
|
||||
VALUE "OriginalFilename", "khanat_client_r.exe"
|
||||
#endif
|
||||
#else
|
||||
#ifdef _DEBUG
|
||||
|
|
|
|||
|
|
@ -5752,7 +5752,74 @@ NLMISC_COMMAND(em, "emote command", "<emote phrase>")
|
|||
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>")
|
||||
|
|
@ -5798,3 +5865,11 @@ NLMISC_COMMAND(time, "Shows information about the current time", "")
|
|||
CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
|
||||
return true;
|
||||
}
|
||||
|
||||
NLMISC_COMMAND(easteregg_siela1915_khanat, "Miscellaneous", "")
|
||||
{
|
||||
string stext = "Siela1915 blesses you...";
|
||||
ucstring ucstext = ucstring(stext);
|
||||
CInterfaceManager::getInstance()->displaySystemInfo(ucstext, "AROUND");
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -874,12 +874,15 @@ class CAHGuildSheetOpen : public IActionHandler
|
|||
{
|
||||
CRyzomTime rt;
|
||||
rt.updateRyzomClock(rGuildMembers[i].EnterDate);
|
||||
ucstring str = toString("%04d", rt.getRyzomYear()) + " ";
|
||||
str += CI18N::get("uiJenaYear") + " : ";
|
||||
str += CI18N::get("uiAtysianCycle") + " ";
|
||||
str += toString("%01d", rt.getRyzomCycle()+1) +", ";
|
||||
str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)rt.getRyzomMonthInCurrentCycle() )) + ", ";
|
||||
str += toString("%02d", rt.getRyzomDayOfMonth()+1);
|
||||
ucstring str = toString("%03d", (sint)RT.getRyzomWeek()) + " ";
|
||||
str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + " - ";
|
||||
ucstring year = CI18N::get("uiYear");
|
||||
if (year.length() == 0) {
|
||||
str += toString("%04d", RT.getRyzomYear()) + " - ";
|
||||
} else {
|
||||
str += year + " - ";
|
||||
}
|
||||
str += CI18N::get("uiEon");
|
||||
pViewEnterDate->setText(str);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -221,12 +221,16 @@ static DECLARE_INTERFACE_USER_FCT(getDateText)
|
|||
CRyzomTime rt;
|
||||
|
||||
string strRes;
|
||||
strRes= NLMISC::toString(rt.getRyzomDayOfMonth()+1); // Start at 1
|
||||
strRes= NLMISC::toString((uint32)rt.getRyzomDayOfWeek()+1); // Start at 1
|
||||
strRes+= " / ";
|
||||
strRes+= NLMISC::toString(rt.getRyzomMonth()+1); // Start at 1 for january
|
||||
strRes+= NLMISC::toString(rt.getRyzomWeek()+1); // Start at 1 for january
|
||||
strRes+= " / ";
|
||||
strRes+= NLMISC::toString(rt.getRyzomYear());
|
||||
|
||||
ucstring year = CI18N::get("uiYear");
|
||||
if (year.length() == 0) {
|
||||
strRes += toString("%04d", RT.getRyzomYear());
|
||||
} else {
|
||||
strRes += year.toUtf8();
|
||||
}
|
||||
result.setString (strRes);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1477,12 +1477,23 @@ void CInterfaceManager::updateFrameEvents()
|
|||
|
||||
// literal version
|
||||
// str = CI18N::get("uiDate");
|
||||
str += toString("%02d", (sint)RT.getRyzomTime()) + CI18N::get("uiMissionTimerHour") + " - ";
|
||||
/* str += toString("%02d", (sint)RT.getRyzomTime()) + CI18N::get("uiMissionTimerHour") + " - ";
|
||||
str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + ", ";
|
||||
str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)RT.getRyzomMonthInCurrentCycle() )) + " ";
|
||||
str += toString("%02d", RT.getRyzomDayOfMonth()+1) + ", ";
|
||||
str += CI18N::get("uiAtysianCycle" + toString(RT.getRyzomCycle()+1) + "Ordinal") + " " + CI18N::get("uiAtysianCycle") + " ";
|
||||
str += toString("%04d", RT.getRyzomYear());
|
||||
str += toString("%04d", RT.getRyzomYear());*/
|
||||
|
||||
str += toString("%02d", (sint)RT.getRyzomTime()) + CI18N::get("uiMissionTimerHour") + " - ";
|
||||
str += toString("%d", (sint)RT.getRyzomWeek()) + " ";
|
||||
str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + " - ";
|
||||
ucstring year = CI18N::get("uiYear");
|
||||
if (year.length() == 0) {
|
||||
str += toString("%04d", RT.getRyzomYear()) + " - ";
|
||||
} else {
|
||||
str += year + " - ";
|
||||
}
|
||||
str += CI18N::get("uiEon");
|
||||
|
||||
pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:time"));
|
||||
if (pVT != NULL)
|
||||
|
|
|
|||
BIN
code/ryzom/client/src/khanat.ico
Normal file
BIN
code/ryzom/client/src/khanat.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 157 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 612 KiB |
|
|
@ -44,7 +44,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef RYZOM_CLIENT_ICON
|
||||
#define RYZOM_CLIENT_ICON "ryzom_client"
|
||||
#define RYZOM_CLIENT_ICON "khanat_client"
|
||||
#endif
|
||||
|
||||
std::string getUserAgent()
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@ IF(WITH_UNIX_STRUCTURE)
|
|||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop")
|
||||
|
||||
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop" DESTINATION share/applications)
|
||||
INSTALL(FILES ryzom_client.png DESTINATION share/pixmaps)
|
||||
INSTALL(FILES khanat_client.png DESTINATION share/pixmaps)
|
||||
INSTALL(FILES ryzom_client.xpm DESTINATION share/pixmaps)
|
||||
INSTALL(FILES ryzom_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES ryzom_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES ryzom_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES ryzom_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES ryzom_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES khanat_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES khanat_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES khanat_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES khanat_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES khanat_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES khanat_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
ELSE()
|
||||
# in case of local client, only copy 48x48 icon
|
||||
INSTALL(FILES ryzom_48x48.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
INSTALL(FILES khanat_48x48.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png)
|
||||
ENDIF()
|
||||
|
|
|
|||
BIN
code/ryzom/client/unix/khanat_128x128.png
Normal file
BIN
code/ryzom/client/unix/khanat_128x128.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
BIN
code/ryzom/client/unix/khanat_16x16.png
Normal file
BIN
code/ryzom/client/unix/khanat_16x16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
code/ryzom/client/unix/khanat_22x22.png
Normal file
BIN
code/ryzom/client/unix/khanat_22x22.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
code/ryzom/client/unix/khanat_24x24.png
Normal file
BIN
code/ryzom/client/unix/khanat_24x24.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
BIN
code/ryzom/client/unix/khanat_256x256.png
Normal file
BIN
code/ryzom/client/unix/khanat_256x256.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
BIN
code/ryzom/client/unix/khanat_32x32.png
Normal file
BIN
code/ryzom/client/unix/khanat_32x32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
BIN
code/ryzom/client/unix/khanat_48x48.png
Normal file
BIN
code/ryzom/client/unix/khanat_48x48.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
BIN
code/ryzom/client/unix/khanat_64x64.png
Normal file
BIN
code/ryzom/client/unix/khanat_64x64.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.3 KiB |
BIN
code/ryzom/client/unix/khanat_client.png
Normal file
BIN
code/ryzom/client/unix/khanat_client.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
BIN
code/ryzom/client/unix/khanat_logo_color.png
Normal file
BIN
code/ryzom/client/unix/khanat_logo_color.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 62 KiB |
|
|
@ -1,11 +1,11 @@
|
|||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Name=Ryzom
|
||||
Version=0.1
|
||||
Name=Khanat
|
||||
Name[ru]=Ризом
|
||||
Type=Application
|
||||
GenericName=Game client
|
||||
Comment=Ryzom client
|
||||
Comment[fr_FR]=Client Ryzom
|
||||
Comment=Khanat client
|
||||
Comment[fr_FR]=Client Khanat
|
||||
TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
|
||||
Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
|
||||
Icon=${RYZOM_CLIENT_ICON}
|
||||
|
|
|
|||
|
|
@ -59,12 +59,10 @@ namespace MONTH
|
|||
namespace WEEKDAY
|
||||
{
|
||||
NL_BEGIN_STRING_CONVERSION_TABLE (EWeekDay)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Prima)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Dua)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Tria)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Quarta)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Quinteth)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Holeth)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Pavdei)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Reldei)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Cibdei)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(Vondei)
|
||||
NL_STRING_CONVERSION_TABLE_ENTRY(UNKNOWN)
|
||||
NL_END_STRING_CONVERSION_TABLE(EWeekDay, ConversionType, UNKNOWN)
|
||||
|
||||
|
|
|
|||
|
|
@ -21,20 +21,18 @@
|
|||
|
||||
#include "nel/misc/types_nl.h"
|
||||
|
||||
const uint RYZOM_HOURS_IN_TICKS = 1800;
|
||||
const uint RYZOM_HOURS_IN_TICKS = 9000;
|
||||
const uint RYZOM_DAY_IN_HOUR = 24;
|
||||
const uint RYZOM_DAY_IN_TICKS = RYZOM_HOURS_IN_TICKS * RYZOM_DAY_IN_HOUR;
|
||||
const uint RYZOM_SEASON_IN_DAY = 90;
|
||||
const uint RYZOM_MONTH_IN_DAY = 30;
|
||||
const uint RYZOM_YEAR_IN_MONTH = 48;
|
||||
const uint RYZOM_WEEK_IN_DAY = 6;
|
||||
const uint RYZOM_YEAR_IN_DAY = RYZOM_MONTH_IN_DAY*RYZOM_YEAR_IN_MONTH;
|
||||
const uint RYZOM_CYCLE_IN_MONTH = 12;
|
||||
const uint RYZOM_YEAR_IN_WEEK = 120;
|
||||
const uint RYZOM_WEEK_IN_DAY = 4;
|
||||
const uint RYZOM_YEAR_IN_DAY = RYZOM_WEEK_IN_DAY*RYZOM_YEAR_IN_WEEK;
|
||||
|
||||
const uint RYZOM_START_YEAR = 2570-2;
|
||||
const uint RYZOM_START_SPRING = 61;
|
||||
const uint RYZOM_START_DAY = 1111111;
|
||||
const uint RYZOM_START_HOUR = 9;
|
||||
const uint RYZOM_START_YEAR = 0;
|
||||
const uint RYZOM_START_SPRING = 0;
|
||||
const uint RYZOM_START_DAY = 0;
|
||||
const uint RYZOM_START_HOUR = 0;
|
||||
|
||||
#include "../season.h"
|
||||
#include "static_light_cycle.h"
|
||||
|
|
@ -82,12 +80,10 @@ namespace WEEKDAY
|
|||
// Week day
|
||||
enum EWeekDay
|
||||
{
|
||||
Prima = 0,
|
||||
Dua,
|
||||
Tria,
|
||||
Quarta,
|
||||
Quinteth,
|
||||
Holeth,
|
||||
Pavdei = 0,
|
||||
Reldei,
|
||||
Cibdei,
|
||||
Vondei,
|
||||
|
||||
UNKNOWN,
|
||||
NUM_WEEKDAY = UNKNOWN
|
||||
|
|
@ -136,15 +132,14 @@ public:
|
|||
_RyzomDay = 0;
|
||||
_RyzomTime = 0;
|
||||
_TickOffset = 0;
|
||||
_RyzomTime = 0;
|
||||
}
|
||||
|
||||
// Update ryzom clock when tick occurs, local time must be given if localUpdateRyzomClock() and getLocalRyzomTime() is used
|
||||
void updateRyzomClock( uint32 gameCyle, double localTime = 0 )
|
||||
{
|
||||
float time = ( gameCyle + _TickOffset ) / float(RYZOM_HOURS_IN_TICKS);
|
||||
_RyzomDay = (uint32) ( time / 24.0f ) - RYZOM_START_SPRING;
|
||||
_RyzomTime = (float) fmod( time, 24.0f );
|
||||
_RyzomDay = (uint32) ( time / RYZOM_DAY_IN_HOUR ) - RYZOM_START_SPRING;
|
||||
_RyzomTime = (float) fmod( time, RYZOM_DAY_IN_HOUR );
|
||||
_LocalTime = localTime;
|
||||
}
|
||||
|
||||
|
|
@ -167,21 +162,9 @@ public:
|
|||
// get Season
|
||||
static inline ESeason getSeasonByDay(uint32 day) { return (ESeason) ( ( ( day % RYZOM_YEAR_IN_DAY ) / RYZOM_SEASON_IN_DAY ) % (EGSPD::CSeason::Invalid) ); }
|
||||
|
||||
// get ryzom month
|
||||
inline uint getRyzomMonth() const { return ( _RyzomDay % RYZOM_YEAR_IN_DAY ) / RYZOM_MONTH_IN_DAY ; }
|
||||
|
||||
// get ryzom month in cycle
|
||||
inline MONTH::EMonth getRyzomMonthInCurrentCycle() const { return (MONTH::EMonth) ( getRyzomMonth() % RYZOM_CYCLE_IN_MONTH ); }
|
||||
|
||||
// get ryzom cycle
|
||||
inline uint32 getRyzomCycle() const { return getRyzomMonth() / RYZOM_CYCLE_IN_MONTH; }
|
||||
|
||||
// get ryzom day of week
|
||||
inline WEEKDAY::EWeekDay getRyzomDayOfWeek() const { return (WEEKDAY::EWeekDay) ( _RyzomDay % RYZOM_WEEK_IN_DAY ); }
|
||||
|
||||
// get ryzom day of month
|
||||
inline uint32 getRyzomDayOfMonth() const { return ( _RyzomDay % RYZOM_MONTH_IN_DAY ); }
|
||||
|
||||
// get ryzom day of season
|
||||
inline uint32 getRyzomDayOfSeason() const { return ( _RyzomDay % RYZOM_SEASON_IN_DAY ); }
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@ bool CFaunaGenericPlace::getActive() const
|
|||
std::vector<std::string> dayIntervals;
|
||||
NLMISC::explode(_DayInterval, std::string(","), dayIntervals, true);
|
||||
std::string season = EGSPD::CSeason::toString(rt.getRyzomSeason());
|
||||
std::string month = MONTH::toString((MONTH::EMonth) rt.getRyzomMonth());
|
||||
std::string weekday = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDay());
|
||||
bool found = false;
|
||||
for (uint k = 0; k < dayIntervals.size(); ++k)
|
||||
|
|
@ -147,15 +146,6 @@ bool CFaunaGenericPlace::getActive() const
|
|||
{
|
||||
goodToken = true;
|
||||
}
|
||||
if (NLMISC::nlstricmp(dayIntervals[k], month) == 0)
|
||||
{
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
if (MONTH::toMonth(dayIntervals[k]) != MONTH::UNKNOWN)
|
||||
{
|
||||
goodToken = true;
|
||||
}
|
||||
if (NLMISC::nlstricmp(dayIntervals[k], weekday) == 0)
|
||||
{
|
||||
found = true;
|
||||
|
|
|
|||
|
|
@ -3063,17 +3063,21 @@ static void displayTime(const CRyzomTime &rt, NLMISC::CLog &log)
|
|||
std::string result;
|
||||
result = NLMISC::toString("hh:mm = %d:%d; ", (int) floorf(rt.getRyzomTime()) , (int) floorf(60.f * fmodf(rt.getRyzomTime(), 1.f)));
|
||||
log.displayNL(result.c_str());
|
||||
uint32 month = rt.getRyzomMonth();
|
||||
MONTH::EMonth monthInCycle = rt.getRyzomMonthInCurrentCycle();
|
||||
std::string monthName = MONTH::toString((MONTH::EMonth) monthInCycle);
|
||||
uint32 dayOfMonth = rt.getRyzomDayOfMonth();
|
||||
std::string dayName = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek());
|
||||
result = NLMISC::toString("mm:dd:yy = %d:%d:%d (%s:%s)",
|
||||
(int) (month + 1),
|
||||
(int) (dayOfMonth + 1),
|
||||
(int) rt.getRyzomYear(),
|
||||
monthName.c_str(),
|
||||
dayName.c_str());
|
||||
std::string week = toString("%03d", rt.getRyzomWeek());
|
||||
std::string dayName = CI18N::get("ui"+WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek())).toUtf8();
|
||||
std::string year;
|
||||
std::string eon = CI18N::get("uiEon").toUtf8();
|
||||
ucstring yearBool = CI18N::get("uiYear");
|
||||
if (yearBool.length() == 0) {
|
||||
year = toString("%04d", rt.getRyzomYear());
|
||||
} else {
|
||||
year = yearBool.toUtf8();
|
||||
}
|
||||
result = NLMISC::toString("week:day:year:eon = %s:%s:%s:%s",
|
||||
week,
|
||||
dayName,
|
||||
year,
|
||||
eon);
|
||||
log.displayNL(result.c_str());
|
||||
log.displayNL("day of year = %d/%d", (int) (rt.getRyzomDayOfYear() + 1), (int) RYZOM_YEAR_IN_DAY);
|
||||
log.displayNL("season = %d/4 (%s)", (int) rt.getRyzomSeason() + 1, EGSPD::CSeason::toString(rt.getRyzomSeason()).c_str());
|
||||
|
|
|
|||
|
|
@ -830,11 +830,11 @@ public:
|
|||
break;
|
||||
case tm_monthday:
|
||||
{
|
||||
uint32 dom = CTimeInterface::getRyzomTime().getRyzomDayOfMonth();
|
||||
/*uint32 dom = CTimeInterface::getRyzomTime().getRyzomDayOfMonth();
|
||||
while (dom < _DayNumber)
|
||||
dom += RYZOM_MONTH_IN_DAY;
|
||||
|
||||
_Min = _Max = timeTicks + dom * RYZOM_DAY_IN_TICKS;
|
||||
_Min = _Max = timeTicks + dom * RYZOM_DAY_IN_TICKS;*/
|
||||
}
|
||||
break;
|
||||
case tm_seasonday:
|
||||
|
|
|
|||
|
|
@ -3364,17 +3364,21 @@ void getRyzomDateStr__s(CStateInstance* entity, CScriptStack& stack)
|
|||
const CRyzomTime &rt = CTimeInterface::getRyzomTime();
|
||||
result = NLMISC::toString("%d:%d:00", (int) floorf(rt.getRyzomTime()) , (int) floorf(60.f * fmodf(rt.getRyzomTime(), 1.f)));
|
||||
|
||||
uint32 month = rt.getRyzomMonth();
|
||||
MONTH::EMonth monthInCycle = rt.getRyzomMonthInCurrentCycle();
|
||||
std::string monthName = MONTH::toString((MONTH::EMonth) monthInCycle);
|
||||
uint32 dayOfMonth = rt.getRyzomDayOfMonth();
|
||||
std::string dayName = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek());
|
||||
result += NLMISC::toString(" / %s %d %s(%d) %d",
|
||||
dayName.c_str(),
|
||||
(int) (dayOfMonth + 1),
|
||||
monthName.c_str(),
|
||||
(int) (month + 1),
|
||||
(int) rt.getRyzomYear());
|
||||
std::string week = toString("%03d", rt.getRyzomWeek());
|
||||
std::string dayName = CI18N::get("ui"+WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek())).toUtf8();
|
||||
std::string year;
|
||||
std::string eon = CI18N::get("uiEon").toUtf8();
|
||||
ucstring yearBool = CI18N::get("uiYear");
|
||||
if (yearBool.length() == 0) {
|
||||
year = toString("%04d", rt.getRyzomYear());
|
||||
} else {
|
||||
year = yearBool.toUtf8();
|
||||
}
|
||||
result += NLMISC::toString(" / %s %s - %s - %s",
|
||||
week,
|
||||
dayName,
|
||||
year,
|
||||
eon);
|
||||
|
||||
stack.push( result );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 (!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 (!CFile::isExists(config))
|
||||
|
|
|
|||
Loading…
Reference in a new issue