From 5a886929410a12c3d8433f7e6baf1c99fc902e79 Mon Sep 17 00:00:00 2001 From: Greavox <35181101+Greavox@users.noreply.github.com> Date: Mon, 9 Sep 2019 16:43:48 +0200 Subject: [PATCH 1/7] Update playing.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ceci est une démonstration de l'ajout du formatage des planètes de l'Astro dans la "ToolTip" avec quelques modifications supplémentaire : - Les zones mortelles se trouvent différenciées par la graisse, l'italique et la couleur liée à cette dernière ; suivies de l'icône Tête de mort de Mush ; - Les zones à risque Mush (Crystalite) se retrouve différenciée par l'italique de couleur suivie de l'icône Mush ; - Les zones d'intérêt (O2 et Fuel) sont différenciées par la graisse suivies de l'icône O2 ou Fuel correspondantes. Images illustrant le propos. Par manque de case nécessaire au test, l'Océan était similaire au Fuel et le Marais à un Mankarog pour l'exemple. http://imgup.motion-twin.com/twinoid/d/0/0b62b13b_6075278.jpg http://imgup.motion-twin.com/twinoid/3/3/e3819f4c_6075278.jpg Qu'en pensez-vous ? --- src/main/tabs/playing.js | 108 +++++++++++++++++++++++++++++++++------ 1 file changed, 93 insertions(+), 15 deletions(-) diff --git a/src/main/tabs/playing.js b/src/main/tabs/playing.js index b13151c..428fe6f 100644 --- a/src/main/tabs/playing.js +++ b/src/main/tabs/playing.js @@ -492,6 +492,7 @@ Main.k.tabs.playing = function() { // Planets if ($("#navModule").length > 0) { + var tolltiptext = Main.k.FormatPlanets(0,true); $("").addClass("butmini formatbtn").html("").attr("href", "#").appendTo(sharediv) .on("click", function() { var txt = Main.k.FormatPlanets(); @@ -499,7 +500,7 @@ Main.k.tabs.playing = function() { return false; }) .attr("_title", Main.k.text.gettext("Partager les planètes")) - .attr("_desc", Main.k.text.gettext("

Insère les détails des planètes dans la zone de texte active.

TODO: Exemple

")) + .attr("_desc", Main.k.text.gettext("

Insère les détails des planètes dans la zone de texte active.
"+tolltiptext+"

")) .on("mouseover", Main.k.CustomTip) .on("mouseout", Main.k.hideTip); } @@ -1002,8 +1003,15 @@ Main.k.tabs.playing = function() { /** * @return string; */ - Main.k.FormatPlanets = function(index) {//TODO: MULTILANG - var ret = "**//"+Main.k.text.gettext("Planètes")+" : //**"; + Main.k.FormatPlanets = function(index,tooltip) {//TODO: MULTILANG + var ret = '',tooltipret = '',nbrPlanet = $("#navModule").find(".planet").not(".planetoff").length, compteurPlanet = 0; + var caseDesc = ''; + + if(tooltip === undefined){ + tooltip = false; + }else{ + tooltip = true; + } var parse = function(t) { t = t.replace(//ig, ":mush_triumph:"); @@ -1033,19 +1041,87 @@ Main.k.tabs.playing = function() { // Cases var nbcases = $(this).find("td img.explTag").length; - var cases = []; + var nbCasesInconnues = $(this).find("td img.explTag.off").length; + var cases = [],casesToolTip = []; var casenamereg = /

