From 1f637ad6eff3742b6a6499a37c3aefc074ed72cc Mon Sep 17 00:00:00 2001 From: PikaMug Date: Thu, 29 Aug 2019 02:21:18 -0400 Subject: [PATCH] Assimilate exit strings --- main/src/main/java/me/blackvein/quests/QuestFactory.java | 4 ++-- .../java/me/blackvein/quests/actions/ActionFactory.java | 4 ++-- .../me/blackvein/quests/prompts/CreateStagePrompt.java | 2 +- main/src/main/resources/strings.yml | 7 ++----- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/QuestFactory.java b/main/src/main/java/me/blackvein/quests/QuestFactory.java index 40a641792..9cb830976 100644 --- a/main/src/main/java/me/blackvein/quests/QuestFactory.java +++ b/main/src/main/java/me/blackvein/quests/QuestFactory.java @@ -906,7 +906,7 @@ public class QuestFactory implements ConversationAbandonedListener { } public String getQueryText(ConversationContext context) { - return ChatColor.YELLOW + Lang.get("questEditorExited") + "\n"; + return ChatColor.YELLOW + Lang.get("confirmDelete") + "\n"; } @Override @@ -2020,7 +2020,7 @@ public class QuestFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + "" + ChatColor.GREEN + " - " + Lang.get("yesWord") + "\n"; text += ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + "" + ChatColor.RED + " - " + Lang.get("noWord"); - return ChatColor.RED + Lang.get("questEditorDeleted") + " (" + ChatColor.YELLOW + (String) context.getSessionData(CK.ED_QUEST_DELETE) + ChatColor.RED + ")\n" + text; + return ChatColor.RED + Lang.get("confirmDelete") + " (" + ChatColor.YELLOW + (String) context.getSessionData(CK.ED_QUEST_DELETE) + ChatColor.RED + ")\n" + text; } @Override diff --git a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java index 98d98502e..5bd9d7fda 100644 --- a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java +++ b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java @@ -408,7 +408,7 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + "" + ChatColor.GREEN + " - " + Lang.get("yesWord") + "\n"; text += ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + "" + ChatColor.RED + " - " + Lang.get("noWord"); - return ChatColor.RED + Lang.get("eventEditorDeletePrompt") + " (" + ChatColor.YELLOW + (String) context.getSessionData(CK.ED_EVENT_DELETE) + ChatColor.RED + ")\n" + text; + return ChatColor.RED + Lang.get("confirmDelete") + " (" + ChatColor.YELLOW + (String) context.getSessionData(CK.ED_EVENT_DELETE) + ChatColor.RED + ")\n" + text; } @Override @@ -799,7 +799,7 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.GREEN + " - " + Lang.get("yesWord") + "\n" + ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.RED + " - " + Lang.get("noWord"); - return ChatColor.YELLOW + Lang.get("questEditorExited") + "\n" + text; + return ChatColor.YELLOW + Lang.get("confirmDelete") + "\n" + text; } @Override diff --git a/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java b/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java index d28e97cc3..ebd7973aa 100644 --- a/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java +++ b/main/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java @@ -1214,7 +1214,7 @@ public class CreateStagePrompt extends FixedSetPrompt { public String getPromptText(ConversationContext context) { String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + "" + ChatColor.GREEN + " - " + Lang.get("yesWord") + "\n"; text += ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + "" + ChatColor.RED + " - " + Lang.get("noWord"); - return ChatColor.RED + Lang.get("stageEditorConfirmStageDelete") + " (" + ChatColor.YELLOW + Lang.get("stageEditorStage") + " " + stageNum + ChatColor.RED + ")\n" + ChatColor.GOLD + "(" + Lang.get("stageEditorConfirmStageNote") + ")\n" + text; + return ChatColor.RED + Lang.get("confirmDelete") + " (" + ChatColor.YELLOW + Lang.get("stageEditorStage") + " " + stageNum + ChatColor.RED + ")\n" + ChatColor.GOLD + "(" + Lang.get("stageEditorConfirmStageNote") + ")\n" + text; } @Override diff --git a/main/src/main/resources/strings.yml b/main/src/main/resources/strings.yml index d524755ba..2c2465877 100644 --- a/main/src/main/resources/strings.yml +++ b/main/src/main/resources/strings.yml @@ -109,8 +109,6 @@ questEditorNeedAskMessage: "You must set an ask message!" questEditorNeedFinishMessage: "You must set a finish message!" questEditorNeedStages: "Your Quest has no Stages!" questEditorSaved: "%bold%Quest saved! %reset%(You will need to perform %red% %reset% for it to appear in-game)" -questEditorExited: "Are you sure you want to exit without saving?" -questEditorDeleted: "Are you sure you want to delete the Quest?" stageEditorEditStage: "Edit Stage" stageEditorNewStage: "Add new Stage" stageEditorStages: "Stages" @@ -273,7 +271,6 @@ stageEditorDelayCleared: "Delay cleared." stageEditorDenizenCleared: "Denizen script cleared." stageEditorObjectiveCleared: "Objective cleared." stageEditorMessageCleared: "Message cleared." -stageEditorConfirmStageDelete: "Are you sure you want to delete this stage?" stageEditorConfirmStageNote: "Any Stages after will be shifted back one spot" stageEditorDeleteSucces: "Stage deleted successfully." stageEditorEnchantments: "Enchantments" @@ -294,7 +291,6 @@ eventEditorErrorSaving: "An error occurred while saving." eventEditorDeleted: "Action deleted, Quests and Actions reloaded." eventEditorSaved: "Action saved, Quests and Actions reloaded." eventEditorEnterEventName: "Enter Action name, " -eventEditorDeletePrompt: "Are you sure you want to delete the Action?" eventEditorModifiedNote: 'Note: You have modified an Action that the following Quests use:' eventEditorForcedToQuit: "If you save the Action, anyone who is actively doing any of these Quests will be forced to quit them." eventEditorEventInUse: "The following Quests use the Action" @@ -842,4 +838,5 @@ questSaveError: "An error occurred while saving." noPermission: "You do not have permission to do that." duplicateEditor: "You are already using an editor!" difference: "The difference is ''." -notInstalled: "Not installed" \ No newline at end of file +notInstalled: "Not installed" +confirmDelete: "Are you sure?" \ No newline at end of file