diff --git a/includes/components/SmartAI/SmartAction.class.php b/includes/components/SmartAI/SmartAction.class.php index 0ae6b681..3135bfaf 100644 --- a/includes/components/SmartAI/SmartAction.class.php +++ b/includes/components/SmartAI/SmartAction.class.php @@ -718,13 +718,19 @@ class SmartAction $this->param[10] = $this->param[1] + $this->param[2] / pow(10, floor(log10($this->param[2] ?: 1.0) + 1)); // i know string concatenation is a thing. don't @ me! break; case self::ACTION_TALK: // 1 -> any target + $talkTarget = $this->param[2]; case self::ACTION_SIMPLE_TALK: // 84 -> any target $playerSrc = false; if ($npcId = $this->smartAI->getTarget()->getTalkSource($playerSrc)) { if ($quotes = $this->smartAI->getQuote($npcId, $this->param[0], $npcSrc)) + { foreach ($quotes as ['text' => $text]) - $this->param[10] .= sprintf($text, $playerSrc ? Lang::main('thePlayer') : $npcSrc); + { + $talkTarget = ($talkTarget ?? true) ? Lang::game('target') : $npcSrc; + $this->param[10] .= sprintf($text, $playerSrc ? Lang::main('thePlayer') : $npcSrc, $talkTarget); + } + } } else trigger_error('SmartAI::action - could not determine talk source for action #'.$this->type); diff --git a/localization/locale_dede.php b/localization/locale_dede.php index 4e51c16a..aaa4d36d 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -383,6 +383,7 @@ $lang = array( 'school' => "Magieart", 'type' => "Art: ", 'valueDelim' => " - ", // " bis " + 'target' => "", 'pvp' => "PvP", 'honorPoints' => "Ehrenpunkte", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index 184eacb1..b163250e 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -383,6 +383,7 @@ $lang = array( 'school' => "School", 'type' => "Type: ", 'valueDelim' => " to ", + 'target' => "", 'pvp' => "PvP", // PVP 'honorPoints' => "Honor Points", // HONOR_POINTS diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 45db09e7..93a7e7a2 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -383,6 +383,7 @@ $lang = array( 'school' => "Escuela", 'type' => "Tipo: ", 'valueDelim' => " - ", + 'target' => "", 'pvp' => "JcJ", 'honorPoints' => "Puntos de Honor", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 088f000d..7826b890 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -383,6 +383,7 @@ $lang = array( 'school' => "École", 'type' => "Type : ", 'valueDelim' => " - ", + 'target' => "", 'pvp' => "JcJ", 'honorPoints' => "Points d'honneur", diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 640f0936..f2ebf436 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -383,6 +383,7 @@ $lang = array( 'school' => "Школа", 'type' => "Тип: ", 'valueDelim' => " - ", + 'target' => "<цель>", 'pvp' => "PvP", 'honorPoints' => "Очки Чести", diff --git a/localization/locale_zhcn.php b/localization/locale_zhcn.php index 0f659a22..8081c29c 100644 --- a/localization/locale_zhcn.php +++ b/localization/locale_zhcn.php @@ -383,6 +383,7 @@ $lang = array( 'school' => "类型", 'type' => "类型:", 'valueDelim' => "到", + 'target' => "<目标>", 'pvp' => "PvP", 'honorPoints' => "荣誉点数",