From fd4d4abb73d64b916e3a32cc5f68fb3092d15363 Mon Sep 17 00:00:00 2001 From: Joko Date: Wed, 15 Jul 2015 20:51:06 +0200 Subject: [PATCH] Move UAV Battery form models to data change LoD Distance Fix IVBag names(my issue) --- addons/attach/data/ace_IRStrobe.p3d | Bin 70930 -> 71554 bytes addons/dagr/data/DAGR.p3d | Bin 25292 -> 25510 bytes addons/explosives/Data/ace_m57.p3d | Bin 81544 -> 81544 bytes addons/hearing/data/ace_earplugs.p3d | Bin 33172 -> 33172 bytes addons/logistics_uavbattery/CfgWeapons.hpp | 2 +- .../logistics_uavbattery/data/ace_battery.p3d | Bin 0 -> 31051 bytes .../{models => data}/battery.rvmat | 6 +++--- .../{models => data}/battery_co.paa | Bin .../{models => data}/battery_nohq.paa | Bin .../{models => data}/battery_smdi.paa | Bin .../{models => data}/default_as.paa | Bin .../models/ace_battery.p3d | Bin 31293 -> 0 bytes addons/maptools/data/ace_MapTools.p3d | Bin 10789 -> 10789 bytes addons/medical/CfgWeapons.hpp | 8 ++++---- addons/medical/data/IVBag_1000ml.p3d | Bin 68518 -> 69138 bytes addons/medical/data/IVBag_250ml.p3d | Bin 68210 -> 68830 bytes addons/medical/data/IVBag_500ml.p3d | Bin 68830 -> 68830 bytes addons/medical/data/QuikClot.p3d | Bin 9606 -> 9688 bytes 18 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 addons/logistics_uavbattery/data/ace_battery.p3d rename addons/logistics_uavbattery/{models => data}/battery.rvmat (87%) rename addons/logistics_uavbattery/{models => data}/battery_co.paa (100%) rename addons/logistics_uavbattery/{models => data}/battery_nohq.paa (100%) rename addons/logistics_uavbattery/{models => data}/battery_smdi.paa (100%) rename addons/logistics_uavbattery/{models => data}/default_as.paa (100%) delete mode 100644 addons/logistics_uavbattery/models/ace_battery.p3d diff --git a/addons/attach/data/ace_IRStrobe.p3d b/addons/attach/data/ace_IRStrobe.p3d index 2be5cbd428a5bc26069d4539e295588e0b27c558..062878073c4fb821da153c90479a51cb1a201d6d 100644 GIT binary patch delta 657 zcmbQVilu2i%Z3y0>Vs2rQj<$kQ3us=?&`XZ6TU{qxPc(2pzb}p<%(PCCUs> QR2djHUw&t+#w6wf0J;DZzW@LL delta 17 ZcmZo#&oXHh%Z3y0Hd}o3P-7}^0su@|2igDt diff --git a/addons/dagr/data/DAGR.p3d b/addons/dagr/data/DAGR.p3d index 7ebff00dcd6397113cb281ce3614ae06c1f108d8..b5b64889d961fb25ed01b67002b804cbeb3e65e3 100644 GIT binary patch delta 244 zcmX?elyTW{#tl9$^}(q*smUd&Das6|7#J8B=?x-jX5nTpmsdPYVlJD_0w)VHFHm&@ E0M*bBcmMzZ delta 26 icmZ2>obk+2#tl9$o7G%j@GuoPZ59ZcEXZsi>jnUo0tr?C diff --git a/addons/explosives/Data/ace_m57.p3d b/addons/explosives/Data/ace_m57.p3d index 56cb44e93763d7b708a1f341421c038197e01d4a..3e4534b47248ee0a86f3176684d35d8dcd6843c2 100644 GIT binary patch delta 14 VcmeD9%hK_erC|$Wn;nyw3ji@=1!w>O delta 14 VcmeD9%hK_erC|$Wn;lbu696(51;79R diff --git a/addons/hearing/data/ace_earplugs.p3d b/addons/hearing/data/ace_earplugs.p3d index 2e66c383a5abfb9693e98dbcb8e836bdbdca134a..3bae59a61907e5c84f092ad24ada653f2ed1d3cf 100644 GIT binary patch delta 12 TcmbQz%rvE$X~U#OCNUQPAAbZ= delta 12 TcmbQz%rvE$X~U#OrUEAbATb20 diff --git a/addons/logistics_uavbattery/CfgWeapons.hpp b/addons/logistics_uavbattery/CfgWeapons.hpp index 923d2dd934..46120f7c3d 100644 --- a/addons/logistics_uavbattery/CfgWeapons.hpp +++ b/addons/logistics_uavbattery/CfgWeapons.hpp @@ -6,7 +6,7 @@ class CfgWeapons { scope = 2; displayName = CSTRING(Battery_Name); descriptionShort = CSTRING(Battery_Description); - model = QUOTE(PATHTOF(models\ace_battery.p3d)); + model = QUOTE(PATHTOF(data\ace_battery.p3d)); picture = QUOTE(PATHTOF(ui\UAV_battery_ca.paa)); class ItemInfo: InventoryItem_Base_F { mass = 20; diff --git a/addons/logistics_uavbattery/data/ace_battery.p3d b/addons/logistics_uavbattery/data/ace_battery.p3d new file mode 100644 index 0000000000000000000000000000000000000000..18c0c99fad8574e559955a9ccd0970af7365815e GIT binary patch literal 31051 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 literal 0 HcmV?d00001 diff --git a/addons/logistics_uavbattery/models/battery.rvmat b/addons/logistics_uavbattery/data/battery.rvmat similarity index 87% rename from addons/logistics_uavbattery/models/battery.rvmat rename to addons/logistics_uavbattery/data/battery.rvmat index 36329ac896..91ba414cc3 100644 --- a/addons/logistics_uavbattery/models/battery.rvmat +++ b/addons/logistics_uavbattery/data/battery.rvmat @@ -8,7 +8,7 @@ PixelShaderID="Super"; VertexShaderID="Super"; class Stage1 { - texture="z\ace\addons\logistics_uavbattery\models\battery_nohq.paa"; + texture="z\ace\addons\logistics_uavbattery\data\battery_nohq.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -38,7 +38,7 @@ class Stage3 { }; }; class Stage4 { - texture="z\ace\addons\logistics_uavbattery\models\default_as.paa"; + texture="z\ace\addons\logistics_uavbattery\data\default_as.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -48,7 +48,7 @@ class Stage4 { }; }; class Stage5 { - texture="z\ace\addons\logistics_uavbattery\models\battery_smdi.paa"; + texture="z\ace\addons\logistics_uavbattery\data\battery_smdi.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; diff --git a/addons/logistics_uavbattery/models/battery_co.paa b/addons/logistics_uavbattery/data/battery_co.paa similarity index 100% rename from addons/logistics_uavbattery/models/battery_co.paa rename to addons/logistics_uavbattery/data/battery_co.paa diff --git a/addons/logistics_uavbattery/models/battery_nohq.paa b/addons/logistics_uavbattery/data/battery_nohq.paa similarity index 100% rename from addons/logistics_uavbattery/models/battery_nohq.paa rename to addons/logistics_uavbattery/data/battery_nohq.paa diff --git a/addons/logistics_uavbattery/models/battery_smdi.paa b/addons/logistics_uavbattery/data/battery_smdi.paa similarity index 100% rename from addons/logistics_uavbattery/models/battery_smdi.paa rename to addons/logistics_uavbattery/data/battery_smdi.paa diff --git a/addons/logistics_uavbattery/models/default_as.paa b/addons/logistics_uavbattery/data/default_as.paa similarity index 100% rename from addons/logistics_uavbattery/models/default_as.paa rename to addons/logistics_uavbattery/data/default_as.paa diff --git a/addons/logistics_uavbattery/models/ace_battery.p3d b/addons/logistics_uavbattery/models/ace_battery.p3d deleted file mode 100644 index b505fc162dc88d76eb0c0289f25aefa1087ca67a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31293 zcmeI5d7Ks1mB(MR$)dEN+>em!qU8J4K=kw|h?&tI4oOAE3 zTj$<;>fH4;V~-v;s;n%RYn{vG##fFS+fy_rc|Vc;MbAW5m^h^GqdywIvTn}OTwP4g z&uS#kn9(Lr`l<=L*Ic#u#k}R!SM*NEPaeK1zhRGdVSc4Qs{9S*TRuA~FM7TqeZ%U3 zHPePao`31qNeA&h%WpojIF#o<-M{9PW1q+$+wq=I=6UI#KfZnEhWFLJ@Y}kHF*%-2 zd9&ZUA>Vi0?G5G4f9m@DtnN!g`PIt4Vfi1u{%V8VIGy&2=^wVA-{6i{-`_n#@Z@JAqFV!KteCLnLw6EXi`u$+?!D0E9yIgy9DARuE z6MH}J%byT?KmF_ecl$p){@RA;Y5z{W7B`ene{Hy7)K=+Fzf%#)uJ6ZFM;%1{sb5p} zKYn1C&hv45vg~v}AMZc%$Lkkw z4?q9O%#~sNbGd~9^)7}qUf*Tw>iTNFUlg6XR8`ED~Vm+GTJFVy%Ok2^l{s7T5zP_xwe!)41z&IvxMZxE|{f{*K;#$yldVz$u~PrH0??j?2Y zHWu3{jZb?=JpSk3JdfAKnw0*|Q+pTSN{r-y<<*!>`6{PXovOkyAobQx!F1x1ZQauy4T~qw6M^x1h7_(-{ zWy`9AH2!ksS*&!*OXKfUo;}B`8FBHl>iRT3@=NuUlg5)K-%}s+hY9|N9joiFT)ys+ zvahP@)A&fw@Lg%V+md%?fsgy2G(HP@ep?;V>JpD{PMK+T6^}3W<+l6tEsb$wA6PS@ zwd^d7e`de^tJ^F6Rr$p*b zW|MqVet`V(c#r?YZ-Y;Kn^FESKFy!R_QZ_e0#pyp$R`G@6S*L*CE zPtzeD-<8ca#?!xP^M`nRbKaLWe~8DcoF>18ZyTRBe~8C7N9U&J54oJ<%c3<5 z?Ucr!(XP6F?iGvjqd%((()h>J7w}sbLX8kZSLgrrk;P=)Oqu2&%JQc%-Pdx zXUv@xiIbqZ*fb_m!znB%Z+esyG+f}(>=|wGq z_TmBZ;4i)`bPx}wee|coz@M$pirPC$C4dnOu3cT&Nj&KM)WiAmOPA$4iU-J~i%o3iti7Wmb%& zTq^A&?A>N~I8|aA)nD*bN^EXGBxlHzpyt3xEoOY>;s*(?1_m@(z-T_%KQn$Cqu5u# zNH7ZQdWcZ*%7rxp4{Q-&*F%N7esN;WX(L)^#Yj+dSWHdqe0U@euKlWjosSSMT{foX zhNC~v$|%WjQz>}3;q$8!u08LZaCl+(sTMr^h)skN_-$r)oO(03do}YN$zILyx$ZCE zATwm!c#Q*uo8CP&7}@r&JYM5K;oka5!IXEN%k#N%f=PP$11qyK++ZZ=Vk2P&SR;4_ zh|yrsHX5;sPy!=iiGX_;-uB|Kby+u#6ebV2D9ClVKaVp!SQz}mf-JQ*Q>R0O70*rz z4w>>qfvMG@!mrk!8g%>RQw4nXC}F^dr)Fus%~WZ$uxj0cP)(*%hY9r^FAl4L5gjhr zh{PsB35*0Cju5<0(nkD|f~QhUT*nBEni(40nE@Upcm~Lf?`Xj@K2|$p1sr6C)Mixt z8-c-`QISz|TqHBNGx(1eJot-Egc2ADEA?Xpuhf~J92?19KPwBEpG**Tdvn*IO_x?# znUk<}Gf~*u?KPym;zl~&UnZbRsQ2u=HEZH`5=_vwh#oJ%pQ0OgwY9zCEWS`_TVbSvH zEUhJ3222y48+Bq$$D7v|sK#{RvB!H9Hto8;z%UgwO$Fn7S?Z`^!yTb0roLsZtiVj)% zB-=@)8G^Uv8E$3@3_lDv3`esfnT=zyiBN)35;bQFR+DPX5nK%%;yHpHqS!-7P#9u6U47FLHx3x$j=%24a?VrsFL{DI)Lu;UtR??J z@LH17g{uXhE-bbwZ1} z^TJc$&f@<`@To9r|4_)7+AO;MS-4=|b3(PL#`S`$f!hBfWKiuNNiD05n*SP8li}zF z!NZZ*L@0r6qt=fFtHu2KM&azS)56xTBu!X;#TlV2HW5ms_RUhnYFCTDMY!#%DWRHF z<5t1d5Ss`kP@BPhvEad-QS&yzgE>p!e-koxRe;vKU2tpC+W#)NwW-!m1XoLJB9x%D zvEBa=Y`d(~?+|=4#y-iNLdFh3x=5v;3O=jBZ~siN-^L;Sr(lODHW5nD+8D*p1sesP zN<1w1h^eFaM+Be2qjp^+bKy>GB9uUFws#&Ce51Iv_{Rj_AjW9wBRNBt zMNw;6Of6dbalv<5S!*tjWG+gJO@tD(Hm&<#g3s7l?fhEsYKKqq2_a*jB#W>o1@`z> z&A%`}?WY9x1d%bK-$XKdgklq+1g*^m!_$H{82Ch=iDaMp{U(eZ>Dk@V33!L@0sUIJ`d!cnU6y;yK=rWG;s?mHI%)*i;IK_n}~i z$MEuz;OmPF_8$vAf)bkuC1~xTQsNWAmyX(r|5WhdbqDdEMd=y(DI9987ktI5z4#3R zYV!-ePU1foeC11QB9x%DM@We;1mE7_?B+|sXE(jYZ;aA2^h*%b`bzM9l0C)$N$_>W z3i1Cd_;peqpFfA^ z)+f1fC_!uU$+eJLzEHQb6R#AF}E{hJ6TCJtljTdYxO#0@n@VCEhB-^ue zQTh&&Gj>^&t;)7ii_4%~7R8UZlWaduwc1DN8S>lxq*e#1_2YrN1~b-m2yYPYDA|`s zsn$-CGj>@NBj_l#xD3i=QEYu@$+mT>)hSBPkZp5T(^+b98I;SS3_o2Yd-&m`tZS5> zq2Y#Y_ij>ax49?Oj5+Du@Hb@LCHwLy)!HRY&(vknDyh{&YH=Bq%c2ZFyGr)(L$!8` z(la#NU;GVS~z)nhw#^^dr0nF8*fXDE%k7OV4v9|0lIb*w0e3ApCmTxfd2@aI(s{^bx2TAr?Q(_{Nz_!^?7%a8e zOyg{(rR04j`v{6%t09uTYn9Mh5hYN&k6t@eYWbow8xX@H*@qy*CHtauM$~3QVT9D8 zHQBmkE3;Cvw=&tftdg9uJwT32t0Ofz<;5uWi>kpnBx-*rTWU`{`0&HaDkhvc_1rn5 zr=L+fw<5QegE9r_83r~o3G5US*byXf208#_?Sfszib66jO< z6Ive80TCS-QJy1Dxxl;87mB{{rsxY#ezrH*!hrIA=w1=!{iG2O?HkdGh?0*qWGMNe z=vyxEJwVYDp8kXOk0|k!$@5UkgVIjKnbJPUluI7sp}Y^?lzg-;{SIY*0VSSy@;)f- z1*IK`Lk7rD+6BtQ&VSCwe|X02*0>#=?sFMG?`=x&s#^A(+kaBU_3|w?*UzVD?kAt~_+Z7q z;qm0x<+wdvp0AbpZi^3IeAMd`4$nq?!r|*_F4y&TyZIMeZcn$P`_1)qz1=Rh11L)- z|N7iJcD4`i*m+CLcIMwtdkN;HmiL^zspE3}3t;b>xL^GfTd#?{_VI66z3z8E`A4E& zSi4`nu=aQ1dNr=6)2*-PqfmaJ=lQGK+3jolirY88Z?T=b|7{QM*T((nel&Ie+8%6Q zwl~|m?}hkAgKsXlfBoIK{d{N2cIxtdRoCCW|f*G8>jE~ zn{j`RAGcpNwO@wf@9h`dZ+@>YmH9H6?bY_-_uF1QPC&U1R~`uS01cx0mY+jmKMW*Ta6+e$Dl9K7R-H@BU7BKL^~_!|mq&w_mkC zwI8z|us^fk^Ehe$XMg4I%YMuL$NtoQ$o|Uy)_%*+$G=zpLYe)f{gnNsPg1Ox{jiTJ zTo3zUp9R<-+YfuQ-S4p<_HMT8XFu%iV*6wJVeiMfe)hxO@N|2`{V-?9ZfDoe`q@9* z5Bq&?ANw(Xm;O%O&yD?u``h1B{QG16W4|8%p16#OUD|G;wp+?!{$%@gd|AclS<}az ze%M(vYMI*-76$SEPpcTW<=^7EH<|^uisG9nWzHe-QrapbYla=82hMF%Uen=@-_<=> zvF;I~kWXs2GJju8CVj)&4F|>3H%9WIlY2i(`qC&rGSA-~lSz-~Cw)`&eA-{HZWJFx z>gE*RB)_UASGnXjdn~2Z()eN-+y2Y`bwgJyQ8}7!FRV}FqjDPb;GNdbe474o-QxPh z-xV*vrGyq+3KzF9DAT{d?}Cfxf#Tb20T^F8MehpO2yWqFcR7!61EUZq9)NAM%=>iuT-}WvlL6BQV1Mn!9NS0Mcss)5Gtb%0o2w9ak*+pqz@eHiu-4E+|v@Vd)7ANOaY*L7h4 diff --git a/addons/maptools/data/ace_MapTools.p3d b/addons/maptools/data/ace_MapTools.p3d index b44cb2b64871968be1426de75ab3e8648ffcc32e..f0952c09faeb9d99af52166ab33af6e16ecd29c0 100644 GIT binary patch delta 10 RcmZ1)vNU9avKEt=3jh|;155w_ delta 10 RcmZ1)vNU9avKCW;695;31Ec@| diff --git a/addons/medical/CfgWeapons.hpp b/addons/medical/CfgWeapons.hpp index 36efb842d5..909b06bfc5 100644 --- a/addons/medical/CfgWeapons.hpp +++ b/addons/medical/CfgWeapons.hpp @@ -113,16 +113,16 @@ class CfgWeapons { }; }; class ACE_plasmaIV_500: ACE_plasmaIV { - displayName = CSTRING(Plasma_500); - model = QUOTE(PATHTOF(data\IVBag_plasma_500ml.p3d)); + displayName = CSTRING(Plasma_IV_500); + model = QUOTE(PATHTOF(data\IVBag_500ml.p3d)); hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_plasma_500ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 5; }; }; class ACE_plasmaIV_250: ACE_plasmaIV { - displayName = CSTRING(Plasma_250); - model = QUOTE(PATHTOF(data\IVBag_plasma_250ml.p3d)); + displayName = CSTRING(Plasma_IV_250); + model = QUOTE(PATHTOF(data\IVBag_250ml.p3d)); hiddenSelectionsTextures[] = { QUOTE(PATHTOF(data\IVBag_plasma_250ml_ca.paa)) }; class ItemInfo: InventoryItem_Base_F { mass = 2.5; diff --git a/addons/medical/data/IVBag_1000ml.p3d b/addons/medical/data/IVBag_1000ml.p3d index ea14e3e59a9a11978166ac8666e71c81a9424dfe..ba3d6d70176edc77180a652234638ad80862365d 100644 GIT binary patch delta 56 zcmZ2Bon_J-mJOwk`IUoHb5fH_Qd5)}Vwe~hHa9+wV&Y+BWK2%X%}0oAzVY;oDwCKC E04c2#2mk;8 delta 17 ZcmbO?x-2!H?p diff --git a/addons/medical/data/IVBag_250ml.p3d b/addons/medical/data/IVBag_250ml.p3d index e5b007fcc47828b07f5ae6a0f2589a8388745b7d..af8015737d209d4fe0ba460e83ccaba75b8fec0e 100644 GIT binary patch delta 42 ycmew~h2`E%mJN=N_?3fGb5fH_Qd5)}Vwe~hHU~ZmW15`sh<&r;BYh1fF&6-4j}KS? delta 17 ZcmcaNljYMCmJN=NHm`l6ufg=e2>?>{2&e!6 diff --git a/addons/medical/data/IVBag_500ml.p3d b/addons/medical/data/IVBag_500ml.p3d index a6a00b825065662cbdb17895af5fb3f188f96837..2c6f0a9f8809d370ffa446d37d75317845969cee 100644 GIT binary patch delta 14 VcmcaNljYt_mWC~icX*h@TmUh%1#kcW delta 14 WcmcaNljYt_mWC~icX*gSH~|1NWd=w9 diff --git a/addons/medical/data/QuikClot.p3d b/addons/medical/data/QuikClot.p3d index 3bc2e0b4caff3c2253b377e91c3c9a450f4f52e2..8c89e1678466b55a7aaacbe98720cb03754e24fc 100644 GIT binary patch delta 105 xcmZqkzTv&WOfn!iH77N>BsE2u!HI!^fstac*+epmg-Oh1^90$??92;P-2l