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

branch merge lirria

Browse source
This commit is contained in:
SIELA1915 2016-02-01 16:10:11 +01:00
commit 98c2b9c67d
51 changed files with 1170 additions and 1349 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.hgignore
View file

@ -158,6 +158,10 @@ code/snowballs/build/*
code/ryzom/build/* code/ryzom/build/*
code/build/* code/build/*
code/build-2010/* code/build-2010/*
code/build_linux/*
code/build_windows/*
code/build_debian32/*
code/build_debian64/*
build/* build/*
install/* install/*
build_vc* build_vc*

1
OLD_TO_DELETE.txt Normal file
View file

@ -0,0 +1 @@

667
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;
@ -23,30 +23,38 @@ PositionY = 0;
Frequency = 0; Frequency = 0;
Depth = 32; Depth = 32;
Sleep = -1; Sleep = -1;
ProcessPriority = 0; // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time ProcessPriority = 0; // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
Contrast = 0.0; // -1.0 ~ 1.0 Contrast = 0.0; // -1.0 ~ 1.0
Luminosity = 0.0; // -1.0 ~ 1.0 Luminosity = 0.0; // -1.0 ~ 1.0
Gamma = 0.0; // -1.0 ~ 1.0 Gamma = 0.0; // -1.0 ~ 1.0
Contrast_min = -1.0; Contrast_min = -1.0;
Luminosity_min = -1.0; Luminosity_min = -1.0;
Gamma_min = -1.0; Gamma_min = -1.0;
Contrast_max = 1.0; Contrast_max = 1.0;
Luminosity_max = 1.0; Luminosity_max = 1.0;
Gamma_max = 1.0; 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 = "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";
//////////////// ////////////////
@ -54,28 +62,28 @@ LoginSupportURL = "http://app.ryzom.com/app_forum/index.php?page=topic/view/2
//////////////// ////////////////
// the language to use as in ISO 639-2 // the language to use as in ISO 639-2
LanguageCode = "en"; // english LanguageCode = "en"; // english
XMLInputFile = "input_config_v3.xml"; XMLInputFile = "input_config_v3.xml";
XMLLoginInterfaceFiles = { XMLLoginInterfaceFiles = {
"login_config.xml", "login_config.xml",
"login_widgets.xml", "login_widgets.xml",
"login_main.xml", "login_main.xml",
"login_keys.xml", "login_keys.xml",
}; };
XMLOutGameInterfaceFiles = { XMLOutGameInterfaceFiles = {
"out_v2_config.xml", "out_v2_config.xml",
"out_v2_widgets.xml", "out_v2_widgets.xml",
"out_v2_connect.xml", "out_v2_connect.xml",
"out_v2_intro.xml", "out_v2_intro.xml",
"out_v2_select.xml", "out_v2_select.xml",
"out_v2_appear.xml", "out_v2_appear.xml",
"out_v2_location.xml", "out_v2_location.xml",
"out_v2_crash.xml", "out_v2_crash.xml",
"out_v2_hierarchy.xml", "out_v2_hierarchy.xml",
"out_v2_keys.xml", "out_v2_keys.xml",
}; };
// The ligo primitive class file // The ligo primitive class file
@ -86,28 +94,28 @@ VerboseLog = 1;
/////////// ///////////
// MOUSE // // MOUSE //
/////////// ///////////
HardwareCursor = 1; HardwareCursor = 1;
CursorSpeed = 1.0; // In pixels per mickey CursorSpeed = 1.0; // In pixels per mickey
CursorSpeed_min = 0.5; CursorSpeed_min = 0.5;
CursorSpeed_max = 2.0; CursorSpeed_max = 2.0;
CursorAcceleration = 40; // Threshold in mickey CursorAcceleration = 40; // Threshold in mickey
CursorAcceleration_min = 20; CursorAcceleration_min = 20;
CursorAcceleration_max = 80; CursorAcceleration_max = 80;
FreeLookSpeed = 0.004; // In radian per mickey FreeLookSpeed = 0.004; // In radian per mickey
FreeLookSpeed_min = 0.0001; FreeLookSpeed_min = 0.0001;
FreeLookSpeed_max = 0.01; FreeLookSpeed_max = 0.01;
FreeLookAcceleration = 40; // Threshold in mickey FreeLookAcceleration = 40; // Threshold in mickey
FreeLookAcceleration_min = 20; FreeLookAcceleration_min = 20;
FreeLookAcceleration_max = 80; FreeLookAcceleration_max = 80;
FreeLookInverted = 0; FreeLookInverted = 0;
AutomaticCamera = 0; AutomaticCamera = 0;
DblClickMode = 1; DblClickMode = 1;
AutoEquipTool = 1; AutoEquipTool = 1;
/////////////////// ///////////////////
// RENDER CONFIG // // RENDER CONFIG //
@ -139,172 +147,172 @@ LandscapeThreshold_ps1 = 500.0;
LandscapeThreshold_ps2 = 1000.0; LandscapeThreshold_ps2 = 1000.0;
LandscapeThreshold_ps3 = 2000.0; LandscapeThreshold_ps3 = 2000.0;
Vision = 500.000000; Vision = 500.000000;
Vision_min = 200.000000; Vision_min = 200.000000;
Vision_max = 800.000000; Vision_max = 800.000000;
Vision_step = 100.000000; Vision_step = 100.000000;
Vision_ps0 = 200.0; Vision_ps0 = 200.0;
Vision_ps1 = 400.0; Vision_ps1 = 400.0;
Vision_ps2 = 500.0; Vision_ps2 = 500.0;
Vision_ps3 = 800.0; Vision_ps3 = 800.0;
MicroVeget = 1; // Enable/Disable MicroVeget. MicroVeget = 1; // Enable/Disable MicroVeget.
MicroVeget_ps0 = 0; MicroVeget_ps0 = 0;
MicroVeget_ps1 = 1; MicroVeget_ps1 = 1;
MicroVeget_ps2 = 1; MicroVeget_ps2 = 1;
MicroVeget_ps3 = 1; MicroVeget_ps3 = 1;
MicroVegetDensity = 80.0; MicroVegetDensity = 80.0;
MicroVegetDensity_min = 10.0; MicroVegetDensity_min = 10.0;
MicroVegetDensity_max = 100.0; MicroVegetDensity_max = 100.0;
MicroVegetDensity_step = 10.0; MicroVegetDensity_step = 10.0;
MicroVegetDensity_ps0 = 10.0; // not used since disabled! MicroVegetDensity_ps0 = 10.0; // not used since disabled!
MicroVegetDensity_ps1 = 30.0; MicroVegetDensity_ps1 = 30.0;
MicroVegetDensity_ps2 = 80.0; MicroVegetDensity_ps2 = 80.0;
MicroVegetDensity_ps3 = 100.0; MicroVegetDensity_ps3 = 100.0;
// *** FX // *** FX
FxNbMaxPoly = 20000; FxNbMaxPoly = 20000;
FxNbMaxPoly_min = 2000; FxNbMaxPoly_min = 2000;
FxNbMaxPoly_max = 50000; FxNbMaxPoly_max = 50000;
FxNbMaxPoly_step= 2000; FxNbMaxPoly_step= 2000;
FxNbMaxPoly_ps0 = 2000; FxNbMaxPoly_ps0 = 2000;
FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps1 = 10000;
FxNbMaxPoly_ps2 = 20000; FxNbMaxPoly_ps2 = 20000;
FxNbMaxPoly_ps3 = 50000; FxNbMaxPoly_ps3 = 50000;
Cloud = 1; Cloud = 1;
Cloud_ps0 = 0 ; Cloud_ps0 = 0 ;
Cloud_ps1 = 1 ; Cloud_ps1 = 1 ;
Cloud_ps2 = 1 ; Cloud_ps2 = 1 ;
Cloud_ps3 = 1 ; Cloud_ps3 = 1 ;
CloudQuality = 160.0; CloudQuality = 160.0;
CloudQuality_min = 80.0; CloudQuality_min = 80.0;
CloudQuality_max = 320.0; CloudQuality_max = 320.0;
CloudQuality_step = 20.0; CloudQuality_step = 20.0;
CloudQuality_ps0 = 80.0; // not used since disabled! CloudQuality_ps0 = 80.0; // not used since disabled!
CloudQuality_ps1 = 80.0; CloudQuality_ps1 = 80.0;
CloudQuality_ps2 = 160.0; CloudQuality_ps2 = 160.0;
CloudQuality_ps3 = 320.0; CloudQuality_ps3 = 320.0;
CloudUpdate = 1; CloudUpdate = 1;
CloudUpdate_min = 1; CloudUpdate_min = 1;
CloudUpdate_max = 8; CloudUpdate_max = 8;
CloudUpdate_step= 1; CloudUpdate_step= 1;
CloudUpdate_ps0 = 1; // not used since disabled! CloudUpdate_ps0 = 1; // not used since disabled!
CloudUpdate_ps1 = 1; CloudUpdate_ps1 = 1;
CloudUpdate_ps2 = 1; CloudUpdate_ps2 = 1;
CloudUpdate_ps3 = 3; CloudUpdate_ps3 = 3;
Shadows = 1; Shadows = 1;
Shadows_ps0 = 0; Shadows_ps0 = 0;
Shadows_ps1 = 1; Shadows_ps1 = 1;
Shadows_ps2 = 1; Shadows_ps2 = 1;
Shadows_ps3 = 1; Shadows_ps3 = 1;
FXAA = 1; FXAA = 1;
FXAA_ps0 = 0; FXAA_ps0 = 0;
FXAA_ps1 = 1; FXAA_ps1 = 1;
FXAA_ps2 = 1; FXAA_ps2 = 1;
FXAA_ps3 = 1; FXAA_ps3 = 1;
AnisotropicFilter = 0; AnisotropicFilter = 0;
Bloom = 1; Bloom = 1;
Bloom_ps0 = 0; Bloom_ps0 = 0;
Bloom_ps1 = 1; Bloom_ps1 = 1;
Bloom_ps2 = 1; Bloom_ps2 = 1;
Bloom_ps3 = 1; Bloom_ps3 = 1;
SquareBloom = 1; SquareBloom = 1;
SquareBloom_ps0 = 0; SquareBloom_ps0 = 0;
SquareBloom_ps1 = 1; SquareBloom_ps1 = 1;
SquareBloom_ps2 = 1; SquareBloom_ps2 = 1;
SquareBloom_ps3 = 1; SquareBloom_ps3 = 1;
DensityBloom = 255.0; DensityBloom = 255.0;
DensityBloom_min = 0.0; DensityBloom_min = 0.0;
DensityBloom_max = 255.0; DensityBloom_max = 255.0;
DensityBloom_step = 1.0; DensityBloom_step = 1.0;
DensityBloom_ps0 = 255.0; DensityBloom_ps0 = 255.0;
DensityBloom_ps1 = 255.0; DensityBloom_ps1 = 255.0;
DensityBloom_ps2 = 255.0; DensityBloom_ps2 = 255.0;
DensityBloom_ps3 = 255.0; DensityBloom_ps3 = 255.0;
// *** CHARACTERS // *** CHARACTERS
SkinNbMaxPoly = 100000; SkinNbMaxPoly = 100000;
SkinNbMaxPoly_min = 5000; SkinNbMaxPoly_min = 5000;
SkinNbMaxPoly_max = 250000; SkinNbMaxPoly_max = 250000;
SkinNbMaxPoly_step = 5000; SkinNbMaxPoly_step = 5000;
SkinNbMaxPoly_ps0 = 10000; SkinNbMaxPoly_ps0 = 10000;
SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps1 = 70000;
SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps2 = 100000;
SkinNbMaxPoly_ps3 = 200000; SkinNbMaxPoly_ps3 = 200000;
NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod = 125;
NbMaxSkeletonNotCLod_min = 5; NbMaxSkeletonNotCLod_min = 5;
NbMaxSkeletonNotCLod_max = 255; NbMaxSkeletonNotCLod_max = 255;
NbMaxSkeletonNotCLod_step = 5; NbMaxSkeletonNotCLod_step = 5;
NbMaxSkeletonNotCLod_ps0 = 10; NbMaxSkeletonNotCLod_ps0 = 10;
NbMaxSkeletonNotCLod_ps1 = 50; NbMaxSkeletonNotCLod_ps1 = 50;
NbMaxSkeletonNotCLod_ps2 = 125; NbMaxSkeletonNotCLod_ps2 = 125;
NbMaxSkeletonNotCLod_ps3 = 255; NbMaxSkeletonNotCLod_ps3 = 255;
CharacterFarClip = 200.0; CharacterFarClip = 200.0;
CharacterFarClip_min = 50.0; CharacterFarClip_min = 50.0;
CharacterFarClip_max = 500.0; CharacterFarClip_max = 500.0;
CharacterFarClip_step = 10.0; CharacterFarClip_step = 10.0;
CharacterFarClip_ps0 = 50.0; CharacterFarClip_ps0 = 50.0;
CharacterFarClip_ps1 = 100.0; CharacterFarClip_ps1 = 100.0;
CharacterFarClip_ps2 = 200.0; CharacterFarClip_ps2 = 200.0;
CharacterFarClip_ps3 = 500.0; CharacterFarClip_ps3 = 500.0;
EnableRacialAnimation = 1; EnableRacialAnimation = 1;
// *** MISC // *** MISC
// This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance // This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance
ScreenAspectRatio = 0.0; ScreenAspectRatio = 0.0;
ForceDXTC = 1; // Enable/Disable DXTC. ForceDXTC = 1; // Enable/Disable DXTC.
DivideTextureSizeBy2= 0; // Divide texture size DivideTextureSizeBy2= 0; // Divide texture size
DisableVtxProgram = 0; // Disable Hardware Vertex Program. DisableVtxProgram = 0; // Disable Hardware Vertex Program.
DisableVtxAGP = 0; // Disable Hardware Vertex AGP. DisableVtxAGP = 0; // Disable Hardware Vertex AGP.
DisableTextureShdr = 0; // Disable Hardware Texture Shader. DisableTextureShdr = 0; // Disable Hardware Texture Shader.
HDEntityTexture = 1; HDEntityTexture = 1;
HDTextureInstalled = 1; HDTextureInstalled = 1;
WaitVBL = 0; // 0 or 1 to wait Vertical Sync. WaitVBL = 0; // 0 or 1 to wait Vertical Sync.
////////////////// //////////////////
// GAME OPTIONS // // GAME OPTIONS //
////////////////// //////////////////
SelectWithRClick = 1; SelectWithRClick = 1;
DisplayWeapons = 1; DisplayWeapons = 1;
RotKeySpeedMax = 2.0; RotKeySpeedMax = 2.0;
RotKeySpeedMax_min = 1.0; RotKeySpeedMax_min = 1.0;
RotKeySpeedMax_max = 4.0; RotKeySpeedMax_max = 4.0;
RotKeySpeedMin = 1.0; RotKeySpeedMin = 1.0;
RotKeySpeedMin_min = 0.5; RotKeySpeedMin_min = 0.5;
RotKeySpeedMin_max = 2.0; RotKeySpeedMin_max = 2.0;
RotAccel = 3.0; RotAccel = 3.0;
FollowOnAtk = 0; FollowOnAtk = 0;
AtkOnSelect = 0; AtkOnSelect = 0;
ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; ZCPacsPrim = "gen_bt_col_ext.pacs_prim";
///////////////// /////////////////
// PREFERENCES // // PREFERENCES //
///////////////// /////////////////
FPV = 0; // FPV(First Person View) : default is false (Third Person View). FPV = 0; // FPV(First Person View) : default is false (Third Person View).
CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View).
CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View).
CameraDistStep = 1.0; CameraDistStep = 1.0;
CameraDistMin = 1.0; CameraDistMin = 1.0;
CameraDistMax = 25.0; CameraDistMax = 25.0;
CameraAccel = 5.0; CameraAccel = 5.0;
CameraSpeedMin = 2.0; CameraSpeedMin = 2.0;
CameraSpeedMax = 100.0; CameraSpeedMax = 100.0;
CameraResetSpeed = 10.0; // Speed in radian/s CameraResetSpeed = 10.0; // Speed in radian/s
////////////////// //////////////////
// SOUND CONFIG // // SOUND CONFIG //
@ -331,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" };
@ -339,15 +348,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" };
NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" };
// Big screen shot // Big screen shot
ScreenShotWidth = 0; ScreenShotWidth = 0;
ScreenShotHeight = 0; ScreenShotHeight = 0;
ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots)
// Read : "ID", "R G B A MODE [FX]" // Read : "ID", "R G B A MODE [FX]"
SystemInfoColors = SystemInfoColors =
{ {
// OLD STUFF Here for compatibility // OLD STUFF Here for compatibility
"RG", "0 0 0 255 normal", // Black to see when there is an error "RG", "0 0 0 255 normal", // Black to see when there is an error
"BC", "0 0 0 255 normal", // Black to see when there is an error "BC", "0 0 0 255 normal", // Black to see when there is an error
"JA", "0 0 0 255 normal", // Black to see when there is an error "JA", "0 0 0 255 normal", // Black to see when there is an error
"BL", "0 0 0 255 normal", // Black to see when there is an error "BL", "0 0 0 255 normal", // Black to see when there is an error
@ -355,58 +364,58 @@ SystemInfoColors =
"VI", "0 0 0 255 normal", // Black to see when there is an error "VI", "0 0 0 255 normal", // Black to see when there is an error
// NEW System Info Categories // NEW System Info Categories
"SYS", "255 255 255 255 normal", // Default system messages "SYS", "255 255 255 255 normal", // Default system messages
"BC", "255 255 255 255 centeraround", // Broadcast messages "BC", "255 255 255 255 centeraround", // Broadcast messages
"TAGBC", "255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged "TAGBC", "255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
"XP", "255 255 64 255 over", // XP Gain "XP", "255 255 64 255 over", // XP Gain
"SP", "255 255 64 255 over", // SP Gain "SP", "255 255 64 255 over", // SP Gain
"TTL", "255 255 64 255 over", // Title "TTL", "255 255 64 255 over", // Title
"TSK", "255 255 255 255 over", // Task "TSK", "255 255 255 255 over", // Task
"ZON", "255 255 255 255 center", // Zone "ZON", "255 255 255 255 center", // Zone
"DG", "255 0 0 255 normal", // Damage to me "DG", "255 0 0 255 normal", // Damage to me
"DMG", "255 0 0 255 normal", // Damage to me "DMG", "255 0 0 255 normal", // Damage to me
"DGP", "200 0 0 255 normal", // Damage to me from player "DGP", "200 0 0 255 normal", // Damage to me from player
"DGM", "255 128 64 255 normal", // Damage from me "DGM", "255 128 64 255 normal", // Damage from me
"MIS", "150 150 150 255 normal", // The opponent misses "MIS", "150 150 150 255 normal", // The opponent misses
"MISM", "255 255 255 255 normal", // I miss "MISM", "255 255 255 255 normal", // I miss
"ITM", "0 200 0 255 over", // Item "ITM", "0 200 0 255 over", // Item
"ITMO", "170 170 255 255 overonly", // Item other in group "ITMO", "170 170 255 255 overonly", // Item other in group
"ITMF", "220 0 220 255 over", // Item failed "ITMF", "220 0 220 255 over", // Item failed
"SPL", "50 50 250 255 normal", // Spell to me "SPL", "50 50 250 255 normal", // Spell to me
"SPLM", "50 150 250 255 normal", // Spell from me "SPLM", "50 150 250 255 normal", // Spell from me
"EMT", "255 150 150 255 normal", // Emote "EMT", "255 150 150 255 normal", // Emote
"MTD", "255 255 0 255 over", // Message Of The Day "MTD", "255 255 0 255 over", // Message Of The Day
"FORLD","64 255 64 255 overonly", // Forage Locate Deposit "FORLD","64 255 64 255 overonly", // Forage Locate Deposit
"CHK", "255 120 60 255 center", // Tous ce qui ne remplit pas une condition "CHK", "255 120 60 255 center", // Tous ce qui ne remplit pas une condition
"CHKCB","255 255 0 255 center", // Tous ce qui ne remplit pas une condition en combat (trop loin, cible invalide, pas assez de mana, etc.) "CHKCB","255 255 0 255 center", // Tous ce qui ne remplit pas une condition en combat (trop loin, cible invalide, pas assez de mana, etc.)
"PVPTM","255 120 60 255 overonly", // PVP timer "PVPTM","255 120 60 255 overonly", // PVP timer
"THM", "255 255 64 255 over misc_levelup.ps", // Thema finished "THM", "255 255 64 255 over misc_levelup.ps", // Thema finished
"AMB", "255 255 64 255 center", // Ambiance "AMB", "255 255 64 255 center", // Ambiance
"ISE", "192 208 255 255 normal", // Item special effect "ISE", "192 208 255 255 normal", // Item special effect
"ISE2", "192 208 255 255 center", // Item special effect with center text (for effects without flying text) "ISE2", "192 208 255 255 center", // Item special effect with center text (for effects without flying text)
"OSM", "128 160 255 255 center", // Outpost state message "OSM", "128 160 255 255 center", // Outpost state message
"AROUND","255 255 0 255 around", // Only in around channel "AROUND","255 255 0 255 around", // Only in around channel
"R2_INVITE","0 255 0 255 around", // Ring invitation "R2_INVITE","0 255 0 255 around", // Ring invitation
}; };
PrintfCommands = { 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", "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", "", "uiEon", "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", "uiEon", "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", "", "uiEon", "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", ""
}; };
DisplayMissingAnimFile = 0; DisplayMissingAnimFile = 0;
@ -416,72 +425,72 @@ LoadingStringCount = 54;
// Some R2 parameters ... // Some R2 parameters ...
R2Mode = 1; R2Mode = 1;
R2EDEnabled = 1; R2EDEnabled = 1;
R2EDExtendedDebug = 0; R2EDExtendedDebug = 0;
R2EDLightPalette = 0; R2EDLightPalette = 0;
R2ClientGw = "r2linux01"; R2ClientGw = "r2linux01";
LoadLuaDebugger = 0; LoadLuaDebugger = 0;
CheckR2ScenarioMD5 = 1; CheckR2ScenarioMD5 = 1;
LevelDesignEnabled = 0; LevelDesignEnabled = 0;
DmCameraDistMax = 25; DmCameraDistMax = 25;
DmRun = 20; DmRun = 20;
DmWalk = 6; DmWalk = 6;
R2EDReloadFiles = { R2EDReloadFiles = {
"r2ed.xml", "r2ed.xml",
"r2_basic_bricks.lua", "r2_basic_bricks.lua",
"r2_components.lua", "r2_components.lua",
"r2_core.lua", "r2_core.lua",
"r2_features_default.lua", "r2_features_default.lua",
"r2_features_fauna.lua", "r2_features_fauna.lua",
"r2_features_npc_groups.lua", "r2_features_npc_groups.lua",
"r2_palette.lua", "r2_palette.lua",
"r2_scenario.lua", "r2_scenario.lua",
"r2_ui.lua" "r2_ui.lua"
}; };
XMLInterfaceFiles = { XMLInterfaceFiles = {
"config.xml", "config.xml",
"widgets.xml", "widgets.xml",
"webig_widgets.xml", "webig_widgets.xml",
"player.xml", "player.xml",
"inventory.xml", "inventory.xml",
"interaction.xml", "interaction.xml",
"phrase.xml", "phrase.xml",
"harvest.xml", "harvest.xml",
"macros.xml", "macros.xml",
"info_player.xml", "info_player.xml",
"outpost.xml", "outpost.xml",
"guild.xml", "guild.xml",
"taskbar.xml", "taskbar.xml",
"game_config.xml", "game_config.xml",
"game_context_menu.xml", "game_context_menu.xml",
"player_trade.xml", "player_trade.xml",
"bot_chat_v4.xml", "bot_chat_v4.xml",
"compass.xml", "compass.xml",
"map.xml", "map.xml",
"hierarchy.xml", "hierarchy.xml",
"reset.xml", "reset.xml",
"actions.xml", "actions.xml",
"help.xml", "help.xml",
"encyclopedia.xml", "encyclopedia.xml",
"commands.xml", "commands.xml",
"commands2.xml", "commands2.xml",
"ring_access_point_filter.xml", "ring_access_point_filter.xml",
"ring_window.xml", "ring_window.xml",
"bg_downloader.xml" "bg_downloader.xml"
}; };
XMLR2EDInterfaceFiles = XMLR2EDInterfaceFiles =
{ {
"r2ed.xml", "r2ed.xml",
"r2_triggers.xml", "r2_triggers.xml",
"r2_logic_entities.xml", "r2_logic_entities.xml",
"r2ed_acts.xml", "r2ed_acts.xml",
"r2ed_scenario.xml", "r2ed_scenario.xml",
"r2ed_connect.xml" "r2ed_connect.xml"
}; };
FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth
@ -493,45 +502,45 @@ FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth
// * individual .tga files for hardware cursor bitmap not looked for, and not supported yet // * individual .tga files for hardware cursor bitmap not looked for, and not supported yet
HardwareCursors = HardwareCursors =
{ {
"curs_can_pan.tga", "curs_can_pan.tga",
"curs_can_pan_dup.tga", "curs_can_pan_dup.tga",
"curs_create.tga", "curs_create.tga",
"curs_create_multi.tga", "curs_create_multi.tga",
"curs_create_vertex_invalid.tga", "curs_create_vertex_invalid.tga",
"curs_default.tga", "curs_default.tga",
"curs_dup.tga", "curs_dup.tga",
"curs_L.tga", "curs_L.tga",
"curs_M.tga", "curs_M.tga",
"curs_pan.tga", "curs_pan.tga",
"curs_pan_dup.tga", "curs_pan_dup.tga",
"curs_pick.tga", "curs_pick.tga",
"curs_pick_dup.tga", "curs_pick_dup.tga",
"curs_R.tga", "curs_R.tga",
"curs_resize_BL_TR.tga", "curs_resize_BL_TR.tga",
"curs_resize_BR_TL.tga", "curs_resize_BR_TL.tga",
"curs_resize_LR.tga", "curs_resize_LR.tga",
"curs_resize_TB.tga", "curs_resize_TB.tga",
"curs_rotate.tga", "curs_rotate.tga",
"curs_scale.tga", "curs_scale.tga",
"curs_stop.tga", "curs_stop.tga",
"text_cursor.tga", "text_cursor.tga",
"r2_hand_can_pan.tga", "r2_hand_can_pan.tga",
"r2_hand_pan.tga", "r2_hand_pan.tga",
"r2ed_tool_can_pick.tga", "r2ed_tool_can_pick.tga",
"r2ed_tool_can_rotate.tga", "r2ed_tool_can_rotate.tga",
"r2ed_tool_pick.tga", "r2ed_tool_pick.tga",
"r2ed_tool_rotate.tga", "r2ed_tool_rotate.tga",
"r2ed_tool_rotating.tga" "r2ed_tool_rotating.tga"
}; };
Loading_BG = "new_loading_bg.tga"; // Default name for the loading background file. Loading_BG = "new_loading_bg.tga"; // Default name for the loading background file.
Launch_BG = "new_launcher_bg.tga"; // Default name for the launch background file. Launch_BG = "new_launcher_bg.tga"; // Default name for the launch background file.
TeleportKami_BG = "new_teleport_kami_bg.tga"; TeleportKami_BG = "new_teleport_kami_bg.tga";
TeleportKaravan_BG = "new_teleport_caravan_bg.tga"; TeleportKaravan_BG = "new_teleport_caravan_bg.tga";
Elevator_BG = "new_elevator_bg.tga"; // Default name for the loading background file. Elevator_BG = "new_elevator_bg.tga"; // Default name for the loading background file.
ResurectKami_BG = "new_resurect_kami_bg.tga"; ResurectKami_BG = "new_resurect_kami_bg.tga";
ResurectKaravan_BG = "new_resurect_caravane_bg.tga"; ResurectKaravan_BG = "new_resurect_caravane_bg.tga";
End_BG = "end_bg.tga"; // Default name for the last background file. End_BG = "end_bg.tga"; // Default name for the last background file.
ScenarioSavePath = "./my_scenarios/"; ScenarioSavePath = "./my_scenarios/";
@ -542,10 +551,10 @@ ScenarioSavePath = "./my_scenarios/";
// note : we add a dot in the name to be sure that there cannot be a conflict with character keyset name // note : we add a dot in the name to be sure that there cannot be a conflict with character keyset name
BuiltInKeySets = BuiltInKeySets =
{ {
"", // default ryzom keyboard layout "", // default ryzom keyboard layout
"bi.zqsd", // european keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is french or belgian) "bi.zqsd", // european keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is french or belgian)
"bi.wasd", // english keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is not french nor belgian) "bi.wasd", // english keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is not french nor belgian)
"bi.wow_alike" // 'world of warcraft' like keyboard style. (NB : not available for ring) "bi.wow_alike" // 'world of warcraft' like keyboard style. (NB : not available for ring)
}; };
// "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other" // "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other"
@ -556,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;

619
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="backward" hardtext="uiMoveBackward" macroisable="false" />
<action name="forward" hardtext="uiMoveForward" macroisable="false" /> <action name="forward" hardtext="uiMoveForward" macroisable="false" />
<action name="backward" hardtext="uiMoveBackward" macroisable="false" /> <action name="strafe_right" hardtext="uiMoveStrafeRight" macroisable="false" />
<action name="turn_left" hardtext="uiMoveTurnLeft" macroisable="false" /> <action name="strafe_left" hardtext="uiMoveStrafeLeft" macroisable="false" />
<action name="turn_right" hardtext="uiMoveTurnRight" macroisable="false" /> <action name="turn_right" hardtext="uiMoveTurnRight" macroisable="false" />
<action name="strafe_left" hardtext="uiMoveStrafeLeft" macroisable="false" /> <action name="turn_left" hardtext="uiMoveTurnLeft" macroisable="false" />
<action name="strafe_right" hardtext="uiMoveStrafeRight" macroisable="false" /> <action name="toggle_run_walk" hardtext="uiMoveRunWalk" contexts="game, r2ed_anim_test, r2ed_anim_dm"/>
<action name="look_up" hardtext="uiMoveLookUp" macroisable="false" /> <action name="toggle_auto_walk" hardtext="uiMoveToggleAutoWalk" macroisable="false" />
<action name="look_down" hardtext="uiMoveLookDown" macroisable="false" /> <action name="toggle_sit_stand" hardtext="uiMoveToggleSitStand" contexts="game, r2ed_anim_test"/>
<action name="toggle_auto_walk" hardtext="uiMoveToggleAutoWalk" macroisable="false" /> <action name="mount_unmount" hardtext="uiMountUnmount" contexts="game"/>
<action name="toggle_run_walk" hardtext="uiMoveRunWalk" contexts="game, r2ed_anim_test, r2ed_anim_dm"/>
<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">
@ -166,7 +147,7 @@
<value value="18" hardtext="uiNumber19"/> <value value="18" hardtext="uiNumber19"/>
<value value="19" hardtext="uiNumber20"/> <value value="19" hardtext="uiNumber20"/>
</parameter> </parameter>
</action> </action>
<action name="run_shortcut" hardtext="uiRunShortcut2" contexts="game, r2ed_anim_test"> <action name="run_shortcut" hardtext="uiRunShortcut2" contexts="game, r2ed_anim_test">
<parameter hardtext="uiShortcutNumber"> <parameter hardtext="uiShortcutNumber">
<value value="20" hardtext="uiNumber01"/> <value value="20" hardtext="uiNumber01"/>
@ -191,84 +172,150 @@
<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">
<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="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="chat" hardtext="uiChat" contexts="game, r2ed, r2ed_anim_test">
<action name="cycle_tell" hardtext="uiCycleTell"/> <action name="cycle_tell" hardtext="uiCycleTell"/>
<action name="enter_tell" hardtext="uiEnterTellCmd"> <action name="talk_untalk" hardtext="uiTalkLeave"/>
<parameter hardtext="uiTellCmdDest" type="%action_param_user_name" name="player"/> <action name="reply_teller" hardtext="uiReplyTeller"/>
</action> </action_category>
<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"/>
</parameter> <action_category name="edit" hardtext="uiEdit" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
</action> <action name="edit_goto_line_begin" hardtext="uiEditGotoLineBegin"/>
<action name="talk" hardtext="uiTalkCmd"> <action name="edit_goto_line_end" hardtext="uiEditGotoLineEnd"/>
<parameter hardtext="uiTalkCmdMode" type="%action_param_constant" name="mode" value="0"> <action name="edit_goto_block_begin" hardtext="uiEditGotoBlockBegin"/>
<value value="0" hardtext="uiTalkCmdModeSay"/> <action name="edit_goto_block_end" hardtext="uiEditGotoBlockEnd"/>
<value value="1" hardtext="uiTalkCmdModeShout"/> <action name="edit_previous_word" hardtext="uiEditPreviousWord" repeat="1"/>
<value value="2" hardtext="uiTalkCmdModeTeam"/> <action name="edit_next_word" hardtext="uiEditNextWord" repeat="1"/>
<value value="3" hardtext="uiTalkCmdModeGuild"/> <action name="edit_previous_char" hardtext="uiEditPreviousChar" repeat="1"/>
<!--<value value="4" hardtext="uiTalkCmdModeCivilisation"/> <action name="edit_next_char" hardtext="uiEditNextChar" repeat="1"/>
<value value="5" hardtext="uiTalkCmdModeTerritory"/> <action name="edit_previous_line" hardtext="uiEditPreviousLine" repeat="1"/>
<value value="6" hardtext="uiTalkCmdModeUniverse"/>--> <action name="edit_next_line" hardtext="uiEditNextLine" repeat="1"/>
<!-- 7 tell <action name="edit_copy" hardtext="uiEditCopy"/>
8 player <action name="edit_paste" hardtext="uiEditPaste" repeat="1"/>
9 arround <action name="edit_cut" hardtext="uiEditCut"/>
10 system --> <action name="edit_expand_or_cycle_tell" hardtext="uiEditExpandOrCycleTell"/>
<value value="11" hardtext="uiTalkCmdModeRegion"/> <action name="edit_back" hardtext="uiEditBack" repeat="1"/>
</parameter> <action name="edit_select_to_line_begin" hardtext="uiEditSelectToLineBegin"/>
<parameter hardtext="uiTalkCmdMsg" type="%action_param_user" name="text"/> <action name="edit_select_to_line_end" hardtext="uiEditSelectToLineEnd"/>
</action> <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">
<action name="open" hardtext="uiOpenWindow">
<parameter hardtext="uiWindowName">
<instance template="openable_window_list"/>
</parameter>
</action>
<action name="close" hardtext="uiCloseWindow">
<parameter hardtext="uiWindowName">
<instance template="openable_window_list"/>
</parameter>
</action>
<action name="open_close" hardtext="uiToggleOpenCloseWindow">
<parameter hardtext="uiWindowName">
<instance template="openable_window_list"/>
</parameter>
</action>
<action name="popup" hardtext="uiPopupWindow">
<parameter hardtext="uiWindowName">
<instance template="popable_window_list"/>
</parameter>
</action>
<action name="popin" hardtext="uiPopinWindow">
<parameter hardtext="uiWindowName">
<instance template="popable_window_list"/>
</parameter>
</action>
<action name="popup_popin" hardtext="uiTogglePopupPopinWindow">
<parameter hardtext="uiWindowName">
<instance template="popable_window_list"/>
</parameter>
</action>
<action name="show" hardtext="uiShow" repeat="1" keyup="1">
<parameter hardtext="uiWindowName">
<instance template="container_window_list"/>
</parameter>
</action>
<action name="hide" hardtext="uiHide" repeat="1" keyup="1">
<parameter hardtext="uiWindowName">
<instance template="container_window_list"/>
</parameter>
</action>
<action name="show_hide" hardtext="uiShowHide">
<parameter hardtext="uiWindowName">
<instance template="container_window_list"/>
</parameter>
</action>
<action name="dock_undock_chat" hardtext="uiDockUndockChat">
<parameter hardtext="uiWindowName">
<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">
<parameter hardtext="uiWindowName">
<instance template="container_window_list"/>
</parameter>
</action>
<action name="set_desktop" hardtext="uiSetDesktop" repeat="1" keyup="1" contexts="game">
<parameter hardtext="uiDesktopNumber">
<value value="0" hardtext="uiKey0"/>
<value value="1" hardtext="uiKey1"/>
<value value="2" hardtext="uiKey2"/>
<value value="3" hardtext="uiKey3"/>
</parameter>
</action>
<action name="copy_to_desktop" hardtext="uiCopyToDesktop" repeat="1" keyup="1" contexts="game">
<parameter hardtext="uiDesktopNumber">
<value value="0" hardtext="uiKey0"/>
<value value="1" hardtext="uiKey1"/>
<value value="2" hardtext="uiKey2"/>
<value value="3" hardtext="uiKey3"/>
</parameter>
</action>
</action_category>
<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="quit_ryzom" hardtext="uiQuitRyzomWithoutWarning" contexts="game, r2ed_scenario_creation"/>
<action name="talk_message" hardtext="uiTalkMem"> <action name="talk_message" hardtext="uiTalkMem">
<parameter hardtext="uiTalkMemMsg" type="%action_param_constant" value="0"> <parameter hardtext="uiTalkMemMsg" type="%action_param_constant" value="0">
<value value="00" hardtext="uiTalkMemMsg00"/> <value value="00" hardtext="uiTalkMemMsg00"/>
@ -295,239 +342,101 @@
</action> </action>
</action_category> </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>
<action_category name="windows" hardtext="uiWindows" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="open" hardtext="uiOpenWindow">
<parameter hardtext="uiWindowName">
<instance template="openable_window_list"/>
</parameter>
</action>
<action name="close" hardtext="uiCloseWindow">
<parameter hardtext="uiWindowName">
<instance template="openable_window_list"/>
</parameter>
</action>
<action name="open_close" hardtext="uiToggleOpenCloseWindow">
<parameter hardtext="uiWindowName">
<instance template="openable_window_list"/>
</parameter>
</action>
<action name="popup" hardtext="uiPopupWindow">
<parameter hardtext="uiWindowName">
<instance template="popable_window_list"/>
</parameter>
</action>
<action name="popin" hardtext="uiPopinWindow">
<parameter hardtext="uiWindowName">
<instance template="popable_window_list"/>
</parameter>
</action>
<action name="popup_popin" hardtext="uiTogglePopupPopinWindow">
<parameter hardtext="uiWindowName">
<instance template="popable_window_list"/>
</parameter>
</action>
<action name="show" hardtext="uiShow" repeat="1" keyup="1">
<parameter hardtext="uiWindowName">
<instance template="container_window_list"/>
</parameter>
</action>
<action name="hide" hardtext="uiHide" repeat="1" keyup="1">
<parameter hardtext="uiWindowName">
<instance template="container_window_list"/>
</parameter>
</action>
<action name="show_hide" hardtext="uiShowHide">
<parameter hardtext="uiWindowName">
<instance template="container_window_list"/>
</parameter>
</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" />
</parameter>
</action>
<action name="show_on_press" hardtext="uiShowOnPress" repeat="1" keyup="1" macroisable="false">
<parameter hardtext="uiWindowName">
<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"/>
<value value="1" hardtext="uiKey1"/>
<value value="2" hardtext="uiKey2"/>
<value value="3" hardtext="uiKey3"/>
</parameter>
</action>
<action name="copy_to_desktop" hardtext="uiCopyToDesktop" repeat="1" keyup="1" contexts="game">
<parameter hardtext="uiDesktopNumber">
<value value="0" hardtext="uiKey0"/>
<value value="1" hardtext="uiKey1"/>
<value value="2" hardtext="uiKey2"/>
<value value="3" hardtext="uiKey3"/>
</parameter>
</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 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_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">
<action name="toggle_help" hardtext="uiDebugToggleHelp"/> <action name="toggle_help" hardtext="uiDebugToggleHelp"/>
<action name="display_infos" hardtext="uiDebugDisplayInfos" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm, r2ed_scenario_creation"/> <action name="display_infos" hardtext="uiDebugDisplayInfos" contexts="game, waiting_network, r2ed, r2ed_anim_test, r2ed_anim_dm, r2ed_scenario_creation"/>
<action name="render_mode" hardtext="uiDebugRenderMode" /> <action name="render_mode" hardtext="uiDebugRenderMode" />
<action name="toggle_render" hardtext="uiDebugToggleRender" /> <action name="toggle_render" hardtext="uiDebugToggleRender" />
<action name="switch_console_display" hardtext="uiDebugSwitchConsoleDisplay" /> <action name="switch_console_display" hardtext="uiDebugSwitchConsoleDisplay" />
<action name="toggle_fly" hardtext="uiDebugToggleFly" /> <action name="toggle_fly" hardtext="uiDebugToggleFly" />
<action name="test" hardtext="uiDebugTest" /> <action name="test" hardtext="uiDebugTest" />
<action name="set_pos" hardtext="uiDebugSetPos" /> <action name="set_pos" hardtext="uiDebugSetPos" />
<action name="pacs_borders" hardtext="uiDebugPacsBorders" /> <action name="pacs_borders" hardtext="uiDebugPacsBorders" />
<action name="debug_clusters" hardtext="uiDebugClusters" /> <action name="debug_clusters" hardtext="uiDebugClusters" />
<action name="reload_landscape_ig" hardtext="uiDebugReloadLandscapeIG" /> <action name="reload_landscape_ig" hardtext="uiDebugReloadLandscapeIG" />
<action name="profile" hardtext="uiDebugProfile" /> <action name="profile" hardtext="uiDebugProfile" />
<action name="profile_vblock" hardtext="uiDebugProfileVbLock" /> <action name="profile_vblock" hardtext="uiDebugProfileVbLock" />
<action name="profile_texture" hardtext="uiDebugProfileTexture" /> <action name="profile_texture" hardtext="uiDebugProfileTexture" />
<action name="profile_fillrate" hardtext="uiDebugProfileFillRate" /> <action name="profile_fillrate" hardtext="uiDebugProfileFillRate" />
<action name="memory_report" hardtext="uiDebugMemoryReport" /> <action name="memory_report" hardtext="uiDebugMemoryReport" />
<action name="toggle_primitive" hardtext="uiDebugTogglePrimitive" /> <action name="toggle_primitive" hardtext="uiDebugTogglePrimitive" />
<action name="primitive_up" hardtext="uiDebugPrimitiveUp" /> <action name="primitive_up" hardtext="uiDebugPrimitiveUp" />
<action name="primitive_down" hardtext="uiDebugPrimitiveDown" /> <action name="primitive_down" hardtext="uiDebugPrimitiveDown" />
<action name="toggle_3d_filter" hardtext="uiDebugToggle3dFilter"> <action name="toggle_3d_filter" hardtext="uiDebugToggle3dFilter">
<parameter hardtext="uiFilterNumber"> <parameter hardtext="uiFilterNumber">
<value value="0" hardtext="uiKey0"/> <value value="0" hardtext="uiKey0"/>
<value value="1" hardtext="uiKey1"/> <value value="1" hardtext="uiKey1"/>
<value value="2" hardtext="uiKey2"/> <value value="2" hardtext="uiKey2"/>
<value value="3" hardtext="uiKey3"/> <value value="3" hardtext="uiKey3"/>
<value value="4" hardtext="uiKey4"/> <value value="4" hardtext="uiKey4"/>
<value value="5" hardtext="uiKey5"/> <value value="5" hardtext="uiKey5"/>
<value value="6" hardtext="uiKey6"/> <value value="6" hardtext="uiKey6"/>
<value value="7" hardtext="uiKey7"/> <value value="7" hardtext="uiKey7"/>
<value value="8" hardtext="uiKey8"/> <value value="8" hardtext="uiKey8"/>
</parameter> </parameter>
</action> </action>
<action name="draw_sound" hardtext="uiDebugDrawSound" /> <action name="draw_sound" hardtext="uiDebugDrawSound" />
<action name="inc_camera_height" hardtext="uiDebugIncCameraHeight" /> <action name="inc_camera_height" hardtext="uiDebugIncCameraHeight" />
<action name="dec_camera_height" hardtext="uiDebugDecCameraHeight" /> <action name="dec_camera_height" hardtext="uiDebugDecCameraHeight" />
<!-- Weather debug --> <!-- Weather debug -->
<action name="inc_time" hardtext="uiDebugWeatherIncTime" /> <action name="inc_time" hardtext="uiDebugWeatherIncTime" />
<action name="dec_time" hardtext="uiDebugWeatherDecTime" /> <action name="dec_time" hardtext="uiDebugWeatherDecTime" />
<action name="toggle_season" hardtext="uiDebugWeatherTogSeason" /> <action name="toggle_season" hardtext="uiDebugWeatherTogSeason" />
<action name="reload_season" hardtext="uiDebugWeatherReloadSeason" /> <action name="reload_season" hardtext="uiDebugWeatherReloadSeason" />
<action name="wind_test" hardtext="uiDebugWeatherWindTest" /> <action name="wind_test" hardtext="uiDebugWeatherWindTest" />
<action name="reel_weather" hardtext="uiDebugWeatherReelWeather" /> <action name="reel_weather" hardtext="uiDebugWeatherReelWeather" />
<action name="update_clouds" hardtext="uiDebugWeatherUpdateClouds" /> <action name="update_clouds" hardtext="uiDebugWeatherUpdateClouds" />
<action name="toggle_weather_function" hardtext="uiDebugWeatherTogFunction" /> <action name="toggle_weather_function" hardtext="uiDebugWeatherTogFunction" />
<action name="inc_hour" hardtext="uiDebugWeatherIncHour" /> <action name="inc_hour" hardtext="uiDebugWeatherIncHour" />
<action name="dec_hour" hardtext="uiDebugWeatherDecHour" /> <action name="dec_hour" hardtext="uiDebugWeatherDecHour" />
<action name="weather_stats" hardtext="uiDebugWeatherStats" /> <action name="weather_stats" hardtext="uiDebugWeatherStats" />
<action name="dec_display_factor" hardtext="uiDebugWeatherDecDispFactor" /> <action name="dec_display_factor" hardtext="uiDebugWeatherDecDispFactor" />
<action name="inc_display_factor" hardtext="uiDebugWeatherIncDispFactor" /> <action name="inc_display_factor" hardtext="uiDebugWeatherIncDispFactor" />
<action name="test" hardtext="uiTest" /> <action name="test" hardtext="uiTest" />
<!-- timed fxs --> <!-- timed fxs -->
<action name="show_timed_fx" hardtext="uiDebugShowTimedFXs" /> <action name="show_timed_fx" hardtext="uiDebugShowTimedFXs" />
<!-- Movie recorder --> <!-- Movie recorder -->
<action name="toggle_movie_recorder" hardtext="uiToggleMovieRecorder" /> <action name="toggle_movie_recorder" hardtext="uiToggleMovieRecorder" />
<action name="replay_movie" hardtext="uiReplayMovie" /> <action name="replay_movie" hardtext="uiReplayMovie" />
<action name="save_movie" hardtext="uiSaveMovie" /> <action name="save_movie" hardtext="uiSaveMovie" />
</action_category> </action_category>
<action_category name="r2ed" hardtext="uiR2EDActionCategory" macroisable="false" contexts="r2ed"> <action_category name="r2ed" hardtext="uiR2EDActionCategory" macroisable="false" contexts="r2ed">
<!-- edition specific (in keys_r2ed.xml) --> <!-- edition specific (in keys_r2ed.xml) -->
<action name="r2ed_context_command" hardtext="uimR2EDContextualCommand"> <action name="r2ed_context_command" hardtext="uimR2EDContextualCommand">
<!-- contextual commands --> <!-- contextual commands -->
<parameter hardtext="uimR2EDCommandName" name="commandId"> <parameter hardtext="uimR2EDCommandName" name="commandId">
<value value="delete" hardtext="uimR2EDMenuDelete"/> <value value="delete" hardtext="uimR2EDMenuDelete"/>
<value value="properties" hardtext="uimR2EDMenuProperties"/> <value value="properties" hardtext="uimR2EDMenuProperties"/>
<value value="group" hardtext="uimR2EDMenuGroup"/> <value value="group" hardtext="uimR2EDMenuGroup"/>
<value value="ungroup" hardtext="uimR2EDMenuUngroup"/> <value value="ungroup" hardtext="uimR2EDMenuUngroup"/>
<value value="set_as_leader" hardtext="uimR2EDMenuSetAsGroupLeader"/> <value value="set_as_leader" hardtext="uimR2EDMenuSetAsGroupLeader"/>
<value value="wander_route" hardtext="uimR2EDMenuPickZone"/> <value value="wander_route" hardtext="uimR2EDMenuPickZone"/>
<value value="follow_route" hardtext="uimR2EDMenuFollowRoute"/> <value value="follow_route" hardtext="uimR2EDMenuFollowRoute"/>
<value value="patrol_route" hardtext="uimR2EDMenuPatrolRoute"/> <value value="patrol_route" hardtext="uimR2EDMenuPatrolRoute"/>
<value value="repeat_route" hardtext="uimR2EDMenuRepeatRoute"/> <value value="repeat_route" hardtext="uimR2EDMenuRepeatRoute"/>
<value value="stand_still" hardtext="uimR2EDMenuStandInPlace"/> <value value="stand_still" hardtext="uimR2EDMenuStandInPlace"/>
<value value="customize_look" hardtext="uiR2EDCustomizeLook"/> <value value="customize_look" hardtext="uiR2EDCustomizeLook"/>
</parameter> </parameter>
</action> </action>
<action name="r2ed_cancel_tool" hardtext="uimR2EDCancelTool" contexts="r2ed, r2ed_anim_dm"/> <action name="r2ed_cancel_tool" hardtext="uimR2EDCancelTool" contexts="r2ed, r2ed_anim_dm"/>
<action name="r2ed_try_go_test" hardtext="uimR2EDTooltipGoTest"/> <action name="r2ed_try_go_test" hardtext="uimR2EDTooltipGoTest"/>
<action name="r2ed_select_move" hardtext="uimR2EDTooltipSelectMove"/> <action name="r2ed_select_move" hardtext="uimR2EDTooltipSelectMove"/>
<action name="r2ed_select_rotate" hardtext="uimR2EDTooltipSelectRotate"/> <action name="r2ed_select_rotate" hardtext="uimR2EDTooltipSelectRotate"/>
<action name="r2ed_teleport" hardtext="uimR2EDTooltipTeleport" contexts="r2ed, r2ed_anim_dm"/> <action name="r2ed_teleport" hardtext="uimR2EDTooltipTeleport" contexts="r2ed, r2ed_anim_dm"/>
<action name="r2ed_undo" hardtext="uimR2EDTooltipUndo" contexts="r2ed"/> <action name="r2ed_undo" hardtext="uimR2EDTooltipUndo" contexts="r2ed"/>
<action name="r2ed_redo" hardtext="uimR2EDTooltipRedo" contexts="r2ed"/> <action name="r2ed_redo" hardtext="uimR2EDTooltipRedo" contexts="r2ed"/>
<action name="r2ed_freeze_unfreeze_botobjects" hardtext="uimR2EDFreezeBotObjects" contexts="r2ed"/> <action name="r2ed_freeze_unfreeze_botobjects" hardtext="uimR2EDFreezeBotObjects" contexts="r2ed"/>
<!-- animation specific (in keys.xml instead) --> <!-- animation specific (in keys.xml instead) -->
<action name="r2ed_stop_test" hardtext="uimR2EDTooltipGoEdition" contexts="r2ed_anim_test, r2ed_anim_dm"/> <action name="r2ed_stop_test" hardtext="uimR2EDTooltipGoEdition" contexts="r2ed_anim_test, r2ed_anim_dm"/>
</action_category> </action_category>
</interface_config> </interface_config>

14
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" />-->

15
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_view" title="uiKeysViewTitle" />
<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_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_edit" title="uiKeysEditTitle" /> <instance template="t_all_keys" id="keys_edit" title="uiKeysEditTitle" />
<instance template="t_all_keys" id="keys_debug" title="uiKeysDebugTitle" /> <instance template="t_all_keys" id="keys_windows" title="uiKeysWindowsTitle" />
<instance template="t_all_keys" id="keys_r2ed" title="uiR2EDActionCategory" /> <instance template="t_all_keys" id="keys_miscellaneous" title="uiKeysMiscellaneousTitle" />
<instance template="t_all_keys" id="keys_debug" title="uiKeysDebugTitle" />
<!-- ************************************************************************************************************************************************ --> <!-- ************************************************************************************************************************************************ -->
<!-- ************************************************************************************************************************************************ --> <!-- ************************************************************************************************************************************************ -->
@ -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

@ -203,7 +203,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");
// append config ID to directory // append config ID to directory
if (Args.haveArg("c")) if (Args.haveArg("c"))

12
code/ryzom/client/src/client.rc
View file

@ -55,7 +55,7 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_MAIN_ICON ICON DISCARDABLE "ryzom.ico" IDI_MAIN_ICON ICON DISCARDABLE "khanat.ico"
#endif // English (U.S.) resources #endif // English (U.S.) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -86,10 +86,10 @@ END
IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301 IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Ryzom information" CAPTION "Khanat information"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN 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 IDC_STATIC,7,7,172,27
PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29 PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29
PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29 PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29
@ -182,14 +182,14 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "Ryzom client" VALUE "FileDescription", "Khanat client"
VALUE "FileVersion", RYZOM_VERSION VALUE "FileVersion", RYZOM_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#if defined(FINAL_VERSION) && (FINAL_VERSION == 1) #if defined(FINAL_VERSION) && (FINAL_VERSION == 1)
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "ryzom_client_d.exe" VALUE "OriginalFilename", "khanat_client_d.exe"
#else #else
VALUE "OriginalFilename", "ryzom_client_r.exe" VALUE "OriginalFilename", "khanat_client_r.exe"
#endif #endif
#else #else
#ifdef _DEBUG #ifdef _DEBUG

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;
}

11
code/ryzom/client/src/interface_v3/guild_manager.cpp
View file

@ -874,12 +874,11 @@ class CAHGuildSheetOpen : public IActionHandler
{ {
CRyzomTime rt; CRyzomTime rt;
rt.updateRyzomClock(rGuildMembers[i].EnterDate); rt.updateRyzomClock(rGuildMembers[i].EnterDate);
ucstring str = toString("%04d", rt.getRyzomYear()) + " "; ucstring str = toString("%03d", (sint)RT.getRyzomWeek()) + " ";
str += CI18N::get("uiJenaYear") + " : "; str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + " - ";
str += CI18N::get("uiAtysianCycle") + " "; ucstring year = RT.getRyzomYearStr();
str += toString("%01d", rt.getRyzomCycle()+1) +", "; str += year + " - ";
str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)rt.getRyzomMonthInCurrentCycle() )) + ", "; str += CI18N::get("uiEon");
str += toString("%02d", rt.getRyzomDayOfMonth()+1);
pViewEnterDate->setText(str); pViewEnterDate->setText(str);
} }

12
code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp
View file

@ -221,12 +221,16 @@ static DECLARE_INTERFACE_USER_FCT(getDateText)
CRyzomTime rt; CRyzomTime rt;
string strRes; string strRes;
strRes= NLMISC::toString(rt.getRyzomDayOfMonth()+1); // Start at 1 strRes= NLMISC::toString((uint32)rt.getRyzomDayOfWeek()+1); // Start at 1
strRes+= " / "; 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+= " / ";
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); result.setString (strRes);
return true; return true;
} }

11
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -1477,12 +1477,19 @@ void CInterfaceManager::updateFrameEvents()
// literal version // literal version
// str = CI18N::get("uiDate"); // 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"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + ", ";
str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)RT.getRyzomMonthInCurrentCycle() )) + " "; str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)RT.getRyzomMonthInCurrentCycle() )) + " ";
str += toString("%02d", RT.getRyzomDayOfMonth()+1) + ", "; str += toString("%02d", RT.getRyzomDayOfMonth()+1) + ", ";
str += CI18N::get("uiAtysianCycle" + toString(RT.getRyzomCycle()+1) + "Ordinal") + " " + CI18N::get("uiAtysianCycle") + " "; 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 = RT.getRyzomYearStr();
str += year + " - ";
str += CI18N::get("uiEon");
pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:time")); pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:time"));
if (pVT != NULL) if (pVT != NULL)

BIN
code/ryzom/client/src/khanat.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
code/ryzom/client/src/ryzom.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 157 KiB

BIN
code/ryzom/client/src/ryzom_small.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
code/ryzom/client/src/splash_screen.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 612 KiB

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

@ -44,7 +44,7 @@
#endif #endif
#ifndef RYZOM_CLIENT_ICON #ifndef RYZOM_CLIENT_ICON
#define RYZOM_CLIENT_ICON "ryzom_client" #define RYZOM_CLIENT_ICON "khanat_client"
#endif #endif
std::string getUserAgent() std::string getUserAgent()

22
code/ryzom/client/unix/CMakeLists.txt
View file

@ -1,16 +1,16 @@
IF(WITH_UNIX_STRUCTURE) IF(WITH_UNIX_STRUCTURE)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/khanat_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/khanat_client.desktop")
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop" DESTINATION share/applications) INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/khanat_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 khanat_client.xpm DESTINATION share/pixmaps)
INSTALL(FILES ryzom_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png) INSTALL(FILES khanat_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 khanat_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 khanat_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 khanat_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 khanat_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_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png)
ELSE() ELSE()
# in case of local client, only copy 48x48 icon # 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() ENDIF()

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

16
code/ryzom/client/unix/khanat_client.desktop.in Normal file
View file

@ -0,0 +1,16 @@
[Desktop Entry]
Version=0.1
Name=Khanat
Name[ru]=Ризом
Type=Application
GenericName=Game client
Comment=Khanat client
Comment[fr_FR]=Client Khanat
TryExec=${RYZOM_GAMES_PREFIX}/khanat_client
Exec=${RYZOM_GAMES_PREFIX}/khanat_client
Icon=${RYZOM_CLIENT_ICON}
Terminal=false
Hidden=false
Categories=Game;RolePlaying;
StartupWMClass=khanat_client
X-AppInstall-Package=khanat-client

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

107
code/ryzom/client/unix/khanat_client.xpm Normal file
View file

@ -0,0 +1,107 @@
/* XPM */
static char *khanat_client[] = {
/* columns rows colors chars-per-pixel */
"32 32 69 1 ",
" c #000065",
". c #00006D",
"X c #000072",
"o c #0E0673",
"O c #0F0873",
"+ c #02007A",
"@ c #0C047A",
"# c #110773",
"$ c #110973",
"% c #10077C",
"& c #120A7B",
"* c #171174",
"= c #1A1574",
"- c #1E1A75",
"; c #17117B",
": c #1A147A",
"> c #1E197D",
", c #211E75",
"< c #211D7E",
"1 c #242277",
"2 c #282577",
"3 c #252278",
"4 c #302F7A",
"5 c #36347B",
"6 c #38377C",
"7 c #3E3C7E",
"8 c #120983",
"9 c #221D84",
"0 c #444281",
"q c #484781",
"w c #4E4D85",
"e c #545387",
"r c #575689",
"t c #5C5B8B",
"y c #605F8D",
"u c #63628E",
"i c #6B6A93",
"p c #727096",
"a c #757498",
"s c #79779B",
"d c #7C7B9D",
"f c #81819F",
"g c #8383A1",
"h c #8C8CA7",
"j c #8E8DA8",
"k c #908FAA",
"l c #9696AE",
"z c #9E9EB4",
"x c #A3A2B7",
"c c #A5A5B9",
"v c #ABABBD",
"b c #B4B4C3",
"n c #BABAC7",
"m c #BBBBC9",
"M c #C2C2CE",
"N c #C6C6D1",
"B c #CBCBD5",
"V c #CFCFD8",
"C c #D1CFD9",
"Z c #D3D3DC",
"A c #DADAE0",
"S c #E2E0E7",
"D c #E3E3E8",
"F c #EAEAEE",
"G c #EEEEF2",
"H c #F4F4F6",
"J c #F7F7F9",
"K c #FEFEFE",
"L c None",
/* pixels */
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL",
"LLLLLLLLLLLO&#LLLL*LLLLLLLLLLLLL",
"LLLLLLLLLLL#88OLLL91LLLLLLLLLLLL",
"LLLLLLLLLLL#&OLLLLX LLL:#LLLLLLL",
"LLLLLLLLLLLLLO#OXwsie .+>#LLLLLL",
"LLLLL###LLLL##:OXsLHZvi.X1LLLLLL",
"LLLLLO8OLLoO&o*OXgLLLJJb0LLLLLLL",
"LLLLLL&OL*&&#o*o.gJJJLLLZuLL#LLL",
"LLLLLLLL*:-=#O*OXgLJJJJJLZr.9oLL",
"LLLLLLLLX..Xo=*O.hLJJJLLLLm1.>oL",
"LLLLLLLXuhfiXX1#.gLJJLFnMJLl.=LL",
"LLL#LLL+eBLJx#.,XgLJJLN.tGLB7LLL",
"L#O&OL#;.0bLLm0..gLJJLN.eFLFgLLL",
"LL#8#OO*o..lJLZu gLLLLZ.yGLJcLLL",
"LLL##L#&#1X.sDLFsubvvvh.tGLLnXX=",
"LLLLLL##Oo-#.tDLJa .....tHLLM=X>",
"LLLLLLO###-XXzJLntpassu.tGLLM*X:",
"LLLLLL#&#-X*vLLc.sLJJLB.tGLLb.X=",
"LLLLLL#*-.2bLLz..hLLJLB.tFLJzLLL",
"LLL&#o#:.7NLJhX..hJJJLM.tFLDsLLL",
"LL#&8#L.wVLHg.X-.gLJJLB.eGLM:.LL",
"LLLL#LLXegfuX.,o.gLJJLGMMLJa.<#L",
"LLLLLLLLXX..X=*o.gLJJJJLLLxX+*LL",
"LLLLLLLLL+#**o*o.gLJJJJLLn5.>oLL",
"LLLLLLL#L-=&#O*O.gLJJLLJv7LLLLLL",
"LLLLLL#8OLLo&&*O.hLLLJSgXLLLLLLL",
"LLLLL#8##LLLLo*&+aFVng7.+-LLLLLL",
"LLLLLOLLLLLLLO#LX5w6LL.+=#LLLLLL",
"LLLLLLLLLLLLO&#LLL+.LLL=LLLLLLLL",
"LLLLLLLLLLLLO8#LLL:,LLLLLLLLLLLL",
"LLLLLLLLLLLLO#LLLLLLLLLLLLLLLLLL",
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL"
};

