From 2a301be4ef39b1150c62b6b3625d52c3d715bf8e Mon Sep 17 00:00:00 2001 From: kyO The NinjA Date: Mon, 1 Jun 2020 15:13:34 -0300 Subject: [PATCH] Fix: [EN] Fix commission reward stuck --- assets/en/reward/EXP_INFO_S_REWARD.png | Bin 8924 -> 9721 bytes module/config/argparser_en.py | 2 +- module/reward/assets.py | 2 +- module/reward/commission.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/en/reward/EXP_INFO_S_REWARD.png b/assets/en/reward/EXP_INFO_S_REWARD.png index 8e01b526bfea99ce41944215a148f7d3040e1463..ea0e9180af995b0c93c88ebc511f5983a0d26d76 100644 GIT binary patch delta 2599 zcmZ8iZCFxi8a^T=YFVh|WQwMJUTPm>jbbL&rmgFSHI7T>2X=XhH7aV3V)=2HX#$e@tpRdO+{jB|F>}C5xmb*!#NT_5z>g z;?&nOT-P{Wc~878)z0eqtOY56d}2U87WsX#fw#`x%??}}i#)ZsSPk`H;$M9XGOKwk zR-u<#&H5Cu8njwT;Ku@tFI*!$I&|l)SD-m%xMm^)gDjF~=Y9}~rlN%UuY$V=Q}1$v zD$QH2IU%*4ftBWieo8tor4V~xJTMZ_2e}Q5tn-C)Kvw?sM7sNE5&Q1pe}f)u&D399 ztu$;ToM9FcVYH+-;yWtE1po&}S|a!tn6pBBUcm$Pc20mrf@8u_;Qe=vxQi)rWWpg}7fgbu!ga73d!eid-eDBA zD*-zMHtodFIh(#{&Zlxq)6UyCA1ds@h4NCQVJR@*9CFrb8}4(uyB&kg8f@~#qy}5O zxju^=Bk;NohqGWXN+CT|92kN-6o=Qj$i~JKD=2xQ#TJEE_gJFwx_*}>ovOVX_|?b~ z5Z;|I9dDOO*u2==8uev=CCzv*XyK7|!{^{TyuZ@^3B)p%V*L?Hl-7D;GU=&?MjI5L z@*AY2jxG3J85Z~U41Fn`nXbm%a*Twlm1i!9jBIl{~I54gobBVX@VP#_vZ8`a`cxKo^DKA$p=?Uk*rLfE-$J7!{EuYO}{l7 zD7KaXP5oE>m6_jfTWMF*3zbdsdu@ATwiUY#*0ChorwWCti^CnCTRNU}w7i9DRK8U> zqo7%Z#bi2rcV}IXQ%(QbK4^^_XnWcF`S7w3_ISibyUY;L#OYe*rk}bINu#s|r0bO{ zxU)MJJ>iAUl}GT!Y;CqI49@K#FDfT2wH;t%P2XK4Y*|!oP-RJ1-E5Sww!xA*F!As+ zK*9BfEs?d%T-jT&MQpJHy;1l1$K-ltjZC$7?055dv5JKa?`v0>?X8}u?_>mU;7G7_ zeg$Fi_z4b_ZdBTH=8brp-jw(u`Fdq3!7eV2p;9=bvBN_z*ZWe&itORehF`gcEAFdH zYL@PKJv0u+BA(IWv<2>QiR* znWXS^3}QmcRu)!VP=Y`ZhP_E{x>#9%!=G(_m}ia=GDhhOTIm~=F~jB!KwP#1*%eia zXt|$~-(WR>s}Fj>tC@W542wyD>dX~Xu%s;x9ki}HAWAsiDEr`V+?}eFay9q!57|_! z>`02kL`)Sa^!d7bzLRU1Fa%I4e&`!g^l9fUxdZ$pRMU4jPPWu!Hsq$G24>)8MGJkP zK2?PGI@=a?yD~3=Op$o18tUVxo*|+BY3Pb2W6BqHRY22uIOGTcim|jy3Hgo4UxUDH zqn*CsZMK{w=>MS6hrZ8z@K4DdDgn+hn+kFqEFaa^MBv{_j`VqW{9K6ACg~-(4$}PW zfgm;1-`1oSCpO-+8LjX{KUlu~=}AsjSX1f2%>J*ZQI{a=D_+m5-;o-OIhrEwT|u_srZ+5|C10@ zU#~*-?E{*M=0c-st9;Oh+p>WI8g~E5*3u*A^o}_t^OSJwDpH0}lO5u5f%!<$fG%t+ z_UM|Qe%?P%-)17(bAmBd<4vK^EG@9jk5_IL)%+{RQifQ6JL5kOP z)gNEp7%@$;W}|HxF$7@=1qM?lsmy#0zRa2(9`}^pl{}NREgZk7FVNyPqssf0LVHPO zwaO**y2OE27q!c!ZO#0Jm(S}7_Ddq+MgoGjO>4hh5iAPi$-yZaF|fW|v1K~{au!Mb zcfvxcoJD!1{TN{Frlugp^bBGk&v<;lW?4MLnAlefY&#`EeWBx*@$Ec$c$vA=>|vor zapK}fI6sb{zN(z4>k(_`sHMcEf}7Wp#vUsg>b1+_FQJNH9Ah!?x_GET0ESo#C!0jS z;9sByt9=rSP5x?j@8jJO3dZHy)6>r!>m}#~6QX+nu0Xkt!p+Cr&u!@%DUz^iajV>X~Jc2qCWaUD|nbz5U2BS~qdk zYU4a;B63VQG)wv#Bz^1I>NH-yGufWk;=JPjziL~Y+rF5B?1A9r+IuS#p6y0f#6*$z JbN8kF@IL{qY)1e9 delta 1202 zcmchW|8Em@7{@;=+hF61Ly@p$FeZ`2EFz?Cv!P#*tO7wmfrM-hrfa$(5gRWn8 zr5fP}pu;7=uv^s-qvASdGY9Q@S3q}8uPrKG2WxvLirv%a3>6@Q^_INW2{6cPNG!HFde$dCR;F1F=AvCVpRy=56o7TFMojBnmyDmE5!CJm1#fhpgGU6CI zlTN5a)Lgp;N_7Tgqzx0JmDIVcim>_Vgd~T*vKjzh;V!^bXVqR^CH#ZkL)dhL7=oh6 zVzd0j*9&!4x_caJgcKxWbj` ze8a&nbw`5Y@M)wUGxj0LaIn)qLJ9|t7(8M0P^qQU51;7$7yxGu*$VPUeXuK{8^`*( zntxG8M-vRUN~`gpP%boSB?&@(ASe3JAK)vqs(vfUe?g44t4*}q^mz;oxFsAXLMp)-?k&ZPA)C&KuDM zIB%`=Xdw*;&tEj*STXvx;a)4sj48Eq~c)=We@#Nt!!$a8uC-g=K$2D%@l z-DC7_e|BE+Y)o;LYD_nJ=4_+Nk|^P=;pWrFKZ4y@PPQ*<<9yVW%!!>vRTPCMGM>GR zW^$N{n7zCXq;@ zRs_m7Y@t0KFJDgkHZp2-T6v@lfX}2)<9$bMU0RU4f-Nm{yrr(FtE<=^%rd?L6%>lv zlVWo?ZK~96GWQ~sr&KGF$A&Jkdm0J>sCe47mqtZKHtEo095lfgQZ(p zBK;55l(_w6+#SS6%74;@UOO_QHZz)Z(|RF7O$G(7G;ZZWHZSXeOWb1$-V;Z42>=f^ z1D^AluCW7u_`M^;_^{_iXWp8KmRsRahjiRt^IN}%)|jebC?rp5+4m;3 z9~yjQr4vCJne<@-GnK;TWarrkkAOwN2dF**s6NSA!D|>p4D=+_#dve2MZZ&vV Wb>S1k`9F)E`q(Eu*kIZHuHj#9$d=>) diff --git a/module/config/argparser_en.py b/module/config/argparser_en.py index 485af2ad1..317ceab09 100644 --- a/module/config/argparser_en.py +++ b/module/config/argparser_en.py @@ -246,7 +246,7 @@ def main(ini_name=''): priority3.add_argument('--extra_oil', default=default('--extra_oil'), help='Small-scale Oil Extraction, Large-scale Oil Extraction') priority3.add_argument('--extra_book', default=default('--extra_book'), help='Small Merchant Escort, Large Merchant Escort') - priority4 = reward_commission.add_argument_group('Urgente commission priority', '') + priority4 = reward_commission.add_argument_group('Urgent commission priority', '') priority4.add_argument('--urgent_drill', default=default('--urgent_drill'), help='Defend the transport troops, annihilate the enemy elite troops') priority4.add_argument('--urgent_part', default=default('--urgent_part'), help='Support Vila Vela Island, support terror Banner') priority4.add_argument('--urgent_cube', default=default('--urgent_cube'), help='Rescue merchant ship, enemy attack') diff --git a/module/reward/assets.py b/module/reward/assets.py index c4a002b42..1e6b9b4ad 100644 --- a/module/reward/assets.py +++ b/module/reward/assets.py @@ -12,7 +12,7 @@ COMMISSION_NOTICE_AT_CAMPAIGN = Button(area={'cn': (1054, 647, 1061, 654), 'en': COMMISSION_START = Button(area={'cn': (1028, 322, 1156, 383), 'en': (1031, 333, 1147, 383)}, color={'cn': (229, 175, 113), 'en': (227, 169, 108)}, button={'cn': (1028, 322, 1156, 383), 'en': (1031, 333, 1147, 383)}, file={'cn': './assets/cn/reward/COMMISSION_START.png', 'en': './assets/en/reward/COMMISSION_START.png'}) COMMISSION_STOP_SCROLLING = Button(area={'cn': (115, 236, 179, 487), 'en': (115, 236, 179, 487)}, color={'cn': (50, 55, 74), 'en': (50, 55, 74)}, button={'cn': (115, 236, 179, 487), 'en': (115, 236, 179, 487)}, file={'cn': './assets/cn/reward/COMMISSION_STOP_SCROLLING.png', 'en': './assets/en/reward/COMMISSION_STOP_SCROLLING.png'}) COMMISSION_URGENT = Button(area={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283)}, color={'cn': (215, 188, 124), 'en': (169, 138, 95)}, button={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283)}, file={'cn': './assets/cn/reward/COMMISSION_URGENT.png', 'en': './assets/en/reward/COMMISSION_URGENT.png'}) -EXP_INFO_S_REWARD = Button(area={'cn': (498, 140, 557, 154), 'en': (477, 132, 521, 144)}, color={'cn': (233, 241, 127), 'en': (233, 241, 126)}, button={'cn': (498, 140, 557, 154), 'en': (477, 132, 521, 144)}, file={'cn': './assets/cn/reward/EXP_INFO_S_REWARD.png', 'en': './assets/en/reward/EXP_INFO_S_REWARD.png'}) +EXP_INFO_S_REWARD = Button(area={'cn': (498, 140, 557, 154), 'en': (1138, 40, 1266, 145)}, color={'cn': (233, 241, 127), 'en': (89, 115, 159)}, button={'cn': (498, 140, 557, 154), 'en': (1138, 40, 1266, 145)}, file={'cn': './assets/cn/reward/EXP_INFO_S_REWARD.png', 'en': './assets/en/reward/EXP_INFO_S_REWARD.png'}) MISSION_MULTI = Button(area={'cn': (1041, 8, 1101, 39), 'en': (1041, 8, 1101, 39)}, color={'cn': (226, 192, 142), 'en': (221, 179, 96)}, button={'cn': (1041, 8, 1101, 39), 'en': (1041, 8, 1101, 39)}, file={'cn': './assets/cn/reward/MISSION_MULTI.png', 'en': './assets/en/reward/MISSION_MULTI.png'}) MISSION_NOTICE = Button(area={'cn': (940, 670, 945, 681), 'en': (940, 670, 945, 681)}, color={'cn': (183, 83, 66), 'en': (183, 83, 66)}, button={'cn': (940, 670, 945, 681), 'en': (940, 670, 945, 681)}, file={'cn': './assets/cn/reward/MISSION_NOTICE.png', 'en': './assets/en/reward/MISSION_NOTICE.png'}) MISSION_SINGLE = Button(area={'cn': (1093, 118, 1179, 177), 'en': (1093, 118, 1179, 177)}, color={'cn': (115, 155, 218), 'en': (106, 147, 215)}, button={'cn': (1093, 118, 1179, 177), 'en': (1093, 118, 1179, 177)}, file={'cn': './assets/cn/reward/MISSION_SINGLE.png', 'en': './assets/en/reward/MISSION_SINGLE.png'}) diff --git a/module/reward/commission.py b/module/reward/commission.py index b5c8dafea..b093288d9 100644 --- a/module/reward/commission.py +++ b/module/reward/commission.py @@ -34,7 +34,7 @@ dictionary_cn = { dictionary_en = { 'major_comm': ['SelfTraining', 'DefenseExercise', 'ResearchMission', 'Prep', 'Class', 'CargoTransport'], 'daily_comm': ['Daily', 'Awakening'], - 'extra_drill': ['Sailing', 'DefensePatrol', 'Buoy'], + 'extra_drill': ['Sailing', 'DefensePatrol', 'Buoy', 'saingTraining'], 'extra_part': ['Protection'], 'extra_cube': ['FleetExercise', 'EscortExercise', 'FleetCargo', 'CombatExercise'], 'extra_oil': ['oil'],