From 48274cd6ddcd29f8ff7fdb27179342a6f16a24a9 Mon Sep 17 00:00:00 2001 From: Elkien3 Date: Fri, 12 Apr 2019 10:53:10 -0500 Subject: [PATCH] add mags for pistols --- init.lua | 35 ++++++++++++++++++++----- textures/rangedweapons_9mm_mag.png | Bin 0 -> 3178 bytes textures/rangedweapons_deagle_mag.png | Bin 0 -> 2960 bytes textures/rangedweapons_makarov_mag.png | Bin 0 -> 3221 bytes 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 textures/rangedweapons_9mm_mag.png create mode 100644 textures/rangedweapons_deagle_mag.png create mode 100644 textures/rangedweapons_makarov_mag.png diff --git a/init.lua b/init.lua index c18ccd8..a666859 100644 --- a/init.lua +++ b/init.lua @@ -516,7 +516,8 @@ gunslinger.register_gun("gunslinger_rangedweapons:beretta", { range = 200, base_spread = 20, max_spread = 80, - ammo = "gunslinger_rangedweapons:bullet_9mm 15", + magazine = true, + ammo = "gunslinger_rangedweapons:mag_9mm", fire_sound = "rangedweapons_beretta" }) minetest.register_craft({ @@ -543,7 +544,8 @@ gunslinger.register_gun("gunslinger_rangedweapons:glock17", { range = 200, base_spread = 20, max_spread = 80, - ammo = "gunslinger_rangedweapons:bullet_9mm 15", + magazine = true, + ammo = "gunslinger_rangedweapons:mag_9mm", fire_sound = "rangedweapons_glock" }) minetest.register_craft({ @@ -570,7 +572,8 @@ gunslinger.register_gun("gunslinger_rangedweapons:makarov", { range = 200, base_spread = 20, max_spread = 80, - ammo = "gunslinger_rangedweapons:bullet_9mm 15", + magazine = true, + ammo = "gunslinger_rangedweapons:mag_makarov", fire_sound = "rangedweapons_makarov" }) minetest.register_craft({ @@ -625,7 +628,8 @@ gunslinger.register_gun("gunslinger_rangedweapons:luger", { range = 200, base_spread = 20, max_spread = 80, - ammo = "gunslinger_rangedweapons:bullet_9mm 15", + magazine = true, + ammo = "gunslinger_rangedweapons:mag_makarov", fire_sound = "rangedweapons_makarov" }) minetest.register_craft({ @@ -679,7 +683,8 @@ gunslinger.register_gun("gunslinger_rangedweapons:deagle", { range = 200, base_spread = 20, max_spread = 80, - ammo = "gunslinger_rangedweapons:bullet_357", + magazine = true, + ammo = "gunslinger_rangedweapons:mag_deagle", fire_sound = "rangedweapons_deagle" }) minetest.register_craft({ @@ -820,4 +825,22 @@ minetest.register_tool("gunslinger_rangedweapons:mag_sniper", { description = "Sniper Magazine", inventory_image = "rangedweapons_sniper_mag.png", }) -gunslinger.register_magazine("gunslinger_rangedweapons:mag_sniper", "gunslinger_rangedweapons:bullet_308mm", 10) \ No newline at end of file +gunslinger.register_magazine("gunslinger_rangedweapons:mag_sniper", "gunslinger_rangedweapons:bullet_308mm", 10) + +minetest.register_tool("gunslinger_rangedweapons:mag_9mm", { + description = "9mm Pistol Magazine", + inventory_image = "rangedweapons_9mm_mag.png", +}) +gunslinger.register_magazine("gunslinger_rangedweapons:mag_9mm", "gunslinger_rangedweapons:bullet_9mm", 15) + +minetest.register_tool("gunslinger_rangedweapons:mag_makarov", { + description = "Small 9mm Magazine", + inventory_image = "rangedweapons_makarov_mag.png", +}) +gunslinger.register_magazine("gunslinger_rangedweapons:mag_makarov", "gunslinger_rangedweapons:bullet_9mm", 7) + +minetest.register_tool("gunslinger_rangedweapons:mag_deagle", { + description = "Desert Eagle Magazine", + inventory_image = "rangedweapons_deagle_mag.png", +}) +gunslinger.register_magazine("gunslinger_rangedweapons:mag_deagle", "gunslinger_rangedweapons:bullet_357", 9) \ No newline at end of file diff --git a/textures/rangedweapons_9mm_mag.png b/textures/rangedweapons_9mm_mag.png new file mode 100644 index 0000000000000000000000000000000000000000..96f713271bf8e0d8db7ea127d95dbcae68ab5eb0 GIT binary patch literal 3178 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 QJpcdz07*qoM6N<$f@lv3`~Uy| literal 0 HcmV?d00001 diff --git a/textures/rangedweapons_deagle_mag.png b/textures/rangedweapons_deagle_mag.png new file mode 100644 index 0000000000000000000000000000000000000000..1dfd19bf64e278b02b829f2b809bf52652a6ab53 GIT binary patch literal 2960 zcmV;B3vcv^P)uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)00009a7bBm z000ie000ie0hKEb8vp%iRaIFn=nx-$fHFV8DLkNfn#+VO0Pak?W zQ13ker4&^4C){ePa}H}Qr4(|`)LMtlxjW~Y*>8ECJ?ITannct!rNzhq0000uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)00009a7bBm z000ie000ie0hKEb8vp*WP0zx5sHa7`b9C8kVw^ayn3Hl(R z6b^AXLc!jF*x=8lci3yMNWasM$9td0`~KcjUVBQf8{_*vUVF;_=+op*{;u@8F}7_p znM}BfDgc&cVcRynZhSQWz;HM$g@l1a7&s;job!PGz+yBSQLoo8gq#+ckFRe7m?A)B z#y#Ho%xbm5bzN-RCW<0_-v=DsdGXWj zTl_e=PMW6d?k&na0O$`aX0sWsRtvy9d(b5PbB*QE?>xtAPgN-Z$UDDybf4(>go9t3 z0Eh^0-)yO(k(Hv`nZ6x