simple dialog plugin naming changed to avoid collision with the core

gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd

@@ -4,79 +4,61 @@ extends EditorPlugin
 class_name RTMISimpleDialogPlugin
 
 
-const MANAGER_CLASS="res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/esc_dialog_simple.gd"
-const SETTINGS_ROOT="escoria/dialog_simple"
-
-const AVATARS_PATH = "%s/avatars_path" % SETTINGS_ROOT
-const TEXT_TIME_PER_LETTER_MS = "%s/text_time_per_letter_ms" % SETTINGS_ROOT
-const TEXT_TIME_PER_LETTER_MS_FAST = "%s/text_time_per_fast_letter_ms" % SETTINGS_ROOT
-const READING_SPEED_IN_WPM = "%s/reading_speed_in_wpm" % SETTINGS_ROOT
-const CLEAR_TEXT_BY_CLICK_ONLY = "%s/clear_text_by_click_only" % SETTINGS_ROOT
-const LEFT_CLICK_ACTION = "%s/left_click_action" % SETTINGS_ROOT
-const STOP_TALKING_ANIMATION_ON = "%s/stop_talking_animation_on" % SETTINGS_ROOT
-
-const LEFT_CLICK_ACTION_SPEED_UP = "Speed up"
-const LEFT_CLICK_ACTION_INSTANT_FINISH = "Instant finish"
-const LEFT_CLICK_ACTION_NOTHING = "None"
-
-const STOP_TALKING_ANIMATION_ON_END_OF_TEXT = "End of text"
-const STOP_TALKING_ANIMATION_ON_END_OF_AUDIO = "End of audio"
+const MANAGER_CLASS="res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd"
+const SETTINGS_ROOT="escoria/rtmi_dialog_simple"
 
 const READING_SPEED_IN_WPM_DEFAULT_VALUE = 200
 const TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE = 100
 const TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE = 25
 
-
 var left_click_actions: PoolStringArray = [
-	LEFT_CLICK_ACTION_SPEED_UP,
-	LEFT_CLICK_ACTION_INSTANT_FINISH,
-	LEFT_CLICK_ACTION_NOTHING
+	RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP,
+	RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH,
+	RTMISimpleDialogSettings.LEFT_CLICK_ACTION_NOTHING
 ]
 
 var stop_talking_animation_on_options: PoolStringArray = [
-	STOP_TALKING_ANIMATION_ON_END_OF_TEXT,
-	STOP_TALKING_ANIMATION_ON_END_OF_AUDIO
+	RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_TEXT,
+	RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO
 ]
 
-
 # Override function to return the plugin name.
 func get_plugin_name():
 	return "escoria-rtmi-dialog-simple"
 
-
 # Unregister ourselves
 func disable_plugin():
-	print("Disabling plugin Escoria Return to the Monkey Island Dialog Simple")
+	print("Disabling plugin Escoria Dialog Simple")
 	ESCProjectSettingsManager.remove_setting(
 		ESCProjectSettingsManager.DEFAULT_DIALOG_TYPE
 	)
 
 	ESCProjectSettingsManager.remove_setting(
-		AVATARS_PATH
+		RTMISimpleDialogSettings.AVATARS_PATH
 	)
 
 	ESCProjectSettingsManager.remove_setting(
-		TEXT_TIME_PER_LETTER_MS
+		RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS
 	)
 
 	ESCProjectSettingsManager.remove_setting(
-		TEXT_TIME_PER_LETTER_MS_FAST
+		RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST
 	)
 
 	ESCProjectSettingsManager.remove_setting(
-		CLEAR_TEXT_BY_CLICK_ONLY
+		RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY
 	)
 
 	ESCProjectSettingsManager.remove_setting(
-		READING_SPEED_IN_WPM
+		RTMISimpleDialogSettings.READING_SPEED_IN_WPM
 	)
 
 	ESCProjectSettingsManager.remove_setting(
-		LEFT_CLICK_ACTION
+		RTMISimpleDialogSettings.LEFT_CLICK_ACTION
 	)
 
 	ESCProjectSettingsManager.remove_setting(
-		STOP_TALKING_ANIMATION_ON
+		RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON
 	)
 
 	EscoriaPlugin.deregister_dialog_manager(MANAGER_CLASS)
