Add: Marker texts are now localized to client #430

1kuemmel1 · 2017-11-12T15:30:59Z

Add: Marker texts are now localized to client.

#400

When merged this pull request will:

marker texts are localized accordingly to client language
the marker will be localized separately on the client via removeExec and setMarkerTextLocal

Final test:

local
server

Screenshots
English dedicated server and German client

Update Branch: Master daily

Update master_daily

Master daily

Master daily update

Update Master daily

This reverts commit ce657c8.

Vdauphin

Hello, I wanted to do the same for markers so thanks to do it :)
As always I have some question ^^, see under :).

Generally, I don't see the point to check parameter passed to a function :

this add unnecessary complexity in function. I like short code with just the necessary, so it easy to understand what the function actually do
check parameter are usefull if you return an error or warning, so the user know he is not using your function correctly and can correct himself. That why I prefer to see a syntaxe error and a message in the RTP. They discribe the error very well and explain there are something wrong. If nothing is return, you can't see you are wrong and you leave hidden error. Those are very hard to find and resolve.

Just check then when it is necessary like I did it here. If you want more information ask me directly inside the PR

Thank you very much for your time!

Vdauphin · 2017-11-13T22:26:46Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_markerText.sqf

+	["_arg", ""]
+];
+//only run on client
+if (isDedicated) exitWith {};


This function is only compiled client side so there are no way this function could be executed on isDedicated (https://github.com/1kuemmel1/HeartsAndMinds/blob/8dd845701e68a3e0309429e4a93bc6dcc75f175b/%3DBTC%3Dco%4030_Hearts_and_Minds.Altis/core/fnc/compile.sqf#L245).

As I understand, Guillustio choosed to only compile function where there are supposed to works. By this way, the loading is faster because there are less function to compile (only usefull function are compiled) and you avoid this type of check in every function and call :)

I am Sorry. That's my fault: I used this function in another project some month ago. And the snippets are remnant. I will remove them.

Vdauphin · 2017-11-13T22:32:34Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/underwater_generator.sqf

@@ -58,7 +58,7 @@ _group = [_pos,8, 1 + round random 5,0.8] call btc_fnc_mil_create_group;
 [_pos,20, 2 + round random 4,0.5] call btc_fnc_mil_create_group;

 _pos = getPosASL _generator;
-leader _group setPosASL [_pos select 0, _pos select 1, (_pos select 2) + 1 + random 1];
+(leader (_group select 0)) setPosASL [_pos select 0, _pos select 1, (_pos select 2) + 1 + random 1];


Should not be here, may be you based your branch on your last PR, doesn't matter :)

My mistake, sorry.

Vdauphin · 2017-11-13T22:36:14Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_markerText.sqf

+if  !((typeName _marker) isEqualTo "STRING") then {_marker = str _marker;};
+
+//check marker
+if ((getMarkerPos _marker) isEqualTo [0,0,0]) exitWith {};


This mean you can't create a marker at position [0,0,0].

same as above

Vdauphin · 2017-11-13T22:36:33Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_markerText.sqf

+if (isDedicated) exitWith {};
+
+//check parameters
+if  !((typeName _marker) isEqualTo "STRING") then {_marker = str _marker;};


createMarker only return string, nop?
Is there situation where this function is call by H&M with a _marker not a string ?

same as above

Vdauphin · 2017-11-13T22:39:19Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf

