diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 7d12423f3..e08bca4e2 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -1,9 +1,9 @@
//////////////////////////
-//////////////////////////
/// CLIENT CONFIG FILE ///
//////////////////////////
//////////////////////////
+//////////////////////////
// If you set this variable to 1, your client.cfg will be overwritten when you quit the client.
// You will loose all the comments and identation in this file.
@@ -15,24 +15,24 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware
-FullScreen = 1;
-Width = 1024;
-Height = 768;
+FullScreen = 0;
+Width = 0;
+Height = 0;
PositionX = 0;
PositionY = 0;
-Frequency = 60;
+Frequency = 0;
Depth = 32;
Sleep = -1;
-ProcessPriority = 0; // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
-Contrast = 0.0; // -1.0 ~ 1.0
-Luminosity = 0.0; // -1.0 ~ 1.0
-Gamma = 0.0; // -1.0 ~ 1.0
-Contrast_min = -1.0;
-Luminosity_min = -1.0;
-Gamma_min = -1.0;
-Contrast_max = 1.0;
-Luminosity_max = 1.0;
-Gamma_max = 1.0;
+ProcessPriority = 0; // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
+Contrast = 0.0; // -1.0 ~ 1.0
+Luminosity = 0.0; // -1.0 ~ 1.0
+Gamma = 0.0; // -1.0 ~ 1.0
+Contrast_min = -1.0;
+Luminosity_min = -1.0;
+Gamma_min = -1.0;
+Contrast_max = 1.0;
+Luminosity_max = 1.0;
+Gamma_max = 1.0;
/////////////
@@ -42,7 +42,7 @@ Gamma_max = 1.0;
Application = { "Lirria", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
PatchWanted = 1;
-PatchUrl = "http://lirria.khaganat.net:43435";
+PatchUrl = "http://lirria.khaganat.net:43435";
RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php";
StartupHost = "lirria.khaganat.net:40916";
StartupPage = "/login/r2_login.php";
@@ -62,33 +62,39 @@ ConditionsTermsURL = "khaganat.net/wikhan/fr:charte";
////////////////
// the language to use as in ISO 639-2
-LanguageCode = "en"; // english
+LanguageCode = "fr"; // english
XMLInputFile = "input_config_v3.xml";
-XMLLoginInterfaceFiles = {
- "login_config.xml",
- "login_widgets.xml",
- "login_main.xml",
- "login_keys.xml",
+XMLLoginInterfaceFiles = {
+ "login_config.xml",
+ "login_widgets.xml",
+ "login_main.xml",
+ "login_keys.xml",
};
XMLOutGameInterfaceFiles = {
- "out_v2_config.xml",
- "out_v2_widgets.xml",
- "out_v2_connect.xml",
- "out_v2_intro.xml",
- "out_v2_select.xml",
- "out_v2_appear.xml",
- "out_v2_location.xml",
- "out_v2_crash.xml",
- "out_v2_hierarchy.xml",
- "out_v2_keys.xml",
+ "out_v2_config.xml",
+ "out_v2_widgets.xml",
+ "out_v2_connect.xml",
+ "out_v2_intro.xml",
+ "out_v2_select.xml",
+ "out_v2_appear.xml",
+ "out_v2_location.xml",
+ "out_v2_crash.xml",
+ "out_v2_hierarchy.xml",
+ "out_v2_keys.xml",
};
-TexturesInterface = "texture_interfaces_v3";
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
-
+ TexturesInterface = {
+ "interface_game_khaganat"
+ };
+ TexturesLoginInterface = {
+ "interface_login_khaganat"
+ };
+ TexturesOutGameInterface = {
+ "interface_outgame_khaganat"
+ };
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@@ -98,28 +104,28 @@ VerboseLog = 1;
///////////
// MOUSE //
///////////
-HardwareCursor = 1;
+HardwareCursor = 1;
-CursorSpeed = 1.0; // In pixels per mickey
-CursorSpeed_min = 0.5;
-CursorSpeed_max = 2.0;
+CursorSpeed = 1.0; // In pixels per mickey
+CursorSpeed_min = 0.5;
+CursorSpeed_max = 2.0;
-CursorAcceleration = 40; // Threshold in mickey
-CursorAcceleration_min = 20;
-CursorAcceleration_max = 80;
+CursorAcceleration = 40; // Threshold in mickey
+CursorAcceleration_min = 20;
+CursorAcceleration_max = 80;
-FreeLookSpeed = 0.004; // In radian per mickey
-FreeLookSpeed_min = 0.0001;
-FreeLookSpeed_max = 0.01;
+FreeLookSpeed = 0.004; // In radian per mickey
+FreeLookSpeed_min = 0.0001;
+FreeLookSpeed_max = 0.01;
-FreeLookAcceleration = 40; // Threshold in mickey
-FreeLookAcceleration_min = 20;
-FreeLookAcceleration_max = 80;
+FreeLookAcceleration = 40; // Threshold in mickey
+FreeLookAcceleration_min = 20;
+FreeLookAcceleration_max = 80;
-FreeLookInverted = 0;
-AutomaticCamera = 0;
-DblClickMode = 1;
-AutoEquipTool = 1;
+FreeLookInverted = 0;
+AutomaticCamera = 0;
+DblClickMode = 1;
+AutoEquipTool = 1;
///////////////////
// RENDER CONFIG //
@@ -151,172 +157,172 @@ LandscapeThreshold_ps1 = 500.0;
LandscapeThreshold_ps2 = 1000.0;
LandscapeThreshold_ps3 = 2000.0;
-Vision = 500.000000;
-Vision_min = 200.000000;
-Vision_max = 800.000000;
-Vision_step = 100.000000;
-Vision_ps0 = 200.0;
-Vision_ps1 = 400.0;
-Vision_ps2 = 500.0;
-Vision_ps3 = 800.0;
+Vision = 500.000000;
+Vision_min = 200.000000;
+Vision_max = 800.000000;
+Vision_step = 100.000000;
+Vision_ps0 = 200.0;
+Vision_ps1 = 400.0;
+Vision_ps2 = 500.0;
+Vision_ps3 = 800.0;
-MicroVeget = 1; // Enable/Disable MicroVeget.
-MicroVeget_ps0 = 0;
-MicroVeget_ps1 = 1;
-MicroVeget_ps2 = 1;
-MicroVeget_ps3 = 1;
+MicroVeget = 1; // Enable/Disable MicroVeget.
+MicroVeget_ps0 = 0;
+MicroVeget_ps1 = 1;
+MicroVeget_ps2 = 1;
+MicroVeget_ps3 = 1;
-MicroVegetDensity = 80.0;
-MicroVegetDensity_min = 10.0;
-MicroVegetDensity_max = 100.0;
-MicroVegetDensity_step = 10.0;
-MicroVegetDensity_ps0 = 10.0; // not used since disabled!
-MicroVegetDensity_ps1 = 30.0;
-MicroVegetDensity_ps2 = 80.0;
-MicroVegetDensity_ps3 = 100.0;
+MicroVegetDensity = 80.0;
+MicroVegetDensity_min = 10.0;
+MicroVegetDensity_max = 100.0;
+MicroVegetDensity_step = 10.0;
+MicroVegetDensity_ps0 = 10.0; // not used since disabled!
+MicroVegetDensity_ps1 = 30.0;
+MicroVegetDensity_ps2 = 80.0;
+MicroVegetDensity_ps3 = 100.0;
// *** FX
-FxNbMaxPoly = 20000;
-FxNbMaxPoly_min = 2000;
-FxNbMaxPoly_max = 50000;
+FxNbMaxPoly = 20000;
+FxNbMaxPoly_min = 2000;
+FxNbMaxPoly_max = 50000;
FxNbMaxPoly_step= 2000;
-FxNbMaxPoly_ps0 = 2000;
-FxNbMaxPoly_ps1 = 10000;
-FxNbMaxPoly_ps2 = 20000;
-FxNbMaxPoly_ps3 = 50000;
+FxNbMaxPoly_ps0 = 2000;
+FxNbMaxPoly_ps1 = 10000;
+FxNbMaxPoly_ps2 = 20000;
+FxNbMaxPoly_ps3 = 50000;
Cloud = 1;
-Cloud_ps0 = 0 ;
-Cloud_ps1 = 1 ;
-Cloud_ps2 = 1 ;
-Cloud_ps3 = 1 ;
+Cloud_ps0 = 0 ;
+Cloud_ps1 = 1 ;
+Cloud_ps2 = 1 ;
+Cloud_ps3 = 1 ;
-CloudQuality = 160.0;
-CloudQuality_min = 80.0;
-CloudQuality_max = 320.0;
-CloudQuality_step = 20.0;
-CloudQuality_ps0 = 80.0; // not used since disabled!
-CloudQuality_ps1 = 80.0;
-CloudQuality_ps2 = 160.0;
-CloudQuality_ps3 = 320.0;
+CloudQuality = 160.0;
+CloudQuality_min = 80.0;
+CloudQuality_max = 320.0;
+CloudQuality_step = 20.0;
+CloudQuality_ps0 = 80.0; // not used since disabled!
+CloudQuality_ps1 = 80.0;
+CloudQuality_ps2 = 160.0;
+CloudQuality_ps3 = 320.0;
-CloudUpdate = 1;
-CloudUpdate_min = 1;
-CloudUpdate_max = 8;
+CloudUpdate = 1;
+CloudUpdate_min = 1;
+CloudUpdate_max = 8;
CloudUpdate_step= 1;
-CloudUpdate_ps0 = 1; // not used since disabled!
-CloudUpdate_ps1 = 1;
-CloudUpdate_ps2 = 1;
-CloudUpdate_ps3 = 3;
+CloudUpdate_ps0 = 1; // not used since disabled!
+CloudUpdate_ps1 = 1;
+CloudUpdate_ps2 = 1;
+CloudUpdate_ps3 = 3;
Shadows = 1;
-Shadows_ps0 = 0;
-Shadows_ps1 = 1;
-Shadows_ps2 = 1;
-Shadows_ps3 = 1;
+Shadows_ps0 = 0;
+Shadows_ps1 = 1;
+Shadows_ps2 = 1;
+Shadows_ps3 = 1;
-FXAA = 1;
-FXAA_ps0 = 0;
-FXAA_ps1 = 1;
-FXAA_ps2 = 1;
-FXAA_ps3 = 1;
+FXAA = 1;
+FXAA_ps0 = 0;
+FXAA_ps1 = 1;
+FXAA_ps2 = 1;
+FXAA_ps3 = 1;
-AnisotropicFilter = 0;
+AnisotropicFilter = 0;
-Bloom = 0;
-Bloom_ps0 = 0;
-Bloom_ps1 = 1;
-Bloom_ps2 = 1;
-Bloom_ps3 = 1;
+Bloom = 1;
+Bloom_ps0 = 0;
+Bloom_ps1 = 1;
+Bloom_ps2 = 1;
+Bloom_ps3 = 1;
SquareBloom = 1;
-SquareBloom_ps0 = 0;
-SquareBloom_ps1 = 1;
-SquareBloom_ps2 = 1;
-SquareBloom_ps3 = 1;
+SquareBloom_ps0 = 0;
+SquareBloom_ps1 = 1;
+SquareBloom_ps2 = 1;
+SquareBloom_ps3 = 1;
DensityBloom = 255.0;
-DensityBloom_min = 0.0;
-DensityBloom_max = 255.0;
-DensityBloom_step = 1.0;
-DensityBloom_ps0 = 255.0;
-DensityBloom_ps1 = 255.0;
-DensityBloom_ps2 = 255.0;
-DensityBloom_ps3 = 255.0;
+DensityBloom_min = 0.0;
+DensityBloom_max = 255.0;
+DensityBloom_step = 1.0;
+DensityBloom_ps0 = 255.0;
+DensityBloom_ps1 = 255.0;
+DensityBloom_ps2 = 255.0;
+DensityBloom_ps3 = 255.0;
// *** CHARACTERS
-SkinNbMaxPoly = 100000;
-SkinNbMaxPoly_min = 5000;
-SkinNbMaxPoly_max = 250000;
-SkinNbMaxPoly_step = 5000;
-SkinNbMaxPoly_ps0 = 10000;
-SkinNbMaxPoly_ps1 = 70000;
-SkinNbMaxPoly_ps2 = 100000;
-SkinNbMaxPoly_ps3 = 200000;
+SkinNbMaxPoly = 100000;
+SkinNbMaxPoly_min = 5000;
+SkinNbMaxPoly_max = 250000;
+SkinNbMaxPoly_step = 5000;
+SkinNbMaxPoly_ps0 = 10000;
+SkinNbMaxPoly_ps1 = 70000;
+SkinNbMaxPoly_ps2 = 100000;
+SkinNbMaxPoly_ps3 = 200000;
-NbMaxSkeletonNotCLod = 125;
-NbMaxSkeletonNotCLod_min = 5;
-NbMaxSkeletonNotCLod_max = 255;
-NbMaxSkeletonNotCLod_step = 5;
-NbMaxSkeletonNotCLod_ps0 = 10;
-NbMaxSkeletonNotCLod_ps1 = 50;
-NbMaxSkeletonNotCLod_ps2 = 125;
-NbMaxSkeletonNotCLod_ps3 = 255;
+NbMaxSkeletonNotCLod = 125;
+NbMaxSkeletonNotCLod_min = 5;
+NbMaxSkeletonNotCLod_max = 255;
+NbMaxSkeletonNotCLod_step = 5;
+NbMaxSkeletonNotCLod_ps0 = 10;
+NbMaxSkeletonNotCLod_ps1 = 50;
+NbMaxSkeletonNotCLod_ps2 = 125;
+NbMaxSkeletonNotCLod_ps3 = 255;
-CharacterFarClip = 200.0;
-CharacterFarClip_min = 50.0;
-CharacterFarClip_max = 500.0;
-CharacterFarClip_step = 10.0;
-CharacterFarClip_ps0 = 50.0;
-CharacterFarClip_ps1 = 100.0;
-CharacterFarClip_ps2 = 200.0;
-CharacterFarClip_ps3 = 500.0;
+CharacterFarClip = 200.0;
+CharacterFarClip_min = 50.0;
+CharacterFarClip_max = 500.0;
+CharacterFarClip_step = 10.0;
+CharacterFarClip_ps0 = 50.0;
+CharacterFarClip_ps1 = 100.0;
+CharacterFarClip_ps2 = 200.0;
+CharacterFarClip_ps3 = 500.0;
-EnableRacialAnimation = 1;
+EnableRacialAnimation = 1;
// *** 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
-ScreenAspectRatio = 0.0;
-ForceDXTC = 1; // Enable/Disable DXTC.
-DivideTextureSizeBy2= 0; // Divide texture size
-DisableVtxProgram = 0; // Disable Hardware Vertex Program.
-DisableVtxAGP = 0; // Disable Hardware Vertex AGP.
-DisableTextureShdr = 0; // Disable Hardware Texture Shader.
-HDEntityTexture = 0;
+ScreenAspectRatio = 0.0;
+ForceDXTC = 1; // Enable/Disable DXTC.
+DivideTextureSizeBy2= 0; // Divide texture size
+DisableVtxProgram = 0; // Disable Hardware Vertex Program.
+DisableVtxAGP = 0; // Disable Hardware Vertex AGP.
+DisableTextureShdr = 0; // Disable Hardware Texture Shader.
+HDEntityTexture = 1;
HDTextureInstalled = 1;
-WaitVBL = 0; // 0 or 1 to wait Vertical Sync.
+WaitVBL = 0; // 0 or 1 to wait Vertical Sync.
//////////////////
// GAME OPTIONS //
//////////////////
-SelectWithRClick = 1;
-DisplayWeapons = 1;
-RotKeySpeedMax = 2.0;
-RotKeySpeedMax_min = 1.0;
-RotKeySpeedMax_max = 4.0;
-RotKeySpeedMin = 1.0;
-RotKeySpeedMin_min = 0.5;
-RotKeySpeedMin_max = 2.0;
-RotAccel = 3.0;
-FollowOnAtk = 0;
-AtkOnSelect = 0;
-ZCPacsPrim = "gen_bt_col_ext.pacs_prim";
+SelectWithRClick = 1;
+DisplayWeapons = 1;
+RotKeySpeedMax = 2.0;
+RotKeySpeedMax_min = 1.0;
+RotKeySpeedMax_max = 4.0;
+RotKeySpeedMin = 1.0;
+RotKeySpeedMin_min = 0.5;
+RotKeySpeedMin_max = 2.0;
+RotAccel = 3.0;
+FollowOnAtk = 0;
+AtkOnSelect = 0;
+ZCPacsPrim = "gen_bt_col_ext.pacs_prim";
/////////////////
// PREFERENCES //
/////////////////
-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).
-CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View).
-CameraDistStep = 1.0;
-CameraDistMin = 1.0;
-CameraDistMax = 25.0;
-CameraAccel = 5.0;
-CameraSpeedMin = 2.0;
-CameraSpeedMax = 100.0;
-CameraResetSpeed = 10.0; // Speed in radian/s
+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).
+CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View).
+CameraDistStep = 1.0;
+CameraDistMin = 1.0;
+CameraDistMax = 25.0;
+CameraAccel = 5.0;
+CameraSpeedMin = 2.0;
+CameraSpeedMax = 100.0;
+CameraResetSpeed = 10.0; // Speed in radian/s
//////////////////
// SOUND CONFIG //
@@ -343,7 +349,8 @@ SoundGameMusicVolume_max = 1.0;
SoundGameMusicVolume_step = 0.001;
// MISC
-PreDataPath = { "user", "patch", "data", "examples" };
+PreDataPath = { "user", "data", "patch", "examples", };
+DataPath = { "data" };
NeedComputeVS = 0;
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
@@ -351,15 +358,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" };
NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" };
// Big screen shot
-ScreenShotWidth = 0;
-ScreenShotHeight = 0;
+ScreenShotWidth = 0;
+ScreenShotHeight = 0;
ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots)
// Read : "ID", "R G B A MODE [FX]"
SystemInfoColors =
{
// 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
"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
@@ -367,57 +374,57 @@ SystemInfoColors =
"VI", "0 0 0 255 normal", // Black to see when there is an error
// NEW System Info Categories
-"SYS", "255 255 255 255 normal", // Default system 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
-"XP", "255 255 64 255 over", // XP Gain
-"SP", "255 255 64 255 over", // SP Gain
-"TTL", "255 255 64 255 over", // Title
-"TSK", "255 255 255 255 over", // Task
-"ZON", "255 255 255 255 center", // Zone
-"DG", "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
-"DGM", "255 128 64 255 normal", // Damage from me
-"MIS", "150 150 150 255 normal", // The opponent misses
-"MISM", "255 255 255 255 normal", // I miss
-"ITM", "0 200 0 255 over", // Item
-"ITMO", "170 170 255 255 overonly", // Item other in group
-"ITMF", "220 0 220 255 over", // Item failed
-"SPL", "50 50 250 255 normal", // Spell to me
-"SPLM", "50 150 250 255 normal", // Spell from me
-"EMT", "255 150 150 255 normal", // Emote
-"MTD", "255 255 0 255 over", // Message Of The Day
-"FORLD","64 255 64 255 overonly", // Forage Locate Deposit
-"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.)
-"PVPTM","255 120 60 255 overonly", // PVP timer
-"THM", "255 255 64 255 over misc_levelup.ps", // Thema finished
-"AMB", "255 255 64 255 center", // Ambiance
-"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)
-"OSM", "128 160 255 255 center", // Outpost state message
-"AROUND","255 255 0 255 around", // Only in around channel
-"R2_INVITE","0 255 0 255 around", // Ring invitation
+"SYS", "255 255 255 255 normal", // Default system 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
+"XP", "255 255 64 255 over", // XP Gain
+"SP", "255 255 64 255 over", // SP Gain
+"TTL", "255 255 64 255 over", // Title
+"TSK", "255 255 255 255 over", // Task
+"ZON", "255 255 255 255 center", // Zone
+"DG", "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
+"DGM", "255 128 64 255 normal", // Damage from me
+"MIS", "150 150 150 255 normal", // The opponent misses
+"MISM", "255 255 255 255 normal", // I miss
+"ITM", "0 200 0 255 over", // Item
+"ITMO", "170 170 255 255 overonly", // Item other in group
+"ITMF", "220 0 220 255 over", // Item failed
+"SPL", "50 50 250 255 normal", // Spell to me
+"SPLM", "50 150 250 255 normal", // Spell from me
+"EMT", "255 150 150 255 normal", // Emote
+"MTD", "255 255 0 255 over", // Message Of The Day
+"FORLD","64 255 64 255 overonly", // Forage Locate Deposit
+"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.)
+"PVPTM","255 120 60 255 overonly", // PVP timer
+"THM", "255 255 64 255 over misc_levelup.ps", // Thema finished
+"AMB", "255 255 64 255 center", // Ambiance
+"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)
+"OSM", "128 160 255 255 center", // Outpost state message
+"AROUND","255 255 0 255 around", // Only in around channel
+"R2_INVITE","0 255 0 255 around", // Ring invitation
};
PrintfCommands = {
- "52", "15", "55 55 0 255", "28", "uiEon", "624",
- "428", "0 0 0 255", "18", "", "624", "378",
- "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
- "18", "", "52", "17", "255 255 255 255", "28",
- "uiEon", "622", "430", "255 255 255 255", "18", "",
- "622", "380", "255 255 255 255", "14", "", "642",
+ "52", "15", "55 55 0 255", "28", "uiEon", "624",
+ "428", "0 0 0 255", "18", "", "624", "378",
+ "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
+ "18", "", "52", "17", "255 255 255 255", "28",
+ "uiEon", "622", "430", "255 255 255 255", "18", "",
+ "622", "380", "255 255 255 255", "14", "", "642",
"280", "255 255 255 255", "18", ""
};
PrintfCommandsFreeTrial = {
- "52", "15", "55 55 0 255", "28", "uiEon", "624",
- "428", "0 0 0 255", "18", "", "624", "378",
- "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
- "18", "", "52", "17", "255 255 255 255", "28",
- "uiEon", "622", "430", "255 255 255 255", "18", "",
- "622", "380", "255 255 255 255", "14", "", "642",
+ "52", "15", "55 55 0 255", "28", "uiEon", "624",
+ "428", "0 0 0 255", "18", "", "624", "378",
+ "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
+ "18", "", "52", "17", "255 255 255 255", "28",
+ "uiEon", "622", "430", "255 255 255 255", "18", "",
+ "622", "380", "255 255 255 255", "14", "", "642",
"280", "255 255 255 255", "18", ""
};
@@ -428,30 +435,30 @@ LoadingStringCount = 54;
// Some R2 parameters ...
-R2Mode = 1;
+R2Mode = 1;
R2EDEnabled = 1;
-R2EDExtendedDebug = 0;
-R2EDLightPalette = 0;
+R2EDExtendedDebug = 0;
+R2EDLightPalette = 0;
R2ClientGw = "r2linux01";
-LoadLuaDebugger = 0;
-CheckR2ScenarioMD5 = 1;
-LevelDesignEnabled = 0;
+LoadLuaDebugger = 0;
+CheckR2ScenarioMD5 = 1;
+LevelDesignEnabled = 0;
-DmCameraDistMax = 25;
-DmRun = 20;
-DmWalk = 6;
+DmCameraDistMax = 25;
+DmRun = 20;
+DmWalk = 6;
R2EDReloadFiles = {
- "r2ed.xml",
- "r2_basic_bricks.lua",
- "r2_components.lua",
- "r2_core.lua",
- "r2_features_default.lua",
- "r2_features_fauna.lua",
- "r2_features_npc_groups.lua",
- "r2_palette.lua",
- "r2_scenario.lua",
- "r2_ui.lua"
+ "r2ed.xml",
+ "r2_basic_bricks.lua",
+ "r2_components.lua",
+ "r2_core.lua",
+ "r2_features_default.lua",
+ "r2_features_fauna.lua",
+ "r2_features_npc_groups.lua",
+ "r2_palette.lua",
+ "r2_scenario.lua",
+ "r2_ui.lua"
};
XMLInterfaceFiles = {
@@ -488,12 +495,12 @@ XMLInterfaceFiles = {
XMLR2EDInterfaceFiles =
{
- "r2ed.xml",
- "r2_triggers.xml",
- "r2_logic_entities.xml",
- "r2ed_acts.xml",
- "r2ed_scenario.xml",
- "r2ed_connect.xml"
+ "r2ed.xml",
+ "r2_triggers.xml",
+ "r2_logic_entities.xml",
+ "r2ed_acts.xml",
+ "r2ed_scenario.xml",
+ "r2ed_connect.xml"
};
FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth
@@ -505,45 +512,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
HardwareCursors =
{
- "curs_can_pan.tga",
- "curs_can_pan_dup.tga",
- "curs_create.tga",
- "curs_create_multi.tga",
- "curs_create_vertex_invalid.tga",
- "curs_default.tga",
- "curs_dup.tga",
- "curs_L.tga",
- "curs_M.tga",
- "curs_pan.tga",
- "curs_pan_dup.tga",
- "curs_pick.tga",
- "curs_pick_dup.tga",
- "curs_R.tga",
- "curs_resize_BL_TR.tga",
- "curs_resize_BR_TL.tga",
- "curs_resize_LR.tga",
- "curs_resize_TB.tga",
- "curs_rotate.tga",
- "curs_scale.tga",
- "curs_stop.tga",
- "text_cursor.tga",
- "r2_hand_can_pan.tga",
- "r2_hand_pan.tga",
- "r2ed_tool_can_pick.tga",
- "r2ed_tool_can_rotate.tga",
- "r2ed_tool_pick.tga",
- "r2ed_tool_rotate.tga",
- "r2ed_tool_rotating.tga"
+ "curs_can_pan.tga",
+ "curs_can_pan_dup.tga",
+ "curs_create.tga",
+ "curs_create_multi.tga",
+ "curs_create_vertex_invalid.tga",
+ "curs_default.tga",
+ "curs_dup.tga",
+ "curs_L.tga",
+ "curs_M.tga",
+ "curs_pan.tga",
+ "curs_pan_dup.tga",
+ "curs_pick.tga",
+ "curs_pick_dup.tga",
+ "curs_R.tga",
+ "curs_resize_BL_TR.tga",
+ "curs_resize_BR_TL.tga",
+ "curs_resize_LR.tga",
+ "curs_resize_TB.tga",
+ "curs_rotate.tga",
+ "curs_scale.tga",
+ "curs_stop.tga",
+ "text_cursor.tga",
+ "r2_hand_can_pan.tga",
+ "r2_hand_pan.tga",
+ "r2ed_tool_can_pick.tga",
+ "r2ed_tool_can_rotate.tga",
+ "r2ed_tool_pick.tga",
+ "r2ed_tool_rotate.tga",
+ "r2ed_tool_rotating.tga"
};
-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.
-TeleportKami_BG = "new_teleport_kami_bg.tga";
-TeleportKaravan_BG = "new_teleport_caravan_bg.tga";
-Elevator_BG = "new_elevator_bg.tga"; // Default name for the loading background file.
-ResurectKami_BG = "new_resurect_kami_bg.tga";
-ResurectKaravan_BG = "new_resurect_caravane_bg.tga";
-End_BG = "end_bg.tga"; // Default name for the last 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.
+TeleportKami_BG = "new_teleport_kami_bg.tga";
+TeleportKaravan_BG = "new_teleport_caravan_bg.tga";
+Elevator_BG = "new_elevator_bg.tga"; // Default name for the loading background file.
+ResurectKami_BG = "new_resurect_kami_bg.tga";
+ResurectKaravan_BG = "new_resurect_caravane_bg.tga";
+End_BG = "end_bg.tga"; // Default name for the last background file.
ScenarioSavePath = "./my_scenarios/";
@@ -554,10 +561,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
BuiltInKeySets =
{
- "", // 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.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)
+ "", // default khanat 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.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)
};
// "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other"
@@ -576,9 +583,9 @@ HelpPages =
"ru=http://www.khaganat.net/forum/index.php/board,31.0.html"
};
-WebIgMainDomain = "app.khaganat.net";
+WebIgMainDomain = "app.lirria.khaganat.net";
WebIgTrustedDomains = {
- "api.khaganat.net", "app.khaganat.net", "lirria.khaganat.net"
+ "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net"
};
//PatchletUrl = "";
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.xml b/code/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.xml
index 914b4f2ff..bd77365c8 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.xml
@@ -2,73 +2,39 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
-
+
-
\ No newline at end of file
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
index 2d3271082..b9c358f96 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
@@ -1617,7 +1617,7 @@
+ -->
-
-
-
-
-
-
+ case_mode="%case_first_word_letter_up" />
@@ -199,7 +199,7 @@
x="-15"
y="10"
posref="BM BM"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="active_hardware_cursor"
hardtext="uiYes" />
@@ -208,7 +208,7 @@
y="0"
posparent="active_ok"
posref="BR BL"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="close_hardware_cursor"
hardtext="uiNo" />
@@ -316,7 +316,7 @@
x="0"
y="6"
posref="BM BM"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="universe_chanel_warning_close"
hardtext="uittOK" />
@@ -356,9 +356,9 @@
@@ -464,9 +463,9 @@
@@ -864,8 +863,10 @@
+
+ value="http://lirria.khaganat.net/ams/" />
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -2829,7 +2809,7 @@
global_color_normal="true"
global_color_over="true"
global_color_pushed="true"
- text_y="0"
+ text_y="-2"
fontsize="10"
shadow="true"
case_mode="%case_upper"
@@ -2888,21 +2868,21 @@
x="4"
y="0"
posref="TL TL"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="proc_stat_report_yes"
hardtext="uiYes" />
-
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
index 38dbf0ed2..7a0919bf1 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
@@ -1467,7 +1467,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
index 660cb4f9d..bff52b123 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
@@ -63,7 +63,7 @@
-
-
-
+
@@ -141,7 +138,7 @@
-
@@ -244,7 +241,7 @@
+ color="255 254 243 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@@ -279,7 +276,7 @@
+ color="255 254 243 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@@ -385,7 +382,7 @@
-
-
-
-
+
+
@@ -614,7 +611,7 @@
-
+
@@ -623,7 +620,7 @@
-
+
@@ -632,7 +629,7 @@
-
+
@@ -829,7 +826,7 @@
>
-
+
-
-
-
-
-
-
-
-
-
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
index 69b9f0bc8..bbc7ffade 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
@@ -403,12 +403,12 @@
onclick_l="new_macro_new_cmd" />
-
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
index 43727200a..2bd2767de 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
@@ -3,256 +3,69 @@
------------------------------------------------------------------------------------------------------------
-- create the game namespace without reseting if already created in an other file.
-if (outgame == nil) then
- outgame = {}
+if (outgame==nil) then
+ outgame= {};
end
-
-
------------------------------------------------------------------------------------------------------------
-- Name generator.
---nb noms:
--- matis: male 621 - female 621 - FirstName 621
--- fyros: given name 14269, FirstName 841
--- zorai: given name one 318, given name two 644, FirstName 1287
--- tryker: given name 4500, FirstName 4335
-
--- Fyros
-function outgame:getFyrosFirstName()
- local nbFyrosFirstNames = #fyrosFirstNames
-
- return fyrosFirstNames[math.random(nbFyrosFirstNames)]
-end
-
-function outgame:getFyrosLastName()
- local nbFyrosLastNames = #fyrosLastNames
-
- return fyrosLastNames[math.random(nbFyrosLastNames)]
-end
-
--- Matis
-function outgame:getMatisFirstName(sex)
- -- 1 = male, 2 = female
- local dbNameSex = getDbProp("UI:TEMP:NAME_SEX")
-
- if sex ~= nil then
- dbNameSex = sex
- end
-
- local FirstName = ""
- if tonumber(dbNameSex) == 1 then
- local nbMatisMaleFirstNames = #matisMaleFirstNames
- FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]
- else
- local nbMatisFemaleFirstNames = #matisFemaleFirstNames
- FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]
- end
-
- return FirstName
-end
-
-function outgame:getMatisLastName()
- local nbMatisLastNames = #matisLastNames
-
- return matisLastNames[math.random(nbMatisLastNames)]
-end
-
--- Tryker
-function outgame:getTrykerFirstName()
- local nbTrykerFirstNames = #trykerFirstNames
-
- return trykerFirstNames[math.random(nbTrykerFirstNames)]
-end
-
-function outgame:getTrykerLastName()
- local nbTrykerLastNames = #trykerLastNames
-
- return trykerLastNames[math.random(nbTrykerLastNames)]
-end
-
--- Zoraï
-function outgame:getZoraiFirstName()
- local nbFirstNamesOne = #zoraiFirstNamesOne
- local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]
-
- local nbFirstNamesTwo = #zoraiFirstNamesTwo
- local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]
-
- return FirstNameOne .. "-" .. FirstNameTwo
-end
-
-function outgame:getZoraiLastName()
- local nbLastNames = #zoraiLastNames
-
- return zoraiLastNames[math.random(nbLastNames)]
-end
function outgame:procGenerateName()
- local uiNameFull = getUI("ui:outgame:appear_name:name_full")
- local uiGenText = getUI("ui:outgame:appear_name:eb")
- local dbNameRace = getDbProp("UI:TEMP:NAME_RACE")
- local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
- local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
+ local uiNameFull = getUI("ui:outgame:appear_name:name_full");
+ local uiNameDef = getUI("ui:outgame:appear_name:name_def");
+ local uiGenText = getUI("ui:outgame:appear_name:eb");
+ local dbNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE");
+ local dbNameRace = getDbProp("UI:TEMP:NAME_RACE");
+ local dbNameSyllabeMax = getDbProp("UI:TEMP:NAME_SYLLABE_MAX");
- local nameResult = ""
- local fullnameResult = ""
-
- -- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
- -- fy ma try zo -->
- local firstName = "test2"
- local lastName = "test"
-
- -- Fyros and Matis are using "first name, last name" order
- -- Trykers and Zoraïs are using "last name, first name" order
- if tonumber(dbNameRace) == 1 then
- -- Fyros
- firstName = self:getFyrosFirstName()
- lastName = self:getFyrosLastName()
- fullnameResult = firstName .. " " .. lastName
- elseif tonumber(dbNameRace) == 2 then
- -- Matis
- firstName = self:getMatisFirstName()
- lastName = self:getMatisLastName()
- fullnameResult = firstName .. " " .. lastName
- elseif tonumber(dbNameRace) == 3 then
- -- Tryker
- firstName = self:getTrykerFirstName()
- lastName = self:getTrykerLastName()
- fullnameResult = lastName .. " " .. firstName
- elseif tonumber(dbNameRace) == 4 then
- -- Zorai
- firstName = self:getZoraiFirstName()
- lastName = self:getZoraiLastName()
- fullnameResult = lastName .. " " .. firstName
- elseif tonumber(dbNameRace) == 5 then
- -- Maraudeurs
-
- -- firstName
- if tonumber(dbNameSubRaceFirstName) == 1 then
- -- Fyros
- firstName = self:getFyrosFirstName()
- elseif tonumber(dbNameSubRaceFirstName) == 2 then
- -- Matis M
- firstName = self:getMatisFirstName(1)
- elseif tonumber(dbNameSubRaceFirstName) == 3 then
- -- Matis F
- firstName = self:getMatisFirstName(2)
- elseif tonumber(dbNameSubRaceFirstName) == 4 then
- -- Tryker
- firstName = self:getTrykerFirstName()
- elseif tonumber(dbNameSubRaceFirstName) == 5 then
- -- Zorai
- firstName = self:getZoraiFirstName()
- end
-
- -- lastName
- if tonumber(dbNameSubRaceLastName) == 1 then
- -- Fyros
- lastName = self:getFyrosLastName()
- elseif tonumber(dbNameSubRaceLastName) == 2 then
- -- Matis
- lastName = self:getMatisLastName()
- elseif tonumber(dbNameSubRaceLastName) == 3 then
- -- Tryker
- lastName = self:getTrykerLastName()
- elseif tonumber(dbNameSubRaceLastName) == 4 then
- -- Zorai
- lastName = self:getZoraiLastName()
- end
-
- fullnameResult = firstName .. " " .. lastName
- end
-
- -- always use first name for character name
- nameResult = firstName
-
- uiNameFull.hardtext = fullnameResult
-
- nameResult = string.gsub(nameResult, "'", "")
- nameResult = string.gsub(nameResult, " ", "")
- nameResult = string.gsub(nameResult, "-", "")
- nameResult = string.lower(nameResult)
- nameResult = nameResult:gsub("^%l", string.upper)
- uiGenText.input_string = nameResult
+ local nameResult = "";
+ local fullnameResult = "";
+ local defResult = "";
+
+ local nbRafsi = 0;
+ for _ in pairs(rafsi) do nbRafsi = nbRafsi + 1 end
+
+
+ index = math.random(nbRafsi);
+ nameResult = rafsi[index];
+ fullnameResult = gismu[index];
+ defResult = def[index];
+
+ imax = tonumber(dbNameSyllabe);
+ for i=2,imax,1 do
+ index = math.random(nbRafsi);
+ nameResult = nameResult .. rafsi[index];
+ fullnameResult = fullnameResult .. " " .. gismu[index];
+ defResult = defResult .. " | " .. def[index];
+ end
+
+ uiNameFull.hardtext = fullnameResult;
+ uiNameDef.hardtext = defResult;
+
+ nameResult = string.gsub(nameResult, "'", "");
+ nameResult = string.gsub(nameResult, " ", "");
+ nameResult = string.gsub(nameResult, "-", "");
+ nameResult = string.lower( nameResult );
+ nameResult = nameResult:gsub("^%l", string.upper);
+ uiGenText.input_string = nameResult;
+
end
-
--- Name sex slider update.
-function outgame:procUpdateNameSexLabel()
- local nameSexType = { "uiCP_Sex_Male", "uiCP_Sex_Female" }
- local uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider:name_sex")
- local uiNameSex = getDbProp("UI:TEMP:NAME_SEX")
-
- tempstr = tostring(i18n.get(nameSexType[tonumber(uiNameSex)]))
- tempstr = string.lower(tempstr)
- tempstr = (tempstr:gsub("^%l", string.upper))
-
- uiNameSexText.hardtext = tempstr
-end
-
--- Name race slider update.
-function outgame:procUpdateNameRaceLabel()
- local nameRaceType = { "Fyros", "Matis", "Tryker", "Zoraï", "uiCP_Maraudeur" }
-
- local uiNameRaceText = getUI("ui:outgame:appear_name:name_race_slider:name_race")
- local dbNameRace = getDbProp("UI:TEMP:NAME_RACE")
-
- local uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider")
-
- local uiNameSubRaceFirstNameSlider = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider")
- local uiNameSubRaceLastNameSlider = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider")
-
- local uiNameGenerate = getUI("ui:outgame:appear_name:generate")
- -- Show/Hide sex slider
-
- uiNameGenerate.y = "-50"
- if tonumber(dbNameRace) == 2 then
- uiNameSexSlider.active = true
- uiNameGenerate.y = "-65"
- else
- uiNameSexSlider.active = false
- end
-
- -- Show/Hide sub race slider
- if tonumber(dbNameRace) == 5 then
- uiNameSubRaceFirstNameSlider.active = true
- uiNameSubRaceLastNameSlider.active = true
- uiNameGenerate.y = "-105"
- else
- uiNameSubRaceFirstNameSlider.active = false
- uiNameSubRaceLastNameSlider.active = false
- end
-
- uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)])
-end
-
-
-local matisF = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Female")) )):gsub("^%l", string.upper)
-local matisM = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Male")) )):gsub("^%l", string.upper)
-
-function outgame:procUpdateNameSubRaceFirstNameLabel()
- local nameSubRaceFirstNameType = { "Fyros", matisM, matisF, "Tryker", "Zoraï" }
- local uiNameSubRaceFirstNameText = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider:name_race")
- local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
-
- uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)])
-end
-
-function outgame:procUpdateNameSubRaceLastNameLabel()
- local nameSubRaceLastNameType = { "Fyros", "Matis", "Tryker", "Zoraï" }
- local uiNameSubRaceLastNameText = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider:name_race")
- local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
-
- uiNameSubRaceLastNameText.hardtext= tostring(nameSubRaceLastNameType[tonumber(dbNameSubRaceLastName)])
+-- Name syllabe slider update.
+function outgame:procUpdateNameSyllabeLabel()
+ local uiNameSyllabeText_nb = getUI("ui:outgame:appear_name:name_syllabe_slider:name_syllabe_nb");
+ local uiNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE");
+ uiNameSyllabeText_nb.hardtext = uiNameSyllabe;
+ -- uiNameSyllabeText.hardtext = uiNameSyllabe .. " " .. i18n.get("uiCP_Syllabe");
end
------------------------------------------------------------------------------------------------------------
-- called to construct icons
function outgame:activePackElement(id, icon)
- local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
- uiDesc['ico' .. tostring(id)].active = true
- uiDesc['ico' .. tostring(id)].texture = icon
- uiDesc['ico' .. tostring(id) .. 'txt'].active = true
+ local uiDesc = getUI("ui:outgame:appear:job_options:options:desc");
+ uiDesc['ico' .. tostring(id)].active= true;
+ uiDesc['ico' .. tostring(id)].texture= icon;
+ uiDesc['ico' .. tostring(id) .. 'txt'].active= true;
end
@@ -260,13 +73,13 @@ end
-- called to construct pack text
function outgame:setPackJobText(id, spec)
-- Set Pack content
- local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id)
- uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec)
+ local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id);
+ uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec);
-- Set specialization text
- local uiResText = getUI("ui:outgame:appear:job_options:options:result:res")
+ local uiResText = getUI("ui:outgame:appear:job_options:options:result:res");
if(spec==2) then
- uiResText.hardtext= "uiCP_Res_" .. id
+ uiResText.hardtext= "uiCP_Res_" .. id;
end
end
@@ -274,65 +87,65 @@ end
-- called to construct pack
function outgame:buildActionPack()
- local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
+ local uiDesc = getUI("ui:outgame:appear:job_options:options:desc");
if (uiDesc==nil) then
- return
+ return;
end
-- Reset All
for i = 1,20 do
- uiDesc['ico' .. tostring(i)].active = false
- uiDesc['ico' .. tostring(i) .. 'txt'].active = false
+ uiDesc['ico' .. tostring(i)].active= false;
+ uiDesc['ico' .. tostring(i) .. 'txt'].active= false;
end
-- Build Default Combat
- self:activePackElement(1, 'f1.tga') -- Dagger
- self:activePackElement(2, 'f2.tga') -- Accurate Attack
-
+ self:activePackElement(1, 'f1.tga'); -- Dagger
+ self:activePackElement(2, 'f2.tga'); -- Accurate Attack
+
-- Build Default Magic
- self:activePackElement(6, 'm2.tga') -- Gloves
- self:activePackElement(7, 'm1.tga') -- Acid
-
+ self:activePackElement(6, 'm2.tga'); -- Gloves
+ self:activePackElement(7, 'm1.tga'); -- Acid
+
-- Build Default Forage
- self:activePackElement(11, 'g1.tga') -- Forage Tool
- self:activePackElement(12, 'g2.tga') -- Basic Extract
-
+ self:activePackElement(11, 'g1.tga'); -- Forage Tool
+ self:activePackElement(12, 'g2.tga'); -- Basic Extract
+
-- Build Default Craft
- self:activePackElement(16, 'c2.tga') -- Craft Tool
- self:activePackElement(17, 'c1.tga') -- 50 raw mat
- self:activePackElement(18, 'c3.tga') -- Craft Root
- self:activePackElement(19, 'c4.tga') -- Boots Plan
+ self:activePackElement(16, 'c2.tga'); -- Craft Tool
+ self:activePackElement(17, 'c1.tga'); -- 50 raw mat
+ self:activePackElement(18, 'c3.tga'); -- Craft Root
+ self:activePackElement(19, 'c4.tga'); -- Boots Plan
-- Build Option
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
- self:activePackElement(3, 'f3.tga') -- Increase damage
+ self:activePackElement(3, 'f3.tga'); -- Increase damage
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
- self:activePackElement(8, 'm5.tga') -- Fear
+ self:activePackElement(8, 'm5.tga'); -- Fear
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
- self:activePackElement(13, 'g3.tga') -- Basic Prospection
+ self:activePackElement(13, 'g3.tga'); -- Basic Prospection
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
- self:activePackElement(20, 'c6.tga') -- Gloves Plan
- self:activePackElement(17, 'c5.tga') -- Replace 17, with 100x RawMat
+ self:activePackElement(20, 'c6.tga'); -- Gloves Plan
+ self:activePackElement(17, 'c5.tga'); -- Replace 17, with 100x RawMat
end
-- Reset Text
- self:setPackJobText('F', 1)
- self:setPackJobText('M', 1)
- self:setPackJobText('G', 1)
- self:setPackJobText('C', 1)
-
- -- Set correct text for specalized version
+ self:setPackJobText('F', 1);
+ self:setPackJobText('M', 1);
+ self:setPackJobText('G', 1);
+ self:setPackJobText('C', 1);
+
+ -- Set correct text for specalized version
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
- self:setPackJobText('F', 2)
+ self:setPackJobText('F', 2);
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
- self:setPackJobText('M', 2)
+ self:setPackJobText('M', 2);
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
- self:setPackJobText('G', 2)
+ self:setPackJobText('G', 2);
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
- self:setPackJobText('C', 2)
+ self:setPackJobText('C', 2);
end
-
+
end
@@ -373,8 +186,8 @@ end
--function outgame:setPatchProgress(progress)
-- --debugInfo("*** 3 ***")
-- local progressPercentText = string.format("%d%%", 100 * progress)
--- local progressPostfix = math.fmod(os.time(), 3)
--- --debugInfo("Patch in progress : " .. tostring(progress))
+-- local progressPostfix = math.fmod(os.time(), 3)
+-- --debugInfo("Patch in progress : " .. tostring(progress))
-- local progressDate = nltime.getLocalTime() / 500
-- local colValue = math.floor(230 + 24 * math.sin(progressDate))
-- local color = string.format("%d %d %d %d", colValue, colValue, colValue, 255)
@@ -390,7 +203,7 @@ end
--
--function outgame:setPatchError()
-- --debugInfo("*** 5 ***")
--- --debugInfo("Patch error")
+-- --debugInfo("Patch error")
-- self:setProgressText(i18n.get("uiBGD_PatchError"), "255 0 0 255", 0)
--end
--
@@ -406,9 +219,9 @@ end
function outgame:launchGame()
if not isPlayerSlotNewbieLand(getPlayerSelectedSlot()) then
if not isFullyPatched() then
- messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame")
+ messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame")
return
end
- end
+ end
runAH(getUICaller(), "proc", "proc_charsel_play")
end
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
index c1e3d736b..ca5867acc 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
@@ -2,10 +2,7 @@
-
-
-
-
+
@@ -47,17 +44,13 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -109,7 +102,7 @@
@@ -136,11 +129,11 @@
-
+
-
+
@@ -195,15 +188,15 @@
-
+
-
+
-
+
@@ -223,41 +216,45 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
+
+
@@ -300,7 +297,7 @@
-
+
@@ -317,7 +314,7 @@
-
+
@@ -329,13 +326,13 @@
-
+
-
+
@@ -351,9 +348,9 @@
-
+
-
@@ -371,7 +368,7 @@
-
@@ -383,13 +380,13 @@
-
+
-
+
@@ -409,14 +406,14 @@
-
-
+
+
-
-
+
+
@@ -612,8 +609,8 @@
-
-
+
+
@@ -635,7 +632,7 @@
-
+
@@ -650,9 +647,10 @@
-
+
+
-
+
@@ -668,14 +666,14 @@
-
+
-
+
-
+
@@ -722,7 +720,7 @@
-
+
@@ -730,10 +728,10 @@
-
+
-
+
@@ -745,13 +743,13 @@
@@ -853,32 +851,39 @@
@@ -918,13 +923,13 @@
-
-
+
+
-
+
@@ -934,55 +939,55 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -1054,16 +1059,16 @@
-
-
+
+
-
+
-
+
@@ -1074,8 +1079,8 @@
-
-
+
+
@@ -1097,18 +1102,18 @@
-
+
-
+
-
+
@@ -1120,7 +1125,7 @@
-
+
@@ -1188,10 +1193,10 @@
-
+
-
+
-
+
-
-
+
@@ -1244,23 +1249,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1270,158 +1275,80 @@
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1432,10 +1359,10 @@
-
+
-
+
@@ -1443,20 +1370,20 @@
-
+
-
+
-
-
+
@@ -1478,23 +1405,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1503,15 +1430,15 @@
-
-
-
+
+
-
-
+
+
@@ -1530,24 +1457,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1564,23 +1474,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1591,23 +1501,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1621,60 +1531,39 @@
-
-
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ -->
+
-
+
-
-
+
+
-
+
@@ -1714,12 +1603,12 @@
-
+
-
+
@@ -1740,36 +1629,36 @@
-
-
+
-
-
+
+
-
+
-
-
-
+
-
-
+
@@ -1778,11 +1667,11 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
-
-
+
@@ -1791,11 +1680,11 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
-
-
+
@@ -1804,11 +1693,11 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
-
-
+
@@ -1839,238 +1728,248 @@
-->
-
+
-
+
+
-
-
+
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
-
-
-
+
-
-
@@ -95,11 +94,10 @@
-
+
-
@@ -114,22 +112,23 @@
-
+
-
-
+
+
+
@@ -138,7 +137,7 @@
+ value=switch(@UI:TEMP:CHARSLOT@0:PEOPLE, 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig')" />
@@ -147,13 +146,14 @@
+
-
+
-
-
+
-
+
-
+
-
+
+ value=switch(@UI:TEMP:CHAR3D:PEOPLE, 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig')" />
+ value=switch(@UI:TEMP:CHAR3D:PEOPLE, 72, 72, 72, 72)" />
+
-
+ value=switch(@0, -95, -65, -35, -65, -95)" />
+
@@ -195,12 +196,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-