BIN
code/ryzom/client/unix/ryzom_128x128.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
code/ryzom/client/unix/ryzom_16x16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
code/ryzom/client/unix/ryzom_22x22.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
code/ryzom/client/unix/ryzom_24x24.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
code/ryzom/client/unix/ryzom_256x256.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 133 KiB

BIN
code/ryzom/client/unix/ryzom_32x32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
code/ryzom/client/unix/ryzom_48x48.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.5 KiB

BIN
code/ryzom/client/unix/ryzom_64x64.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

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

@ -1,16 +0,0 @@
[Desktop Entry]
Version=1.0
Name=Ryzom
Name[ru]=Ризом
Type=Application
GenericName=Game client
Comment=Ryzom client
Comment[fr_FR]=Client Ryzom
TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
Icon=${RYZOM_CLIENT_ICON}
Terminal=false
Hidden=false
Categories=Game;RolePlaying;
StartupWMClass=ryzom_client
X-AppInstall-Package=ryzom-client

BIN
code/ryzom/client/unix/ryzom_client.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.5 KiB

265
code/ryzom/client/unix/ryzom_client.xpm
View file

@ -1,265 +0,0 @@
/* XPM */
static char *ryzom[] = {
/* columns rows colors chars-per-pixel */
"32 32 227 2 ",
" c #281C09",
". c #1D250B",
"X c #2A360B",
"o c #39360D",
"O c #2A2C17",
"+ c #332A10",
"@ c #2D3411",
"# c #333312",
"$ c #373817",
"% c #30290F",
"& c #2C3523",
"* c #3B3E2B",
"= c #343826",
"- c #3B2F3F",
"; c #383A38",
": c #252B2B",
"> c #483818",
", c #523A19",
"< c #402D0E",
"1 c #443A21",
"2 c #483F31",
"3 c #3C4C15",
"4 c #384717",
"5 c #3C5415",
"6 c #3B5315",
"7 c #3B4426",
"8 c #3D5029",
"9 c #384435",
"0 c #344934",
"q c #47491A",
"w c #52461C",
"e c #42541B",
"r c #455719",
"t c #51581D",
"y c #67421B",
"u c #63531F",
"i c #4C6519",
"p c #58661E",
"a c #5B761F",
"s c #4C781A",
"d c #6E6E1E",
"f c #4B4224",
"g c #444A23",
"h c #464728",
"j c #594222",
"k c #564C23",
"l c #564A28",
"z c #495A28",
"x c #535423",
"c c #585728",
"v c #464333",
"b c #494934",
"n c #454738",
"m c #564C31",
"M c #4C513D",
"N c #555334",
"B c #55533B",
"V c #585935",
"C c #6A4D26",
"Z c #714F22",
"A c #695629",
"S c #785724",
"D c #63563B",
"F c #695838",
"G c #4C6327",
"H c #566727",
"J c #557521",
"K c #5A7D24",
"L c #587728",
"P c #526334",
"I c #56613A",
"U c #5A7633",
"Y c #4B6E33",
"T c #626826",
"R c #756A27",
"E c #667E28",
"W c #72772A",
"Q c #6C643C",
"! c #75663A",
"~ c #64753A",
"^ c #7E7535",
"/ c #2E3B4A",
"( c #353445",
") c #353649",
"_ c #373849",
"` c #3C4B4C",
"' c #384949",
"] c #2D4459",
"[ c #334B5B",
"{ c #394455",
"} c #3E5455",
"| c #2E4B64",
" . c #374E64",
".. c #3C5464",
"X. c #335269",
"o. c #385567",
"O. c #3F677A",
"+. c #454E45",
"@. c #495746",
"#. c #535443",
"$. c #5C5A4B",
"%. c #575848",
"&. c #45545A",
"*. c #495D5B",
"=. c #465656",
"-. c #515C54",
";. c #675C48",
":. c #625D53",
">. c #536349",
",. c #576D4A",
"<. c #576959",
"1. c #4E6244",
"2. c #6C634B",
"3. c #656649",
"4. c #766E4E",
"5. c #69774A",
"6. c #6B6452",
"7. c #6B6A56",
"8. c #66695B",
"9. c #736D56",
"0. c #687A56",
"q. c #7C795C",
"w. c #7C754E",
"e. c #445C63",
"r. c #455B68",
"t. c #4E6766",
"y. c #556867",
"u. c #597764",
"i. c #436274",
"p. c #4C6672",
"a. c #4D6B7A",
"s. c #5B7271",
"d. c #4A7661",
"f. c #666C66",
"g. c #67756B",
"h. c #7B7A62",
"j. c #787868",
"k. c #6B7877",
"l. c #7A7E77",
"z. c #805D3A",
"x. c #84652C",
"c. c #876A38",
"v. c #837536",
"b. c #957530",
"n. c #A47E33",
"m. c #80684D",
"M. c #827255",
"N. c #847051",
"B. c #A0764C",
"V. c #837B64",
"C. c #877865",
"Z. c #817675",
"A. c #5A8622",
"S. c #648627",
"D. c #668833",
"F. c #65834A",
"G. c #708046",
"H. c #7C885D",
"J. c #6F8E4F",
"K. c #7E916F",
"L. c #768679",
"P. c #738571",
"I. c #87882C",
"U. c #979237",
"Y. c #A68B3C",
"T. c #A79035",
"R. c #928E52",
"E. c #89A556",
"W. c #878469",
"Q. c #928A6D",
"!. c #898677",
"~. c #958674",
"^. c #94987D",
"/. c #8E9A70",
"(. c #AA926F",
"). c #94A57F",
"_. c #AEA278",
"`. c #CCB055",
"'. c #C9A453",
"]. c #D4B874",
"[. c #C6A166",
"{. c #4B6D83",
"}. c #4A7787",
"|. c #587789",
" X c #627A84",
".X c #617780",
"XX c #518395",
"oX c #688089",
"OX c #758887",
"+X c #688798",
"@X c #7B8F95",
"#X c #7A959E",
"$X c #6E8EA0",
"%X c #6E90A3",
"&X c #868887",
"*X c #889487",
"=X c #969589",
"-X c #8A9695",
";X c #9C9C94",
":X c #958F84",
">X c #A49887",
",X c #A69F90",
"<X c #9FAF82",
"1X c #9BA795",
"2X c #8DA189",
"3X c #AEA597",
"4X c #ACA98C",
"5X c #839DAB",
"6X c #94A4A7",
"7X c #81A1B1",
"8X c #97ACB4",
"9X c #BBB2A9",
"0X c #A7B5B9",
"qX c #BDB7B0",
"wX c #ADAEA6",
"eX c #C4B9AE",
"rX c #B9C0BB",
"tX c #C6C5B8",
"yX c #D2C3A6",
"uX c #E1D6BF",
"iX c #B7C0C4",
"pX c #C6C9C7",
"aX c #D2CAC5",
"sX c #D8CDC3",
"dX c #D5D4D4",
"fX c #D6DEE0",
"gX c None",
/* pixels */
"gXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX",
"gXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX",
"gXgXgXgXgXgXgXgXgXE.E.tXpX;XOX0XpXqX=XV.q.*XgXgXgXgXgXgXgXgXgXgX",
"gXgXgXgXgXgXgXgX4XG.8.j.!.&X3X:Xj.).=X;.2 $.>X XgXgXgXgXgXgXgXgX",
"gXgXgXgXgXgXgX_.h.#.:.Z.=X!.^.4.Q H.;X3.z g b H ,.gXgXgXgXgXgXgX",
"gXgXgXgXgXE.Q.W.9.h.M.8.v f F V D !.=X5.5.I h r L 0.OXgXgXgXgXgX",
"gXgXgXgX<Xh.v f A m 3.B l c a K H.W.6.W.).).h.V G U g.u.gXgXgXgX",
"gXgXgXgXw.f q t g N m c W u i q 2.>X3XV.m 7 * v 7 5 8 >.gXgXgXgX",
"gXgXgXgXt t E r k j y W i w , F yXpXwX,X>X!.q.B z b O ; -.gXgXgX",
"gXgXgXA.X 3 4 o , S d S.T S x.(.qX;X:Xj.C.M.~.H.F.J.2 1 #.gXgXgX",
"gXgXgXS.3 % + , y x.S.a H x.c.(.>XC.;.M.N.N.(.!.f.g.n 1 g >.gXgX",
"gXgXE A.4 w z.B.n.I.i a p u x.(.eX>X3XtX4XF =XeX!.g.; v @ Y gXgX",
"gXgXp 5 $ 5.! ! b.R c J t Z n.[.sXeXsXeX9X;.Z.dXwX-Xg.%.` <.&.gX",
"gXgXx f V ~ ! x c A ^ ^ v.Y.T.U.4XdXaXeXwX7.,XdX8X8.oXy.=.*.` gX",
"gX5.k 6.;Xj.4.F w R `.`.Y.Y.I.a m Z.eXaX>X6.V.iX5X@.M = & 9 ' gX",
"gXU N $.&X$.V = q R.].].'.'.W q ;.Z.eX:X;.v D 0X X= v t # $ ' gX",
"gXgXf O ; 9 h $ c c.R.tXuXyX(.N.C.C.6.F F w G.OX9 + 3 a 4 7 0 gX",
"gXgXw # 0 0 N 2.A R E U 9.N.m.;.;.l , Z l H K g > # 5 A.5 . 4 gX",
"gXgXJ o # H /.q.A t J r v P H l C C Z , m e $ > % 5 s X q 6 gX",
"gXJ x 4 < o i K /.4.t 8 7 =.d.8 @.;.F F , C > > > > q 5 . 3 @ gX",
"gXgXx g % $ % e J.H.F.%.$.s.}.O.|.y.+.N b j j w z L 4 X O 8 gXgX",
"gXgXH f $ 1 > q K Y >.f.2.~ F.d.}.e.} +.c T H A.A.s @ z } gXgXgX",
"gXgXgXx f #.!.7.z 5 * 9 N V z 8 @.=.I P L S.D.J.A.7 4 ,.` gXgXgX",
"gXgXgXP g #.y.6XK.~ 7.<.f.6.+.` =.@.0 G ~ J z P.@.: 7 = : gXgXgX",
"gXgXgXgXP B @.k.8X*X>.7.l.9.B =.-.0.,.@.P.n = .Xa.0 ` ' gXgXgXgX",
"gXgXgXgXe.$.n =.s.@.@.0.h.#.B %.P.<X-XL.-X-.n t.a.] { ( gXgXgXgX",
"gXgXgXgXgXr.&.=.*.*.1.F.0.M :.!.-X6X8X8X#X<.@.e.i.{ gXgXgXgXgXgX",
"gXgXgXgXgXgX[ e.p.a.|.#X#X@XOXk.@X#X7X#Xk.' : r.o.{ gXgXgXgXgXgX",
"gXgXgXgXgXgXgX[ o.i.a.|.%X%X X X+X$X+X|.p.......{ gXgXgXgXgXgXgX",
"gXgXgXgXgXgXgXgX/ ] X.o.O.{.|.{.{.a.i...[ .. ._ gXgXgXgXgXgXgXgX",
"gXgXgXgXgXgXgXgXgXgX) / ] | X.X.X.| ] / / _ - gXgXgXgXgXgXgXgXgX",
"gXgXgXgXgXgXgXgXgXgXgXgX( ) ) ) _ _ ( ( gXgXgXgXgXgXgXgXgXgXgXgX"
};

