diff --git a/.hgignore b/.hgignore index 41a0e58cf..1c8d9e03c 100644 --- a/.hgignore +++ b/.hgignore @@ -157,7 +157,13 @@ code/nelns/build/* code/snowballs/build/* code/ryzom/build/* code/build/* -code/build-2010/* +code/build-2010/* +code/build_linux32/* +code/build_linux64/* +code/build_windows32/* +code/build_debian32/* +code/build_debian64/* +code/build_mac/* build/* install/* build_vc* diff --git a/OLD_TO_DELETE.txt b/OLD_TO_DELETE.txt new file mode 100644 index 000000000..8d1c8b69c --- /dev/null +++ b/OLD_TO_DELETE.txt @@ -0,0 +1 @@ + diff --git a/code/CMakeModules/ConfigureChecks.cmake b/code/CMakeModules/ConfigureChecks.cmake index 3929d65c9..20a53e8b0 100644 --- a/code/CMakeModules/ConfigureChecks.cmake +++ b/code/CMakeModules/ConfigureChecks.cmake @@ -47,7 +47,7 @@ MACRO(NL_CONFIGURE_CHECKS) SET(COPYRIGHT "${YEAR} ${AUTHOR}") IF(NOT RYZOM_CLIENT_ICON) - SET(RYZOM_CLIENT_ICON "ryzom_client") + SET(RYZOM_CLIENT_ICON "khanat_client") ENDIF() CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index 114e72d5a..66e8081be 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -1,575 +1,584 @@ -////////////////////////// -////////////////////////// -/// 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. -SaveConfig = 1; - -/////////////////// -// WINDOW CONFIG // -/////////////////// - -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 = 0; -Height = 0; -PositionX = 0; -PositionY = 0; -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; - - -///////////// -// NETWORK // -///////////// - -Application = { "ryzom_live", "./client_ryzom_r.exe", "./" }; -BackgroundDownloader = 0; -PatchServer = "http://dl.ryzom.com/patch_live"; -StartupHost = "shard.ryzom.com:40916"; -StartupPage = "/login/r2_login.php"; - -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"; - - -//////////////// -// INTERFACES // -//////////////// - -// the language to use as in ISO 639-2 -LanguageCode = "en"; // english - -XMLInputFile = "input_config_v3.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", -}; - -// The ligo primitive class file -LigoPrimitiveClass = "world_editor_classes.xml"; - -VerboseLog = 1; - -/////////// -// MOUSE // -/////////// -HardwareCursor = 1; - -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; - -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; - -FreeLookInverted = 0; -AutomaticCamera = 0; -DblClickMode = 1; -AutoEquipTool = 1; - -/////////////////// -// RENDER CONFIG // -/////////////////// - -// NB: thoses variables configure also the InGameConfigurator: -// _min and _max define the bounds -// _step defines the step (NB: take care of _min and _max!!) -// _ps0 is the LOW preset, _ps1 is the MEDIUM preset, _ps2 is the NORMAL Preset, and _ps3 is the HIGH one - - -// *** LANDSCAPE -LandscapeTileNear = 50.000000; -LandscapeTileNear_min = 20.000000; -LandscapeTileNear_max = 100.000000; -LandscapeTileNear_step = 10.0; -LandscapeTileNear_ps0 = 20.0; -LandscapeTileNear_ps1 = 40.0; -LandscapeTileNear_ps2 = 50.0; -LandscapeTileNear_ps3 = 80.0; - -// NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible -LandscapeThreshold = 1000.0; -LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold -LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold -LandscapeThreshold_step = 100.0; -LandscapeThreshold_ps0 = 100.0; -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; - -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; - - -// *** FX -FxNbMaxPoly = 20000; -FxNbMaxPoly_min = 2000; -FxNbMaxPoly_max = 50000; -FxNbMaxPoly_step= 2000; -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 ; - -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_step= 1; -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; - -FXAA = 1; -FXAA_ps0 = 0; -FXAA_ps1 = 1; -FXAA_ps2 = 1; -FXAA_ps3 = 1; - -AnisotropicFilter = 0; - -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; - -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; - - -// *** CHARACTERS -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; - -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; - -// *** 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 = 1; -HDTextureInstalled = 1; -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"; - -///////////////// -// 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 - -////////////////// -// SOUND CONFIG // -////////////////// -SoundForceSoftwareBuffer= 1; -SoundOn = 1; -UseEax = 0; - -MaxTrack = 32; -MaxTrack_min = 4; -MaxTrack_max = 32; -MaxTrack_step = 4; - -// This is the volume for "InGame" sound FXs -SoundSFXVolume = 1.0; -SoundSFXVolume_min = 0.0; -SoundSFXVolume_max = 1.0; -SoundSFXVolume_step = 0.001; - -// This is volume for "InGame" music. Does not affect the MP3 player -SoundGameMusicVolume = 0.5; -SoundGameMusicVolume_min = 0.0; -SoundGameMusicVolume_max = 1.0; -SoundGameMusicVolume_step = 0.001; - -// MISC -PreDataPath = { "user", "patch", "data", "examples" }; -NeedComputeVS = 0; - -NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" }; -NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" }; -NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; - -// Big screen shot -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 -"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 -"VE", "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 -"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", "uiChapterV", "624", - "428", "0 0 0 255", "18", "", "624", "378", - "0 0 0 255", "14", "", "644", "278", "0 0 0 255", - "18", "", "52", "17", "255 255 255 255", "28", - "uiChapterV", "622", "430", "255 255 255 255", "18", "", - "622", "380", "255 255 255 255", "14", "", "642", - "280", "255 255 255 255", "18", "" -}; - -PrintfCommandsFreeTrial = { - "52", "15", "55 55 0 255", "28", "uiChapterV", "624", - "428", "0 0 0 255", "18", "", "624", "378", - "0 0 0 255", "14", "", "644", "278", "0 0 0 255", - "18", "", "52", "17", "255 255 255 255", "28", - "uiChapterV", "622", "430", "255 255 255 255", "18", "", - "622", "380", "255 255 255 255", "14", "", "642", - "280", "255 255 255 255", "18", "" -}; - -DisplayMissingAnimFile = 0; - -LoadingStringCount = 54; - - -// Some R2 parameters ... - -R2Mode = 1; -R2EDEnabled = 1; -R2EDExtendedDebug = 0; -R2EDLightPalette = 0; -R2ClientGw = "r2linux01"; -LoadLuaDebugger = 0; -CheckR2ScenarioMD5 = 1; -LevelDesignEnabled = 0; - -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" -}; - -XMLInterfaceFiles = { - "config.xml", - "widgets.xml", - "webig_widgets.xml", - "player.xml", - "inventory.xml", - "interaction.xml", - "phrase.xml", - "harvest.xml", - "macros.xml", - "info_player.xml", - "outpost.xml", - "guild.xml", - "taskbar.xml", - "game_config.xml", - "game_context_menu.xml", - "player_trade.xml", - "bot_chat_v4.xml", - "compass.xml", - "map.xml", - "hierarchy.xml", - "reset.xml", - "actions.xml", - "help.xml", - "encyclopedia.xml", - "commands.xml", - "commands2.xml", - "ring_access_point_filter.xml", - "ring_window.xml", - "bg_downloader.xml" -}; - -XMLR2EDInterfaceFiles = -{ - "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 - - -// Hardware cursor textures -// These will be extracted from the corresponding packed ui .tga files when they are loaded -// * -// * 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" -}; - -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/"; - -// list ofpredefined keyset -// name will be looked up in the translation file by searching 'uiCP_KeysetName_" + id -// tooltip will be looked up in the translation file by searching 'uiCP_KeysetTooltip_" + id -// 'bi.' stands for built-in -// 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) -}; - -// "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other" -ScenarioTypes = {"so_newbie_training","so_story_telling","so_mistery","so_hack_slash","so_guild_training","so_other"}; - -ScenarioLanguages = {"fr","de","en","other_lang"}; - -// Map each language to a forum help page -HelpPages = -{ - "fr=http://forums.ryzom.com/forum/showthread.php?t=29130", - "en=http://forums.ryzom.com/forum/showthread.php?t=29129", - "wk=http://forums.ryzom.com/forum/showthread.php?t=29129", - "de=http://forums.ryzom.com/forum/showthread.php?t=29131", - "es=http://forums.ryzom.com/forum/showthread.php?t=29129", - "ru=http://forums.ryzom.com/forum/showthread.php?t=29129" -}; - -WebIgMainDomain = "app.ryzom.com"; -WebIgTrustedDomains = { - "api.ryzom.com", "app.ryzom.com" -}; -PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload"; - -SelectedSlot = 0; - -BuildName = "RELEASE_HEAD"; +////////////////////////// +/// 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. +SaveConfig = 1; + +/////////////////// +// WINDOW CONFIG // +/////////////////// + +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 = 0; +Width = 0; +Height = 0; +PositionX = 0; +PositionY = 0; +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; + + +///////////// +// NETWORK // +///////////// + +Application = { "Lirria", "./client_ryzom_r.exe", "./" }; +BackgroundDownloader = 0; +PatchWanted = 1; +PatchUrl = "http://lirria.khaganat.net:43435"; +RingReleaseNotePath = "http://lirria.khaganat.net/patch/index.php"; +StartupHost = "lirria.khaganat.net:40916"; +StartupPage = "/login/r2_login.php"; +InstallStatsUrl = "http://lirria.khaganat.net:50000/stats/stats.php"; + +CreateAccountURL = "http://lirria.khaganat.net/ams/?page=register"; +EditAccountURL = "http://lirria.khaganat.net/"; +ForgetPwdURL = "http://lirria.khaganat.net/ams/index.php?page=forgot_password"; +//FreeTrialURL = "http://lirria.khaganat.net/"; +LoginSupportURL = "http://lirria.khaganat.net/"; +ConditionsTermsURL = "khaganat.net/wikhan/fr:charte"; + + + +//////////////// +// INTERFACES // +//////////////// + +// the language to use as in ISO 639-2 +LanguageCode = "en"; // english + +XMLInputFile = "input_config_v3.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", +}; + +// The ligo primitive class file +LigoPrimitiveClass = "world_editor_classes.xml"; + +VerboseLog = 1; + +/////////// +// MOUSE // +/////////// +HardwareCursor = 1; + +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; + +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; + +FreeLookInverted = 0; +AutomaticCamera = 0; +DblClickMode = 1; +AutoEquipTool = 1; + +/////////////////// +// RENDER CONFIG // +/////////////////// + +// NB: thoses variables configure also the InGameConfigurator: +// _min and _max define the bounds +// _step defines the step (NB: take care of _min and _max!!) +// _ps0 is the LOW preset, _ps1 is the MEDIUM preset, _ps2 is the NORMAL Preset, and _ps3 is the HIGH one + + +// *** LANDSCAPE +LandscapeTileNear = 50.000000; +LandscapeTileNear_min = 20.000000; +LandscapeTileNear_max = 100.000000; +LandscapeTileNear_step = 10.0; +LandscapeTileNear_ps0 = 20.0; +LandscapeTileNear_ps1 = 40.0; +LandscapeTileNear_ps2 = 50.0; +LandscapeTileNear_ps3 = 80.0; + +// NB: threshold is inverted ULandscape::setThreshold(), to be more intelligible +LandscapeThreshold = 1000.0; +LandscapeThreshold_min = 100.0; // Low quality => 0.01 threshold +LandscapeThreshold_max = 2000.0; // High quality => 0.0005 threshold +LandscapeThreshold_step = 100.0; +LandscapeThreshold_ps0 = 100.0; +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; + +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; + + +// *** FX +FxNbMaxPoly = 20000; +FxNbMaxPoly_min = 2000; +FxNbMaxPoly_max = 50000; +FxNbMaxPoly_step= 2000; +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 ; + +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_step= 1; +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; + +FXAA = 1; +FXAA_ps0 = 0; +FXAA_ps1 = 1; +FXAA_ps2 = 1; +FXAA_ps3 = 1; + +AnisotropicFilter = 0; + +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; + +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; + + +// *** CHARACTERS +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; + +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; + +// *** 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 = 1; +HDTextureInstalled = 1; +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"; + +///////////////// +// 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 + +////////////////// +// SOUND CONFIG // +////////////////// +SoundForceSoftwareBuffer= 1; +SoundOn = 1; +UseEax = 0; + +MaxTrack = 32; +MaxTrack_min = 4; +MaxTrack_max = 32; +MaxTrack_step = 4; + +// This is the volume for "InGame" sound FXs +SoundSFXVolume = 1.0; +SoundSFXVolume_min = 0.0; +SoundSFXVolume_max = 1.0; +SoundSFXVolume_step = 0.001; + +// This is volume for "InGame" music. Does not affect the MP3 player +SoundGameMusicVolume = 0.5; +SoundGameMusicVolume_min = 0.0; +SoundGameMusicVolume_max = 1.0; +SoundGameMusicVolume_step = 0.001; + +// MISC +PreDataPath = { "user", "patch", "examples", "data/patch_lirria.bnp", "data/fonts", "data/gamedev.bnp" }; +DataPath = { "data" }; +NeedComputeVS = 0; + +NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" }; +NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" }; +NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; + +// Big screen shot +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 +"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 +"VE", "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 +"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", + "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", + "280", "255 255 255 255", "18", "" +}; + +DisplayMissingAnimFile = 0; + +LoadingStringCount = 54; + + +// Some R2 parameters ... + +R2Mode = 1; +R2EDEnabled = 1; +R2EDExtendedDebug = 0; +R2EDLightPalette = 0; +R2ClientGw = "r2linux01"; +LoadLuaDebugger = 0; +CheckR2ScenarioMD5 = 1; +LevelDesignEnabled = 0; + +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" +}; + +XMLInterfaceFiles = { + "config.xml", + "widgets.xml", + "webig_widgets.xml", + "player.xml", + "inventory.xml", + "interaction.xml", + "phrase.xml", + "harvest.xml", + "macros.xml", + "info_player.xml", + "outpost.xml", + "guild.xml", + "taskbar.xml", + "game_config.xml", + "game_context_menu.xml", + "player_trade.xml", + "bot_chat_v4.xml", + "compass.xml", + "map.xml", + "hierarchy.xml", + "reset.xml", + "actions.xml", + "help.xml", + "encyclopedia.xml", + "commands.xml", + "commands2.xml", + "ring_access_point_filter.xml", + "ring_window.xml", + "bg_downloader.xml" +}; + +XMLR2EDInterfaceFiles = +{ + "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 + + +// Hardware cursor textures +// These will be extracted from the corresponding packed ui .tga files when they are loaded +// * +// * 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" +}; + +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/"; + +// list ofpredefined keyset +// name will be looked up in the translation file by searching 'uiCP_KeysetName_" + id +// tooltip will be looked up in the translation file by searching 'uiCP_KeysetTooltip_" + id +// 'bi.' stands for built-in +// 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) +}; + +// "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other" +ScenarioTypes = {"so_newbie_training","so_story_telling","so_mistery","so_hack_slash","so_guild_training","so_other"}; + +ScenarioLanguages = {"fr","de","en","other_lang"}; + +// Map each language to a forum help page +HelpPages = +{ + "fr=http://www.khaganat.net/forum/index.php/board,31.0.html", + "en=http://www.khaganat.net/forum/index.php/board,31.0.html", + "wk=http://www.khaganat.net/forum/index.php/board,31.0.html", + "de=http://www.khaganat.net/forum/index.php/board,31.0.html", + "es=http://www.khaganat.net/forum/index.php/board,31.0.html", + "ru=http://www.khaganat.net/forum/index.php/board,31.0.html" +}; + +WebIgMainDomain = "app.khaganat.net"; +WebIgTrustedDomains = { + "api.khaganat.net", "app.khaganat.net", "lirria.khaganat.net" +}; +//PatchletUrl = ""; + +SelectedSlot = 0; + +BuildName = "RELEASE_HEAD"; diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml b/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml index 8696de32a..5fb009adf 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml @@ -77,70 +77,51 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -166,7 +147,7 @@ - + @@ -191,84 +172,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -295,239 +342,101 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/hierarchy.xml b/code/ryzom/client/data/gamedev/interfaces_v3/hierarchy.xml index 737db5c59..9499119ee 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/hierarchy.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/hierarchy.xml @@ -110,15 +110,15 @@ - - - - + - - + + + - + + + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml index 65d6394d7..bbc7ffade 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml @@ -207,17 +207,15 @@ - - + + + - - - - - - + + + @@ -648,6 +646,7 @@ + diff --git a/code/ryzom/client/macosx/khanat.icns b/code/ryzom/client/macosx/khanat.icns new file mode 100644 index 000000000..fafeddeb2 Binary files /dev/null and b/code/ryzom/client/macosx/khanat.icns differ diff --git a/code/ryzom/client/macosx/ryzom.icns b/code/ryzom/client/macosx/ryzom.icns deleted file mode 100644 index 45e7bace1..000000000 Binary files a/code/ryzom/client/macosx/ryzom.icns and /dev/null differ diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 4f91cfed8..55c9271b4 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -52,11 +52,11 @@ IF(WITH_RYZOM_CLIENT) # on Mac, create a .App Bundle if(APPLE) - SET(MACOSX_BUNDLE_INFO_STRING "Ryzom") - SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns") - SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom") + SET(MACOSX_BUNDLE_INFO_STRING "Khanat") + SET(MACOSX_BUNDLE_ICON_FILE "khanat.icns") + SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.khaganat.khanat") SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION}) - SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom") + SET(MACOSX_BUNDLE_BUNDLE_NAME "Khanat") SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION}) SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0") SET(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT}) @@ -66,53 +66,53 @@ IF(WITH_RYZOM_CLIENT) SET(MAC_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/ryzom/client/macosx) ENDIF() - ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2}) + ADD_EXECUTABLE(khanat_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2}) IF(APPLE) - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME}) - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist) - ADD_CUSTOM_COMMAND(TARGET ryzom_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR}) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR}) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/ryzom.icns ${RYZOM_RESOURCES_DIR}) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR}) + SET_TARGET_PROPERTIES(khanat_client PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME}) + SET_TARGET_PROPERTIES(khanat_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist) + ADD_CUSTOM_COMMAND(TARGET khanat_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/khanat.icns ${RYZOM_RESOURCES_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_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 - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND rm -f ${RYZOM_OUTPUT_DIR}/installscript_osx.vdf) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND rm -f ${RYZOM_OUTPUT_DIR}/installscript_osx.vdf) IF(RYZOM_DATA_DIR) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR}) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR}) ENDIF() IF(TARGET crash_report) - ADD_DEPENDENCIES(ryzom_client crash_report) + ADD_DEPENDENCIES(khanat_client crash_report) # copy crash_report to bundle - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crash_report ${RYZOM_CONTENTS_DIR}/MacOS/CrashReport) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crash_report ${RYZOM_CONTENTS_DIR}/MacOS/CrashReport) IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/CrashReport" COMMENT "Signing CrashReport executable...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/CrashReport" COMMENT "Signing CrashReport executable...") ENDIF() ENDIF() - IF(TARGET ryzom_client_patcher) - ADD_DEPENDENCIES(ryzom_client ryzom_client_patcher) + IF(TARGET khanat_client_patcher) + ADD_DEPENDENCIES(khanat_client khanat_client_patcher) - # copy ryzom_client_patcher to bundle - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_client_patcher ${RYZOM_CONTENTS_DIR}/MacOS/RyzomClientPatcher) + # copy khanat_client_patcher to bundle + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/khanat_client_patcher ${RYZOM_CONTENTS_DIR}/MacOS/KhanatClientPatcher) IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomClientPatcher" COMMENT "Signing RyzomClientPatcher executable...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/KhanatClientPatcher" COMMENT "Signing KhanatClientPatcher executable...") ENDIF() ENDIF() IF(TARGET ryzom_configuration_qt) - ADD_DEPENDENCIES(ryzom_client ryzom_configuration_qt) + ADD_DEPENDENCIES(khanat_client ryzom_configuration_qt) # copy ryzom_configuration_qt to bundle - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_configuration_qt ${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration) + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND cp -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ryzom_configuration_qt ${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration) IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration" COMMENT "Signing RyzomConfiguration executable...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_CONTENTS_DIR}/MacOS/RyzomConfiguration" COMMENT "Signing RyzomConfiguration executable...") ENDIF() ENDIF() @@ -126,7 +126,7 @@ IF(WITH_RYZOM_CLIENT) ENDIF() IF(CODESIGN_ALLOCATE AND APPLE_CERTIFICATE) - ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_OUTPUT_DIR}" COMMENT "Signing Ryzom bundle...") + ADD_CUSTOM_COMMAND(TARGET khanat_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_OUTPUT_DIR}" COMMENT "Signing Ryzom bundle...") ENDIF() ENDIF() @@ -143,7 +143,7 @@ IF(WITH_RYZOM_CLIENT) INCLUDE_DIRECTORIES(${STEAM_INCLUDE_DIRS}) ENDIF() - TARGET_LINK_LIBRARIES(ryzom_client + TARGET_LINK_LIBRARIES(khanat_client nelmisc nelnet nelligo @@ -161,40 +161,40 @@ IF(WITH_RYZOM_CLIENT) ) IF(NOT APPLE AND NOT WIN32) - TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES}) + TARGET_LINK_LIBRARIES(khanat_client ${X11_LIBRARIES}) ENDIF() IF(APPLE) FIND_LIBRARY(FOUNDATION_LIBRARY Foundation) - TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_LIBRARY}) + TARGET_LINK_LIBRARIES(khanat_client ${FOUNDATION_LIBRARY}) ENDIF() ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS}) - NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client") - NL_ADD_RUNTIME_FLAGS(ryzom_client) + NL_DEFAULT_PROPS(khanat_client "Khanat, Client: Khanat Client") + NL_ADD_RUNTIME_FLAGS(khanat_client) IF(FINAL_VERSION) - NL_ADD_LIB_SUFFIX(ryzom_client) + NL_ADD_LIB_SUFFIX(khanat_client) ELSE() IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r") + SET_TARGET_PROPERTIES(khanat_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r") ELSE() - SET_TARGET_PROPERTIES(ryzom_client PROPERTIES POSTFIX "_dev") + SET_TARGET_PROPERTIES(khanat_client PROPERTIES POSTFIX "_dev") ENDIF() ENDIF() IF(WITH_RYZOM_CLIENT_UAC) IF(CMAKE_GENERATOR MATCHES "Visual Studio") - SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'") + SET_PROPERTY(TARGET khanat_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'") ELSEIF(CMAKE_GENERATOR MATCHES "NMake Makefiles") - SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"") + SET_PROPERTY(TARGET khanat_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"") ENDIF() ENDIF() IF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS)) - ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) + ADD_NATIVE_PRECOMPILED_HEADER(khanat_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF() - INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) + INSTALL(TARGETS khanat_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) ENDIF() diff --git a/code/ryzom/client/src/client.cpp b/code/ryzom/client/src/client.cpp index e899771b2..638b94572 100644 --- a/code/ryzom/client/src/client.cpp +++ b/code/ryzom/client/src/client.cpp @@ -207,7 +207,7 @@ int main(int argc, char **argv) // if client_default.cfg is not in current directory, use application default directory if (Args.haveArg("c") || !CFile::isExists("client_default.cfg")) { - std::string currentPath = CPath::getApplicationDirectory("Ryzom"); + std::string currentPath = CPath::getApplicationDirectory("Khanat"); // append config ID to directory if (Args.haveArg("c")) diff --git a/code/ryzom/client/src/client.rc b/code/ryzom/client/src/client.rc index d4fa4d8c4..ab2bb70a2 100644 --- a/code/ryzom/client/src/client.rc +++ b/code/ryzom/client/src/client.rc @@ -55,7 +55,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_MAIN_ICON ICON DISCARDABLE "ryzom.ico" +IDI_MAIN_ICON ICON DISCARDABLE "khanat.ico" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// @@ -86,10 +86,10 @@ END IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Ryzom information" +CAPTION "Khanat information" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Ryzom has detected that the last game session has not quit properly. You have experienced :", + LTEXT "Khanat has detected that the last game session has not quit properly. You have experienced :", IDC_STATIC,7,7,172,27 PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29 PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29 @@ -182,20 +182,20 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "FileDescription", "Ryzom client" + VALUE "FileDescription", "Khanat client" VALUE "FileVersion", RYZOM_VERSION VALUE "LegalCopyright", COPYRIGHT #if defined(FINAL_VERSION) && (FINAL_VERSION == 1) #ifdef _DEBUG - VALUE "OriginalFilename", "ryzom_client_d.exe" + VALUE "OriginalFilename", "khanat_client_d.exe" #else - VALUE "OriginalFilename", "ryzom_client_r.exe" + VALUE "OriginalFilename", "khanat_client_r.exe" #endif #else #ifdef _DEBUG - VALUE "OriginalFilename", "ryzom_client_dev_d.exe" + VALUE "OriginalFilename", "kkhanat_client_dev_d.exe" #else - VALUE "OriginalFilename", "ryzom_client_dev_r.exe" + VALUE "OriginalFilename", "khanat_client_dev_r.exe" #endif #endif VALUE "ProductName", "Ryzom Core" diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp index f958869f5..512679758 100644 --- a/code/ryzom/client/src/commands.cpp +++ b/code/ryzom/client/src/commands.cpp @@ -5752,7 +5752,74 @@ NLMISC_COMMAND(em, "emote command", "") return false; } +NLMISC_COMMAND(me, "emote command", "") +{ + 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", "") +{ + 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", "") +{ + 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","") @@ -5798,3 +5865,11 @@ NLMISC_COMMAND(time, "Shows information about the current time", "") CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND"); return true; } + +NLMISC_COMMAND(easteregg_siela1915_khanat, "Miscellaneous", "") +{ + string stext = "Siela1915 blesses you..."; + ucstring ucstext = ucstring(stext); + CInterfaceManager::getInstance()->displaySystemInfo(ucstext, "AROUND"); + return true; +} diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp index a22c8dbc5..525a84210 100644 --- a/code/ryzom/client/src/interface_v3/guild_manager.cpp +++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp @@ -874,12 +874,11 @@ class CAHGuildSheetOpen : public IActionHandler { CRyzomTime rt; rt.updateRyzomClock(rGuildMembers[i].EnterDate); - ucstring str = toString("%04d", rt.getRyzomYear()) + " "; - str += CI18N::get("uiJenaYear") + " : "; - str += CI18N::get("uiAtysianCycle") + " "; - str += toString("%01d", rt.getRyzomCycle()+1) +", "; - str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)rt.getRyzomMonthInCurrentCycle() )) + ", "; - str += toString("%02d", rt.getRyzomDayOfMonth()+1); + ucstring str = toString("%03d", (sint)RT.getRyzomWeek()) + " "; + str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + " - "; + ucstring year = RT.getRyzomYearStr(); + str += year + " - "; + str += CI18N::get("uiEon"); pViewEnterDate->setText(str); } diff --git a/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp index 61fe71958..486ecdf01 100644 --- a/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp +++ b/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp @@ -221,12 +221,16 @@ static DECLARE_INTERFACE_USER_FCT(getDateText) CRyzomTime rt; string strRes; - strRes= NLMISC::toString(rt.getRyzomDayOfMonth()+1); // Start at 1 + strRes= NLMISC::toString((uint32)rt.getRyzomDayOfWeek()+1); // Start at 1 strRes+= " / "; - strRes+= NLMISC::toString(rt.getRyzomMonth()+1); // Start at 1 for january + strRes+= NLMISC::toString(rt.getRyzomWeek()+1); // Start at 1 for january strRes+= " / "; - strRes+= NLMISC::toString(rt.getRyzomYear()); - + ucstring year = CI18N::get("uiYear"); + if (year.length() == 0) { + strRes += toString("%04d", RT.getRyzomYear()); + } else { + strRes += year.toUtf8(); + } result.setString (strRes); return true; } diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index b8721ffdd..ed9a2ba8a 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -1477,12 +1477,19 @@ void CInterfaceManager::updateFrameEvents() // literal version // str = CI18N::get("uiDate"); - str += toString("%02d", (sint)RT.getRyzomTime()) + CI18N::get("uiMissionTimerHour") + " - "; + /* str += toString("%02d", (sint)RT.getRyzomTime()) + CI18N::get("uiMissionTimerHour") + " - "; str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + ", "; str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)RT.getRyzomMonthInCurrentCycle() )) + " "; str += toString("%02d", RT.getRyzomDayOfMonth()+1) + ", "; str += CI18N::get("uiAtysianCycle" + toString(RT.getRyzomCycle()+1) + "Ordinal") + " " + CI18N::get("uiAtysianCycle") + " "; - str += toString("%04d", RT.getRyzomYear()); + str += toString("%04d", RT.getRyzomYear());*/ + + str += toString("%02d", (sint)RT.getRyzomTime()) + CI18N::get("uiMissionTimerHour") + " - "; + str += toString("%d", (sint)RT.getRyzomWeek()) + " "; + str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + " - "; + ucstring year = RT.getRyzomYearStr(); + str += year + " - "; + str += CI18N::get("uiEon"); pVT = dynamic_cast(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:time")); if (pVT != NULL) diff --git a/code/ryzom/client/src/khanat.ico b/code/ryzom/client/src/khanat.ico new file mode 100644 index 000000000..fbb20a5ad Binary files /dev/null and b/code/ryzom/client/src/khanat.ico differ diff --git a/code/ryzom/client/src/ryzom.ico b/code/ryzom/client/src/ryzom.ico deleted file mode 100644 index f2c7e8424..000000000 Binary files a/code/ryzom/client/src/ryzom.ico and /dev/null differ diff --git a/code/ryzom/client/src/ryzom_small.ico b/code/ryzom/client/src/ryzom_small.ico deleted file mode 100644 index ae1ec5f44..000000000 Binary files a/code/ryzom/client/src/ryzom_small.ico and /dev/null differ diff --git a/code/ryzom/client/src/splash_screen.bmp b/code/ryzom/client/src/splash_screen.bmp index b2bee524d..f3836eaf0 100644 Binary files a/code/ryzom/client/src/splash_screen.bmp and b/code/ryzom/client/src/splash_screen.bmp differ diff --git a/code/ryzom/client/src/user_agent.cpp b/code/ryzom/client/src/user_agent.cpp index 7ba2b4e38..a57135dd8 100644 --- a/code/ryzom/client/src/user_agent.cpp +++ b/code/ryzom/client/src/user_agent.cpp @@ -44,7 +44,7 @@ #endif #ifndef RYZOM_CLIENT_ICON -#define RYZOM_CLIENT_ICON "ryzom_client" +#define RYZOM_CLIENT_ICON "khanat_client" #endif std::string getUserAgent() diff --git a/code/ryzom/client/unix/CMakeLists.txt b/code/ryzom/client/unix/CMakeLists.txt index ee7179c07..1dbe48949 100644 --- a/code/ryzom/client/unix/CMakeLists.txt +++ b/code/ryzom/client/unix/CMakeLists.txt @@ -1,16 +1,16 @@ 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 ryzom_client.png DESTINATION share/pixmaps) - INSTALL(FILES ryzom_client.xpm DESTINATION share/pixmaps) - INSTALL(FILES ryzom_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png) - INSTALL(FILES ryzom_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${RYZOM_CLIENT_ICON}.png) - INSTALL(FILES ryzom_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${RYZOM_CLIENT_ICON}.png) - INSTALL(FILES ryzom_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ${RYZOM_CLIENT_ICON}.png) - INSTALL(FILES ryzom_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ${RYZOM_CLIENT_ICON}.png) - INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/khanat_client.desktop" DESTINATION share/applications) + INSTALL(FILES khanat_client.png DESTINATION share/pixmaps) + INSTALL(FILES khanat_client.xpm DESTINATION share/pixmaps) + INSTALL(FILES khanat_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png) + INSTALL(FILES khanat_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${RYZOM_CLIENT_ICON}.png) + INSTALL(FILES khanat_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${RYZOM_CLIENT_ICON}.png) + INSTALL(FILES khanat_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ${RYZOM_CLIENT_ICON}.png) + INSTALL(FILES khanat_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ${RYZOM_CLIENT_ICON}.png) + INSTALL(FILES khanat_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png) ELSE() # in case of local client, only copy 48x48 icon - INSTALL(FILES ryzom_48x48.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png) + INSTALL(FILES khanat_48x48.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png) ENDIF() diff --git a/code/ryzom/client/unix/khanat_128x128.png b/code/ryzom/client/unix/khanat_128x128.png new file mode 100644 index 000000000..b3a682194 Binary files /dev/null and b/code/ryzom/client/unix/khanat_128x128.png differ diff --git a/code/ryzom/client/unix/khanat_16x16.png b/code/ryzom/client/unix/khanat_16x16.png new file mode 100644 index 000000000..e20affb32 Binary files /dev/null and b/code/ryzom/client/unix/khanat_16x16.png differ diff --git a/code/ryzom/client/unix/khanat_22x22.png b/code/ryzom/client/unix/khanat_22x22.png new file mode 100644 index 000000000..b46b0dc3f Binary files /dev/null and b/code/ryzom/client/unix/khanat_22x22.png differ diff --git a/code/ryzom/client/unix/khanat_24x24.png b/code/ryzom/client/unix/khanat_24x24.png new file mode 100644 index 000000000..5dba76dad Binary files /dev/null and b/code/ryzom/client/unix/khanat_24x24.png differ diff --git a/code/ryzom/client/unix/khanat_256x256.png b/code/ryzom/client/unix/khanat_256x256.png new file mode 100644 index 000000000..97647d961 Binary files /dev/null and b/code/ryzom/client/unix/khanat_256x256.png differ diff --git a/code/ryzom/client/unix/khanat_32x32.png b/code/ryzom/client/unix/khanat_32x32.png new file mode 100644 index 000000000..42716b532 Binary files /dev/null and b/code/ryzom/client/unix/khanat_32x32.png differ diff --git a/code/ryzom/client/unix/khanat_48x48.png b/code/ryzom/client/unix/khanat_48x48.png new file mode 100644 index 000000000..19159e140 Binary files /dev/null and b/code/ryzom/client/unix/khanat_48x48.png differ diff --git a/code/ryzom/client/unix/khanat_64x64.png b/code/ryzom/client/unix/khanat_64x64.png new file mode 100644 index 000000000..67dec3e2d Binary files /dev/null and b/code/ryzom/client/unix/khanat_64x64.png differ diff --git a/code/ryzom/client/unix/khanat_client.desktop.in b/code/ryzom/client/unix/khanat_client.desktop.in new file mode 100644 index 000000000..9941fa563 --- /dev/null +++ b/code/ryzom/client/unix/khanat_client.desktop.in @@ -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 diff --git a/code/ryzom/client/unix/khanat_client.png b/code/ryzom/client/unix/khanat_client.png new file mode 100644 index 000000000..19159e140 Binary files /dev/null and b/code/ryzom/client/unix/khanat_client.png differ diff --git a/code/ryzom/client/unix/khanat_client.xpm b/code/ryzom/client/unix/khanat_client.xpm new file mode 100644 index 000000000..e37a7617b --- /dev/null +++ b/code/ryzom/client/unix/khanat_client.xpm @@ -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#X.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" +}; diff --git a/code/ryzom/client/unix/ryzom_128x128.png b/code/ryzom/client/unix/ryzom_128x128.png deleted file mode 100644 index a51ce87ab..000000000 Binary files a/code/ryzom/client/unix/ryzom_128x128.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_16x16.png b/code/ryzom/client/unix/ryzom_16x16.png deleted file mode 100644 index 451f7df45..000000000 Binary files a/code/ryzom/client/unix/ryzom_16x16.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_22x22.png b/code/ryzom/client/unix/ryzom_22x22.png deleted file mode 100644 index 2505a9259..000000000 Binary files a/code/ryzom/client/unix/ryzom_22x22.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_24x24.png b/code/ryzom/client/unix/ryzom_24x24.png deleted file mode 100644 index 1aa4207ab..000000000 Binary files a/code/ryzom/client/unix/ryzom_24x24.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_256x256.png b/code/ryzom/client/unix/ryzom_256x256.png deleted file mode 100644 index 36f557ca9..000000000 Binary files a/code/ryzom/client/unix/ryzom_256x256.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_32x32.png b/code/ryzom/client/unix/ryzom_32x32.png deleted file mode 100644 index b22c586eb..000000000 Binary files a/code/ryzom/client/unix/ryzom_32x32.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_48x48.png b/code/ryzom/client/unix/ryzom_48x48.png deleted file mode 100644 index 67e3034ef..000000000 Binary files a/code/ryzom/client/unix/ryzom_48x48.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_64x64.png b/code/ryzom/client/unix/ryzom_64x64.png deleted file mode 100644 index 94e07d66e..000000000 Binary files a/code/ryzom/client/unix/ryzom_64x64.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_client.desktop.in b/code/ryzom/client/unix/ryzom_client.desktop.in deleted file mode 100644 index b42aee5bf..000000000 --- a/code/ryzom/client/unix/ryzom_client.desktop.in +++ /dev/null @@ -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 diff --git a/code/ryzom/client/unix/ryzom_client.png b/code/ryzom/client/unix/ryzom_client.png deleted file mode 100644 index 67e3034ef..000000000 Binary files a/code/ryzom/client/unix/ryzom_client.png and /dev/null differ diff --git a/code/ryzom/client/unix/ryzom_client.xpm b/code/ryzom/client/unix/ryzom_client.xpm deleted file mode 100644 index 74df2446f..000000000 --- a/code/ryzom/client/unix/ryzom_client.xpm +++ /dev/null @@ -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 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", -"gXgXgXgXX3XV.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. dayIntervals; NLMISC::explode(_DayInterval, std::string(","), dayIntervals, true); std::string season = EGSPD::CSeason::toString(rt.getRyzomSeason()); - std::string month = MONTH::toString((MONTH::EMonth) rt.getRyzomMonth()); std::string weekday = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDay()); bool found = false; for (uint k = 0; k < dayIntervals.size(); ++k) @@ -147,15 +146,6 @@ bool CFaunaGenericPlace::getActive() const { goodToken = true; } - if (NLMISC::nlstricmp(dayIntervals[k], month) == 0) - { - found = true; - break; - } - if (MONTH::toMonth(dayIntervals[k]) != MONTH::UNKNOWN) - { - goodToken = true; - } if (NLMISC::nlstricmp(dayIntervals[k], weekday) == 0) { found = true; diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp index 8d8d1c7c9..966462331 100644 --- a/code/ryzom/server/src/ai_service/commands.cpp +++ b/code/ryzom/server/src/ai_service/commands.cpp @@ -39,7 +39,7 @@ #include "fx_entity_manager.h" #include "ai_script_data_manager.h" #include "commands.h" - +#include "nel/misc/i18n.h" #include "ais_user_models.h" extern bool GrpHistoryRecordLog; @@ -3065,17 +3065,15 @@ static void displayTime(const CRyzomTime &rt, NLMISC::CLog &log) std::string result; result = NLMISC::toString("hh:mm = %d:%d; ", (int) floorf(rt.getRyzomTime()) , (int) floorf(60.f * fmodf(rt.getRyzomTime(), 1.f))); log.displayNL(result.c_str()); - uint32 month = rt.getRyzomMonth(); - MONTH::EMonth monthInCycle = rt.getRyzomMonthInCurrentCycle(); - std::string monthName = MONTH::toString((MONTH::EMonth) monthInCycle); - uint32 dayOfMonth = rt.getRyzomDayOfMonth(); - std::string dayName = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek()); - result = NLMISC::toString("mm:dd:yy = %d:%d:%d (%s:%s)", - (int) (month + 1), - (int) (dayOfMonth + 1), - (int) rt.getRyzomYear(), - monthName.c_str(), - dayName.c_str()); + std::string week = toString("%03d", rt.getRyzomWeek()); + std::string dayName = CI18N::get("ui"+WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek())).toUtf8(); + std::string year = rt.getRyzomYearStr().toUtf8(); + std::string eon = CI18N::get("uiEon").toUtf8(); + result = NLMISC::toString("week:day:year:eon = %s:%s:%s:%s", + week.c_str(), + dayName.c_str(), + year.c_str(), + eon.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("season = %d/4 (%s)", (int) rt.getRyzomSeason() + 1, EGSPD::CSeason::toString(rt.getRyzomSeason()).c_str()); diff --git a/code/ryzom/server/src/ai_service/generic_logic_action.cpp b/code/ryzom/server/src/ai_service/generic_logic_action.cpp index 0b0e254b7..8d56ac7d0 100644 --- a/code/ryzom/server/src/ai_service/generic_logic_action.cpp +++ b/code/ryzom/server/src/ai_service/generic_logic_action.cpp @@ -830,11 +830,11 @@ public: break; case tm_monthday: { - uint32 dom = CTimeInterface::getRyzomTime().getRyzomDayOfMonth(); + /*uint32 dom = CTimeInterface::getRyzomTime().getRyzomDayOfMonth(); while (dom < _DayNumber) dom += RYZOM_MONTH_IN_DAY; - _Min = _Max = timeTicks + dom * RYZOM_DAY_IN_TICKS; + _Min = _Max = timeTicks + dom * RYZOM_DAY_IN_TICKS;*/ } break; case tm_seasonday: diff --git a/code/ryzom/server/src/ai_service/nf_grp.cpp b/code/ryzom/server/src/ai_service/nf_grp.cpp index fde5a557c..47ee114cb 100644 --- a/code/ryzom/server/src/ai_service/nf_grp.cpp +++ b/code/ryzom/server/src/ai_service/nf_grp.cpp @@ -3364,17 +3364,15 @@ void getRyzomDateStr__s(CStateInstance* entity, CScriptStack& stack) const CRyzomTime &rt = CTimeInterface::getRyzomTime(); result = NLMISC::toString("%d:%d:00", (int) floorf(rt.getRyzomTime()) , (int) floorf(60.f * fmodf(rt.getRyzomTime(), 1.f))); - uint32 month = rt.getRyzomMonth(); - MONTH::EMonth monthInCycle = rt.getRyzomMonthInCurrentCycle(); - std::string monthName = MONTH::toString((MONTH::EMonth) monthInCycle); - uint32 dayOfMonth = rt.getRyzomDayOfMonth(); - std::string dayName = WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek()); - result += NLMISC::toString(" / %s %d %s(%d) %d", - dayName.c_str(), - (int) (dayOfMonth + 1), - monthName.c_str(), - (int) (month + 1), - (int) rt.getRyzomYear()); + std::string week = toString("%03d", rt.getRyzomWeek()); + std::string dayName = CI18N::get("ui"+WEEKDAY::toString((WEEKDAY::EWeekDay) rt.getRyzomDayOfWeek())).toUtf8(); + std::string year = toString(rt.getRyzomYearStr()); + std::string eon = CI18N::get("uiEon").toUtf8(); + result += NLMISC::toString(" / %s %s - %s - %s", + week.c_str(), + dayName.c_str(), + year.c_str(), + eon.c_str()); stack.push( result ); } diff --git a/code/ryzom/server/src/shard_unifier_service/character_sync.cpp b/code/ryzom/server/src/shard_unifier_service/character_sync.cpp index 29b404567..2d05956e9 100644 --- a/code/ryzom/server/src/shard_unifier_service/character_sync.cpp +++ b/code/ryzom/server/src/shard_unifier_service/character_sync.cpp @@ -328,20 +328,20 @@ namespace CHARSYNC { const CONTINENT::TContinentId &cont = first->first; const uint32 &count = first->second; - if (cont == CONTINENT::FYROS) - access['D'] += count; - else if (cont == CONTINENT::ZORAI) - access['J'] += count; - if (cont == CONTINENT::BAGNE - || cont == CONTINENT::NEXUS - || cont == CONTINENT::ROUTE_GOUFFRE - || cont == CONTINENT::SOURCES - || cont == CONTINENT::TERRE) - access['P'] += count; - if (cont == CONTINENT::MATIS) - access['F'] += count; - if (cont == CONTINENT::TRYKER) - access['L'] += count; +// if (cont == CONTINENT::FYROS) +// access['D'] += count; +// else if (cont == CONTINENT::ZORAI) +// access['J'] += count; +// if (cont == CONTINENT::BAGNE +// || cont == CONTINENT::NEXUS +// || cont == CONTINENT::ROUTE_GOUFFRE +// || cont == CONTINENT::SOURCES +// || cont == CONTINENT::TERRE) +// access['P'] += count; +// if (cont == CONTINENT::MATIS) +// access['F'] += count; +// if (cont == CONTINENT::TRYKER) +// access['L'] += count; } // parse the RingAccessLimits variable and build up a limits map... diff --git a/code/ryzom/server/used_continents.cfg b/code/ryzom/server/used_continents.cfg index d8055753b..156c9ccfd 100644 --- a/code/ryzom/server/used_continents.cfg +++ b/code/ryzom/server/used_continents.cfg @@ -1,14 +1,12 @@ // This is the mapping for logical continent to physical one (server_share/used_continent.cpp) ContinentNameTranslator = { - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +// "terre", "terre_oubliee", +// "sources", "sources_interdites" }; // This is the list of continent to use with their unique instance number (server_share/used_continent.cpp) UsedContinents = { - "newbieland", "20", + "newbieland", "2", }; diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp index bfa9bbc58..e29c9a4cc 100644 --- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp +++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp @@ -146,13 +146,13 @@ void CClientConfigDialog::onClickPlay() bool started = false; #ifdef Q_OS_WIN32 - started = QProcess::startDetached( "ryzom_client_r.exe" ); + started = QProcess::startDetached( "khanat_client_r.exe" ); if( !started ) - QProcess::startDetached( "ryzom_client_d.exe" ); + QProcess::startDetached( "khanat_client_d.exe" ); #elif defined(Q_OS_MAC) - started = QProcess::startDetached( "./Ryzom.app" ); + started = QProcess::startDetached( "./Khanat.app" ); #else - started = QProcess::startDetached( "./ryzom_client" ); + started = QProcess::startDetached( "./khanat_client" ); #endif onClickOK(); diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index 9616f8153..d9f2a8215 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -11,7 +11,7 @@ FILE(GLOB SRC main.cpp # always enable 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( ${LIBXML2_INCLUDE_DIR} @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/ryzom/client/src ) -TARGET_LINK_LIBRARIES(ryzom_client_patcher +TARGET_LINK_LIBRARIES(khanat_client_patcher nelmisc nelnet ryzom_gameshare @@ -29,16 +29,16 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher IF(APPLE) FIND_LIBRARY(FOUNDATION_LIBRARY Foundation) - TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY}) + TARGET_LINK_LIBRARIES(khanat_client_patcher ${FOUNDATION_LIBRARY}) ENDIF(APPLE) ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP) -NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher") -NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher) +NL_DEFAULT_PROPS(khanat_client_patcher "Khanat, Tools: Khanat Client Patcher") +NL_ADD_RUNTIME_FLAGS(khanat_client_patcher) 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) -INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client) +INSTALL(TARGETS khanat_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client) diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/code/ryzom/tools/client/client_patcher/main.cpp index 7575e8fe8..6df90c0ef 100644 --- a/code/ryzom/tools/client/client_patcher/main.cpp +++ b/code/ryzom/tools/client/client_patcher/main.cpp @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) // if client.cfg is not in current directory, use client.cfg from user directory if (!CFile::isExists(config)) - config = CPath::getApplicationDirectory("Ryzom") + config; + config = CPath::getApplicationDirectory("Khanat") + config; // if client.cfg is not in current directory, use client_default.cfg if (!CFile::isExists(config))