From 93948a2ec53de57c4dacdeba8ef0d41b8534e9d6 Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Mon, 3 Aug 2020 22:52:55 +0200 Subject: [PATCH] Spells/DetailPage * resolve spell effect #86 with info from https://github.com/TrinityCore/TrinityCore/commit/203573db83fb1d3f141b5aadbf1d1ca0a637bf94 --- localization/locale_dede.php | 7 +++++++ localization/locale_enus.php | 7 +++++++ localization/locale_eses.php | 7 +++++++ localization/locale_frfr.php | 7 +++++++ localization/locale_ruru.php | 7 +++++++ localization/locale_zhcn.php | 7 +++++++ pages/spell.php | 10 +++++++++- 7 files changed, 51 insertions(+), 1 deletion(-) diff --git a/localization/locale_dede.php b/localization/locale_dede.php index 010d7729..0ea49de0 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -840,6 +840,13 @@ $lang = array( GO_FLAG_TRIGGERED => 'Ausgelöst', GO_FLAG_DAMAGED => 'Belagerung beschädigt', GO_FLAG_DESTROYED => 'Belagerung zerstört' + ), + 'actions' => array( + "None", "Animate Custom 0", "Animate Custom 1", "Animate Custom 2", "Animate Custom 3", + "Disturb / Trigger Trap", "Unlock", "Lock", "Open", "Unlock & Open", + "Close", "Toggle Open", "Destroy", "Rebuild", "Creation", + "Despawn", "Make Inert", "Make Active", "Close & Lock", "Use ArtKit 0", + "Use ArtKit 1", "Use ArtKit 2", "Use ArtKit 3", "Set Tap List" ) ), 'npc' => array( diff --git a/localization/locale_enus.php b/localization/locale_enus.php index b229831f..7efe453c 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -840,6 +840,13 @@ $lang = array( GO_FLAG_TRIGGERED => 'Triggered', GO_FLAG_DAMAGED => 'Siege damaged', GO_FLAG_DESTROYED => 'Siege destroyed' + ), + 'actions' => array( + "None", "Animate Custom 0", "Animate Custom 1", "Animate Custom 2", "Animate Custom 3", + "Disturb / Trigger Trap", "Unlock", "Lock", "Open", "Unlock & Open", + "Close", "Toggle Open", "Destroy", "Rebuild", "Creation", + "Despawn", "Make Inert", "Make Active", "Close & Lock", "Use ArtKit 0", + "Use ArtKit 1", "Use ArtKit 2", "Use ArtKit 3", "Set Tap List" ) ), 'npc' => array( diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 1fce1068..38ccb0be 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -840,6 +840,13 @@ $lang = array( GO_FLAG_TRIGGERED => 'Triggered', GO_FLAG_DAMAGED => 'Siege damaged', GO_FLAG_DESTROYED => 'Siege destroyed' + ), + 'actions' => array( + "None", "Animate Custom 0", "Animate Custom 1", "Animate Custom 2", "Animate Custom 3", + "Disturb / Trigger Trap", "Unlock", "Lock", "Open", "Unlock & Open", + "Close", "Toggle Open", "Destroy", "Rebuild", "Creation", + "Despawn", "Make Inert", "Make Active", "Close & Lock", "Use ArtKit 0", + "Use ArtKit 1", "Use ArtKit 2", "Use ArtKit 3", "Set Tap List" ) ), 'npc' => array( diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 1d59d587..63f3ab5f 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -840,6 +840,13 @@ $lang = array( GO_FLAG_TRIGGERED => 'Triggered', GO_FLAG_DAMAGED => 'Siege damaged', GO_FLAG_DESTROYED => 'Siege destroyed' + ), + 'actions' => array( + "None", "Animate Custom 0", "Animate Custom 1", "Animate Custom 2", "Animate Custom 3", + "Disturb / Trigger Trap", "Unlock", "Lock", "Open", "Unlock & Open", + "Close", "Toggle Open", "Destroy", "Rebuild", "Creation", + "Despawn", "Make Inert", "Make Active", "Close & Lock", "Use ArtKit 0", + "Use ArtKit 1", "Use ArtKit 2", "Use ArtKit 3", "Set Tap List" ) ), 'npc' => array( diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 1c4623ee..8c013d79 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -840,6 +840,13 @@ $lang = array( GO_FLAG_TRIGGERED => 'Triggered', GO_FLAG_DAMAGED => 'Siege damaged', GO_FLAG_DESTROYED => 'Siege destroyed' + ), + 'actions' => array( + "None", "Animate Custom 0", "Animate Custom 1", "Animate Custom 2", "Animate Custom 3", + "Disturb / Trigger Trap", "Unlock", "Lock", "Open", "Unlock & Open", + "Close", "Toggle Open", "Destroy", "Rebuild", "Creation", + "Despawn", "Make Inert", "Make Active", "Close & Lock", "Use ArtKit 0", + "Use ArtKit 1", "Use ArtKit 2", "Use ArtKit 3", "Set Tap List" ) ), 'npc' => array( diff --git a/localization/locale_zhcn.php b/localization/locale_zhcn.php index d8abb3b6..62a8e8a8 100644 --- a/localization/locale_zhcn.php +++ b/localization/locale_zhcn.php @@ -840,6 +840,13 @@ $lang = array( GO_FLAG_TRIGGERED => 'Triggered', GO_FLAG_DAMAGED => 'Siege damaged', GO_FLAG_DESTROYED => 'Siege destroyed' + ), + 'actions' => array( + "None", "Animate Custom 0", "Animate Custom 1", "Animate Custom 2", "Animate Custom 3", + "Disturb / Trigger Trap", "Unlock", "Lock", "Open", "Unlock & Open", + "Close", "Toggle Open", "Destroy", "Rebuild", "Creation", + "Despawn", "Make Inert", "Make Active", "Close & Lock", "Use ArtKit 0", + "Use ArtKit 1", "Use ArtKit 2", "Use ArtKit 3", "Set Tap List" ) ), 'npc' => array( diff --git a/pages/spell.php b/pages/spell.php index 0a5e6081..b888e121 100644 --- a/pages/spell.php +++ b/pages/spell.php @@ -1736,7 +1736,6 @@ class SpellPage extends GenericPage break; case 50: // Trans Door case 76: // Summon Object (Wild) - // case 86: // Activate Object case 104: // Summon Object (slot 1) case 105: // Summon Object (slot 2) case 106: // Summon Object (slot 3) @@ -1750,6 +1749,15 @@ class SpellPage extends GenericPage $foo['name'] .= $_; break; + case 86: // Activate Object + $_ = Lang::gameObject('actions', $effMV); + if ($_ && User::isInGroup(U_GROUP_EMPLOYEE)) + $_ = sprintf(Util::$dfnString, 'MiscValue'.Lang::main('colon').$effMV, $_); + else if (!$_) + $_ = $effMV; + + $foo['name'] .= ' ('.$_.')'; + break; case 74: // Apply Glyph if ($_ = DB::Aowow()->selectCell('SELECT spellId FROM ?_glyphproperties WHERE id = ?d', $effMV)) {