From 93187552456e5c547ecaa8690299e8d621bdd29e Mon Sep 17 00:00:00 2001 From: "C.S. Melis" Date: Fri, 2 Sep 2022 01:26:49 +0200 Subject: [PATCH] Put ship control names in separate resource DLL This resolves the issue where players with foreign installs will have the blank ship control names. Now they'll at least still be displayed in English, but they can always be translated later. This commit also adds a few missing tool tips for the new controls. --- DATA/INTERFACE/keymap.ini | 24 ++++++++++++------------ DATA/INTERFACE/optlist.ini | 6 +++--- EXE/controls.dll | Bin 0 -> 1536 bytes EXE/freelancer.ini | 1 + EXE/resources_tsr.dll | Bin 717824 -> 717312 bytes 5 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 EXE/controls.dll diff --git a/DATA/INTERFACE/keymap.ini b/DATA/INTERFACE/keymap.ini index 8042941..94e5301 100644 --- a/DATA/INTERFACE/keymap.ini +++ b/DATA/INTERFACE/keymap.ini @@ -250,13 +250,13 @@ key = 39 [KeyCmd] nickname = USER_MANEUVER_SLIDE_EVADE_UP ids_name = 1958 -ids_info = 3321 +ids_info = 458763 state = keydown, keyup [KeyCmd] nickname = USER_MANEUVER_SLIDE_EVADE_DOWN ids_name = 1959 -ids_info = 3322 +ids_info = 458764 state = keydown, keyup [KeyCmd] @@ -411,27 +411,27 @@ key = 34 [KeyCmd] nickname = USER_FORMATION_LIST -ids_name = 1936 -ids_info = 2415 +ids_name = 458756 +ids_info = 458761 state = keydown [KeyCmd] nickname = USER_SWITCH_TO_TARGET -ids_name = 1937 +ids_name = 458757 ids_info = 2409 state = keydown key = "T", ALT [KeyCmd] nickname = USER_NEXT_SUBTARGET -ids_name = 1938 +ids_name = 458758 ids_info = 2055 state = keydown key = "S", control [KeyCmd] nickname = USER_PREV_SUBTARGET -ids_name = 1939 +ids_name = 458759 ids_info = 2056 state = keydown key = "S", SHIFT @@ -824,15 +824,15 @@ key = 9 [KeyCmd] nickname = USER_AFTERBURN_ON -ids_name = 1500 +ids_name = 458753 ids_info = 2262 state = keydown key = 9, control [KeyCmd] nickname = USER_AFTERBURN_OFF -ids_name = 1502 -ids_info = 3112 +ids_name = 458754 +ids_info = 458768 state = keydown key = 9, SHIFT @@ -844,8 +844,8 @@ state = keydown [KeyCmd] nickname = USER_TOGGLE_LEVEL_CAMERA -ids_name = 3323 -ids_info = 3324 +ids_name = 458765 +ids_info = 458766 state = keydown [KeyCmd] diff --git a/DATA/INTERFACE/optlist.ini b/DATA/INTERFACE/optlist.ini index b2393fe..762a0bc 100644 --- a/DATA/INTERFACE/optlist.ini +++ b/DATA/INTERFACE/optlist.ini @@ -11,8 +11,8 @@ option = 1400, 2449, 100, false, false option = 1401, 2450, 100, false, false option = 1495, 1769, 1, false, false option = 1555, 1771, 0, false, false -option = 1498, -1, 1, false, false -option = 1407, -1, 2, true, false +option = 1498, 458770, 1, false, false +option = 1407, 458771, 2, true, false [Audio] option = -1 @@ -33,7 +33,7 @@ option = 1895, 2446, 100, true, false, -1, -1 option = -1 option = 1493, 1774, 100, true, false, 0, 100 option = 1404, 1775, 100, true, false, 0, 100 -option = 1624, -1, 100, true, false, 0, 100 +option = 1624, 458773, 100, true, false, 0, 100 option = 1622, 1777, 100, true, false, 0, 100 option = 1483, 1778, 100, true, false, 0, 100 option = 1403, 1780, 100, true, false, 0, 100 diff --git a/EXE/controls.dll b/EXE/controls.dll new file mode 100644 index 0000000000000000000000000000000000000000..e78ce50849fe1d0c0f9d7a7ee0d97dfd5d9f8c5e GIT binary patch literal 1536 zcmcgryKWOf6g?XdC`2}oghzptv4lj0sgNkMi5<(rFWDwoAPU>N@h-7_uM;n`Q-;(0&to8uUQa$zulrq3Y^NF2@<7S5@VNJ}n)r^9&a7Bhj4F*J>jp2fk-n$+x3+ZyDsiAM{OtDHuikrH2}zroz|;(&*=AHYY9E+^$;#K;(-K1Ek#86v^}ZQ6a_ z1KP^;4A9{j>5P4PT;gOo(^Vq&sXMe7G=noDzKJH^4 z%%n<`TX=?b+C%jC^`{jh>hS_!U$bs%1`(ObBxj6k_IabM>yvTtLTKIykZ z{t@xyF8#{n7wgA*l8R^{_a3{I`6|eiM%*24nNW;(v>I;Plrl?+n{g}f^&PxnMe)o} z(_#EBKc5xGM4QJlJO?^HWQ-yonWW;IjT!Ip=CDV3(;oX!72R_DdWAZdnrBs5{w?WAQ_@zgUbO;%3a)sAxtgEGiz%oV+)Vsgw<@F(f8lKk-9!(j|48A8?FbmX zL*XF`Y2}>?1!QsGT?&gyp#N?OISK5P1UX6(+qOa>kNAh~Q7CqB5P8K4E@uGw_nHDn zextC23<%t>u#pt@lq$SNxMr2YGU6XvV@9xZt-`9fgFzr`y+SpGFd}#%Vb6mKniM2U z&U{YvsNnhJae9@)BH}OKps<`A?0ZnNIm_Mc;@QTzu(Mw-7 zlPuCE@`yiUzrrap(ATa|I&R>3{iuONBG!VbdAOdg^pTBML94I1V*j z=0fLm2Nz|!kbVV%agXbN=0d|Xhap`SFywRaz$O=(uW)cpvkN(wIk@|v3oTO}T=Ag` z5sFB5p9?E5b?D9KTv$3));|^jBw5%&0vfNfu$v|XGA*nmdgvz>qF!fyQ;~(mWKeXy zg-VKG>F+HZpa`c|Styp?5jSAl2Foa;hK-id+XnLa+T(rePBPr02TR2B}L~w|3OPvKdQp63eueY#~ za>nyKKH?I3Q@v~COegiC|REc8)G z0w*kVkO9dbSm-3&BeF`(|;{|8)pETpiQhaYKflV(kLd} zAeeVgt@Zg{FUvgkDR672%*XbhLR%w+_WR0YjUzH1YfOO)G&U0M5!_9<=|XLI+%rjI z9YrAbB5fRC@}@WrjqiVX7i;Vwfy073NI>Wk@sP6IcbOPWILoK;2|3`qTBD4Xtahdu zv6NXlmSf}kF(L!p8pGFU94CWn{My`}uhqs8tnoUNzihS`Kn@Jf(MH*2r)dPn>F4#M z=6a1NSzIw!BTOD;+^7*DgGK~L2@lTG*iE?p`zC*WmNu%S_y-e99NYghp6?~3%w}HFNCF%Ty#!lidDbUzY*nhX=nCOpZ`JfDNr)ym%9?^urFU^RQ6iS)V zlJzXtC?E&Yi!|nc$El*y`^8|AS5&IyrX=ehE3@QPCIeP$^w5MJ!JMS^W$`Q)F4<1k zm}OS_fHro&{IzDE=n(9Y{U>ff=Q>Fm@~CFLBo%eG%nceR$sq4WGpSM^HVqsQ{4(*^ zS8HQ4Tl9!VFqJ}9vPm1;XWpY4tt3F#Xv`o3{hKxN$bpJ28rukapAdPJq@z!nWtjH| z9W>V5*I?Fp;OX%siAN}ThsNz>P=Vlugc}8OEA~8Nw%)=e#4n@M2mYo>y*V7|DNwQ1w- zH!OG~&94X>tvQJ3>l&5BP`Y2TmLihUt}&Nz-Wz6FWgXBMBD%jrV+rAkgBpt{X(NYZ zvx@7J`frLz648Xgw>7+kM-Q6@R=i^-QFW)DxJ-&v`HTo2kndPu>3dfjC!p{Vja@PN z*#1-aXN?oF0r}4CGCLvOlip7TRUFlLi1_ioHm+{ng5wH=ue{q_((GdzH52p4_rER~ zxSbUE{_=li*kfjOzuEHaAUjdj`97!<0dzvB(U|zB9QL$19!Sn;&lY(mbi_^ z6ZowgbEY`-@}L`i^lmt>&W&Ysl?&|@eRBVdmr2tuH>Qw+@P0S)ZAakbgKo^CoX9-n zM$ttMy`jgA>EvPi$8NOK?pgkKHM zVL{@FIXv>Rq!Z(~M~1Qcf42os*R(8gjqVinzLV>#i@fQ?zS zWYM3CKvL*kX(OLbKqbEugUNuNH8z50NMR&skF7~OBB9^gC?>k^F&jgKJzH%|q3gQu zIor5=4hrT2$hKX!aiq(5UgE!v%B<^o+vtQ%%{GdN?s>sB4v`VTJBePr+cxeESufhi zBYLgi3c|@P;_*@%C~C2hOE@I>6yb)KBnJp*zigwBaHHTs!qt0h;}q?0wT;(sjX@b$ zLKB7scMuM}VjGR9c&}|7IK2C8Z`samR~!o;GH?*>5fMNh2i}%4BHS%_?^TY1 zsxM^CQyuJ2PC$5ugZtAG@Hz2EauaZb=(Vd8kR6{d_20cU0rO}=^6Lq(XE_4Bp9-Go zV4wD&_-Y4NUE{$NqHha$FhmNg?)Tu*xI+1rtqK-DE}N8u zdE{ZMYz(J~-mo+Y12K=pp~|&_$-tuRNhl`V)t-c;>EjW&LD+%blS#&#%g&FIFi5*y z>$xPzxip?+MgQ7&Z{djikW=^mH!~IXecU^9e%d8iAkE@ltifuO$&(^aDSm|&xJUjk zlD}nwevJ~OA$LJr##D97cdgry)3$!Dy2f31T>09vGF4=LT}R>NZ7bKR!#8XVHEQqH k^t)B^!^3-&JT7@Gd9*xkd2D$S8h$R{osWUcKSrfOL&KsZmpoMDl8Z_%xuj;3x!YvqPKNCqCI4&ZG}JMr zBBP`r!{QXj$jC@7$;i;i$f(FTu3Mv7%@!3IdN?iHvDz18=6h~u&rW9?p6`9{`~SZ8 z-mj9#gp$q))xvB-0)~aoO@^e+3`}V5t0Y za>s5pX!;etzgm zg)A~4_y;pYWmCli5?C}{A&2;DuTt12sf#KonxRlf{6q5<(uhB6rb0W>L%KlWfb9rq zpQ~^$h15G=!ABN1+^8^<1fIG{LQVp!Z&vt#A{LPRdWpYzkwTG!Lr7n&5a&EV#@|eV zZ2^V3WI$@M!a7n|cZb5OgbSA|EFk{oRb~XMrNWoR91KY_+^tYbA*>QSjc{17CI!c& zX1*YLixfZ^c|7Mn1&MkrB~@bWLUQm_sX}3Nz37MUeuWfbSo5I51C$ai73Yar3?x@7 z1fv4vw?goKQs{d^ijw4opH#>roGSTRGqAo-KdR)xj{^_-aQV{;lBSpky;9N}2$w#i zFpv0;363LrI{)YM)nFLOJuiC{;^1yFsCi1n3lqfFA^}C`S=dSoJd-UfB6{#z3*8=PePEG= znPgC7$U+H4F#A3Wdnm%af{SF9#0)50Zy9amFSRg(7SszaCjOKMEKDKnd(gsh;xCXE zSwi%thpbrN3mdXFSP113!-|J3^is$IkD3-|Y_w2A3fcspB-|`p=T5>a9*-Yx=%IJj}Ig)B0-YoCR2gon0RkTXk6VXt7(8N=nR z7V3$f^RDEmh8~39wGbiPeBd`8y=NJdGSFsW5-F(p&@$TC*KT1g8F=g?3$mfc49X6D zY#~e`@f^0$Oa^oaZY5m(PYcHg2R{+*l(JyhLL1TZk65TC91$#?95W!)_L+stCOHPVF z^02N)Qb6>YA1%zI$=Lg|1vz!aJWT)9j6jRvqcMY||7)R*5C@dTFEIun5ceBwX_OQF zl;9%5eyxq&v(2SX&w5F7-zP0zJ8j;#|D?M$Qfa@>AFOdeo<|3hXNbl+!qtM?2?vI1 z!{h2<8h23yl9RM?fJyN<4)yPUDI+wVB7seUn@K=$lz2#09ywbKCalM393=-LX&Ngi zW%DmEBi1Q+pvL<3qd8q0qp{>dje}&6_abd>&l9w91S`rg`ExE71IU4fiP~s8cczA% zdnLlB^}~CKMmJfUm!;829-W%3(Lx3_|6ceBH{@t+CG5M> zuh+(8>=C?=1T@amI7z!(z0XWZ`Ar(n5P#MJjopO11viWSSd};2Y_{Q=Lh*^sC@l9#be%S}o0A8oUao62%U+|6-7ob{b54{BcFX<~GoV}&%qJGF6vtMYY*?@H2^ka?%%iuf)HJaE zevNI!?|VQS+w;%|H9~0=vMjmA@b;PVkVXRuXcIh+Lf-wbhL;@3+o(}RIQ+QCqatm2 z(rm+&&C-9oyG1seeeQX>zer*c>JU7O3`(of##OCIFpuJP!TrZ}}bsV)~^21N)_jXhFj}8Xm$et)_u_@0vw4=YSr#Oo~+bGz*T% zZ?r~g-_ynksH9C}OO)QX|D?aKaVYvge*4~^a96Yn4w6B6?HczIf2-gR2v>bX3gmh2 zK{KW9k2T5$`1|+23VAS#6hu0H(}su4s;(1!7b#5phtveEZ#*oU3xz!SQ`6vT!2?Cv zuOG!>^Td;LL_$mg@;{T!hZGF@+>BU6u)NlZh1~b03?{-2k_$fI%=uUJ#B^FeO1?6S zC?I2NJ9(J;jm!a>6X{)M%>=%e5R<~JALxuHaSPv@4D25O|m=2_W#nUE_9Q?HM2z^ z-RJB7>_Wif2uxn$G6s)lsS6py9eVCPE`;gbaLQvYETF4guvYZR{WF%cK%EQ2NkK`I z3-fJ9;Ng8PoKH1@w_WfLbLjpzLvcT}Ig#KyP~2}qx8qml5j z={9E45i8?r8w&}S&$4korL6Hr5l9Ndx7nCaC!nn5VlWv{z1l|TI4LZ<$L`BX%);P( zHj0QI*tXovM@gSM{~QKo?XzZyS>^u+@g2 z=E!Oet&J8WYRW$v_%14mf!kHp{ciVd5(B)rQu z-i}wiW*c|I(9qXyW7MX+VH#B2hiS64?6Hmi#p2&&s{U1mJKApWws@i;*A`77g*8(S~^ zU-d*hCewnB-SM!`cLauy2_Em@h|7(l^Bi1op&P@AUO3B*E>c)@<90@?}Z3`@jh@^H;%iTIZ2{`rZBL_HFR^6wN(24++zqKI(Co5stW!Vc7g6OA{Q{FEWdm?~rDcC5s5tibZhYrl>kG1!k=1>Azg z2w)<1g-5Cx=U9v3-!*=cy1=D|ZJc^f($%TBMs!^xdi%6rhcm>Esq)t!1$&Vyv*l{} z>jn(zw`qR=v+KmhX}H+nOxpPQ!K9@BL3w2Ch+RdOtClJ1g351woje4 mK4Y7bZ=8HB`D*#P