@@ -84,7 +66,7 @@ func disable_plugin():
 
 # Add ourselves to the list of dialog managers
 func enable_plugin():
-	print("Enabling plugin Escoria Return to the Monkey Island Dialog Simple")
+	print("Enabling plugin Escoria Dialog Simple")
 
 	if EscoriaPlugin.register_dialog_manager(self, MANAGER_CLASS):
 		ESCProjectSettingsManager.register_setting(
@@ -96,7 +78,7 @@ func enable_plugin():
 		)
 
 		ESCProjectSettingsManager.register_setting(
-			AVATARS_PATH,
+			RTMISimpleDialogSettings.AVATARS_PATH,
 			"res://game/dialog_avatars",
 			{
 				"type": TYPE_STRING,
@@ -105,7 +87,7 @@ func enable_plugin():
 		)
 
 		ESCProjectSettingsManager.register_setting(
-			TEXT_TIME_PER_LETTER_MS,
+			RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS,
 			TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE,
 			{
 				"type": TYPE_REAL
@@ -113,7 +95,7 @@ func enable_plugin():
 		)
 
 		ESCProjectSettingsManager.register_setting(
-			TEXT_TIME_PER_LETTER_MS_FAST,
+			RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST,
 			TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE,
 			{
 				"type": TYPE_REAL
@@ -121,7 +103,7 @@ func enable_plugin():
 		)
 
 		ESCProjectSettingsManager.register_setting(
-			CLEAR_TEXT_BY_CLICK_ONLY,
+			RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY,
 			false,
 			{
 				"type": TYPE_BOOL
@@ -129,7 +111,7 @@ func enable_plugin():
 		)
 
 		ESCProjectSettingsManager.register_setting(
-			READING_SPEED_IN_WPM,
+			RTMISimpleDialogSettings.READING_SPEED_IN_WPM,
 			READING_SPEED_IN_WPM_DEFAULT_VALUE,
 			{
 				"type": TYPE_INT
@@ -139,8 +121,8 @@ func enable_plugin():
 		var left_click_actions_string: String = left_click_actions.join(",")
 
 		ESCProjectSettingsManager.register_setting(
-			LEFT_CLICK_ACTION,
-			LEFT_CLICK_ACTION_SPEED_UP,
+			RTMISimpleDialogSettings.LEFT_CLICK_ACTION,
+			RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP,
 			{
 				"type": TYPE_STRING,
 				"hint": PROPERTY_HINT_ENUM,
@@ -151,8 +133,8 @@ func enable_plugin():
 		var stop_talking_animation_on_options_string: String = stop_talking_animation_on_options.join(",")
 
 		ESCProjectSettingsManager.register_setting(
-			STOP_TALKING_ANIMATION_ON,
-			STOP_TALKING_ANIMATION_ON_END_OF_AUDIO,
+			RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON,
+			RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO,
 			{
 				"type": TYPE_STRING,
 				"hint": PROPERTY_HINT_ENUM,

gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd

@@ -4,7 +4,7 @@ class_name ESCReturnToMonekyIslandDialogs
 
 
 # State machine that governs how the dialog manager behaves
-var state_machine = preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/esc_dialog_simple_state_machine.gd").new()
+var state_machine = preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd").new()
 
 # The currently running player
 var _type_player: Node = null

gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd

@@ -1,7 +1,7 @@
 extends Resource
-class_name SimpleDialogSettings
+class_name RTMISimpleDialogSettings
 
-const SETTINGS_ROOT = "escoria/dialog_simple"
+const SETTINGS_ROOT = "escoria/rtmi_dialog_simple"
 
 const AVATARS_PATH = "%s/avatars_path" % SETTINGS_ROOT
 const TEXT_TIME_PER_LETTER_MS = "%s/text_time_per_letter_ms" % SETTINGS_ROOT