diff --git a/includes/types/gameobject.class.php b/includes/types/gameobject.class.php index 30b30c62..93617d1d 100644 --- a/includes/types/gameobject.class.php +++ b/includes/types/gameobject.class.php @@ -140,6 +140,15 @@ class GameObjectList extends BaseType class GameObjectListFilter extends Filter { public $extraOpts = []; + protected $enums = array( + 50 => array( + null, 1, 2, 3, 4, + 663 => 663, + 883 => 883, + FILTER_ENUM_ANY => true, + FILTER_ENUM_NONE => false + ) + ); protected $genericFilter = array( 1 => [FILTER_CR_ENUM, 's.areaId', null ], // foundin @@ -152,12 +161,13 @@ class GameObjectListFilter extends Filter 13 => [FILTER_CR_FLAG, 'cuFlags', CUSTOM_HAS_COMMENT ], // hascomments 15 => [FILTER_CR_NUMERIC, 'id', NUM_CAST_INT ], // id 16 => [FILTER_CR_CALLBACK, 'cbRelEvent', null, null], // relatedevent (ignore removed by event) - 18 => [FILTER_CR_FLAG, 'cuFlags', CUSTOM_HAS_VIDEO ] // hasvideos + 18 => [FILTER_CR_FLAG, 'cuFlags', CUSTOM_HAS_VIDEO ], // hasvideos + 50 => [FILTER_CR_ENUM, 'spellFocusId', null, ], // SpellFocus ); // fieldId => [checkType, checkValue[, fieldIsArray]] protected $inputFields = array( - 'cr' => [FILTER_V_LIST, [[1, 5], 7, 11, 13, 15, 16, 18], true ], // criteria ids + 'cr' => [FILTER_V_LIST, [[1, 5], 7, 11, 13, 15, 16, 18, 50], true ], // criteria ids 'crs' => [FILTER_V_LIST, [FILTER_ENUM_NONE, FILTER_ENUM_ANY, [0, 5000]], true ], // criteria operators 'crv' => [FILTER_V_RANGE, [0, 99999], true ], // criteria values - only numeric input values expected 'na' => [FILTER_V_REGEX, '/[\p{C};]/ui', false], // name - only printable chars, no delimiter diff --git a/static/js/filters.js b/static/js/filters.js index 39ee4cfe..7e5e3b69 100644 --- a/static/js/filters.js +++ b/static/js/filters.js @@ -258,6 +258,7 @@ var fi_filters = { { id: 7, name: 'requiredskilllevel', type: 'num' }, { id: 2, name: 'startsquest', type: 'side' }, { id: 3, name: 'endsquest', type: 'side' }, + { id: 50, name: 'spellfocus', type: 'spellfocus-any+none' }, { id: 9, name: 'seploot' }, { id: 5, name: 'averagemoneycontained', type: 'num' }, diff --git a/static/js/global.js b/static/js/global.js index 6cbef854..833b7faf 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -11267,6 +11267,12 @@ Listview.templates = { var wrapper = $WH.ce('div'); var a = $WH.ce('a'); + // aowow - custom for unnamed objects + if (!object.name){ + object.name = 'Unnamed Object #' + object.id; + a.className += 'q0'; + } + a.style.fontFamily = 'Verdana, sans-serif'; a.href = this.getItemLink(object); $WH.ae(a, $WH.ct(object.name)); diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index b6224db6..cb3e9a1d 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -3813,6 +3813,10 @@ var LANG = { [15, "Munition"], [16, "Pyrit"], [17, "Dampfdruck"], [18, "Hitze"], [19, "Schlamm"], [20, "Blutmacht"], [21, "Wrath"] ], + spellfocus: [ + [1, "Amboss"], [2, "Webstuhl"], [3, "Schmiede"], [4, "Kochstelle"], [663, "Alchemielabor"], + [883, "Mondbrunnen"] + ], flags: [ [1, '0x00000001'], [2, '0x00000002'], [3, '0x00000004'], [4, '0x00000008'], [5, '0x00000010'], [6, '0x00000020'], [7, '0x00000040'], [8, '0x00000080'], [9, '0x00000100'], [10,'0x00000200'], @@ -3995,6 +3999,7 @@ var LANG = { startsquest: "Startet eine Quest", endsquest: "Beendet eine Quest", id: "ID", + spellfocus: "Zauberfokus", seploot: "Loot", averagemoneycontained: "Durchschnittlich enthaltene Geldmenge", diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js index 4fc8a592..b04e51b9 100644 --- a/static/js/locale_enus.js +++ b/static/js/locale_enus.js @@ -3860,6 +3860,10 @@ var LANG = { [15, "Ammo"], [16, "Pyrite"], [17, "Steam Pressure"], [18, "Heat"], [19, "Ooze"], [20, "Blood Power"], [21, "Wrath"] ], + spellfocus: [ + [1, "Anvil"], [2, "Loom"], [3, "Forge"], [4, "Cooking Fire"], [663, "Alchemy Lab"], + [883, "Moonwell"], + ], flags: [ [1, '0x00000001'], [2, '0x00000002'], [3, '0x00000004'], [4, '0x00000008'], [5, '0x00000010'], [6, '0x00000020'], [7, '0x00000040'], [8, '0x00000080'], [9, '0x00000100'], [10,'0x00000200'], @@ -4042,6 +4046,7 @@ var LANG = { startsquest: "Starts a quest", endsquest: "Ends a quest", id: "ID", + spellfocus: "Spell Focus", seploot: "Loot", averagemoneycontained: "Average money contained", diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js index 1a157022..d36e95aa 100644 --- a/static/js/locale_eses.js +++ b/static/js/locale_eses.js @@ -3815,6 +3815,10 @@ var LANG = { [15, "Munición"], [16, "Pirita"], [17, "Presión de vapor"], [18, "Calor"], [19, "Moco"], [20, "Poder de sangre"], [21, "Cólera"] ], + spellfocus: [ + [1, "Yunque"], [2, "Telar"], [3, "Forja"], [4, "Lumbre"], [663, "Laboratorio de alquimia"], + [883, "Poza de la Luna"] + ], flags: [ [1, '0x00000001'], [2, '0x00000002'], [3, '0x00000004'], [4, '0x00000008'], [5, '0x00000010'], [6, '0x00000020'], [7, '0x00000040'], [8, '0x00000080'], [9, '0x00000100'], [10,'0x00000200'], @@ -3997,6 +4001,7 @@ var LANG = { startsquest: "Empieza una misión", endsquest: "Termina una misión", id: "ID", + spellfocus: "Foco del hechizo", seploot: "Botín", averagemoneycontained: "Cantidad promedio de dinero contenido", diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js index ede7f545..7b85aff4 100644 --- a/static/js/locale_frfr.js +++ b/static/js/locale_frfr.js @@ -3814,6 +3814,10 @@ var LANG = { [15, "Munitions"], [16, "Pyrite"], [17, "Pression vapeur"], [18, "Chaleur"], [19, "Limon"], [20, "Puissance de sang"], [21, "Courroux"] ], + spellfocus: [ + [1, "Enclume"], [2, "Métier à tisser"], [3, "Forge"], [4, "Feu de cuisine"], [663, "Laboratoire d'alchimie"], + [883, "Puits de lune"] + ], flags: [ [1, '0x00000001'], [2, '0x00000002'], [3, '0x00000004'], [4, '0x00000008'], [5, '0x00000010'], [6, '0x00000020'], [7, '0x00000040'], [8, '0x00000080'], [9, '0x00000100'], [10,'0x00000200'], @@ -3996,6 +4000,7 @@ var LANG = { startsquest: "Débute une quête", endsquest: "Termine une quête", id: "ID", + spellfocus: "Focus de sort", seploot: "Butin", averagemoneycontained: "Argent contenu en moyenne", diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js index 9442ad1d..e81d5edc 100644 --- a/static/js/locale_ruru.js +++ b/static/js/locale_ruru.js @@ -3807,7 +3807,6 @@ var LANG = { ], damagetype: [ [1, "Нет"], [2, "Магический"], [3, "Ближний бой"], [4, "Дальний бой"] - ], resourcetype: [ [4, "Энергия"], [5, "Тонус"], [6, "Здоровье"], [8, "Мана"], @@ -3815,6 +3814,10 @@ var LANG = { [15, "Боеприпасы"], [16, "Колчедан"], [17, "Давление пара"], [18, "Жар"], [19, "Слизнюк"], [20, "Сила крови"], [21, "Гнев"] ], + spellfocus: [ + [1, "находиться рядом с наковальней"], [2, "находиться рядом с ткацким станком"], [3, "находиться рядом с горном"], [4, "находиться рядом с очагом для приготовления пищи"], + [663, "находиться в Алхимической лаборатории"], [883, "находиться возле Лунного колодца"] + ], flags: [ [1, '0x00000001'], [2, '0x00000002'], [3, '0x00000004'], [4, '0x00000008'], [5, '0x00000010'], [6, '0x00000020'], [7, '0x00000040'], [8, '0x00000080'], [9, '0x00000100'], [10,'0x00000200'], @@ -3824,7 +3827,6 @@ var LANG = { [26,'0x02000000'], [27,'0x04000000'], [28,'0x08000000'], [29,'0x10000000'], [30,'0x20000000'], [31,'0x40000000'], [32,'0x80000000'] ] - }, fiitems: { @@ -3998,6 +4000,7 @@ var LANG = { startsquest: "Дает задание", endsquest: "Завершает задание", id: "Номер", + spellfocus: "[Spell Focus]", seploot: "Добыча", averagemoneycontained: "Содержит денег", diff --git a/static/js/locale_zhcn.js b/static/js/locale_zhcn.js index 7205a056..dbf31a44 100644 --- a/static/js/locale_zhcn.js +++ b/static/js/locale_zhcn.js @@ -3840,6 +3840,10 @@ var LANG = { [15, "Ammo"], [16, "蓝铁"], [17, "蒸汽动力"], [18, "Heat"], [19, "Ooze"], [20, "Blood Power"], [21, "Wrath"] ], + spellfocus: [ + [1, "铁砧"], [2, "织布机"], [3, "熔炉"], [4, "烹饪用火"], [663, "炼金实验室"], + [883, "月亮井"] + ], flags: [ [1, '0x00000001'], [2, '0x00000002'], [3, '0x00000004'], [4, '0x00000008'], [5, '0x00000010'], [6, '0x00000020'], [7, '0x00000040'], [8, '0x00000080'], [9, '0x00000100'], [10,'0x00000200'], @@ -4022,6 +4026,7 @@ var LANG = { startsquest: "启动任务", endsquest: "结束任务", id: "ID", + spellfocus: "Spell Focus", seploot: "拾取", averagemoneycontained: "平均含有金钱", diff --git a/template/listviews/areatrigger.tpl.php b/template/listviews/areatrigger.tpl.php index 4c7d8bf0..6409e489 100644 --- a/template/listviews/areatrigger.tpl.php +++ b/template/listviews/areatrigger.tpl.php @@ -28,7 +28,7 @@ Listview.templates.areatrigger = { a.style.fontFamily = 'Verdana, sans-serif'; a.href = this.getItemLink(areatrigger); if (!areatrigger.name){ - areatrigger.name = 'Unnamed' + areatrigger.name = 'Unnamed Areatrigger' a.className = 'q0'; }