From 59ef124a2605aa436507688f0213050e62ebc851 Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Wed, 26 Feb 2020 16:33:31 +0100 Subject: [PATCH] SmartAI * fixed several ocurences of time strings being cast to int * always use short time format * also fixed that one questionmark typo that kicked this whole commit off --- includes/smartAI.class.php | 6 +++--- localization/locale_dede.php | 12 ++++++------ localization/locale_enus.php | 12 ++++++------ localization/locale_eses.php | 12 ++++++------ localization/locale_frfr.php | 12 ++++++------ localization/locale_ruru.php | 12 ++++++------ localization/locale_zhcn.php | 12 ++++++------ 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/includes/smartAI.class.php b/includes/smartAI.class.php index 1491013b..a5878d23 100644 --- a/includes/smartAI.class.php +++ b/includes/smartAI.class.php @@ -889,7 +889,7 @@ class SmartAI case SAI_ACTION_SUMMON_CREATURE: // 12 -> any target $this->jsGlobals[TYPE_NPC][] = $a['param'][0]; if ($a['param'][2]) - $a['param'][6] = Util::formatTime($a['param'][2]); + $a['param'][6] = Util::formatTime($a['param'][2], true); $footer = $this->summonType($a['param'][1]); break; @@ -971,13 +971,13 @@ class SmartAI if ($a['param'][3]) $this->jsGlobals[TYPE_QUEST][] = $a['param'][3]; if ($a['param'][4]) - $a['param'][6] = Util::formatTime($a['param'][4]); + $a['param'][6] = Util::formatTime($a['param'][4], true); if ($a['param'][2]) $footer = true; break; case SAI_ACTION_WP_PAUSE: // 54 -> self - $a['param'][6] = Util::formatTime($a['param'][0]); + $a['param'][6] = Util::formatTime($a['param'][0], true); break; case SAI_ACTION_WP_STOP: // 55 -> self if ($a['param'][0]) diff --git a/localization/locale_dede.php b/localization/locale_dede.php index 9dad95be..c1db4097 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -531,7 +531,7 @@ $lang = array( SAI_ACTION_ACTIVATE_GOBJECT => ['#target# wird aktiviert.', null], /* 10*/ SAI_ACTION_RANDOM_EMOTE => ['Emote %7$s zu #target#.', null], SAI_ACTION_CAST => ['Wirke [spell=%1$d] auf #target#.', null], - SAI_ACTION_SUMMON_CREATURE => ['Beschwöre [npc=%1$d](%4$d)?, den Auslöser angreifend:;(%3$d)? für %7$d:;.', null], + SAI_ACTION_SUMMON_CREATURE => ['Beschwöre [npc=%1$d](%4$d)?, den Auslöser angreifend:;(%3$d)? für %7$s:.;', null], SAI_ACTION_THREAT_SINGLE_PCT => ['Ändere Bedrohung von #target# um %7$d%%.', null], SAI_ACTION_THREAT_ALL_PCT => ['Ändere Bedrohung aller Ziele um %7$d%%.', null], SAI_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS => ['Erfülle Entdeckungsereignis von [quest=%1$d] für #target#.', null], @@ -559,7 +559,7 @@ $lang = array( SAI_ACTION_SET_IN_COMBAT_WITH_ZONE => ['Beginne Kampf mit allen Einheiten in der Zone.', null], SAI_ACTION_CALL_FOR_HELP => ['Rufe nach Hilfe.', 'Benutze Standard Hilfe-Emote'], /* 40*/ SAI_ACTION_SET_SHEATH => ['Stecke %7$s -waffen ein.', null], - SAI_ACTION_FORCE_DESPAWN => ['Entferne #target#(%1$d)? nach %7$s:;(%2$d)? und setze es nach %8$s wieder ein:;.', null], + SAI_ACTION_FORCE_DESPAWN => ['Entferne #target#(%1$d)? nach %7$s:;(%2$d)? und setze es nach %8$s wieder ein.:;', null], SAI_ACTION_SET_INVINCIBILITY_HP_LEVEL => ['Werde unverwundbar mit weniger als (%2$d)?%2$d%%:%1$d; Gesundheit.', null], SAI_ACTION_MOUNT_TO_ENTRY_OR_MODEL => ['Sitze (%7$d)?auf:ab; (%1$d)?[npc=%1$d].:;(%2$d)?[model npc=%2$d border=1 float=right][/model]:;', null], SAI_ACTION_SET_INGAME_PHASE_MASK => ['Setze Sichtbarkeit von #target# auf Phase %7$s.', null], @@ -568,12 +568,12 @@ $lang = array( SAI_ACTION_SET_VISIBILITY => ['#target# wird (%1$d)?sichtbar:unsichtbar;.', null], SAI_ACTION_SET_ACTIVE => ['#target# kann(%1$d)?: keine; Grids aktivieren.', null], SAI_ACTION_ATTACK_START => ['Greife #target# an.', null], -/* 50*/ SAI_ACTION_SUMMON_GO => ['Beschwöre [object=%1$d] bei #target#(%2$d)? für ?%7$d:;.', 'Verschwinden an Beschwörer geknüpft'], +/* 50*/ SAI_ACTION_SUMMON_GO => ['Beschwöre [object=%1$d] bei #target#(%2$d)? für %7$s:.;', 'Verschwinden an Beschwörer geknüpft'], SAI_ACTION_KILL_UNIT => ['#target# stirbt!', null], SAI_ACTION_ACTIVATE_TAXI => ['Fliege von [span class=q1]%7$s[/span] nach [span class=q1]%8$s[/span]', null], - SAI_ACTION_WP_START => ['(%1$d)?Gehe:Renne; auf Pfad #[b]%2$d[/b].(%4$d)? Verknüpft mit [quest=%4$d].:; Reagiere auf dem Pfad %8$s.(%5$d)? Verschwinde nach %7$s.:;', 'Wiederholbar'], - SAI_ACTION_WP_PAUSE => ['Pausiere Pfad für %7$d.', null], - SAI_ACTION_WP_STOP => ['Beende Pfad(%1$d)? und verschwinde nach %7$s:;.(%8$d)? [quest=%2$d] schlägt fehl.:;(%9$d)? [quest=%2$d] wird abgeschlossen.:;', null], + SAI_ACTION_WP_START => ['(%1$d)?Gehe:Renne; auf Pfad #[b]%2$d[/b].(%4$d)? Verknüpft mit [quest=%4$d].:; Reagiere auf dem Pfad %8$s.(%5$d)? Verschwinde nach %7$s:;', 'Wiederholbar'], + SAI_ACTION_WP_PAUSE => ['Pausiere Pfad für %7$s.', null], + SAI_ACTION_WP_STOP => ['Beende Pfad(%1$d)? und verschwinde nach %7$s:.;(%8$d)? [quest=%2$d] schlägt fehl.:;(%9$d)? [quest=%2$d] wird abgeschlossen.:;', null], SAI_ACTION_ADD_ITEM => ['Gib #target# %2$d [item=%1$d].', null], SAI_ACTION_REMOVE_ITEM => ['Nimm %2$d [item=%1$d] von #target#.', null], SAI_ACTION_INSTALL_AI_TEMPLATE => ['Verhalten als %7$s.', null], diff --git a/localization/locale_enus.php b/localization/locale_enus.php index 4d9782b8..f3a2c54d 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -531,7 +531,7 @@ $lang = array( SAI_ACTION_ACTIVATE_GOBJECT => ['#target# becomes activated.', null], /* 10*/ SAI_ACTION_RANDOM_EMOTE => ['Emote %7$s to #target#.', null], SAI_ACTION_CAST => ['Cast [spell=%1$d] at #target#.', null], - SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$d:;(%4$d)?, attacking invoker:;.', null], + SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$s:;(%4$d)?, attacking invoker.:;', null], SAI_ACTION_THREAT_SINGLE_PCT => ['Modify #target#\'s threat by %7$d%%.', null], SAI_ACTION_THREAT_ALL_PCT => ['Modify the threat of all targets by %7$d%%.', null], SAI_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS => ['Exploration event of [quest=%1$d] is completed for #target#.', null], @@ -559,7 +559,7 @@ $lang = array( SAI_ACTION_SET_IN_COMBAT_WITH_ZONE => ['Set in combat with units in zone.', null], SAI_ACTION_CALL_FOR_HELP => ['Call for help.', 'Use default help emote'], /* 40*/ SAI_ACTION_SET_SHEATH => ['Sheath %7$s weapons.', null], - SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;.', null], + SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;', null], SAI_ACTION_SET_INVINCIBILITY_HP_LEVEL => ['Become invincable below (%2$d)?%2$d%%:%1$d; HP.', null], SAI_ACTION_MOUNT_TO_ENTRY_OR_MODEL => ['(%7$d)?Dismount.:Mount ;(%1$d)?[npc=%1$d].:;(%2$d)?[model npc=%2$d border=1 float=right][/model]:;', null], SAI_ACTION_SET_INGAME_PHASE_MASK => ['Set visibility of #target# to phase %7$s.', null], @@ -568,12 +568,12 @@ $lang = array( SAI_ACTION_SET_VISIBILITY => ['#target# becomes (%1$d)?visible:invisible;.', null], SAI_ACTION_SET_ACTIVE => ['#target# becomes Grid (%1$d)?active:inactive;.', null], SAI_ACTION_ATTACK_START => ['Start attacking #target#.', null], -/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for ?%7$d:; at #target#.', 'Despawn linked to summoner'], +/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for %7$s:; at #target#.', 'Despawn linked to summoner'], SAI_ACTION_KILL_UNIT => ['#target# dies!', null], SAI_ACTION_ACTIVATE_TAXI => ['Fly from [span class=q1]%7$s[/span] to [span class=q1]%8$s[/span]', null], - SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s.:;', 'Repeatable'], - SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$d.', null], - SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:;.(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], + SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s:;', 'Repeatable'], + SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$s', null], + SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:.;(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], SAI_ACTION_ADD_ITEM => ['Give %2$d [item=%1$d] to #target#.', null], SAI_ACTION_REMOVE_ITEM => ['Remove %2$d [item=%1$d] from #target#.', null], SAI_ACTION_INSTALL_AI_TEMPLATE => ['Behave as a %7$s.', null], diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 22e7a02c..a713c93b 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -531,7 +531,7 @@ $lang = array( SAI_ACTION_ACTIVATE_GOBJECT => ['#target# becomes activated.', null], /* 10*/ SAI_ACTION_RANDOM_EMOTE => ['Emote %7$s to #target#.', null], SAI_ACTION_CAST => ['Cast [spell=%1$d] at #target#.', null], - SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$d:;(%4$d)?, attacking invoker:;.', null], + SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$s:;(%4$d)?, attacking invoker.:;', null], SAI_ACTION_THREAT_SINGLE_PCT => ['Modify #target#\'s threat by %7$d%%.', null], SAI_ACTION_THREAT_ALL_PCT => ['Modify the threat of all targets by %7$d%%.', null], SAI_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS => ['Exploration event of [quest=%1$d] is completed for #target#.', null], @@ -559,7 +559,7 @@ $lang = array( SAI_ACTION_SET_IN_COMBAT_WITH_ZONE => ['Set in combat with units in zone.', null], SAI_ACTION_CALL_FOR_HELP => ['Call for help.', 'Use default help emote'], /* 40*/ SAI_ACTION_SET_SHEATH => ['Sheath %7$s weapons.', null], - SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;.', null], + SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;', null], SAI_ACTION_SET_INVINCIBILITY_HP_LEVEL => ['Become invincable below (%2$d)?%2$d%%:%1$d; HP.', null], SAI_ACTION_MOUNT_TO_ENTRY_OR_MODEL => ['(%7$d)?Dismount.:Mount ;(%1$d)?[npc=%1$d].:;(%2$d)?[model npc=%2$d border=1 float=right][/model]:;', null], SAI_ACTION_SET_INGAME_PHASE_MASK => ['Set visibility of #target# to phase %7$s.', null], @@ -568,12 +568,12 @@ $lang = array( SAI_ACTION_SET_VISIBILITY => ['#target# becomes (%1$d)?visible:invisible;.', null], SAI_ACTION_SET_ACTIVE => ['#target# becomes Grid (%1$d)?active:inactive;.', null], SAI_ACTION_ATTACK_START => ['Start attacking #target#.', null], -/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for ?%7$d:; at #target#.', 'Despawn linked to summoner'], +/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for %7$s:; at #target#.', 'Despawn linked to summoner'], SAI_ACTION_KILL_UNIT => ['#target# dies!', null], SAI_ACTION_ACTIVATE_TAXI => ['Fly from [span class=q1]%7$s[/span] to [span class=q1]%8$s[/span]', null], - SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s.:;', 'Repeatable'], - SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$d.', null], - SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:;.(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], + SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s:;', 'Repeatable'], + SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$s', null], + SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:.;(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], SAI_ACTION_ADD_ITEM => ['Give %2$d [item=%1$d] to #target#.', null], SAI_ACTION_REMOVE_ITEM => ['Remove %2$d [item=%1$d] from #target#.', null], SAI_ACTION_INSTALL_AI_TEMPLATE => ['Behave as a %7$s.', null], diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 4056b65f..caff842c 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -531,7 +531,7 @@ $lang = array( SAI_ACTION_ACTIVATE_GOBJECT => ['#target# becomes activated.', null], /* 10*/ SAI_ACTION_RANDOM_EMOTE => ['Emote %7$s to #target#.', null], SAI_ACTION_CAST => ['Cast [spell=%1$d] at #target#.', null], - SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$d:;(%4$d)?, attacking invoker:;.', null], + SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$s:;(%4$d)?, attacking invoker.:;', null], SAI_ACTION_THREAT_SINGLE_PCT => ['Modify #target#\'s threat by %7$d%%.', null], SAI_ACTION_THREAT_ALL_PCT => ['Modify the threat of all targets by %7$d%%.', null], SAI_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS => ['Exploration event of [quest=%1$d] is completed for #target#.', null], @@ -559,7 +559,7 @@ $lang = array( SAI_ACTION_SET_IN_COMBAT_WITH_ZONE => ['Set in combat with units in zone.', null], SAI_ACTION_CALL_FOR_HELP => ['Call for help.', 'Use default help emote'], /* 40*/ SAI_ACTION_SET_SHEATH => ['Sheath %7$s weapons.', null], - SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;.', null], + SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;', null], SAI_ACTION_SET_INVINCIBILITY_HP_LEVEL => ['Become invincable below (%2$d)?%2$d%%:%1$d; HP.', null], SAI_ACTION_MOUNT_TO_ENTRY_OR_MODEL => ['(%7$d)?Dismount.:Mount ;(%1$d)?[npc=%1$d].:;(%2$d)?[model npc=%2$d border=1 float=right][/model]:;', null], SAI_ACTION_SET_INGAME_PHASE_MASK => ['Set visibility of #target# to phase %7$s.', null], @@ -568,12 +568,12 @@ $lang = array( SAI_ACTION_SET_VISIBILITY => ['#target# becomes (%1$d)?visible:invisible;.', null], SAI_ACTION_SET_ACTIVE => ['#target# becomes Grid (%1$d)?active:inactive;.', null], SAI_ACTION_ATTACK_START => ['Start attacking #target#.', null], -/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for ?%7$d:; at #target#.', 'Despawn linked to summoner'], +/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for %7$s:; at #target#.', 'Despawn linked to summoner'], SAI_ACTION_KILL_UNIT => ['#target# dies!', null], SAI_ACTION_ACTIVATE_TAXI => ['Fly from [span class=q1]%7$s[/span] to [span class=q1]%8$s[/span]', null], - SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s.:;', 'Repeatable'], - SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$d.', null], - SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:;.(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], + SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s:;', 'Repeatable'], + SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$s', null], + SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:.;(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], SAI_ACTION_ADD_ITEM => ['Give %2$d [item=%1$d] to #target#.', null], SAI_ACTION_REMOVE_ITEM => ['Remove %2$d [item=%1$d] from #target#.', null], SAI_ACTION_INSTALL_AI_TEMPLATE => ['Behave as a %7$s.', null], diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index a04fa2cf..3788b7e2 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -531,7 +531,7 @@ $lang = array( SAI_ACTION_ACTIVATE_GOBJECT => ['#target# becomes activated.', null], /* 10*/ SAI_ACTION_RANDOM_EMOTE => ['Emote %7$s to #target#.', null], SAI_ACTION_CAST => ['Cast [spell=%1$d] at #target#.', null], - SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$d:;(%4$d)?, attacking invoker:;.', null], + SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$s:;(%4$d)?, attacking invoker.:;', null], SAI_ACTION_THREAT_SINGLE_PCT => ['Modify #target#\'s threat by %7$d%%.', null], SAI_ACTION_THREAT_ALL_PCT => ['Modify the threat of all targets by %7$d%%.', null], SAI_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS => ['Exploration event of [quest=%1$d] is completed for #target#.', null], @@ -559,7 +559,7 @@ $lang = array( SAI_ACTION_SET_IN_COMBAT_WITH_ZONE => ['Set in combat with units in zone.', null], SAI_ACTION_CALL_FOR_HELP => ['Call for help.', 'Use default help emote'], /* 40*/ SAI_ACTION_SET_SHEATH => ['Sheath %7$s weapons.', null], - SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;.', null], + SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;', null], SAI_ACTION_SET_INVINCIBILITY_HP_LEVEL => ['Become invincable below (%2$d)?%2$d%%:%1$d; HP.', null], SAI_ACTION_MOUNT_TO_ENTRY_OR_MODEL => ['(%7$d)?Dismount.:Mount ;(%1$d)?[npc=%1$d].:;(%2$d)?[model npc=%2$d border=1 float=right][/model]:;', null], SAI_ACTION_SET_INGAME_PHASE_MASK => ['Set visibility of #target# to phase %7$s.', null], @@ -568,12 +568,12 @@ $lang = array( SAI_ACTION_SET_VISIBILITY => ['#target# becomes (%1$d)?visible:invisible;.', null], SAI_ACTION_SET_ACTIVE => ['#target# becomes Grid (%1$d)?active:inactive;.', null], SAI_ACTION_ATTACK_START => ['Start attacking #target#.', null], -/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for ?%7$d:; at #target#.', 'Despawn linked to summoner'], +/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for %7$s:; at #target#.', 'Despawn linked to summoner'], SAI_ACTION_KILL_UNIT => ['#target# dies!', null], SAI_ACTION_ACTIVATE_TAXI => ['Fly from [span class=q1]%7$s[/span] to [span class=q1]%8$s[/span]', null], - SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s.:;', 'Repeatable'], - SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$d.', null], - SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:;.(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], + SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s:;', 'Repeatable'], + SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$s', null], + SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:.;(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], SAI_ACTION_ADD_ITEM => ['Give %2$d [item=%1$d] to #target#.', null], SAI_ACTION_REMOVE_ITEM => ['Remove %2$d [item=%1$d] from #target#.', null], SAI_ACTION_INSTALL_AI_TEMPLATE => ['Behave as a %7$s.', null], diff --git a/localization/locale_zhcn.php b/localization/locale_zhcn.php index 30827482..8a479967 100644 --- a/localization/locale_zhcn.php +++ b/localization/locale_zhcn.php @@ -531,7 +531,7 @@ $lang = array( SAI_ACTION_ACTIVATE_GOBJECT => ['#target# becomes activated.', null], /* 10*/ SAI_ACTION_RANDOM_EMOTE => ['Emote %7$s to #target#.', null], SAI_ACTION_CAST => ['Cast [spell=%1$d] at #target#.', null], - SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$d:;(%4$d)?, attacking invoker:;.', null], + SAI_ACTION_SUMMON_CREATURE => ['Summon [npc=%1$d](%3$d)? for %7$s:;(%4$d)?, attacking invoker.:;', null], SAI_ACTION_THREAT_SINGLE_PCT => ['Modify #target#\'s threat by %7$d%%.', null], SAI_ACTION_THREAT_ALL_PCT => ['Modify the threat of all targets by %7$d%%.', null], SAI_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS => ['Exploration event of [quest=%1$d] is completed for #target#.', null], @@ -559,7 +559,7 @@ $lang = array( SAI_ACTION_SET_IN_COMBAT_WITH_ZONE => ['Set in combat with units in zone.', null], SAI_ACTION_CALL_FOR_HELP => ['Call for help.', 'Use default help emote'], /* 40*/ SAI_ACTION_SET_SHEATH => ['Sheath %7$s weapons.', null], - SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;.', null], + SAI_ACTION_FORCE_DESPAWN => ['Despawn #target#(%1$d)? after %7$s:;(%2$d)? and then respawn after %8$s:;', null], SAI_ACTION_SET_INVINCIBILITY_HP_LEVEL => ['Become invincable below (%2$d)?%2$d%%:%1$d; HP.', null], SAI_ACTION_MOUNT_TO_ENTRY_OR_MODEL => ['(%7$d)?Dismount.:Mount ;(%1$d)?[npc=%1$d].:;(%2$d)?[model npc=%2$d border=1 float=right][/model]:;', null], SAI_ACTION_SET_INGAME_PHASE_MASK => ['Set visibility of #target# to phase %7$s.', null], @@ -568,12 +568,12 @@ $lang = array( SAI_ACTION_SET_VISIBILITY => ['#target# becomes (%1$d)?visible:invisible;.', null], SAI_ACTION_SET_ACTIVE => ['#target# becomes Grid (%1$d)?active:inactive;.', null], SAI_ACTION_ATTACK_START => ['Start attacking #target#.', null], -/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for ?%7$d:; at #target#.', 'Despawn linked to summoner'], +/* 50*/ SAI_ACTION_SUMMON_GO => ['Summon [object=%1$d](%2$d)? for %7$s:; at #target#.', 'Despawn linked to summoner'], SAI_ACTION_KILL_UNIT => ['#target# dies!', null], SAI_ACTION_ACTIVATE_TAXI => ['Fly from [span class=q1]%7$s[/span] to [span class=q1]%8$s[/span]', null], - SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s.:;', 'Repeatable'], - SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$d.', null], - SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:;.(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], + SAI_ACTION_WP_START => ['(%1$d)?Walk:Run; on waypoint path #[b]%2$d[/b].(%4$d)? Is linked to [quest=%4$d].:; React %8$s while following the path.(%5$d)? Despawn after %7$s:;', 'Repeatable'], + SAI_ACTION_WP_PAUSE => ['Pause waypoint path for %7$s', null], + SAI_ACTION_WP_STOP => ['End waypoint path(%1$d)? and despawn after %7$s:.;(%8$d)? [quest=%2$d] fails.:;(%9$d)? [quest=%2$d] is completed.:;', null], SAI_ACTION_ADD_ITEM => ['Give %2$d [item=%1$d] to #target#.', null], SAI_ACTION_REMOVE_ITEM => ['Remove %2$d [item=%1$d] from #target#.', null], SAI_ACTION_INSTALL_AI_TEMPLATE => ['Behave as a %7$s.', null],