diff --git a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd index 6d1c7a81..4015166a 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd @@ -152,11 +152,12 @@ func activate( escoria.logger.report_warnings( "ESCActionManager.activate: Invalid action on item", [ - "Trying to run %s on object %s, "+ - "but item must be in inventory." % [ + "Trying to run %s on object %s, " % + [ action, - target.global_id + target.node.global_id ] + + "but item must be in inventory." ] ) diff --git a/game/translations/main_menu.csv b/game/translations/main_menu.csv index 5a25259c..0eb1c2e6 100644 --- a/game/translations/main_menu.csv +++ b/game/translations/main_menu.csv @@ -11,3 +11,4 @@ SOUND_VOLUME,Sound effects,Effets sonores CANCEL,Cancel,Annuler OK,OK,OK ENTER_SAVE_NAME,Enter the save name:,Entrez un nom de sauvegarde +APPLY,Apply,Appliquer diff --git a/game/translations/main_menu.en.translation b/game/translations/main_menu.en.translation index 2a70687c..88ff5a35 100644 Binary files a/game/translations/main_menu.en.translation and b/game/translations/main_menu.en.translation differ diff --git a/game/translations/main_menu.fr.translation b/game/translations/main_menu.fr.translation index 61b60b98..78833c03 100644 Binary files a/game/translations/main_menu.fr.translation and b/game/translations/main_menu.fr.translation differ diff --git a/project.godot b/project.godot index 39120d71..3b09cc15 100644 --- a/project.godot +++ b/project.godot @@ -330,6 +330,11 @@ _global_script_classes=[ { "path": "res://addons/escoria-core/game/core-scripts/esc/commands/queue_resource.gd" }, { "base": "ESCBaseCommand", +"class": "RandGlobalCommand", +"language": "GDScript", +"path": "res://addons/escoria-core/game/core-scripts/esc/commands/rand_global.gd" +}, { +"base": "ESCBaseCommand", "class": "RepeatCommand", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/commands/repeat.gd" @@ -514,6 +519,7 @@ _global_script_class_icons={ "PlaySndCommand": "", "QueueAnimationCommand": "", "QueueResourceCommand": "", +"RandGlobalCommand": "", "RepeatCommand": "", "SayCommand": "", "SchedEventCommand": "",