10
code/ryzom/common/src/game_share/time_weather_season/time_and_season.cpp
View file

@ -59,12 +59,10 @@ namespace MONTH
namespace WEEKDAY namespace WEEKDAY
{ {
NL_BEGIN_STRING_CONVERSION_TABLE (EWeekDay) NL_BEGIN_STRING_CONVERSION_TABLE (EWeekDay)
NL_STRING_CONVERSION_TABLE_ENTRY(Prima) NL_STRING_CONVERSION_TABLE_ENTRY(Pavdei)
NL_STRING_CONVERSION_TABLE_ENTRY(Dua) NL_STRING_CONVERSION_TABLE_ENTRY(Reldei)
NL_STRING_CONVERSION_TABLE_ENTRY(Tria) NL_STRING_CONVERSION_TABLE_ENTRY(Cibdei)
NL_STRING_CONVERSION_TABLE_ENTRY(Quarta) NL_STRING_CONVERSION_TABLE_ENTRY(Vondei)
NL_STRING_CONVERSION_TABLE_ENTRY(Quinteth)
NL_STRING_CONVERSION_TABLE_ENTRY(Holeth)
NL_STRING_CONVERSION_TABLE_ENTRY(UNKNOWN) NL_STRING_CONVERSION_TABLE_ENTRY(UNKNOWN)
NL_END_STRING_CONVERSION_TABLE(EWeekDay, ConversionType, UNKNOWN) NL_END_STRING_CONVERSION_TABLE(EWeekDay, ConversionType, UNKNOWN)

44
code/ryzom/common/src/game_share/time_weather_season/time_and_season.h
View file

@ -20,21 +20,20 @@
#define RY_TIME_AND_SEASON_H #define RY_TIME_AND_SEASON_H
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/i18n.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_HOUR = 24;
const uint RYZOM_DAY_IN_TICKS = RYZOM_HOURS_IN_TICKS * RYZOM_DAY_IN_HOUR; const uint RYZOM_DAY_IN_TICKS = RYZOM_HOURS_IN_TICKS * RYZOM_DAY_IN_HOUR;
const uint RYZOM_SEASON_IN_DAY = 90; const uint RYZOM_SEASON_IN_DAY = 90;
const uint RYZOM_MONTH_IN_DAY = 30; const uint RYZOM_YEAR_IN_WEEK = 120;
const uint RYZOM_YEAR_IN_MONTH = 48; const uint RYZOM_WEEK_IN_DAY = 4;
const uint RYZOM_WEEK_IN_DAY = 6; const uint RYZOM_YEAR_IN_DAY = RYZOM_WEEK_IN_DAY*RYZOM_YEAR_IN_WEEK;
const uint RYZOM_YEAR_IN_DAY = RYZOM_MONTH_IN_DAY*RYZOM_YEAR_IN_MONTH;
const uint RYZOM_CYCLE_IN_MONTH = 12;
const uint RYZOM_START_YEAR = 2570-2; const uint RYZOM_START_YEAR = 0;
const uint RYZOM_START_SPRING = 61; const uint RYZOM_START_SPRING = 0;
const uint RYZOM_START_DAY = 1111111; const uint RYZOM_START_DAY = 0;
const uint RYZOM_START_HOUR = 9; const uint RYZOM_START_HOUR = 0;
#include "../season.h" #include "../season.h"
#include "static_light_cycle.h" #include "static_light_cycle.h"
@ -82,12 +81,10 @@ namespace WEEKDAY
// Week day // Week day
enum EWeekDay enum EWeekDay
{ {
Prima = 0, Pavdei = 0,
Dua, Reldei,
Tria, Cibdei,
Quarta, Vondei,
Quinteth,
Holeth,
UNKNOWN, UNKNOWN,
NUM_WEEKDAY = UNKNOWN NUM_WEEKDAY = UNKNOWN
@ -157,6 +154,9 @@ public:
// get ryzom Year // get ryzom Year
inline uint32 getRyzomYear() const { return _RyzomDay / RYZOM_YEAR_IN_DAY + RYZOM_START_YEAR; } inline uint32 getRyzomYear() const { return _RyzomDay / RYZOM_YEAR_IN_DAY + RYZOM_START_YEAR; }
// get ryzom Year as string
inline ucstring getRyzomYearStr() const { return NLMISC::CI18N::get("uiYear").length()==0?NLMISC::toString(_RyzomDay / RYZOM_YEAR_IN_DAY + RYZOM_START_YEAR):NLMISC::CI18N::get("uiYear"); }
// get ryzom week // get ryzom week
inline uint32 getRyzomWeek() const { return (_RyzomDay % RYZOM_YEAR_IN_DAY) / RYZOM_WEEK_IN_DAY; } inline uint32 getRyzomWeek() const { return (_RyzomDay % RYZOM_YEAR_IN_DAY) / RYZOM_WEEK_IN_DAY; }
@ -166,21 +166,9 @@ public:
// get Season // get Season
static inline ESeason getSeasonByDay(uint32 day) { return (ESeason) ( ( ( day % RYZOM_YEAR_IN_DAY ) / RYZOM_SEASON_IN_DAY ) % (EGSPD::CSeason::Invalid) ); } 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 // get ryzom day of week
inline WEEKDAY::EWeekDay getRyzomDayOfWeek() const { return (WEEKDAY::EWeekDay) ( _RyzomDay % RYZOM_WEEK_IN_DAY ); } 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 // get ryzom day of season
inline uint32 getRyzomDayOfSeason() const { return ( _RyzomDay % RYZOM_SEASON_IN_DAY ); } inline uint32 getRyzomDayOfSeason() const { return ( _RyzomDay % RYZOM_SEASON_IN_DAY ); }

10
code/ryzom/server/src/ai_service/ai_place.cpp
View file

@ -127,7 +127,6 @@ bool CFaunaGenericPlace::getActive() const
std::vector<std::string> dayIntervals; std::vector<std::string> dayIntervals;
NLMISC::explode(_DayInterval, std::string(","), dayIntervals, true); NLMISC::explode(_DayInterval, std::string(","), dayIntervals, true);
std::string season = EGSPD::CSeason::toString(rt.getRyzomSeason()); 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()); std::string weekday = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDay());
bool found = false; bool found = false;
for (uint k = 0; k < dayIntervals.size(); ++k) for (uint k = 0; k < dayIntervals.size(); ++k)
@ -147,15 +146,6 @@ bool CFaunaGenericPlace::getActive() const
{ {
goodToken = true; 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) if (NLMISC::nlstricmp(dayIntervals[k], weekday) == 0)
{ {
found = true; found = true;

22
code/ryzom/server/src/ai_service/commands.cpp
View file

@ -39,7 +39,7 @@
#include "fx_entity_manager.h" #include "fx_entity_manager.h"
#include "ai_script_data_manager.h" #include "ai_script_data_manager.h"
#include "commands.h" #include "commands.h"
#include "nel/misc/i18n.h"
#include "ais_user_models.h" #include "ais_user_models.h"
extern bool GrpHistoryRecordLog; extern bool GrpHistoryRecordLog;
@ -3065,17 +3065,15 @@ static void displayTime(const CRyzomTime &rt, NLMISC::CLog &log)
std::string result; std::string result;
result = NLMISC::toString("hh:mm = %d:%d; ", (int) floorf(rt.getRyzomTime()) , (int) floorf(60.f * fmodf(rt.getRyzomTime(), 1.f))); 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()); log.displayNL(result.c_str());
uint32 month = rt.getRyzomMonth(); std::string week = toString("%03d", rt.getRyzomWeek());
MONTH::EMonth monthInCycle = rt.getRyzomMonthInCurrentCycle(); std::string dayName = CI18N::get("ui"+WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek())).toUtf8();
std::string monthName = MONTH::toString((MONTH::EMonth) monthInCycle); std::string year = rt.getRyzomYearStr().toUtf8();
uint32 dayOfMonth = rt.getRyzomDayOfMonth(); std::string eon = CI18N::get("uiEon").toUtf8();
std::string dayName = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek()); result = NLMISC::toString("week:day:year:eon = %s:%s:%s:%s",
result = NLMISC::toString("mm:dd:yy = %d:%d:%d (%s:%s)", week.c_str(),
(int) (month + 1), dayName.c_str(),
(int) (dayOfMonth + 1), year.c_str(),
(int) rt.getRyzomYear(), eon.c_str());
monthName.c_str(),
dayName.c_str());
log.displayNL(result.c_str()); log.displayNL(result.c_str());
log.displayNL("day of year = %d/%d", (int) (rt.getRyzomDayOfYear() + 1), (int) RYZOM_YEAR_IN_DAY); 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()); log.displayNL("season = %d/4 (%s)", (int) rt.getRyzomSeason() + 1, EGSPD::CSeason::toString(rt.getRyzomSeason()).c_str());

4
code/ryzom/server/src/ai_service/generic_logic_action.cpp
View file

@ -830,11 +830,11 @@ public:
break; break;
case tm_monthday: case tm_monthday:
{ {
uint32 dom = CTimeInterface::getRyzomTime().getRyzomDayOfMonth(); /*uint32 dom = CTimeInterface::getRyzomTime().getRyzomDayOfMonth();
while (dom < _DayNumber) while (dom < _DayNumber)
dom += RYZOM_MONTH_IN_DAY; dom += RYZOM_MONTH_IN_DAY;
_Min = _Max = timeTicks + dom * RYZOM_DAY_IN_TICKS; _Min = _Max = timeTicks + dom * RYZOM_DAY_IN_TICKS;*/
} }
break; break;
case tm_seasonday: case tm_seasonday:

20
code/ryzom/server/src/ai_service/nf_grp.cpp
View file

@ -3364,17 +3364,15 @@ void getRyzomDateStr__s(CStateInstance* entity, CScriptStack& stack)
const CRyzomTime &rt = CTimeInterface::getRyzomTime(); const CRyzomTime &rt = CTimeInterface::getRyzomTime();
result = NLMISC::toString("%d:%d:00", (int) floorf(rt.getRyzomTime()) , (int) floorf(60.f * fmodf(rt.getRyzomTime(), 1.f))); result = NLMISC::toString("%d:%d:00", (int) floorf(rt.getRyzomTime()) , (int) floorf(60.f * fmodf(rt.getRyzomTime(), 1.f)));
uint32 month = rt.getRyzomMonth(); std::string week = toString("%03d", rt.getRyzomWeek());
MONTH::EMonth monthInCycle = rt.getRyzomMonthInCurrentCycle(); std::string dayName = CI18N::get("ui"+WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek())).toUtf8();
std::string monthName = MONTH::toString((MONTH::EMonth) monthInCycle); std::string year = toString(rt.getRyzomYearStr());
uint32 dayOfMonth = rt.getRyzomDayOfMonth(); std::string eon = CI18N::get("uiEon").toUtf8();
std::string dayName = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek()); result += NLMISC::toString(" / %s %s - %s - %s",
result += NLMISC::toString(" / %s %d %s(%d) %d", week.c_str(),
dayName.c_str(), dayName.c_str(),
(int) (dayOfMonth + 1), year.c_str(),
monthName.c_str(), eon.c_str());
(int) (month + 1),
(int) rt.getRyzomYear());
stack.push( result ); stack.push( result );
} }