([^<]+)<\/h1>/; $(this).find("td img.explTag.on").each(function() { - cases.push(casenamereg.exec($(this).attr("onmouseover"))[1]); - }); - - // Print planet - ret += "\n**" + name + "** (" + nbcases + ' ' + Main.k.text.gettext('cases') + ")\n"; - if (dist && dir) ret += "//" + dir + " - " + dist + " :mush_fuel:****//\n"; - ret += cases.join(", "); + var caseNameRecup = casenamereg.exec($(this).attr("onmouseover"))[1]; + var finalCaseName = '',finalCaseNameToolTip = ''; + switch(caseNameRecup){ + case 'Activité sismique': + case 'Mankarog': + case 'Activité volcanique': + finalCaseName = '**//'+caseNameRecup+'//** :dead:'; + finalCaseNameToolTip = ''+caseNameRecup+' '; + break; + case 'Cristalite': + finalCaseName = '//'+caseNameRecup+'// :mush:'; + finalCaseNameToolTip = ''+caseNameRecup+' '; + break; + case 'Hydro-Carbure': + finalCaseName = '**'+caseNameRecup+'** :fuel:'; + finalCaseNameToolTip = ''+caseNameRecup+' '; + break; + case 'Oxygène': + finalCaseName = '**'+caseNameRecup+'** :o2:'; + finalCaseNameToolTip = ''+caseNameRecup+' '; + break; + default: + finalCaseNameToolTip = finalCaseName = caseNameRecup; + } + cases.push(finalCaseName); + casesToolTip.push(finalCaseNameToolTip); }); - return ret; + // Print planet + if(compteurPlanet === 0){ + compteurPlanet++; + }else{ + ret += "\n"; + tooltipret += "
"; + compteurPlanet++; + } + ret += "**" + name + "** (" + nbcases + ' ' + Main.k.text.gettext('cases') + ")\n"; + tooltipret += "" + name + " (" + nbcases + ' ' + Main.k.text.gettext('cases') + ")
"; + if (dist && dir) ret += "//" + dir + " - " + dist + " :mush_fuel:****//\n"; + if (dist && dir) tooltipret += "" + dir + " - " + dist + " \"Icône
"; + ret += '---\n'+cases.join(", "); + tooltipret += '--
'+casesToolTip.join(", "); + if(nbCasesInconnues === 1){ + if(cases.length === 0){ + ret += "Encore "; + tooltipret += "Encore "; + } else { + ret += " et encore "; + tooltipret += " et encore "; + } + ret += "1 case inconnue."; + tooltipret += "1 case inconnue."; + } else if ( nbCasesInconnues === 0){ + ret += "."; + tooltipret += "."; + } else { + if(cases.length === 0){ + ret += "Encore "; + tooltipret += "Encore "; + } else { + ret += " et encore "; + tooltipret += " et encore "; + } + ret += nbCasesInconnues+" cases inconnues."; + tooltipret += nbCasesInconnues+" cases inconnues."; + } + }); + + if(compteurPlanet > 0 && compteurPlanet < nbrPlanet){ + tooltipret += '
'; + } + + if(tooltip === true){ + return tooltipret; + }else{ + return ret; + } }; /** * @return string; @@ -5335,6 +5411,7 @@ Main.k.tabs.playing = function() { // Astro } else if ($("#navModule").length > 0) { var nav = $("#navModule"); + var toolTipText = ''; var planets = nav.find(".planet").not(".planetoff"); if (planets.length > 0) { t = $("

").html(Main.k.text.gettext("Planètes")).appendTo(project_list); @@ -5343,6 +5420,7 @@ Main.k.tabs.playing = function() { projectsdiv = $("
").addClass("projectspreview planetpreview").attr("id", "projectspreview").appendTo(project_list); planets.each(function(i) { + toolTipText = Main.k.FormatPlanets(i,true); // Print planet var planet = $("
").addClass("planetpreview").appendTo(projectsdiv); $("").attr("width", "40") @@ -5374,8 +5452,8 @@ Main.k.tabs.playing = function() { // Planets actions Main.k.MakeButton(" "+Main.k.text.gettext("Partager"), null, null, Main.k.text.gettext("Partager les planètes"), - Main.k.text.gettext("Insère la liste de planètes dans la zone de texte active, de la forme :

" + - "TODO: aperçu") + Main.k.text.gettext("Insère la liste de planètes dans la zone de texte active, de la forme :
" + + toolTipText + "

") ).appendTo(project_list) .find("a").on("mousedown", function(e) { $('textarea:focus').each(function(e) { @@ -5666,4 +5744,4 @@ Main.k.tabs.playing = function() { $(document).keypress(function(e){ if (e.keyCode === 27) Main.k.ClosePopup(); }); -}; \ No newline at end of file +}; From e620bfd2dabb0d7b1d32387c5c75fbca8caf3ec4 Mon Sep 17 00:00:00 2001 From: Greavox <35181101+Greavox@users.noreply.github.com> Date: Mon, 9 Sep 2019 19:06:49 +0200 Subject: [PATCH 2/7] Update playing.js Changement pour le nom de la case en **Sismique** --- src/main/tabs/playing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/tabs/playing.js b/src/main/tabs/playing.js index 428fe6f..cfb417e 100644 --- a/src/main/tabs/playing.js +++ b/src/main/tabs/playing.js @@ -1048,7 +1048,7 @@ Main.k.tabs.playing = function() { var caseNameRecup = casenamereg.exec($(this).attr("onmouseover"))[1]; var finalCaseName = '',finalCaseNameToolTip = ''; switch(caseNameRecup){ - case 'Activité sismique': + case 'Sismique': case 'Mankarog': case 'Activité volcanique': finalCaseName = '**//'+caseNameRecup+'//** :dead:'; From 638767ecac53b86e50ad7db69ae4d7598d111453 Mon Sep 17 00:00:00 2001 From: Greavox <35181101+Greavox@users.noreply.github.com> Date: Mon, 23 Sep 2019 11:31:52 +0200 Subject: [PATCH 3/7] Update src/main/tabs/playing.js Co-Authored-By: badconker --- src/main/tabs/playing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/tabs/playing.js b/src/main/tabs/playing.js index cfb417e..c71665d 100644 --- a/src/main/tabs/playing.js +++ b/src/main/tabs/playing.js @@ -492,7 +492,7 @@ Main.k.tabs.playing = function() { // Planets if ($("#navModule").length > 0) { - var tolltiptext = Main.k.FormatPlanets(0,true); + var tooltipText = Main.k.FormatPlanets(0,true); $("").addClass("butmini formatbtn").html("").attr("href", "#").appendTo(sharediv) .on("click", function() { var txt = Main.k.FormatPlanets(); From de5f832a39c21047c6a191405412a2adf283d111 Mon Sep 17 00:00:00 2001 From: Greavox <35181101+Greavox@users.noreply.github.com> Date: Mon, 23 Sep 2019 11:32:29 +0200 Subject: [PATCH 4/7] Update src/main/tabs/playing.js Co-Authored-By: badconker --- src/main/tabs/playing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/tabs/playing.js b/src/main/tabs/playing.js index c71665d..c15ed11 100644 --- a/src/main/tabs/playing.js +++ b/src/main/tabs/playing.js @@ -500,7 +500,7 @@ Main.k.tabs.playing = function() { return false; }) .attr("_title", Main.k.text.gettext("Partager les planètes")) - .attr("_desc", Main.k.text.gettext("

