From e4b8a8e90888ef93d58543205b4641eb354d951e Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Sun, 17 Oct 2021 19:22:57 +0200 Subject: [PATCH] Zone/Mapper * show fishing nodes on map --- pages/zone.php | 5 ++++- static/js/ShowOnMap.js | 6 +++--- static/js/locale_dede.js | 3 ++- static/js/locale_enus.js | 3 ++- static/js/locale_eses.js | 5 +++-- static/js/locale_frfr.js | 3 ++- static/js/locale_ruru.js | 3 ++- static/js/locale_zhcn.js | 3 ++- 8 files changed, 20 insertions(+), 11 deletions(-) diff --git a/pages/zone.php b/pages/zone.php index 7b5e2063..9158663f 100644 --- a/pages/zone.php +++ b/pages/zone.php @@ -215,6 +215,9 @@ class ZonePage extends GenericPage case 9: $what = 'book'; break; + case 25: + $what = 'pool'; + break; case 0: if ($tpl['type'] == 19) $what = 'mail'; @@ -414,7 +417,7 @@ class ZonePage extends GenericPage foreach ($dataz as &$data) $data = array_values($data); - if (!in_array($what, ['vein', 'herb', 'rare'])) + if (!in_array($what, ['vein', 'herb', 'rare', 'pool'])) { $foo = []; foreach ($dataz as $d) diff --git a/static/js/ShowOnMap.js b/static/js/ShowOnMap.js index 9d80f993..ccec51a6 100644 --- a/static/js/ShowOnMap.js +++ b/static/js/ShowOnMap.js @@ -86,7 +86,7 @@ ShowOnMap.prototype.construct = function() { if (pin.list.length == 1) { url = (g_types[pin.list[0].type] && pin.list[0].id ? '?' + g_types[pin.list[0].type] + '=' + pin.list[0].id : ''); } - if (i == 'rare' || i == 'herb' || i == 'vein') { + if (i == 'rare' || i == 'herb' || i == 'vein' || i == 'pool') { tooltip[1] = submenu.length + 1; } if (coords[pin.level] == undefined) { @@ -121,7 +121,7 @@ ShowOnMap.prototype.construct = function() { allCoords[l] = coords[l]; } } - allLegend[submenu.length] = [p, url]; + allLegend[submenu.length] = [group[p][0].name, url]; } } if (submenu.length > 0) { @@ -482,7 +482,7 @@ ShowOnMap.prototype.checkMenu = function(path) { var maxLabel = label.length - 1; var str = ''; - var singlePinOptions = { 'rare': true, 'herb': true, 'vein': true }; + var singlePinOptions = { 'rare': true, 'herb': true, 'vein': true, 'pool': true }; for (var i = 0; i < label.length; ++i) { if (i > 0 && singlePinOptions[label[0][0]]) { var span = $('span', this._legendContents); diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index 3995d276..80f44f59 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -3244,7 +3244,8 @@ var LANG = { spirithealer: "Geistheiler", boss: "Bosse", areatrigger: "Areatrigger", // aowow - custom - mail: "Briefkästen" + mail: "Briefkästen", + pool: "Fischschwärme" }, markup_b: "Fett", diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js index 4be7b6b1..d15db3ba 100644 --- a/static/js/locale_enus.js +++ b/static/js/locale_enus.js @@ -3292,7 +3292,8 @@ var LANG = { spirithealer: "Spirit Healers", boss: "Bosses", areatrigger: "Areatrigger", // aowow - custom - mail: "Mailbox" + mail: "Mailbox", + pool: "Fishing Pools" }, markup_b: "Bold", diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js index 355e399d..d9c36a9c 100644 --- a/static/js/locale_eses.js +++ b/static/js/locale_eses.js @@ -290,7 +290,7 @@ var mn_objects = [ [9,"Libros"], [3,"Contenedores"], [-5,"Cofres"], - [25,"[Fishing Pools]"], + [25,"Bancos de peces"], [-3,"Hierbas"], [-4,"Venas de minerales"], [-2,"Misión"], @@ -3245,7 +3245,8 @@ var LANG = { spirithealer: "Espíritus sanadores", boss: "Jefes", areatrigger: "Areatrigger", // aowow - custom - mail: "Buzón" + mail: "Buzón", + pool: "Bancos de peces" }, markup_b: "Negrita", diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js index 260e329f..869ca571 100644 --- a/static/js/locale_frfr.js +++ b/static/js/locale_frfr.js @@ -3245,7 +3245,8 @@ var LANG = { spirithealer: "Esprits soigneurs", boss: "Boss", areatrigger: "Areatrigger", // aowow - custom - mail: "Boîte aux lettres" + mail: "Boîte aux lettres", + pool: "Bancs de poissons" }, markup_b: "Gras", diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js index c3f56155..c42e722f 100644 --- a/static/js/locale_ruru.js +++ b/static/js/locale_ruru.js @@ -3245,7 +3245,8 @@ var LANG = { spirithealer: "Целители душ", boss: "Боссы", areatrigger: "Areatrigger", // aowow - custom - mail: "Почтовый ящик" + mail: "Почтовый ящик", + pool: "Рыболовные лунки", }, markup_b: "Жирный", diff --git a/static/js/locale_zhcn.js b/static/js/locale_zhcn.js index 3b319cc8..fe9179fa 100644 --- a/static/js/locale_zhcn.js +++ b/static/js/locale_zhcn.js @@ -3292,7 +3292,8 @@ var LANG = { spirithealer: "灵魂医者", boss: "首领", areatrigger: "Areatrigger", // aowow - custom - mail: "邮箱" + mail: "邮箱", + pool: "钓鱼池" }, markup_b: "勇敢",