From 34f9f97aa31c5f368379dc7856ea6610f3d8f3cc Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sat, 23 Jul 2016 14:55:04 -0400 Subject: [PATCH] Icons, 9mm silencer, m16a2 Vanilla development commit: https://github.com/DayZMod/DayZ/commit/896825693dfe7bc231af17a3dbbf48eccbd765e9 --- .../Configs/CfgLoot/Groups/Attachments.hpp | 3 +-- .../Configs/CfgLoot/Groups/Weapons.hpp | 2 +- .../CfgServerTrader/Category/Attachments.hpp | 10 ---------- .../Configs/CfgWeapons/Pistols/Makarov.hpp | 5 +++-- .../Configs/CfgWeapons/Rifles/Bizon.hpp | 5 +++-- .../Configs/CfgWeapons/Rifles/M16A2.hpp | 12 ++++++++++++ .../R3F_Weight/Magazines/Attachments.hpp | 8 -------- .../status/status_temp_border_down1_ca.paa | Bin 5655 -> 5655 bytes .../status/status_temp_border_down2_ca.paa | Bin 5655 -> 5655 bytes .../status/status_temp_border_down3_ca.paa | Bin 5655 -> 5655 bytes .../gui/status/status_temp_border_up1_ca.paa | Bin 5655 -> 5655 bytes .../gui/status/status_temp_border_up2_ca.paa | Bin 5655 -> 5655 bytes .../gui/status/status_temp_border_up3_ca.paa | Bin 5655 -> 5655 bytes Server Files/SQL/1.0.6_Updates.sql | 2 -- 14 files changed, 20 insertions(+), 27 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp index de6fcb599..bc0ddfd3b 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp @@ -10,8 +10,7 @@ AttachmentsEast[] = { {Loot_MAGAZINE, 2, Attachment_Kobra}, {Loot_MAGAZINE, 1, Attachment_PSO1}, - {Loot_MAGAZINE, 3, Attachment_SupMakarov}, - {Loot_MAGAZINE, 2, Attachment_SupBizon}, + {Loot_MAGAZINE, 3, Attachment_Sup9}, {Loot_MAGAZINE, 1, Attachment_Sup545}, {Loot_MAGAZINE, 2, Attachment_GP25}, {Loot_MAGAZINE, 2, Attachment_Ghillie}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 5cffd3a5f..fe42c3d67 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -80,7 +80,7 @@ assaultrifles[] = { {Loot_WEAPON, 0.5, G36K_Camo_DZ}, //G36K_camo {Loot_WEAPON, 0.3, G36_C_SD_camo}, {Loot_WEAPON, 0.5, M16A2_DZ}, //M16A2 - {Loot_WEAPON, 0.2, M16A2_GL_DZ}, //M16A2GL + //{Loot_WEAPON, 0.2, M16A2_GL_DZ}, //M16A2GL //added to attachments system {Loot_WEAPON, 0.1, M16A4_ACOG_DZ}, //M16A4_ACG (has slightly different scope) {Loot_WEAPON, 0.5, M4A1_DZ}, //M4A1 {Loot_WEAPON, 0.4, M4A1_CCO_DZ}, //M4A1_Aim diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Attachments.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Attachments.hpp index 45ae518bf..07a7dade8 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Attachments.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Attachments.hpp @@ -59,16 +59,6 @@ class Category_693 { buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Attachment_SupMakarov { - type = "trade_items"; - buy[] = {4,"ItemGoldBar"}; - sell[] = {2,"ItemGoldBar"}; - }; - class Attachment_SupBizon { - type = "trade_items"; - buy[] = {6,"ItemGoldBar"}; - sell[] = {3,"ItemGoldBar"}; - }; class Attachment_Sup545 { type = "trade_items"; buy[] = {6,"ItemGoldBar"}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp index bdcc9bc52..efa737324 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp @@ -9,7 +9,8 @@ class Makarov_DZ : Makarov class Attachments { - Attachment_SupMakarov = "Makarov_SD_DZ"; + Attachment_SupMakarov = "Makarov_SD_DZ"; //left to maintain old suppressor attachment + Attachment_Sup9 = "Makarov_SD_DZ"; }; }; @@ -27,7 +28,7 @@ class Makarov_SD_DZ : MakarovSD class RemoveSuppressor { text = $STR_ATTACHMENT_RMVE_Silencer; - script = "; ['Attachment_SupMakarov',_id,'Makarov_DZ'] call player_removeAttachment"; + script = "; ['Attachment_Sup9',_id,'Makarov_DZ'] call player_removeAttachment"; }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp index 8e3c62f13..68d77e501 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp @@ -15,7 +15,8 @@ class Bizon_DZ : bizon class Attachments { - Attachment_SupBizon = "Bizon_SD_DZ"; + Attachment_SupBizon = "Bizon_SD_DZ";//left to maintain old attachment suppressor + Attachment_Sup9 = "Bizon_SD_DZ"; }; }; @@ -39,7 +40,7 @@ class Bizon_SD_DZ : bizon_silenced class RemoveSuppressor { text = $STR_ATTACHMENT_RMVE_Silencer; - script = "; ['Attachment_SupBizon',_id,'Bizon_DZ'] call player_removeAttachment"; + script = "; ['Attachment_Sup9',_id,'Bizon_DZ'] call player_removeAttachment"; }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp index 407696e7d..a0bfa550a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp @@ -6,6 +6,10 @@ class M16A2_DZ : M16A2 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD }; + class Attachments + { + Attachment_M203 = "M16A2_GL_DZ"; + }; }; class M16A2_GL_DZ : M16A2GL @@ -15,4 +19,12 @@ class M16A2_GL_DZ : M16A2GL 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD }; + class ItemActions + { + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'M16A2_DZ'] call player_removeAttachment"; + }; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Attachments.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Attachments.hpp index 3eff5f1ba..74bfc9c1b 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Attachments.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Attachments.hpp @@ -71,12 +71,4 @@ class Attachment_Sup545 class Attachment_Sup556 { weight = 0.1; -}; -class Attachment_SupBizon -{ - weight = 0.1; -}; -class Attachment_SupMakarov -{ - weight = 0.05; }; \ No newline at end of file diff --git a/SQF/dayz_code/gui/status/status_temp_border_down1_ca.paa b/SQF/dayz_code/gui/status/status_temp_border_down1_ca.paa index 39bf270229323d5426b53e2416028f26437f3442..1eec9a8b5b6bea73b964afa3d7defb1b6394d2be 100644 GIT binary patch delta 309 zcmbQPGhJuG^vQ8T4jA}4;|7hJjGi-CJZGr<|IYvhKbZWQ)B|D|VEmsfiOxC)7OPEO z&vaw*Jplm;=eucH+}m<*!xS(EH0It0@+Z#Mn0%di0Z0u86NBR<70*d36X$zuzRt3M z5p4540fo)i**>r`N^U;EvyEAtodKxAa}o>8APzA9(8M~)$?F6HBp7|olA5n#V_}Aj=Mv)L`Tb$ksPwx&8k?0~j!>Z{WSXA@>-Z4_4ZwGO=D_ z@^!`y8te}YIJC_&q+#;k8U32n1AG`@{9nw9&N>Gc+f822bi)E-kB|yX@)3jJlpdhf zFn%FJ#V4RU;Cv=z%a|88G(2+#;-^qi1_%uzGhKsb+)Y4UvGXB_cBXZ_Kf za$$0>h=l|rgTo{hAcCp1V(6UF(K#()@?8-N#^}jnqGcS0jD=Y-o>N>VPZ4bf06c}H AegFUf diff --git a/SQF/dayz_code/gui/status/status_temp_border_down2_ca.paa b/SQF/dayz_code/gui/status/status_temp_border_down2_ca.paa index ef1461766406247491284baacf15aa2ef64488cb..ad2d794ddca48700959d03934a29d5f1f7fdf542 100644 GIT binary patch delta 519 zcmbQPGhJuG^vQ8T4k&m#qW}jJgXbg_Pa%cL_jxoY-(cjISjp%q#Lvp`;s1XIFc4VL zFqg$M$$avE#tw}wjGi-CJZGrDBtJ6vHK_;0Fu?dfnG~IM4lGuiyq@WWgzMqBB<5|o zw_%b@;f=hvf&9tqnNLiIw-kbyFE8?_@b=D9~V*B#oq< zw-ApK(MpdQN&`IOY1}UJ(hFa7It1$ty)<1er@TxLes0;6Z9W s`I?A5W6WeR(K04?#>su6?&6b_6avlwjlw$ksPwx&8k?0~j!>Z{WSXA@|tienyFj?E;gp zGYUwoX7H5bXJz;RQ?rVpp6LO@1dhr789OxC9~f|Gn`KDDB)>EIHK_;qFu?e~m=&FM z4lK5tyq@WW#3Kg5DLp{DVUmRm6`z0(QJK7+`Gk-dgXd%gBuSailRH`Dgg!8O&XQ19 zNPy{?!8my*%Q-{llWkef+jyB_!r%D>92k~QI0NH(2GkFK=ehp5Blk*!q zr#*qG;$rY@QmI3zV$^p_xUntw_QZM#4qzxv067lG-h7?y11qD{<`X>Im?bzMp~nI< zgCEFOe}9=7s7^2sB-bepcU9Bm{Q~xi!Hk|0QamTwz;rBU_``K@>ST2opJTGTV7$f- zCeN7?p0nVAbB5E?%D>@_B}|nAgU2Qne_&uO6O0gKW?&Px0@?+W6xqx##Lp;H&Tw*~ zOy|@Jm@r4pWCP(mMyAR0g`aUG03G*7bIRq(y&@7UAxxf3lUIt!2sSZDiZ`E}3^&PQ s@--2A#^}jnqGe3pOq2UW-Nh#`DF_N_!pvl1U}6wpVBnFO{6l{#4pS+&wg@nh0uq@|oxp2j7VU4`Ef&9tq88s$fXI?NF zXbq#tiziIIU5=$R(C5^j)Nwk0aVw6MIN zyp!#a1F|jOS=a=aJ0~uIDf!Ce+oTHgIE?>+(a?c`fyV;IXZbu)ck*ubGh(a^o)drp z2e<1BBP-CL$#XfRCN5W)e4XO}D99Hd=VWG-+pp~Z8O4NQ6p^B=AU(ZYa_6WnBa7Y;wdhDL-UeH=8E`q!V$h>*&l`jNqCF(oD# z?Cz*b%L>LNi+*VSCv^D|9 zzp^c(+%+q%oS^y);bsq&vX0*Ls#jMt;Z}ZAx)DPh(@e5yutzo zxmc(;=v#_sq}>`n#5+=PRK`abSJ@-OY#olbZTU4Cthh%V<&q!JBur_m;`l2#>;RS; zj-^$bn>{wp=b2zb{gb@8!VBLeDJ)PnObQ5sdVT-8H?~M-2!TVJYf=NQk!L213MS_) zaV(SnF^POamWGwj3s`TvZ*6rPLo|GnM)vXg7_6J0^fQHH!isF(-3fsX%5*55!Mus? zZMpifmaFRE@Iz2jKb7 z-nqFDd!6gTUZ`bcM|a@3blHFJRbzsSs-P*TTqsW4Er$U$Mx(cQy&T$)mYkSP8y7(Y uD?l|m+f`M{JX|J#pwlH;=4CBbE!V%=SFl(RAf3+3*GZkWXg9`q6Tv?LH3BgJ diff --git a/SQF/dayz_code/gui/status/status_temp_border_up1_ca.paa b/SQF/dayz_code/gui/status/status_temp_border_up1_ca.paa index f5959ea5cd5c1c9a52a3c54ccd6cfa1a1737ede3..5bdf811f1d45b5f143f57a038714355f2a0724c3 100644 GIT binary patch delta 275 zcmbQPGhJsx1?%Mdf<}{9vHqQWPrzXFb+!deKt{mkf3$*6jmB_Z=U8BR=A@tmYGc|Y$BpvexK zuk$SjSz$1FonXS`I6=k9`a=^31@&c$%!oIU|@teYVui;3XWt3%L#u#_W6psD6=Igz)Uh^@M%&nQc{QU4H!BF WH;Yf7GkJ@sISa2P1M}qfq8b1_L0c36 delta 361 zcmbQPGhJsx1uKgr15?Aq8tui)Ss6K47*0-q;yFoWV!g)Z>ud{{I2ai`C#Zl0JT@Qa zJiy4p!r(b^b2m2+qu^&|&#z4EHU|IyGl0SW$t!s7TYxku05!lwXEO#oQumzn1jg@X z2MSDH zCzycbJc-GALKi^%Nh&}WPi7OY(BNh8oW}y>z)V}k#I`E1b`G3h%+UE%;{4Plla~o+ za4<740(DMOnOx5eG)iPT&?pZku)tZ73J#Vuwd7a0_JN$P!5H0{d)pv^8LrfsAz2z20x&)cG+ZX{=e+?8Fo(_8`Ia+*LvEd5!sIwX z#mV|Y{*%kO1jH8sLqz3g@&TAm8xY@f-sGi1ks9?3o^xb8=fDHx0Q00H^F1e7!_-zV zoNJWdJGEl6ns9_V11AH60s|M^32Ruz_XPUQgKI8k>ijC>Ic4%v;Y^ShCd-K|=U`xj zMBC)EA{OEqK$|CMPJnwin(3s}2{Y7$hgZ7S#a&#Y@Bb delta 709 zcmbQPGhJsx1uKgr15?Aq8tut-LhO^*vHoObVK_Pc$>ud|zZro-Y)nEb6YDi5U*}lh z!pPt`LB(^D%K!fiV8FrPKMBZZf$>?sZA(lz(4-3E|7P*ur1FUQ1B}nY;Q49tZq7YG zV+Gtff0!jSe@ileNxo%ZVOa6tG2HO?3=CzACnvPPV1u`TyDOe4d}$tStb8GUB<{K~{`1GoP_ zV-%Bt;0$k=GGvW(;_w?m6iROj$Q0=S1W%V&pZ< zxeYXF@_ybM5{%qtNzzD8VdN3y0Z9S_c=L6>Y5h|0#MAidc z=)nZ$oE5PUF9kZMKyv~-sG}H8Ry~eRo-8A(DZ-NGmgK>f0F?U&PChOS(~BoZidx7q wFe$)nHDvHIwu;C9uei00U#OPwo8x?ORDHT{|L{XwQCa&{+c0Sj+I?s9kp7(j*6D|#xN*z4@ zD3swL{#X76Kp`vY%TK3)ay~(V>lm9Du;Y|QIy|q~`*%`%&3fX#4K14~Ue!#qOQ0E2 zY#NQX%}Kjv#XvqzX`j|}N_>c;_OE(gk3j#OkVk-)+#67-5S22xRfoR6s%2ZIS2f^Q&{;ubQLfli0r}V@4 zkszE}B{IY&M77NyS{@|*%POr!0M;N9V>IEST%es%3y#1EQK#?0lZMysLzOOXW{c1h z_Y}n2ifC+yB2kx`n;9#)Hk%>I2wN3-R@J|Nr?w@_e=~r2N@(zXN*Gv>rv}V-&^YZ1h&r{yA_JzK~tlXzu{^wa$Qjw z4=_Lqpinh+?go<&3dh0`igkCeBe%|O0H~is5mmJTpm|e&w@<~~O{rwRqt%B8bNzDv zc(-|IJA6!*ypvPMbOZz=4}%FjZ{C-u^)G39E_vOw&PBL(d!Y#zSW3)n(@C#ek#0lz zCbck}i!WFX1`t4f-N>(UD+gz~Y}faw+g$_smg$ygjOIK5{O5|j@3u$+4hR60!K)2U p!RMrI3}EEv!tAV0mJm*-<+4U21W9{I!eKasqIK`;ceDG)fzR)8e&65k{H{CCoi~1w zW781R;cVYYhq-_j^IprM*R&D}q42lC@-B6SEeDuE0#`B`r!|!>$i~aqzzs{f&a4H0 zNvQPJlSX;l7C&&1>mW;MU3%aqIwv2is3su0%s5*rzmMg$)&|7DCVao>o!Bst0 zFOvW;jtnxh-r_~zxv=EE66#Zo)cn!!V!^4{&>5};jrqXe5Q|2ZK1;<{5xRiq9oNCH zTC-L7d+tjujxzI3xgtQ{MNXBqpsD|ab9SA9cr96w+xK^Nz_RC&&3<8mz<5;OaOSxA z5cNgP6?`ZBIuo%^5*ETInf&P>nPC30>XwQ+kX?DF>zpUY1D-d-X zE1a8Wi=zvgh1o9B>1cl{j?x*^H|tTxD@CW%s-0Yj8D``WLIWBn6_!a$AI0mn=5Ry( zTjBPP3f`sTU5*R{rL-@tn*+!1`_mc27q4@!-wKau21+DrwX1ptqf;pSimsS>8_b6DqYai0^0lE-CFHBYRMN_1`sZ$o?hO zcXx<-5*p+LVPTbBYMPulmeMauwP#4`_F#MWO}mGFO3Y0@k7|0`avjn;oy8lMznW=! z(vC#7zSLNzGYGC<;UBOBx!dT8q#`S0)|pMn(*yzwP`ORhx?KZYg}BD|^}R#DyHLZC zY~zfioE7#k4xu94a