Insère les détails des planètes dans la zone de texte active.
"+tolltiptext+"

")) + .attr("_desc", Main.k.text.gettext("

Insère les détails des planètes dans la zone de texte active.
"+tooltipText+"

")) .on("mouseover", Main.k.CustomTip) .on("mouseout", Main.k.hideTip); } From aac82eb74229232cf6bec603d882eb0e4bf83ace Mon Sep 17 00:00:00 2001 From: Greavox <35181101+Greavox@users.noreply.github.com> Date: Mon, 23 Sep 2019 11:32:58 +0200 Subject: [PATCH 5/7] Update src/main/tabs/playing.js Co-Authored-By: badconker --- src/main/tabs/playing.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/tabs/playing.js b/src/main/tabs/playing.js index c15ed11..e885515 100644 --- a/src/main/tabs/playing.js +++ b/src/main/tabs/playing.js @@ -1004,7 +1004,10 @@ Main.k.tabs.playing = function() { * @return string; */ Main.k.FormatPlanets = function(index,tooltip) {//TODO: MULTILANG - var ret = '',tooltipret = '',nbrPlanet = $("#navModule").find(".planet").not(".planetoff").length, compteurPlanet = 0; + var ret = ''; + var tooltipret = ''; + var nbrPlanet = $("#navModule").find(".planet").not(".planetoff").length; + var compteurPlanet = 0; var caseDesc = ''; if(tooltip === undefined){ From 90d4330466fe008ede5dbc444b85bd799ea75ec6 Mon Sep 17 00:00:00 2001 From: Greavox <35181101+Greavox@users.noreply.github.com> Date: Mon, 23 Sep 2019 11:33:21 +0200 Subject: [PATCH 6/7] Update src/main/tabs/playing.js Co-Authored-By: badconker --- src/main/tabs/playing.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/tabs/playing.js b/src/main/tabs/playing.js index e885515..ec6abd8 100644 --- a/src/main/tabs/playing.js +++ b/src/main/tabs/playing.js @@ -1045,7 +1045,8 @@ Main.k.tabs.playing = function() { // Cases var nbcases = $(this).find("td img.explTag").length; var nbCasesInconnues = $(this).find("td img.explTag.off").length; - var cases = [],casesToolTip = []; + var cases = []; + var casesToolTip = []; var casenamereg = /

([^<]+)<\/h1>/; $(this).find("td img.explTag.on").each(function() { var caseNameRecup = casenamereg.exec($(this).attr("onmouseover"))[1]; From c016e7cb4bccf0f4348e9f5d8ea545c2aa95422b Mon Sep 17 00:00:00 2001 From: Greavox <35181101+Greavox@users.noreply.github.com> Date: Mon, 23 Sep 2019 11:33:36 +0200 Subject: [PATCH 7/7] Update src/main/tabs/playing.js Co-Authored-By: badconker --- src/main/tabs/playing.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/tabs/playing.js b/src/main/tabs/playing.js index ec6abd8..f59296e 100644 --- a/src/main/tabs/playing.js +++ b/src/main/tabs/playing.js @@ -1050,7 +1050,8 @@ Main.k.tabs.playing = function() { var casenamereg = /

([^<]+)<\/h1>/; $(this).find("td img.explTag.on").each(function() { var caseNameRecup = casenamereg.exec($(this).attr("onmouseover"))[1]; - var finalCaseName = '',finalCaseNameToolTip = ''; + var finalCaseName = ''; + var finalCaseNameToolTip = ''; switch(caseNameRecup){ case 'Sismique': case 'Mankarog':