diff --git a/website/common/locales/en/quests.json b/website/common/locales/en/quests.json index d467f41c08..7e6c3c1569 100644 --- a/website/common/locales/en/quests.json +++ b/website/common/locales/en/quests.json @@ -129,7 +129,7 @@ "rageStrikes": "Rage Strikes", "chatQuestStarted": "Your quest, <%= questName %>, has started.", "chatBossDamage": "<%= username %> attacks <%= bossName %> for <%= userDamage %> damage. <%= bossName %> attacks party for <%= bossDamage %> damage.", - "chatBossDontAttack": "<%= bossName %> does not attack, because it respects the fact that there are some bugs post-maintenance, and it doesn't want to hurt anyone unfairly. It will continue its rampage soon!", + "chatBossDontAttack": "<%= username %> attacks <%= bossName %> for <%= userDamage %> damage. <%= bossName %> does not attack, because it respects the fact that there are some bugs post-maintenance, and it doesn't want to hurt anyone unfairly. It will continue its rampage soon!", "chatBossDefeated": "You defeated <%= bossName %>! Questing party members receive the rewards of victory.", "chatFindItems": "<%= username %> found <%= items %>.", "chatItemQuestFinish": "All items found! Party has received their rewards.", diff --git a/website/server/models/group.js b/website/server/models/group.js index fe19156636..03cc28efb6 100644 --- a/website/server/models/group.js +++ b/website/server/models/group.js @@ -329,7 +329,7 @@ function translateSystemMessages (group, user) { group.chat[i].text = `\`${shared.i18n.t('chatBossDamage', {username: group.chat[i].info.user, bossName: questScrolls[group.chat[i].info.quest].boss.name(user.preferences.language), userDamage: group.chat[i].info.userDamage, bossDamage: group.chat[i].info.bossDamage}, user.preferences.language)}\``; break; case 'boss_dont_attack': - group.chat[i].text = `\`${shared.i18n.t('chatBossDontAttack', {bossName: questScrolls[group.chat[i].info.quest].boss.name(user.preferences.language)}, user.preferences.language)}\``; + group.chat[i].text = `\`${shared.i18n.t('chatBossDontAttack', {username: group.chat[i].info.user, bossName: questScrolls[group.chat[i].info.quest].boss.name(user.preferences.language), userDamage: group.chat[i].info.userDamage}, user.preferences.language)}\``; break; case 'boss_rage': group.chat[i].text = `\`${questScrolls[group.chat[i].info.quest].boss.rage.effect(user.preferences.language)}\``; @@ -968,7 +968,9 @@ schema.methods._processBossQuest = async function processBossQuest (options) { if (CRON_SAFE_MODE || CRON_SEMI_SAFE_MODE) { group.sendChat(`\`${shared.i18n.t('chatBossDontAttack', {bossName: quest.boss.name('en')}, 'en')}\``, null, null, { type: 'boss_dont_attack', + user: user.profile.name, quest: group.quest.key, + userDamage: progress.up.toFixed(1), }); } else { group.sendChat(`\`${shared.i18n.t('chatBossDamage', {username: user.profile.name, bossName: quest.boss.name('en'), userDamage: progress.up.toFixed(1), bossDamage: Math.abs(down).toFixed(1)}, user.preferences.language)}\``, null, null, {