From f4079e586d0126db0c87ad31c23a0714f5fb636f Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 23 Jul 2012 19:33:37 +0000 Subject: [PATCH] =?UTF-8?q?New=20feature:=20guns=20can=20now=20be=20fed=20?= =?UTF-8?q?externally=20-=20added=20necessary=20face=20icons=20-=20added?= =?UTF-8?q?=20description=20in=20ini=20-=20as=20an=20example,=20the=20MG?= =?UTF-8?q?=C2=A7=20and=20the=20FN=20mag=20can=20now=20be=20fed=20external?= =?UTF-8?q?ly=20with=20any=20100-rnd=207.62=20NATO=20mag.=20Internal=20fee?= =?UTF-8?q?ding=20is=20possible=20from=20the=20LRAK=20vest=20-=20for=20mor?= =?UTF-8?q?e=20info,=20see=20http://www.bears-pit.com/board/ubbthreads.php?= =?UTF-8?q?/topics/307574/New=5Ffeature=5FExternally=5Ffed=5Fmac.html#Post?= =?UTF-8?q?307574?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1474 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/Ja2_Options.INI | 7 +++++++ Data-1.13/TableData/Items.xml | 10 ++++++++++ Data/Interface/PORTRAITICONS_A.STI | Bin 5119 -> 5416 bytes Data/Interface/PORTRAITICONS_B.STI | Bin 4728 -> 5025 bytes Data/Interface/PORTRAITICONS_C.STI | Bin 4038 -> 4333 bytes Data/Interface/PORTRAITICONS_D.STI | Bin 4364 -> 4661 bytes INIEditorJA2Options.xml | Bin 827702 -> 828834 bytes 7 files changed, 17 insertions(+) diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index 316a07c87..b249c62ef 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/Data-1.13/Ja2_Options.INI @@ -1207,6 +1207,13 @@ USE_SCOPE_MODES = TRUE ; Allow display of scope modes on weapon DISPLAY_SCOPE_MODES = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; external feeding +;------------------------------------------------------------------------------------------------------------------------------ + +; determines wether we can allow to feed guns externally. 0 = no external feeding 1= only fro other mercs 2 = from other mercs and dedicated slots from ourself +EXTERNAL_FEEDING = 2 + ;------------------------------------------------------------------------------------------------------------------------------ ; Set the grid number for the initial merc arrival location. ; The JA2 default grid number is 4870 (Sector A9 Omerta). diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml index f0504e216..92911ec42 100644 --- a/Data-1.13/TableData/Items.xml +++ b/Data-1.13/TableData/Items.xml @@ -3789,6 +3789,7 @@ 1 1 100.0 + 256 @@ -3813,6 +3814,7 @@ 1 1 100.0 + 256 @@ -13185,6 +13187,7 @@ 1 1 100.0 + 256 @@ -13212,6 +13215,7 @@ 2 6 100.0 + 256 @@ -13237,6 +13241,7 @@ 120 10 100.0 + 256 @@ -13262,6 +13267,7 @@ 40 -20 100.0 + 256 @@ -13287,6 +13293,7 @@ 40 -20 100.0 + 256 @@ -18464,6 +18471,7 @@ 950 209 100.0 + 128 @@ -32776,6 +32784,7 @@ 1000 209 100.0 + 128 @@ -37113,6 +37122,7 @@ 1 5 100.0 + 512 diff --git a/Data/Interface/PORTRAITICONS_A.STI b/Data/Interface/PORTRAITICONS_A.STI index 335210dc3478bede926ae44d413092295660f37f..74c65bcbde2d02626d719126cf7c08eec80d1761 100644 GIT binary patch delta 343 zcmeybzCuejIKp1;KBKB>!SY6iMu96=&fov??832QXD?jXw&vJbu-Hkc p*afiIg+`#px`}O#g@sjBh4E=sRU~MvCtD|VG)e;VYyg7wweA1_ delta 43 ucmZ3X^TBR>NeXaLCvj15c-j0_B78)b`G_+RicFh~Mn64}78X`j6~?DkRgs{vo@|}e(I^dcEOHPavjNLGwm<*? delta 43 ucmZ3e{zFAJIKm|5i~pIKiFUUjV41nu~#9C!Ej2V8YG7APF=X1Oym_Hutk6aPT&ArF3=G zs;bs@O-yN={D((Jin(iIWivw?>(rT3Q`8!PjG0p_fpQFuER&si3s{-UD%6@c@8soW zs&D5w0|s;FHZ!#F&RD%>0T3*oQPs3yIZ(O4l`H4(e|dJ{*s-%0E^J$K>?~O9BvkAI nSnNV0P-ET1w#LH3s;a{Hw5lo+G}e=?lR6rufsREE0%SG-u-(t) delta 181 zcmaE>cuZb4IK82A`?7_>MU7{Z`@ zHXy$N$WMjxxq$qqK>iFUUjV41mWzR5C!Ei-c|J=52QLppN>^8{s%mZ5#1w|fJiI#6 vEL{^T8JZZ{Sf|dMnxfXo(8e}%Y9&yTft6u$5N`n+OId{)L(}Htyu3^RgVZ3W diff --git a/Data/Interface/PORTRAITICONS_D.STI b/Data/Interface/PORTRAITICONS_D.STI index 1f84aae5003cba1dee77086efc85cf1246a25bd2..6844235cbe7b5a577f4c5bfdc69b21d27cfa7e4d 100644 GIT binary patch delta 343 zcmeBC+NvTO9OCTBuz`hPDlY>VXaLCvj15c-j0_B78)b`G_-l9=7$ku_5D;Jx+T71l z%TwRZaRvp1;KBKB>!SY6iMu96=&fov??832QXD?jXw&vJbu-Hkc p*afiIg+`#px`}O#g@sjBh4E=sRU~MvCtD|VG)e;VYyc00wVMC{ delta 43 ucmdn0(xW6B9OCTBuz`i4hKB(RG=Ss-#s($^Mg|7ajk3ion-{Ru@BjeCJqXzV diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml index 1a478e967c50203ad0df1dfe7dbe00d3adc0d475..8a66f0a41bd8798aba3bab0bab15b05a5c46747b 100644 GIT binary patch delta 454 zcmZutJx{_=6g_RBmg1lTqoI))2Nz**a?Ok`-{=IC|RiP3?` ztb>X17x*vqA9x;`7=n2@@4b8Px$mCyo?c21@1;SaC3<2csZsjQmd6h>l{-cmN7#dl zU7TQtQ5oCf-DmT%)zT|6Xz8ZBu9}x_4OOlHX9!V;1COYq%g8|u9kkKnt%^Qk?j7bm zG?|H5=`!}^`A{#&!G>Wih0H1LH1l_Yc#B3sJ}bJFpM7mgg}D1#Zl%FNA%#VJvP~&! zkI|Tja41TN@#XxDmew~7>#9h`8qs6Lfj{Y17JlrhZY5Wpy@|P5lL5KvBUG=l5Re_w yteUG-{C&qiObZumi4c#!mW`q&r$#!E<|wmpJ+#w=Nz4%zks)j%J09BeH@Dx#_Gd`| delta 62 zcmZ2<+GyJ$qlOm77N!>F7M3lnGq|Ry^RP_6vxAeTU4)+%h}nRc9f&!Am=lP(fS7x` J2tQBXGyrn=5i|e*