diff --git a/includes/class.creature.php b/includes/class.creature.php index a636c938..a354a680 100644 --- a/includes/class.creature.php +++ b/includes/class.creature.php @@ -6,6 +6,11 @@ if (!defined('AOWOW_REVISION')) class CreatureList extends BaseType { + public $tooltips = []; + + protected $setupQuery = 'SELECT *, ct.entry AS ARRAY_KEY, ct.entry AS id FROM creature_template ct LEFT JOIN locales_creature lc ON lc.entry = ct.entry LEFT JOIN creature_template_addon cta on cta.entry = ct.entry WHERE [filter] [cond]'; + protected $matchQuery = 'SELECT COUNT(*) FROM creature_template ct WHERE [filter] [cond]'; + public static function getName($id) { $n = DB::Aowow()->SelectRow(' @@ -28,10 +33,58 @@ class CreatureList extends BaseType return Util::localizedString($n, 'name'); } + public function renderTooltip() + { + if (!$this->curTpl) + return null; + + if (isset($this->tooltips[$this->id])) + return $this->tooltips[$this->id]; + + $level = '??'; + $type = $this->curTpl['type']; + $row3 = [Lang::$game['level']]; + $fam = $this->curTpl['family']; + // todo (low): rework, when factions are implemented + $fac = DB::Aowow()->selectRow('SELECT * FROM dbc.faction f JOIN dbc.factionTemplate ft ON f.id = ft.factionId WHERE ft.id = ?d AND NOT f.reputationFlags1 & 0x4 AND f.reputationIndex <> -1', $this->curTpl['faction_A']); + + if (!($this->curTpl['type_flags'] & 0x4)) + { + $level = $this->curTpl['minlevel']; + if ($level != $this->curTpl['maxlevel']) + $level .= ' - '.$this->curTpl['maxlevel']; + } + $row3[] = $level; + + if ($type) + $row3[] = Lang::$game['ct'][$type]; + + $row3[] = '('.Lang::$npc['rank'][$this->curTpl['rank']].')'; + + $x = ''; + $x .= ''; + + if ($sn = $this->getField('subname', true)) + $x .= ''; + + $x .= ''; + + if ($type == 1 && $fam) // 1: Beast + $x .= ''; + + if ($fac) + $x .= ''; + + $x .= '
'.$this->getField('name', true).'
'.$sn.'
'.implode(' ', $row3).'
'.Lang::$game['fa'][$fam].'
'.Util::localizedString($fac, 'name').'
'; + + $this->tooltips[$this->id] = $x; + + return $x; + } + public function getListviewData() { } public function addGlobalsToJScript(&$refs) { } public function addRewardsToJScript(&$refs) { } - public function renderTooltip() { } } diff --git a/includes/class.filter.php b/includes/class.filter.php index 2a7c0808..e3b03ecb 100644 --- a/includes/class.filter.php +++ b/includes/class.filter.php @@ -228,7 +228,7 @@ abstract class Filter // if called with POST-data, convert to GET request and call self private function redirect($get) { - header('Location: http://'.$_SERVER['SERVER_NAME'].str_replace('index.php', '', $_SERVER['PHP_SELF']).'?'.$_SERVER['QUERY_STRING'].'='.$get); + header('Location: '.STATIC_URL.'?'.$_SERVER['QUERY_STRING'].'='.$get); } // TODO: wrong wrong wrong!! diff --git a/includes/class.item.php b/includes/class.item.php index a1122b13..ba024f0b 100644 --- a/includes/class.item.php +++ b/includes/class.item.php @@ -446,7 +446,7 @@ class ItemList extends BaseType $pop = array_pop($enhance['gems']); $col = $pop ? 1 : 0; $hasMatch &= $pop ? (($gems[$pop]['colorMask'] & (1 << $colorId)) ? 1 : 0) : 0; - $icon = $pop ? sprintf(Util::$bgImagePath['tiny'], strtolower($gems[$pop]['icon'])) : null; + $icon = $pop ? sprintf(Util::$bgImagePath['tiny'], STATIC_URL, strtolower($gems[$pop]['icon'])) : null; $text = $pop ? Util::localizedString($gems[$pop], 'text') : Lang::$item['socket'][$colorId]; if ($interactive) @@ -460,7 +460,7 @@ class ItemList extends BaseType { $pop = array_pop($enhance['gems']); $col = $pop ? 1 : 0; - $icon = $pop ? sprintf(Util::$bgImagePath['tiny'], strtolower($gems[$pop]['icon'])) : null; + $icon = $pop ? sprintf(Util::$bgImagePath['tiny'], STATIC_URL, strtolower($gems[$pop]['icon'])) : null; $text = $pop ? Util::localizedString($gems[$pop], 'text') : Lang::$item['socket'][-1]; if ($interactive) @@ -611,7 +611,7 @@ class ItemList extends BaseType if ($itemset['skillId']) // bonus requires skill to activate { - $name = DB::Aowow()->selectRow('SELECT * FROM ?_skill WHERE skillId=?d', $itemset['skillId']); + $name = DB::Aowow()->selectRow('SELECT * FROM ?_skillline WHERE Id=?d', $itemset['skillId']); $xSet .= '
'.sprintf(Lang::$game['requires'], ''.Util::localizedString($name, 'name').''); if ($itemset['skillLevel']) diff --git a/includes/kernel.php b/includes/kernel.php index 747dc3d5..9fcd0afc 100644 --- a/includes/kernel.php +++ b/includes/kernel.php @@ -12,6 +12,8 @@ require 'config/config.php'; $e = !!$AoWoWconf['debug'] ? (E_ALL & ~(E_DEPRECATED|E_USER_DEPRECATED|E_STRICT)) : 0; error_reporting($e); +define('STATIC_URL', substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1)); + require 'includes/Smarty-2.6.26/libs/Smarty.class.php'; // Libraray: http://www.smarty.net/ require 'includes/DbSimple/Generic.php'; // Libraray: http://en.dklab.ru/lib/DbSimple require 'includes/utilities.php'; diff --git a/includes/utilities.php b/includes/utilities.php index 47353362..b6f7a3ef 100644 --- a/includes/utilities.php +++ b/includes/utilities.php @@ -321,8 +321,9 @@ class Lang public static $event; public static $item; public static $itemset; - public static $pet; public static $maps; + public static $npc; + public static $pet; public static $spell; public static $talent; public static $title; @@ -332,7 +333,7 @@ class Lang public static function load($loc) { - if (@(require 'localization/locale_'.$loc.'.php') !== 1) + if ((require 'localization/locale_'.$loc.'.php') !== 1) die('File for localization '.$loc.' not found.'); foreach ($lang as $k => $v) @@ -530,8 +531,7 @@ class SmartyAoWoW extends Smarty 'tab' => null, // [int] # of tab to highlight in the menu 'type' => null, // [int] numCode for spell, npc, object, ect 'typeId' => null, // [int] entry to display - 'path' => '[]', // [string] (js:array) path to preselect in the menu - 'gStaticUrl' => substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1) + 'path' => '[]' // [string] (js:array) path to preselect in the menu ); } @@ -1329,10 +1329,10 @@ class Util ); public static $bgImagePath = array ( - 'tiny' => 'style="background-image: url(images/icons/tiny/%s.gif)"', - 'small' => 'style="background-image: url(images/icons/small/%s.jpg)"', - 'medium' => 'style="background-image: url(images/icons/medium/%s.jpg)"', - 'large' => 'style="background-image: url(images/icons/large/%s.jpg)"', + 'tiny' => 'style="background-image: url(%s/images/icons/tiny/%s.gif)"', + 'small' => 'style="background-image: url(%s/images/icons/small/%s.jpg)"', + 'medium' => 'style="background-image: url(%s/images/icons/medium/%s.jpg)"', + 'large' => 'style="background-image: url(%s/images/icons/large/%s.jpg)"', ); private static $execTime = 0.0; diff --git a/localization/locale_dede.php b/localization/locale_dede.php index e877de4c..da4b50f8 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -141,19 +141,20 @@ $lang = array( "Verstohlenheit", "Mondkingestalt", "Geist der Erlösung" ), 'me' => array( - null, "Bezaubert", "Desorientiert", "Entwaffnet", "Abgelenkt", "Flüchtend", "Ergriffen", "Unbeweglich", - "Befriedet", "Schweigend", "Schlafend", "Verlangsamt", "Betäubt", "Eingefroren", "Handlungsunfähig", "Blutend", - "Heilung", "Verwandelt", "Verbannt", "Abgeschirmt", "Gefesselt", "Reitend", "Verführt", "Vertrieben", - "Entsetzt", "Unverwundbar", "Unterbrochen", "Benommen", "Entdeckung", "Unverwundbar", "Kopfnuss", "Wütend" + null, "Bezaubert", "Desorientiert", "Entwaffnet", "Abgelenkt", "Flüchtend", "Ergriffen", "Unbeweglich", + "Befriedet", "Schweigend", "Schlafend", "Verlangsamt", "Betäubt", "Eingefroren", "Handlungsunfähig", "Blutend", + "Heilung", "Verwandelt", "Verbannt", "Abgeschirmt", "Gefesselt", "Reitend", "Verführt", "Vertrieben", + "Entsetzt", "Unverwundbar", "Unterbrochen", "Benommen", "Entdeckung", "Unverwundbar", "Kopfnuss", "Wütend" ), 'ct' => array( - null, "Wildtier", "Drachkin", "Dämon", "Elementar", - "Riese", "Untoter", "Humanoid", "Tier", "Mechanisch", - "Nicht kategorisiert", "Totem", "Haustier", "Gas Wolke" + "Nicht kategorisiert", "Wildtier", "Drachkin", "Dämon", "Elementar", "Riese", "Untoter", "Humanoid", + "Tier", "Mechanisch", "Nicht spezifiziert", "Totem", "Haustier", "Gas Wolke" ), - 'professions' => array( - 171 => "Alchemie", 164 => "Schmiedekunst", 333 => "Verzauberkunst", 202 => "Ingenieurskunst", 773 => "Inschriftenkunde", 755 => "Juwelenschleifen", - 165 => "Lederverarbeitung", 186 => "Bergbau", 197 => "Schneiderei", 185 => "Kochkunst", 129 => "Erste Hilfe", 356 => "Angeln" + 'fa' => array( + 1 => "Wolf", 2 => "Katze", 3 => "Spinne", 4 => "Bär", 5 => "Eber", 6 => "Krokilisk", 7 => "Aasvogel", 8 => "Krebs", + 9 => "Gorilla", 11 => "Raptor", 12 => "Weitschreiter", 20 => "Skorpid", 21 => "Schildkröte", 24 => "Fledermaus", 25 => "Hyäne", 26 => "Raubvogel", + 27 => "Windnatter", 30 => "Drachenfalke", 31 => "Felshetzer", 32 => "Sphärenjäger", 33 => "Sporensegler", 34 => "Netherrochen", 35 => "Schlange", 37 => "Motte", + 38 => "Schimäre", 39 => "Teufelssaurier", 41 => "Silithid", 42 => "Wurm", 43 => "Rhinozeros", 44 => "Wespe", 45 => "Kernhund", 46 => "Geisterbestie" ), 'pvpRank' => array( null, "Gefreiter / Späher", "Fußknecht / Grunzer", @@ -213,6 +214,9 @@ $lang = array( 'event' => array( 'category' => array("Nicht kategorisiert", "Feiertage", "Wiederkehrend", "Spieler vs. Spieler") ), + 'npc' => array( + 'rank' => ['Normal', 'Elite', 'Rar Elite', 'Boss', 'Rar'] + ), 'achievement' => array( 'achievements' => "Erfolge", 'criteria' => "Kriterien", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index 17faf7b7..f288882a 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -136,15 +136,20 @@ $lang = array( "Stealth", "Moonkin Form", "Spirit of Redemption" ), 'me' => array( - null, "Charmed", "Disoriented", "Disarmed", "Distracted", "Fleeing", "Gripped", "Rooted", - "Pacified", "Silenced", "Asleep", "Ensnared", "Stunned", "Frozen", "Incapacitated", "Bleeding", - "Healing", "Polymorphed", "Banished", "Shielded", "Shackled", "Mounted", "Seduced", "Turned", - "Horrified", "Invulnerable", "Interrupted", "Dazed", "Discovery", "Invulnerable", "Sapped", "Enraged" + null, "Charmed", "Disoriented", "Disarmed", "Distracted", "Fleeing", "Gripped", "Rooted", + "Pacified", "Silenced", "Asleep", "Ensnared", "Stunned", "Frozen", "Incapacitated", "Bleeding", + "Healing", "Polymorphed", "Banished", "Shielded", "Shackled", "Mounted", "Seduced", "Turned", + "Horrified", "Invulnerable", "Interrupted", "Dazed", "Discovery", "Invulnerable", "Sapped", "Enraged" ), 'ct' => array( - null, "Beast", "Dragonkin", "Demon", "Elemental", - "Giant", "Undead", "Humanoid", "Critter", "Mechanical", - "Uncategorized", "Totem", "Non-combat Pet", "Gas Cloud" + "Uncategorized", "Beast", "Dragonkin", "Demon", "Elemental", "Giant", "Undead", "Humanoid", + "Critter", "Mechanical", "Not specified", "Totem", "Non-combat Pet", "Gas Cloud" + ), + 'fa' => array( + 1 => "Wolf", 2 => "Cat", 3 => "Spider", 4 => "Bear", 5 => "Boar", 6 => "Crocolisk", 7 => "Carrion Bird", 8 => "Crab", + 9 => "Gorilla", 11 => "Raptor", 12 => "Tallstrider", 20 => "Scorpid", 21 => "Turtle", 24 => "Bat", 25 => "Hyena", 26 => "Bird of Prey", + 27 => "Wind Serpent", 30 => "Dragonhawk", 31 => "Ravager", 32 => "Warp Stalker", 33 => "Sporebat", 34 => "Nether Ray", 35 => "Serpent", 37 => "Moth", + 38 => "Chimaera", 39 => "Devilsaur", 41 => "Silithid", 42 => "Worm", 43 => "Rhino", 44 => "Wasp", 45 => "Core Hound", 46 => "Spirit Beast" ), 'pvpRank' => array( null, "Private / Scout", "Corporal / Grunt", @@ -201,6 +206,9 @@ $lang = array( // Sign_in_to_your_Game_Account = Enter your game account: // Please_enter_your_confirm_password = Please enter your confirm password ), + 'npc' => array( + 'rank' => ['Normal', 'Elite', 'Rare Elite', 'Boss', 'Rare'] + ), 'event' => array( 'category' => array("Uncategorized", "Holidays", "Recurring", "Player vs. Player") ), diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 7c113e37..d43758d7 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -133,19 +133,21 @@ $lang = array( "Sigilo", "Forma de lechúcico lunar", "Espíritu redentor" ), 'me' => array( - null, "Embelesado", "Desorientado", "Desarmado", "Distraído", "Huyendo", "Agarrado", "Enraizado", - "Pacificado", "Silenciado", "Dormido", "Frenado", "Aturdido", "Congelado", "Incapacitado", "Sangrando", - "Sanacíon", "Polimorfado", "Desterrado", "Protegido", "Aprisionado", "Montado", "Seducido", "Girado", - "Horrorizado", "Invulnerable", "Interrumpido", "Atontado", "Descubierto", "Invulnerable", "Aporreado", "Iracundo" + null, "Embelesado", "Desorientado", "Desarmado", "Distraído", "Huyendo", "Agarrado", "Enraizado", + "Pacificado", "Silenciado", "Dormido", "Frenado", "Aturdido", "Congelado", "Incapacitado", "Sangrando", + "Sanacíon", "Polimorfado", "Desterrado", "Protegido", "Aprisionado", "Montado", "Seducido", "Girado", + "Horrorizado", "Invulnerable", "Interrumpido", "Atontado", "Descubierto", "Invulnerable", "Aporreado", "Iracundo" ), 'ct' => array( - null, "Bestia", "Dragonante", "Demonio", "Elemental", - "Gigante", "No-muerto", "Humanoide", "Alimaña", "Mecánico", - "Sin categoría", "Tótem", "Mascota mansa", "Nube de gas" + "Sin categoría", "Bestia", "Dragonante", "Demonio", "Elemental", "Gigante", "No-muerto", "Humanoide", + "Alimaña", "Mecánico", "Sin especificar", "Tótem", "Mascota mansa", "Nube de gas" ), - 'professions' => array( - 171 => "Alquimia", 164 => "Herrería", 333 => "Encantamiento", 202 => "Ingeniería", 773 => "Inscripción", 755 => "Joyería", - 165 => "Peletería", 186 => "Minería", 197 => "Sastrería", 185 => "Cocina", 129 => "Primeros auxilios", 356 => "Pesca" + 'fa' => array( + + 1 => "Lobo", 2 => "Felino", 3 => "Araña", 4 => "Oso", 5 => "Jabalí", 6 => "Crocolisco", 7 => "Carroñero", 8 => "Cangrejo", + 9 => "Gorila", 11 => "Raptor", 12 => "Zancaalta", 20 => "Escórpido", 21 => "Tortuga", 24 => "Murciélago", 25 => "Hiena", 26 => "Ave rapaz", + 27 => "Serpiente alada", 30 => "Dracohalcón", 31 => "Devastador", 32 => "Acechador deformado",33 => "Esporiélago", 34 => "Raya abisal", 35 => "Serpiente", 37 => "Palomilla", + 38 => "Quimera", 39 => "Demosaurio", 41 => "Silítido", 42 => "Gusano", 43 => "Rinoceronte", 44 => "Avispa", 45 => "Can del Núcleo", 46 => "Bestia espíritu" ), 'pvpRank' => array( null, "Private / Scout", "Corporal / Grunt", @@ -165,6 +167,9 @@ $lang = array( 'event' => array( 'category' => array("Sin categoría", "Vacacionales", "Periódicos", "Jugador contra Jugador") ), + 'npc' => array( + 'rank' => ['Normal', 'Élite', 'Élite raro', 'Jefe', 'Raro'] + ), 'achievement' => array( 'achievements' => "logros", 'criteria' => "Requisitos", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 21fb30c1..9885be6e 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -133,19 +133,20 @@ $lang = array( "Camouflage", "Forme de sélénien", "Esprit de rédemption" ), 'me' => array( - null, "Charmé", "Désorienté", "Désarmé", "Distrait", "En fuite", "Maladroit", "Immobilisé", - "Pacifié", "Réduit au silence", "Endormi", "Pris au piège", "Étourdi", "Gelé", "Stupéfié", "Sanguinolent", - "Soins", "Métamorphosé", "Banni", "Protégé", "Entravé", "Monté", "Séduit", "Repoussé", - "Horrifié", "Invulnérable", "Interrompu", "Hébété", "Découverte", "Invulnérable", "Assommé", "Enragé" + null, "Charmé", "Désorienté", "Désarmé", "Distrait", "En fuite", "Maladroit", "Immobilisé", + "Pacifié", "Réduit au silence", "Endormi", "Pris au piège", "Étourdi", "Gelé", "Stupéfié", "Sanguinolent", + "Soins", "Métamorphosé", "Banni", "Protégé", "Entravé", "Monté", "Séduit", "Repoussé", + "Horrifié", "Invulnérable", "Interrompu", "Hébété", "Découverte", "Invulnérable", "Assommé", "Enragé" ), 'ct' => array( - null, "Bête", "Draconien", "Démon", "Élémentaire", - "Géant", "Mort-vivant", "Humanoïde", "Bestiole", "Mécanique", - "Non classés", "Totem", "Familier pacifique", "Nuage de gaz" + "Non classés", "Bête", "Draconien", "Démon", "Élémentaire", "Géant", "Mort-vivant", "Humanoïde", + "Bestiole", "Mécanique", "Non spécifié", "Totem", "Familier pacifique", "Nuage de gaz" ), - 'professions' => array( - 171 => "Alchimie", 164 => "Forge", 333 => "Enchantement", 202 => "Ingénierie", 773 => "Calligraphie", 755 => "Joaillerie", - 165 => "Travail du cuir", 186 => "Minage", 197 => "Couture", 185 => "Cuisine", 129 => "Secourisme", 356 => "Pêche" + 'fa' => array( + 1 => "Loup", 2 => "Félin", 3 => "Araignée", 4 => "Ours", 5 => "Sanglier", 6 => "Crocilisque", 7 => "Charognard", 8 => "Crabe", + 9 => "Gorille", 11 => "Raptor", 12 => "Haut-trotteur", 20 => "Scorpide", 21 => "Tortue", 24 => "Chauve-souris", 25 => "Hyène", 26 => "Oiseau de proie", + 27 => "Serpent des vents", 30 => "Faucon-dragon", 31 => "Ravageur", 32 => "Traqueur dim.", 33 => "Sporoptère", 34 => "Raie du Néant", 35 => "Serpent", 37 => "Phalène", + 38 => "Chimère", 39 => "Diablosaure", 41 => "Silithide", 42 => "Ver", 43 => "Rhinocéros", 44 => "Guêpe", 45 => "Chien du Magma", 46 => "Esprit de bête" ), 'pvpRank' => array( null, "Private / Scout", "Corporal / Grunt", @@ -165,6 +166,9 @@ $lang = array( 'event' => array( 'category' => array("Non classés", "Vacances", "Récurrent", "Joueur ctr. Joueur") ), + 'npc' => array( + 'rank' => ['Standard', 'Élite', 'Élite rare', 'Boss', 'Rare'] + ), 'achievement' => array( 'achievements' => "hauts faits", 'criteria' => "Critères", @@ -349,8 +353,8 @@ $lang = array( ) ), 'item' => array( - 'armor' => "Armure :", - 'block' => "Bloquer :", + 'armor' => "Armure", + 'block' => "Bloquer", 'charges' => "Charges", 'expend' => "expendable", 'locked' => "Verrouillé", diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 6aa9aa28..b17115f0 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -133,19 +133,20 @@ $lang = array( "Незаметность", "Облик лунного совуха", "Дух воздаяния" ), 'me' => array( - null, "Подчинённый", "Дезориентирован", "Разоружённый", "Отвлечён", "Убегающий", "Неуклюжий", "Оплетён", - "Немота", "В покое", "Усыплён", "Пойманный в ловушку", "Оглушен", "Замороженный", "Бездейственный", "Кровоточащий", - "Целительное", "Превращён", "Изгнан", "Ограждён", "Скован", "Оседлавший", "Соблазнён", "Обращение", - "Испуганный", "Неуязвимый", "Прервано", "Замедленный", "Открытие", "Неуязвимый", "Ошеломлён", "Исступление" + null, "Подчинённый", "Дезориентирован", "Разоружённый", "Отвлечён", "Убегающий", "Неуклюжий", "Оплетён", + "Немота", "В покое", "Усыплён", "Пойманный в ловушку", "Оглушен", "Замороженный", "Бездейственный", "Кровоточащий", + "Целительное", "Превращён", "Изгнан", "Ограждён", "Скован", "Оседлавший", "Соблазнён", "Обращение", + "Испуганный", "Неуязвимый", "Прервано", "Замедленный", "Открытие", "Неуязвимый", "Ошеломлён", "Исступление" ), 'ct' => array( - null, "Животное", "Дракон", "Демон", "Элементаль", - "Великан", "Нежить", "Гуманоид", "Существо", "Механизм", - "Разное", "Тотем", "Спутник", "Облако газа" + "Разное", "Животное", "Дракон", "Демон", "Элементаль", "Великан", "Нежить", "Гуманоид", + "Существо", "Механизм", "Не указано", "Тотем", "Спутник", "Облако газа" ), - 'professions' => array( - 171 => "Алхимия", 164 => "Кузнечное дело", 333 => "Наложение чар", 202 => "Инженерное дело", 773 => "Начертание", 755 => "Ювелирное дело", - 165 => "Кожевничество", 186 => "Горное дело", 197 => "Портняжное дело", 185 => "Кулинария", 129 => "Первая помощь", 356 => "Рыбная ловля", + 'fa' => array( + 1 => "Волк", 2 => "Кошка", 3 => "Паук", 4 => "Медведь", 5 => "Вепрь", 6 => "Кроколиск", 7 => "Падальщик", 8 => "Краб", + 9 => "Горилла", 11 => "Ящер", 12 => "Долгоног", 20 => "Скорпид", 21 => "Черепаха", 24 => "Летучая мышь", 25 => "Гиена", 26 => "Сова", + 27 => "Крылатый змей", 30 => "Дракондор", 31 => "Опустошитель", 32 => "Прыгуана", 33 => "Спороскат", 34 => "Скат Пустоты", 35 => "Змей", 37 => "Мотылек", + 38 => "Химера", 39 => "Дьявозавр", 41 => "Силитид", 42 => "Червь", 43 => "Люторог", 44 => "Оса", 45 => "Гончая Недр", 46 => "Дух зверя" ), 'pvpRank' => array( null, "Private / Scout", "Corporal / Grunt", @@ -165,6 +166,9 @@ $lang = array( 'event' => array( 'category' => array("Разное", "Праздники", "Периодические", "PvP") ), + 'npc' => array( + 'rank' => ['Обычный', 'Элитный', 'Редкий элитный', 'Босс', 'Редкий'] + ), 'achievement' => array( 'achievements' => "достижения", 'criteria' => "Критерий", diff --git a/template/head.tpl b/template/head.tpl index 63f0141d..0a2f227d 100644 --- a/template/head.tpl +++ b/template/head.tpl @@ -19,7 +19,7 @@ {/foreach} diff --git a/template/js/locale_dede.js b/template/js/locale_dede.js index d56567e5..10f7491b 100644 --- a/template/js/locale_dede.js +++ b/template/js/locale_dede.js @@ -1204,16 +1204,20 @@ var g_npc_classifications = { }; var g_npc_types = { + 0: 'Nicht kategorisiert', 1: 'Wildtier', - 8: 'Tier', + 2: 'Drachkin', 3: 'Dämon', 4: 'Elementar', - 2: 'Drachkin', 5: 'Riese', - 7: 'Humanoid', - 9: 'Mechanisch', 6: 'Untot', - 10: 'Nicht kategorisiert' + 7: 'Humanoid', + 8: 'Tier', + 9: 'Mechanisch', + 10: 'Nicht spezifiziert', + 11: 'Totem', + 12: 'Haustier', + 13: 'Gaswolke' }; var g_pet_families = { diff --git a/template/js/locale_enus.js b/template/js/locale_enus.js index 37c368cf..c919a96d 100644 --- a/template/js/locale_enus.js +++ b/template/js/locale_enus.js @@ -1250,6 +1250,7 @@ var g_npc_classifications = { }; var g_npc_types = { + 0: 'Uncategorized', 1: 'Beast', 8: 'Critter', 3: 'Demon', @@ -1257,9 +1258,12 @@ var g_npc_types = { 2: 'Dragonkin', 5: 'Giant', 7: 'Humanoid', - 9: 'Mechanical', 6: 'Undead', - 10: 'Uncategorized' + 9: 'Mechanical', + 10: 'Not specified', + 11: 'Totem', + 12: 'Non-combat Pet', + 13: 'Gas Cloud' }; var g_pet_families = { diff --git a/template/js/locale_eses.js b/template/js/locale_eses.js index a5658f15..30493469 100644 --- a/template/js/locale_eses.js +++ b/template/js/locale_eses.js @@ -1204,16 +1204,20 @@ var g_npc_classifications = { }; var g_npc_types = { + 0: 'Sin categoría', 1: 'Bestia', - 8: 'Alimaña', + 2: 'Dragonante', 3: 'Demonio', 4: 'Elemental', - 2: 'Dragonante', 5: 'Gigante', - 7: 'Humanoide', - 9: 'Mecánico', 6: 'No-muerto', - 10: 'Sin categoría' + 7: 'Humanoide', + 8: 'Alimaña', + 9: 'Mecánico', + 10: 'Sin especificar', + 11: 'Tótem', + 12: 'Mascota mansa', + 13: 'Nube de gas' }; var g_pet_families = { diff --git a/template/js/locale_frfr.js b/template/js/locale_frfr.js index 1d83c4ef..e5c7d6b5 100644 --- a/template/js/locale_frfr.js +++ b/template/js/locale_frfr.js @@ -1204,16 +1204,20 @@ var g_npc_classifications = { }; var g_npc_types = { + 0: 'Non classés', 1: 'Bête', - 8: 'Bestiole', + 2: 'Draconien', 3: 'Démon', 4: 'Élémentaire', - 2: 'Draconien', 5: 'Géant', - 7: 'Humanoïde', - 9: 'Mécanique', 6: 'Mort-vivant', - 10: 'Non classés' + 7: 'Humanoïde', + 8: 'Bestiole', + 9: 'Mécanique', + 10: 'Non spécifié', + 11: 'Totem', + 12: 'Familier pacifique', + 13: 'Nuage de gaz' }; var g_pet_families = { diff --git a/template/js/locale_ruru.js b/template/js/locale_ruru.js index 3fbda0eb..b09cf73f 100644 --- a/template/js/locale_ruru.js +++ b/template/js/locale_ruru.js @@ -1204,16 +1204,20 @@ var g_npc_classifications = { }; var g_npc_types = { + 0: 'Разное', 1: 'Животное', - 8: 'Существо', + 2: 'Дракон', 3: 'Демон', 4: 'Элементаль', - 2: 'Дракон', 5: 'Великан', - 7: 'Гуманоид', - 9: 'Механизм', 6: 'Нежить', - 10: 'Разное' + 7: 'Гуманоид', + 8: 'Существо', + 9: 'Механизм', + 10: 'Не указано', + 11: 'Тотем', + 12: 'Спутник', + 13: 'Облако газа' }; var g_pet_families = {