14
code/ryzom/tools/client/client_patcher/CMakeLists.txt
View file

@ -12,7 +12,7 @@ FILE(GLOB SRC main.cpp
# always enable custom patch server # always enable custom patch server
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DRZ_USE_CUSTOM_PATCH_SERVER) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DRZ_USE_CUSTOM_PATCH_SERVER)
ADD_EXECUTABLE(ryzom_client_patcher ${SRC}) ADD_EXECUTABLE(khanat_client_patcher ${SRC})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}
@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/ryzom/client/src ${CMAKE_SOURCE_DIR}/ryzom/client/src
) )
TARGET_LINK_LIBRARIES(ryzom_client_patcher TARGET_LINK_LIBRARIES(khanat_client_patcher
nelmisc nelmisc
nelnet nelnet
ryzom_gameshare ryzom_gameshare
@ -29,16 +29,16 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
IF(APPLE) IF(APPLE)
FIND_LIBRARY(FOUNDATION_LIBRARY Foundation) FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY}) TARGET_LINK_LIBRARIES(khanat_client_patcher ${FOUNDATION_LIBRARY})
ENDIF(APPLE) ENDIF(APPLE)
ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP) ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher") NL_DEFAULT_PROPS(khanat_client_patcher "Khanat, Tools: Khanat Client Patcher")
NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher) NL_ADD_RUNTIME_FLAGS(khanat_client_patcher)
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp) ADD_NATIVE_PRECOMPILED_HEADER(khanat_client_patcher ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp)
ENDIF(WITH_PCH) ENDIF(WITH_PCH)
INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client) INSTALL(TARGETS khanat_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client)

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