From e0de1de1cef241f75b123b11a6713d7ee7c4191e Mon Sep 17 00:00:00 2001
From: Julian Murgia <the.straton@gmail.com>
Date: Mon, 5 Jul 2021 11:23:00 +0200
Subject: [PATCH] Fix bug in a warning not correctly formatted.

---
 .../game/core-scripts/esc/esc_action_manager.gd |   7 ++++---
 game/translations/main_menu.csv                 |   1 +
 game/translations/main_menu.en.translation      | Bin 729 -> 825 bytes
 game/translations/main_menu.fr.translation      | Bin 760 -> 856 bytes
 project.godot                                   |   6 ++++++
 5 files changed, 11 insertions(+), 3 deletions(-)

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 2a70687c7bc65906de9e84ee3e9c71ca68670e8d..88ff5a35cde533b0550405b645ce54350c075094 100644
GIT binary patch
literal 825
zcmbW0ze^)Q6vtm;Jmaqu1yMNA9LRB~5XB#b_&X=c>6sYAA&7)=9oEHlH|*>pik;V5
zSXkTGSRNu47WyApT388I;<Z<9?)zc}f?C~!4{zRg-psstJDXk3rl@RH@S0|fGjl?1
z<~-pjTlkji=)C{-aja|yo>Xq&88UCXhOqO#n^%T(Bz>%$bHui!S}5C6DPc-QH3&*8
zB-LZMiR$vcShpoLB3uuQE$Np9K1unW<(Mzal;K$gA0kl%)Pd4YBgtexHLwJG_s-mq
z7)XFN!1e(&fEG}!Fuq$w_-5FF`7Y26`oJ*Yq{*_chEIU+fNNrMxp;)j<vB*{>4R^l
z8N^%*qjme_ZVh3nS=<G!kDV?4{rrx8eSZ4*6M7S9t;jbi^_#WV`|sVyF9xA=O^n|E
zVeVHkiTHJ$mrut>U!n8IW1@i9bpDCD9P0=7MGW1JBjzv8=)5aypq}gEe)Ie2UTN-`
zh1YppUnh_toE`YI5>k4emIBMCsY1ctrEqz5BHG(~S5+5Mm>xa62`MEUL)tVgj4fJl
r#YV#9x3(Z0Gr&WmMY;2${0Nj~P&kv>kBrCM=a^lLjNll`;-~osqZFo+

literal 729
zcmbV~yGsK>5XL7lYK$);3O))`h=m43qK)_fA1L^U#uTE+u{oD`<Z>sscL-vqt%ZfP
zO&V(v3k&@ZEG?`AE78{S;y3XQM64Y6@$Jm*%-qgyZZkJWfz?4nl31@V3ALYhgr!X3
z8nzYg`?toC*$o`2Y|qi9X4<+iHP_aZE-guIKfhU`EU5{RvQ$bGrJ_bSwG2tkSnlKR
zG*=W%Nv&`To?en}5a3SAbquTcou+ihIB*dpihu;DRhk$X8Ko8u!Tvlm4<rUsfZMQD
zVO*j!Soa3Xakc^YLtre3*F#fa8bks2%bv_v^3aBWK{5WA#+pyeg!_iJlEceC;`i5;
z*KzpmpbKy<CZCT-wxQgM3G?raOmhl;3*h<QzFnNpLwT4?nBV^qwfRip0|@iY%ctF*
zU@uSgW$CoabNJoo=sA9aaBZ|)XX<M0vjfUKIFHZS4>Yi1i@j8l?>D<lvqCSCpPf8=
z@X24y^ld>lcV?pL^iy5JrxjrpJzPKe3+u;`>6rZ<GpmsaniG~TO<I$O-<4K9W$3iw
K8Mx&f9`zTw2a0?E

diff --git a/game/translations/main_menu.fr.translation b/game/translations/main_menu.fr.translation
index 61b60b9830dc7c38ab27cc155253af264e860858..78833c037c8d55916b8f767671ef49f9fab0dcd3 100644
GIT binary patch
literal 856
zcmbW0u}>6H5XOfC_25uMO|T#WiMawu4k1_|B#_g92<&-YL89dHSRZ=}%iHt4-I&;7
zYhjFuoedOM5<)Pskc2<Ll7dDPE2FLD;y34RvQaBu^2>Yk&AgeN+1>J^a*^WIiantl
z=hB=owTc$Xcp`9pmBgKS&*J8Fpr!FcZOf|X+rp~`e%07gNxGEwDX}T39m=LOMmW;Y
z1sKg6l5#lK@O0Hcta_3z!dwmQ4H?7&S2BTimGkGCv9((dAQH8J4$#arQ7GJ^PL{C#
z+jAQnJd|_szNU$#e$WGWod=!Z3OG$IZZ&28bG!lnO)v;Xz-_=m)A7zF`@uZmM`S9M
zYzueGv*0EZ-P*dl{Up}Xy7&Hg1#+`v?mCH|YApR4g8g@%PkY<no<hG0dQ<TZ6?d<}
z<{arfFHW-iGtjtZy6)Gxm!}iZI6srrJ^23i^=KT+@tN4y_cP;j-sJnsi}BC*VJG*K
zxR35wj_1ZR=mLYw-9shpJpapp-$fsI4rY%U>ZqZGN7e(19_9-lBATh!J@;8CHAVM^
zhcm4`dj|s@5k=PIt3!B|3O)GBGQbB)#hTC#%mtyGP*Sw?*ngLswB|DrEry2EAWLcB
VgueWEv$Nlp_wQKi5m6cc)NfARv+@7{

delta 455
zcmcb?_JehU4P!ko0|fjB0xlp^1c*UwDJTtMgMbQ<uLZ;=P;piutpLP!K+FWhj6m$)
z?6M>dNOM53TB7NB10b6niec)sA_TRAfMPrh4D}2GK*s*fOP-hmX<;Ci0b-D0ARH3H
z!I%c5K?Z;fg&D9r)0kTs$Ok!|ABeZVnmW-7NW(0K>6d@Yln)YPhGLlhocY&dC4pjG
zK>L9N1H(g)mjB#98r`K;w>h=~h2aL<uJrpR1XTwzm<@>KfjAe4oih@P(o>5V{Jj~1
zQcLnnix~d-+w>mz$KZZ=W!~YHMTt2K|6Fx+n3%;kZ&&2{$KaEgmtJb03KR@byv^|7
z&E%z9S=92a{j>ftIOgS*<^YZQ=NFwngWJa6i|HSOZ)tI6VJT2~pql=Ue?a>ff`Wsb
E0g16>ng9R*

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": "",