@@ -242,6 +242,7 @@ if (!isDedicated) then {
 	btc_fnc_systemchat_debug = compile preprocessFileLineNumbers "core\fnc\common\systemchat_debug.sqf";
 	btc_fnc_show_hint = compile preprocessFileLineNumbers "core\fnc\common\show_hint.sqf";
 	btc_fnc_intro = compile preprocessFileLineNumbers "core\fnc\common\intro.sqf";
+	btc_fnc_set_markerText = compile preprocessFileLineNumbers "core\fnc\common\set_markerText.sqf";


btc_fnc_set_markerTextLocal may be ?

Good idea I will change this.

Vdauphin · 2017-11-13T22:44:03Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/eh/veh_killed.sqf

@@ -6,8 +6,7 @@ _vehicle = _this select 0;
 _marker = createmarker [format ["m_%1",_vehicle],getPos _vehicle];
 _marker setMarkerType "mil_box";
 _marker setMarkerColor "ColorRed";
-_marker setMarkerText format [(localize "STR_BTC_HAM_O_EH_VEHKILLED_MRK"),getText (configFile >> "cfgVehicles" >> typeof _vehicle >> "displayName")]; // %1 wreck
-
+[_marker,{localize "STR_BTC_HAM_O_EH_VEHKILLED_MRK"},(getText (configFile >> "cfgVehicles" >> typeof _vehicle >> "displayName"))] remoteExec ["btc_fnc_set_markerText",0,true];


Why not a simple [_marker,"STR_BTC_HAM_O_EH_VEHKILLED_MRK",(getText (configFile >> "cfgVehicles" >> typeof _vehicle >> "displayName"))] remoteExec ["btc_fnc_set_markerText",0,true]; ?

Then in btc_fnc_set_markerText and check isLocalized ? instead of :

//check text for localization code if ((typeName _text) isEqualTo "CODE") then { _text = call _text; };

Do it for all remoteexec with {localize

Vdauphin · 2017-11-13T23:03:29Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/cache/hd_cache.sqf

@@ -19,7 +19,8 @@ if (isNil {_cache getVariable "btc_hd_cache"} && {_explosive} && {_damage > 0.6}
 	deleteVehicle btc_cache_obj;
 	_marker = createmarker [format ["btc_cache_%1", btc_cache_n], btc_cache_pos];
 	_marker setmarkertype "hd_destroy";
-	_marker setMarkerText format ["Cached %1 destroyed", btc_cache_n];
+	[_marker,{localize "STR_BTC_HAM_O_EH_HDCACHE_MRK"},btc_cache_n] remoteExec ["btc_fnc_set_markerText",0,true]; //Cached %1 destroyed


remoteexec only client side (-2) not all (0).

Do it for all remoteexec :/

This is the reason for the execution on all machines.

A possible solution is this (for example):

[_marker,{localize "STR_BTC_HAM_O_EH_HDCACHE_MRK"},btc_cache_n] remoteExec ["btc_fnc_set_markerText", [0, -2] select isDedicated, true];

But so you have extra code.

Vdauphin · 2017-11-13T23:17:20Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/capture_officer.sqf

@@ -36,12 +36,12 @@ btc_side_jip_data = [14,getPos _city1,_city1 getVariable "name"];
 //// Create markers \\\\
 _marker1 = createmarker [format ["sm_2_%1",getPos _city1],getPos _city1];
 _marker1 setmarkertype "hd_flag";
-_marker1 setmarkertext (localize "STR_BTC_HAM_SIDE_CONVOY_MRKSTART"); //Convoy Start
+[_marker,{localize "STR_BTC_HAM_SIDE_CONVOY_MRKSTART"}] remoteExec ["btc_fnc_set_markerText",0,true]; //Convoy Start


The JIP should be removed at the end of side mission see exemple 7.

You could handle this by two way :

[] remoteExec ["someScriptCommand", targets, Object or Group or netId ]; see the "JIP (Optional):" section in remoteexec

Or get the JIP ID returned by remoteexec and remove it in this function here. When the marker is deleted, delete also the JIP remoteexec you created (if no JIP ID use "").

Something like this could work (I wrote the concept):

{ params ["_marker", "_JIP_ID"]; deletemarker _marker; if !(_JIP_ID isequalto "") then remoteExec ["", _JIP_ID]; } foreach [["marker name1", "JIP ID1"],["marker name2", "JIP ID2"]];

I´ve changed something. Please take a look.

1kuemmel1 · 2017-11-18T14:25:57Z

As always I have some question ^^, see under :).

No problem
Your comments will make the code even better and I'll learn something. That's great!

PS: Sorry for my late answer

Vdauphin · 2017-11-19T17:56:36Z

I also learn a lot!
Dont worry for the delay, I am also busy until middle of december... I will only work on PR with "Bug" label.
Have a good day!

Vdauphin

Looks even more great. I will do final test when those changes are done.

Vdauphin · 2017-11-19T18:52:23Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/delete.sqf

@@ -2,6 +2,8 @@

 {
 	deletemarker _x;
+	//remove JIP remoteExec
+	remoteExec ["", _x];


Perfect! So there was a third solution !

Vdauphin · 2017-11-19T18:58:08Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/capture_officer.sqf

@@ -36,12 +36,12 @@ btc_side_jip_data = [14,getPos _city1,_city1 getVariable "name"];
 //// Create markers \\\\
 _marker1 = createmarker [format ["sm_2_%1",getPos _city1],getPos _city1];
 _marker1 setmarkertype "hd_flag";
-_marker1 setmarkertext (localize "STR_BTC_HAM_SIDE_CONVOY_MRKSTART"); //Convoy Start
+[_marker,"STR_BTC_HAM_SIDE_CONVOY_MRKSTART"] remoteExec ["btc_fnc_set_markerTextLocal", [0, -2] select isDedicated, _marker]; //Convoy Start


Vdauphin · 2017-11-19T18:59:07Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/capture_officer.sqf

 _marker1 setMarkerSize [0.6, 0.6];

 _marker2 = createmarker [format ["sm_2_%1",_pos2],_pos2];
 _marker2 setmarkertype "hd_flag";
-_marker2 setmarkertext (localize "STR_BTC_HAM_SIDE_CONVOY_MRKEND"); //Convoy End
+[_marker,"STR_BTC_HAM_SIDE_CONVOY_MRKEND"] remoteExec ["btc_fnc_set_markerTextLocal", [0, -2] select isDedicated, _marker]; //Convoy End


Vdauphin · 2017-11-19T19:05:55Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/capture_officer.sqf

@@ -36,12 +36,12 @@ btc_side_jip_data = [14,getPos _city1,_city1 getVariable "name"];
 //// Create markers \\\\
 _marker1 = createmarker [format ["sm_2_%1",getPos _city1],getPos _city1];
 _marker1 setmarkertype "hd_flag";
-_marker1 setmarkertext (localize "STR_BTC_HAM_SIDE_CONVOY_MRKSTART"); //Convoy Start
+[_marker,"STR_BTC_HAM_SIDE_CONVOY_MRKSTART"] remoteExec ["btc_fnc_set_markerTextLocal", [0, -2] select isDedicated, _marker]; //Convoy Start


Vdauphin · 2017-11-19T19:06:01Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/capture_officer.sqf

 _marker1 setMarkerSize [0.6, 0.6];

 _marker2 = createmarker [format ["sm_2_%1",_pos2],_pos2];
 _marker2 setmarkertype "hd_flag";
-_marker2 setmarkertext (localize "STR_BTC_HAM_SIDE_CONVOY_MRKEND"); //Convoy End
+[_marker,"STR_BTC_HAM_SIDE_CONVOY_MRKEND"] remoteExec ["btc_fnc_set_markerTextLocal", [0, -2] select isDedicated, _marker]; //Convoy End


Vdauphin · 2017-11-19T19:12:15Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/eh/veh_killed.sqf

@@ -6,7 +6,7 @@ _vehicle = _this select 0;
 _marker = createmarker [format ["m_%1",_vehicle],getPos _vehicle];
 _marker setMarkerType "mil_box";
 _marker setMarkerColor "ColorRed";
-_marker setMarkerText format [(localize "STR_BTC_HAM_O_EH_VEHKILLED_MRK"),getText (configFile >> "cfgVehicles" >> typeof _vehicle >> "displayName")]; // %1 wreck
+[_marker,"STR_BTC_HAM_O_EH_VEHKILLED_MRK",(getText (configFile >> "cfgVehicles" >> typeof _vehicle >> "displayName"))] remoteExec ["btc_fnc_set_markerTextLocal", [0, -2] select isDedicated, _marker]; // %1 wreck


Can you remove the JIP when this marker is deleted ?
Add: remoteExec [_marker, _x]; in /core/fnc/log/server_repair_wreck.sqf#L13)

Sure

done 😄

Vdauphin · 2017-11-25T17:45:37Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/capture_officer.sqf

@@ -36,12 +36,12 @@ btc_side_jip_data = [14,getPos _city1,_city1 getVariable "name"];
 //// Create markers \\\\
 _marker1 = createmarker [format ["sm_2_%1",getPos _city1],getPos _city1];
 _marker1 setmarkertype "hd_flag";
-_marker1 setmarkertext (localize "STR_BTC_HAM_SIDE_CONVOY_MRKSTART"); //Convoy Start
+[_marker1,"STR_BTC_HAM_SIDE_CONVOY_MRKSTART"] remoteExec ["btc_fnc_set_markerTextLocal", [0, -2] select isDedicated, _marker]; //Convoy Start


Started to do local test and got an error : need _marker1 at the end of remoteExec also ^^ a sad copy and paste ;)

ahh, ok. 😞

sorry

Vdauphin · 2017-11-25T17:45:40Z

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/capture_officer.sqf

 _marker1 setMarkerSize [0.6, 0.6];

 _marker2 = createmarker [format ["sm_2_%1",_pos2],_pos2];
 _marker2 setmarkertype "hd_flag";
-_marker2 setmarkertext (localize "STR_BTC_HAM_SIDE_CONVOY_MRKEND"); //Convoy End
+[_marker2,"STR_BTC_HAM_SIDE_CONVOY_MRKEND"] remoteExec ["btc_fnc_set_markerTextLocal", [0, -2] select isDedicated, _marker]; //Convoy End


_marker2 ^^

Extended_PreInit_EventHandlers compile the compile.sqf file before the JIP remoteExec "btc_fnc_" is executed

1kuemmel1 and others added 14 commits September 18, 2017 09:11

Merge pull request #2 from Vdauphin/master_daily

0db2117

Update Branch: Master daily

Merge pull request #3 from Vdauphin/master_daily

6561054

Update master_daily

Merge pull request #7 from Vdauphin/master_daily

37da641

Master daily

Merge pull request #9 from Vdauphin/master_daily

9405052

Master daily update

Merge pull request #11 from Vdauphin/master_daily

247a598

Update Master daily

fix script error

50c3045

disable debug console

803880a

add fnc

3456998

add missing translation for markers

8e06700

integrate set_markterText fnc

a0da886

re-added setVariable

ce657c8

Revert "re-added setVariable"

fba9e12

This reverts commit ce657c8.

re-added set variable

5b73cf4

removed comments

8dd8457

1kuemmel1 changed the title ~~Add marker handling client~~ Add: Marker handling client Nov 12, 2017

1kuemmel1 changed the title ~~Add: Marker handling client~~ Add: Marker texts are now localized to client Nov 12, 2017

Vdauphin self-requested a review November 12, 2017 16:57

Vdauphin added this to the 1.18 milestone Nov 12, 2017

Vdauphin added the enhancement label Nov 12, 2017

Vdauphin requested changes Nov 13, 2017

View reviewed changes

1kuemmel1 added 4 commits November 18, 2017 15:20

changed name and simplified

524e8c3

changed function name

e782220

changed remote exec handling

3053a6c

added delete remoteExec JIP

ef9b484

Vdauphin requested changes Nov 24, 2017

View reviewed changes

1kuemmel1 added 2 commits November 25, 2017 15:28

corrected _marker1/2 variable

ca32f3a

remove remoteExec on wreck repair

4d76c0b

Vdauphin requested changes Nov 25, 2017

View reviewed changes

fixed copy/paste mistake

a05272c

Vdauphin approved these changes Dec 9, 2017

View reviewed changes

Compile "compile.sqf" file before JIP are executed

4135c3a

Extended_PreInit_EventHandlers compile the compile.sqf file before the JIP remoteExec "btc_fnc_" is executed

Vdauphin merged commit bf486a2 into Vdauphin:master_daily Dec 12, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add: Marker texts are now localized to client #430

Add: Marker texts are now localized to client #430

1kuemmel1 commented Nov 12, 2017 •

edited by Vdauphin

Loading

Vdauphin left a comment •

edited

Loading

Vdauphin Nov 13, 2017

1kuemmel1 Nov 18, 2017

Vdauphin Nov 13, 2017

1kuemmel1 Nov 18, 2017

Vdauphin Nov 13, 2017

1kuemmel1 Nov 18, 2017

Vdauphin Nov 13, 2017

1kuemmel1 Nov 18, 2017

Vdauphin Nov 13, 2017

1kuemmel1 Nov 18, 2017

Vdauphin Nov 13, 2017

1kuemmel1 Nov 18, 2017

Vdauphin Nov 13, 2017

1kuemmel1 Nov 18, 2017

Vdauphin Nov 13, 2017 •

edited

Loading

1kuemmel1 Nov 18, 2017

1kuemmel1 commented Nov 18, 2017

Vdauphin commented Nov 19, 2017 •

edited

Loading

Vdauphin left a comment

Vdauphin Nov 19, 2017

Vdauphin Nov 19, 2017

Vdauphin Nov 19, 2017

Vdauphin Nov 19, 2017

Vdauphin Nov 19, 2017

Vdauphin Nov 19, 2017

1kuemmel1 Nov 25, 2017

Vdauphin Nov 25, 2017

1kuemmel1 Nov 25, 2017

Vdauphin Nov 25, 2017

Add: Marker texts are now localized to client #430

Add: Marker texts are now localized to client #430

Conversation

1kuemmel1 commented Nov 12, 2017 • edited by Vdauphin Loading

Vdauphin left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Vdauphin Nov 13, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

1kuemmel1 commented Nov 18, 2017

Vdauphin commented Nov 19, 2017 • edited Loading

Vdauphin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

1kuemmel1 commented Nov 12, 2017 •

edited by Vdauphin

Loading

Vdauphin left a comment •

edited

Loading

Vdauphin Nov 13, 2017 •

edited

Loading

Vdauphin commented Nov 19, 2017 •

edited

Loading