From ef05eb4e095d9d1fd14ae76d81050ffca8677613 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Sun, 13 Sep 2020 02:24:34 +0200 Subject: [PATCH] Completly re-structure of the journal main page Now actual useful information can be read there. Besides a short player overview a few server settings can be found there. --- .../playerstats/epeen_setText_journal.sqf | 125 +++++++----------- SQF/dayz_code/stringtable.xml | 45 ++++++- 2 files changed, 94 insertions(+), 76 deletions(-) diff --git a/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf b/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf index 4c9c564cc..6f8fcd94d 100644 --- a/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf +++ b/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf @@ -1,86 +1,61 @@ -private ["_currentTime","_totalMins","_days","_hours","_mins","_ys","_ms","_ds","_b","_2","_6","_7","_8","_9","_10","_str_left_text","_1","_3","_4","_5","_blood_in_pack","_blood_in_inv","_mag_arr","_backpack","_11","_mags_for_weap","_mssv_cnt","_weapon","_config","_survivors","_moon","_spawnselection","_disabledTemperature"]; -_survivors = playersNumber west; +private ["_currentTime","_totalMins","_days","_hours","_mins","_base","_plots","_currency","_pve","_b","_survived"]; -_str_left_text = " - -"+(localize "str_playerstats_journal_1")+" -
-
-"+(localize "str_playerstats_journal_2")+" -
-
-%7%8%9 %10 -
-
-%11 - -"; - -_1 = name player; - -dayz_currentGlobalZombies = count entities "zZombie_Base"; - -//Work out survival time _currentTime = floor ((diag_tickTime - dayz_loginTime) / 60); _totalMins = (player getVariable "SurvivalTime") + _currentTime; _days = floor (_totalMins / 1440); _totalMins = (_totalMins - (_days * 1440)); _hours = floor (_totalMins / 60); _mins = (_totalMins - (_hours * 60)); - dayz_Survived = [_days,_hours,_mins,_totalMins]; +_survived = format["%1 %2, %3 %4, %5 %6",(dayz_Survived select 0),localize "STR_EPOCH_JOURNAL_DAYS",(dayz_Survived select 1),localize "STR_EPOCH_JOURNAL_HOURS",(dayz_Survived select 2),localize "STR_EPOCH_JOURNAL_MINUTES"]; +_base = ["STR_EP1_dogfighters_params09","STR_EP1_dogfighters_params08"] select (DZE_GodModeBase); +_plots = [localize "str_ep1_mpt_param1_5",DZE_limitPlots] select (DZE_limitPlots > 0); +_currency = [localize "STR_EPOCH_GOLD",CurrencyName] select (Z_SingleCurrency); +_pve = ["str_temp_param_disabled","str_temp_param_enabled"] select (DZE_PVE_Mode); -_moon = if (dayz_ForcefullmoonNights) then { "Yes" } else { "No" }; - -_spawnselection = switch (dayz_spawnselection) do { - case 1: { "Yes" }; - case 0: { "No" }; -}; - -_disabledTemperature = switch (dayz_temperature_override) do { - case true: { "Disabled" }; - case false: { "Enabled" }; -}; - - // left page - ((uiNamespace getVariable "horde_myDisplay") displayCtrl 1800) ctrlSetStructuredText parseText format [" - Survival Type: %14
-
- Health: %1
- Hunger: %2%
- Thirst: %3%
-
- Temp: %5/%13
-
- Humanity: %6
- Zombies: %7
-
- SpawnSelection: %4
- Full Moon: %12
-
- Survived: %8 Day(s), %15 Hour(s), %16 Minute(s)
-
- Survivors:%9
-
- FPS:%10, FPSMin:%11
- ", - (round(r_player_blood)), - (round(dayz_hunger)), - (round(dayz_thirst)), - (_spawnselection), - (round(dayz_temperatur)), - (round(player getVariable['humanity', 0])), - (dayz_currentGlobalZombies), - (dayz_Survived select 0), - (_survivors), - (round diag_fps), - (round diag_fpsmin), - (_moon), - (_disabledTemperature), - (dayz_presets), - (dayz_Survived select 1), - (dayz_Survived select 2) - ]; +// left page +((uiNamespace getVariable "horde_myDisplay") displayCtrl 1800) ctrlSetStructuredText parseText format [" + %1: %2
+ %3: %4
+ %5: %6
+ %7: %8
+
+ %9
+
+ %10: %11
+ %12: %13
+ %14: %15
+ %16: %17
+ %18: %19
+ %20 %21: %22
+ %23 %24: %25
+ ", + localize "STR_EPOCH_JOURNAL_Name", // 1 + (name player), // 2 + localize "STR_EPOCH_JOURNAL_HEALTH", // 3 + (round(r_player_blood)), // 4 + localize "str_actions_stats_hm", // 5 + (round(player getVariable['humanity', 0])), // 6 + localize "STR_EPOCH_JOURNAL_SURVIVED", // 7 + _survived, // 8 + localize "STR_EPOCH_JOURNAL_SERVER_SETTINGS", // 9 + localize "STR_EPOCH_JOURNAL_BASE", // 10 + localize _base, // 11 + localize "STR_EPOCH_JOURNAL_PLOT", // 12 + _plots, // 13 + localize "STR_EPOCH_JOURNAL_BUILDINGLIMIT", // 14 + DZE_BuildingLimit, // 15 + localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY", // 16 + _currency, // 17 + localize "STR_EPOCH_JOURNAL_PVE", // 18 + localize _pve, // 19 + localize "str_actions_stats_hm", // 20 + localize "str_playerstats_hero", // 21 + DZE_Hero, // 22 + localize "str_actions_stats_hm", // 23 + localize "str_playerstats_bandit", // 24 + DZE_Bandit // 25 +]; // right page - blank until humanity is checked @@ -94,4 +69,4 @@ _b = "