From 08d0859728897c638784184488184fbde51f05d5 Mon Sep 17 00:00:00 2001 From: 2ndbeam <2ndbeam@disroot.org> Date: Sat, 26 Jul 2025 14:18:13 +0300 Subject: [PATCH] Slot selection and non-working auto weapon --- .../guns/gangstaholder/gangstaholder.tres | 118 ++++++++++++++++++ .../sprites/guns/gangstaholder/reload1.png | Bin 0 -> 460 bytes .../guns/gangstaholder/reload1.png.import | 34 +++++ .../sprites/guns/gangstaholder/reload2.png | Bin 0 -> 488 bytes .../guns/gangstaholder/reload2.png.import | 34 +++++ .../sprites/guns/gangstaholder/reload3.png | Bin 0 -> 470 bytes .../guns/gangstaholder/reload3.png.import | 34 +++++ .../sprites/guns/gangstaholder/reload4.png | Bin 0 -> 413 bytes .../guns/gangstaholder/reload4.png.import | 34 +++++ .../sprites/guns/gangstaholder/reload5.png | Bin 0 -> 484 bytes .../guns/gangstaholder/reload5.png.import | 34 +++++ .../sprites/guns/gangstaholder/reload6.png | Bin 0 -> 452 bytes .../guns/gangstaholder/reload6.png.import | 34 +++++ .../sprites/guns/gangstaholder/reload7.png | Bin 0 -> 460 bytes .../guns/gangstaholder/reload7.png.import | 34 +++++ .../sprites/guns/gangstaholder/shoot1.png | Bin 0 -> 619 bytes .../guns/gangstaholder/shoot1.png.import | 34 +++++ .../sprites/guns/gangstaholder/shoot2.png | Bin 0 -> 643 bytes .../guns/gangstaholder/shoot2.png.import | 34 +++++ .../sprites/guns/gangstaholder/shoot3.png | Bin 0 -> 582 bytes .../guns/gangstaholder/shoot3.png.import | 34 +++++ .../sprites/guns/gangstaholder/static.png | Bin 0 -> 479 bytes .../guns/gangstaholder/static.png.import | 34 +++++ base/scenes/player.tscn | 9 +- base/scenes/weapons/auto_weapon_test.tscn | 15 +++ base/scripts/player/player.gd | 16 ++- 26 files changed, 528 insertions(+), 4 deletions(-) create mode 100644 base/assets/sprites/guns/gangstaholder/gangstaholder.tres create mode 100644 base/assets/sprites/guns/gangstaholder/reload1.png create mode 100644 base/assets/sprites/guns/gangstaholder/reload1.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/reload2.png create mode 100644 base/assets/sprites/guns/gangstaholder/reload2.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/reload3.png create mode 100644 base/assets/sprites/guns/gangstaholder/reload3.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/reload4.png create mode 100644 base/assets/sprites/guns/gangstaholder/reload4.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/reload5.png create mode 100644 base/assets/sprites/guns/gangstaholder/reload5.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/reload6.png create mode 100644 base/assets/sprites/guns/gangstaholder/reload6.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/reload7.png create mode 100644 base/assets/sprites/guns/gangstaholder/reload7.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/shoot1.png create mode 100644 base/assets/sprites/guns/gangstaholder/shoot1.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/shoot2.png create mode 100644 base/assets/sprites/guns/gangstaholder/shoot2.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/shoot3.png create mode 100644 base/assets/sprites/guns/gangstaholder/shoot3.png.import create mode 100644 base/assets/sprites/guns/gangstaholder/static.png create mode 100644 base/assets/sprites/guns/gangstaholder/static.png.import create mode 100644 base/scenes/weapons/auto_weapon_test.tscn diff --git a/base/assets/sprites/guns/gangstaholder/gangstaholder.tres b/base/assets/sprites/guns/gangstaholder/gangstaholder.tres new file mode 100644 index 0000000..47b6217 --- /dev/null +++ b/base/assets/sprites/guns/gangstaholder/gangstaholder.tres @@ -0,0 +1,118 @@ +[gd_resource type="AnimationLibrary" load_steps=16 format=3 uid="uid://57ng8lwnt2k4"] + +[ext_resource type="Texture2D" uid="uid://cy3ija8ratxjq" path="res://base/assets/sprites/guns/gangstaholder/shoot1.png" id="1_rooin"] +[ext_resource type="Texture2D" uid="uid://cd4m4g44rmwrc" path="res://base/assets/sprites/guns/gangstaholder/shoot2.png" id="2_57rwx"] +[ext_resource type="Texture2D" uid="uid://bq6u2xb34xf0p" path="res://base/assets/sprites/guns/gangstaholder/shoot3.png" id="3_eqg6o"] +[ext_resource type="Texture2D" uid="uid://d3ys0jdfd5uxl" path="res://base/assets/sprites/guns/gangstaholder/reload1.png" id="4_vwudn"] +[ext_resource type="Texture2D" uid="uid://bkpthumpkpxh5" path="res://base/assets/sprites/guns/gangstaholder/reload2.png" id="5_p7jc5"] +[ext_resource type="Texture2D" uid="uid://bhoj5jfr2bqjo" path="res://base/assets/sprites/guns/gangstaholder/reload3.png" id="6_t6dve"] +[ext_resource type="Texture2D" uid="uid://b33s3psoy6k03" path="res://base/assets/sprites/guns/gangstaholder/reload4.png" id="7_5sdma"] +[ext_resource type="Texture2D" uid="uid://hyr3s50x4fsk" path="res://base/assets/sprites/guns/gangstaholder/reload5.png" id="8_2gfsp"] +[ext_resource type="Texture2D" uid="uid://cvw7h7fsfdjln" path="res://base/assets/sprites/guns/gangstaholder/reload6.png" id="9_y5ueg"] +[ext_resource type="Texture2D" uid="uid://ditbn0dkyjj6e" path="res://base/assets/sprites/guns/gangstaholder/reload7.png" id="10_tf0tm"] +[ext_resource type="Texture2D" uid="uid://dftqlo1lltx5f" path="res://base/assets/sprites/guns/gangstaholder/static.png" id="11_fahg7"] + +[sub_resource type="Animation" id="Animation_i1xqq"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [null] +} + +[sub_resource type="Animation" id="Animation_8sdfx"] +resource_name = "shoot" +length = 0.30001 +step = 0.1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 1, +"values": [ExtResource("1_rooin"), ExtResource("2_57rwx"), ExtResource("3_eqg6o")] +} +tracks/1/type = "method" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("../..") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0.2, 0.3), +"transitions": PackedFloat32Array(1, 1), +"values": [{ +"args": [], +"method": &"finish_task" +}, { +"args": [], +"method": &"reset_animation" +}] +} + +[sub_resource type="Animation" id="Animation_08xoc"] +resource_name = "reload" +length = 1.10001 +step = 0.1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.3, 0.4, 0.7, 0.8, 1), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [ExtResource("4_vwudn"), ExtResource("5_p7jc5"), ExtResource("6_t6dve"), ExtResource("7_5sdma"), ExtResource("8_2gfsp"), ExtResource("9_y5ueg"), ExtResource("10_tf0tm")] +} +tracks/1/type = "method" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("../..") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(1.1), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [], +"method": &"finish_task" +}] +} + +[sub_resource type="Animation" id="Animation_ma1q3"] +resource_name = "static" +length = 0.001 +step = 0.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("11_fahg7")] +} + +[resource] +_data = { +&"RESET": SubResource("Animation_i1xqq"), +&"fire": SubResource("Animation_8sdfx"), +&"reload": SubResource("Animation_08xoc"), +&"static": SubResource("Animation_ma1q3") +} diff --git a/base/assets/sprites/guns/gangstaholder/reload1.png b/base/assets/sprites/guns/gangstaholder/reload1.png new file mode 100644 index 0000000000000000000000000000000000000000..baa0709f7dee542f1e5b86fca34cd6d9caa823d5 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O{!3HGlTK@_GDaPU;cPEB*=VV?2*=?RKjv*Cu z-rm@lbtpiD?Lqd-2d|`8#Kv&zv4+Pl<-Z#KGU|m=$=gLggq+N*SzVHZZb=tUs*~s7 zljO7fztjBtG8UkT=)i$v@;+{f#ZPN$_5REE?Y{8dqNLEd=zT#J}}qyHW$kR=8Mbr^fCM?X1dVqal3(` zL?NhoHiv`%q81khqv&(jpD%y8<-Jjqa0B0)?nUo~fQ&PI$M2?iXdg(v&)RdgY-{G7 z+sb!^TQpO6*3I6p-&L|#YEONAOV#sj4ShftC`CK4g-)K&Ce##g`r?GCiYu%brzm!8 z`=cK1V7I-m?qWCt`q9A2(% zU|?Br<$)fHg3#0nKpnbit6vowb;i2ovnVtqM;_B#XwGD?>2hVf0b@d}VnC(n6b&VH zegE_JeC5YC{Sj?@o2dTz&P)czpR?9KvnylV`C)C1w*rgNVh#3Ej+%VNQjRId_8T%D zd$_JnTv)+5*SB2V!Im#AQabU^Mt!G?!suTxEzEIf7AoT*^%x?_3#yBEDR*Lu$Ij*+ckc9{8( z$Dbemw%*!3Pmg86@@=B4?VjD?*l!EXQn literal 0 HcmV?d00001 diff --git a/base/assets/sprites/guns/gangstaholder/reload2.png.import b/base/assets/sprites/guns/gangstaholder/reload2.png.import new file mode 100644 index 0000000..2b6ecfa --- /dev/null +++ b/base/assets/sprites/guns/gangstaholder/reload2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bkpthumpkpxh5" +path="res://.godot/imported/reload2.png-f38017cfb06de950af87d5ce913ea4f6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base/assets/sprites/guns/gangstaholder/reload2.png" +dest_files=["res://.godot/imported/reload2.png-f38017cfb06de950af87d5ce913ea4f6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/base/assets/sprites/guns/gangstaholder/reload3.png b/base/assets/sprites/guns/gangstaholder/reload3.png new file mode 100644 index 0000000000000000000000000000000000000000..1a152b35c5c32c544c2987a8535affa18e66c37a GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O{!3HGlTK@_GDaPU;cPEB*=VV?2*%Lfn978JR zyuD%Vci2IIErC67$x}8(lPw;Z6Eb#kwLj9@;$bo|BU9+9kjFcxRL!WLt{XNdf3BT+ zdgAl@H{An)#$f<~LrUe0#arTX`>uZfw}JO>zq7cx>+-YfUHA@$zGHf}WZln;oCjE4 z_}Um^Jgx|E9B5E_|J7G5{Da7rwcj!n4H@-xZiOi@D0gf-b(`aWy*h)W%PlsR1eS?X zcU&2aI)#K7C2mx0wY;Z0edp;Hz6@>~v`^nr{i4Red|Q57x2A8y>pQGx&VK$I{QREW z%ee|Zip3Mm>cgkGTJhf7chC86ar6O?SF_|N>LxIhYVV)n!Qs@qSaY>gKsoaYCxP5Q z;@cV?n#BHH+4lZh ze-0^b*uTsCx#onB;D#QBWazFoH6T|C{N-l7ozx?hM5vh1X#;7G{ z{rStD$9!CLm&K=n%~#w0*WQ2IeH!dnRNs6Z_3$EJqrJRi;TgHrFaCjo)zj6_Wt~$( F696LT#c2Ql literal 0 HcmV?d00001 diff --git a/base/assets/sprites/guns/gangstaholder/reload3.png.import b/base/assets/sprites/guns/gangstaholder/reload3.png.import new file mode 100644 index 0000000..b774697 --- /dev/null +++ b/base/assets/sprites/guns/gangstaholder/reload3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhoj5jfr2bqjo" +path="res://.godot/imported/reload3.png-1dd7ee4373caa409c59eea5fc29cbbe6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base/assets/sprites/guns/gangstaholder/reload3.png" +dest_files=["res://.godot/imported/reload3.png-1dd7ee4373caa409c59eea5fc29cbbe6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/base/assets/sprites/guns/gangstaholder/reload4.png b/base/assets/sprites/guns/gangstaholder/reload4.png new file mode 100644 index 0000000000000000000000000000000000000000..b720f8270f37e7bc3599712dac2a7fda3532faac GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O{!3HGlTK@_GDaPU;cPEB*=VV?2+2Nipjv*Cu z-rls$J7gfimaxJq$vPbcy~ZiMe!T&=0%V*HKeszS z>u6v6ezQaapm|sTN0QY%`DKrPE_`2Dl6m7h!=e@Xf6BI>dUQ9{uroXR)>q4x2kYK5 zx=cGnJ|m+=@H$-u2HB1~OiU9Lj*AI2^tt3RGI~sj=1wu4x&Om$ zzkV?R-Vf(F9k@3y%BT^0tEa%An{#T@d&Lqr2BF;Y)el#)bv)Y#G}%A}v&grn|*Y#P6ocv-%N sQEy9xe*5H$|BfH+cVJle=GuFv`4N*s=RQn*`5F{Bp00i_>zopr0Pd!zi~s-t literal 0 HcmV?d00001 diff --git a/base/assets/sprites/guns/gangstaholder/reload4.png.import b/base/assets/sprites/guns/gangstaholder/reload4.png.import new file mode 100644 index 0000000..6b97070 --- /dev/null +++ b/base/assets/sprites/guns/gangstaholder/reload4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b33s3psoy6k03" +path="res://.godot/imported/reload4.png-32487311de3708121cec2955d1de0c8a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base/assets/sprites/guns/gangstaholder/reload4.png" +dest_files=["res://.godot/imported/reload4.png-32487311de3708121cec2955d1de0c8a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/base/assets/sprites/guns/gangstaholder/reload5.png b/base/assets/sprites/guns/gangstaholder/reload5.png new file mode 100644 index 0000000000000000000000000000000000000000..a99a7d23ec914a3491c0ba3ed45daeed8b47e3f1 GIT binary patch literal 484 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O{!3HGlTK@_GDaPU;cPEB*=VV?2+4DSI978JR zyuEqQi`h`%*vFL`Ivh>;0k@mywK!>t?D?fts}X;6wSvdN)#BOr9W*#vn?61|C1w8d z(L1Z;PyZbkvQOObIo0T97tmaMV5bD{@;s9{R&PtMNM`6Ol-4~Af4y{NdR~^{O3t@c z-ij6%;uuN<8Ca)1V`Q3O$#g;4JH3{JF(B!wgaX4%Wf(HHU%E`e>_g^#kryzbWVRO< zzaE_`ELeFjZ*l!{OZE$lRY79$E-5i0ySh6quEaTHt!n+xZ^2|068>k?-|4Xj?D=-E zsU6W@7hm&#ciG2Qz6*0}_rD9}uK!(<{%q%EMv;hF!W<6nNpJ7$XPq;5-`}H?q!bzU zZ@7KtPM-1ajoq)E5`J=N#4yiZz3+#>Sjv*Cu z-rlnIb8?hmyKpdKLc~tyqsOMTv>my&c8A8cq->|;r0mDZ>|tsp5x!0pF?t0b8L$QB8+a)|9^)o^$!vY?17z>;-E%*N%Hi$fm0T_6e-xRd&Y z;oRNFe-GO%onn`^`NhIDsjL=@Wa_*$?|%KgvH7M0V_%BlpGiA;-`v>s;Pa>X;f+t< zDttPw#QNgIGRgfi|2{pwxL-uefqh%+eBEgee*RtBk^P>hV8ODz`(8c>KP9=aLu}rv zZHjeg(zH`|?EUAfxzuFlzMt+FG;gJ{O|RmfA(CM4|M;QJ`3JQ!pKh)DsrG@v^2GZ2 ztJj{ND)LK-^~S}^6+1S4F>j5|`Y=;Bf&KNN_;jP%*RJyKZUr?=yVbUTg)ir~%KLhn h4&1w2O03-=$_Ok!+_M!Ff}XB^F6*2UngF+{!JhyC literal 0 HcmV?d00001 diff --git a/base/assets/sprites/guns/gangstaholder/reload6.png.import b/base/assets/sprites/guns/gangstaholder/reload6.png.import new file mode 100644 index 0000000..c2d6c25 --- /dev/null +++ b/base/assets/sprites/guns/gangstaholder/reload6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cvw7h7fsfdjln" +path="res://.godot/imported/reload6.png-56f58b6e5cbe8f75b730e7ce8996cdce.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base/assets/sprites/guns/gangstaholder/reload6.png" +dest_files=["res://.godot/imported/reload6.png-56f58b6e5cbe8f75b730e7ce8996cdce.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/base/assets/sprites/guns/gangstaholder/reload7.png b/base/assets/sprites/guns/gangstaholder/reload7.png new file mode 100644 index 0000000000000000000000000000000000000000..baa0709f7dee542f1e5b86fca34cd6d9caa823d5 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O{!3HGlTK@_GDaPU;cPEB*=VV?2*=?RKjv*Cu z-rm@lbtpiD?Lqd-2d|`8#Kv&zv4+Pl<-Z#KGU|m=$=gLggq+N*SzVHZZb=tUs*~s7 zljO7fztjBtG8UkT=)i$v@;+{f#ZPN$_5REE?Y{8dqNLEd=zT#J}}qyHW$kR=8Mbr^fCM?X1dVqal3(` zL?NhoHiv`%q81khqv&(jpD%y8<-Jjqa0B0)?nUo~fQ&PI$M2?iXdg(v&)RdgY-{G7 z+sb!^TQpO6*3I6p-&L|#YEONAOV#sj4ShftC`CK4g-)K&Ce##g`r?GCiYu%brzm!8 z`=cK1V7I-m?qWCt5L_4V<-ao&^LzolM|%{OGRVJg~S@xa&XJHM#rJ%+`OzJ7XkDJCoa{(Dzs zV^->$+0ZkoP5y7DDB}qY@4w%lhg#mSH~m_cuxgzN(2CPbcJH%~-#cAx^TN*T>_-!% z?ryuSU0!9wkfg%$ia*0O>T5QCF@Gx6cZ9RAAtWohzSS z#eBn+gQFoR(pe#z4XE^)5=#w7(3%(d3{K290-pFeFz}odYS{xc@YowGmNyKlQ_?F{ z82-yJ8mOF~J6Dv^U{S|IZtn%WmF@G>IsY);bX+gLPx%JxN4CRCt{2+CfUgP!NFOsVEdIf;X@V(yc)R!L2v&4DLONd(Y4txDo_GY~4yh z+ZzaiAh?LD2ak}{v?gz6;{UCrN_jZHlSCB(00000000000000000000004l_n_nH~ z+Gl_PT?t`B`v9JVp?78YLIA%j8~X5i)(fwBkAVPIR5ozW5%jbV;7M@{lx+oX*Z?(! zVTVDFvn-$74PrL(kGR`uWTfk+tsTEgz96|j0#dON|v&%vV<1EX=@Z*m?+SERP zH>>>A@9!PwA|h{#C$pQu?7=LHBd7`>3_q|MfyqO4K`{U^8UarMEhrnlRpyH9ie(X4 z+5~I>1x;>E}~MKmduoEuMM@{r=J| zkP-nXxP7@_dYw-h2mcSC;Cysey5cpq0vkX<*Z}dswJr$+psebCplVArjQ|u>4Y&Ao zkRk$p5v1sRbe5Mr5{8X1-2D_0k(-C-*52*9|u zBOm|=+Khkz9H|q+su2)?GfhW801h=70RcEu_kKWXM!+9~99d=fbrFCQZ46(y1o*Jd d@ax_K`~c!_*aiz7SkM3f002ovPDHLkV1k$b2rB>p literal 0 HcmV?d00001 diff --git a/base/assets/sprites/guns/gangstaholder/shoot2.png.import b/base/assets/sprites/guns/gangstaholder/shoot2.png.import new file mode 100644 index 0000000..5f15ef4 --- /dev/null +++ b/base/assets/sprites/guns/gangstaholder/shoot2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cd4m4g44rmwrc" +path="res://.godot/imported/shoot2.png-1d9c68873459e0c6cac350658144c708.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base/assets/sprites/guns/gangstaholder/shoot2.png" +dest_files=["res://.godot/imported/shoot2.png-1d9c68873459e0c6cac350658144c708.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/base/assets/sprites/guns/gangstaholder/shoot3.png b/base/assets/sprites/guns/gangstaholder/shoot3.png new file mode 100644 index 0000000000000000000000000000000000000000..d50f4b3603e99bc083017169f91723bf1c900556 GIT binary patch literal 582 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O{!3HGlTK@_GDaPU;cPEB*=VV?oFfcKAx;TbZ z%z1lbuh-!Kkpmy23s1a~{=)1P?k(7|u2%HBUFYue52SZ+>9K|j{`$z%6i~3kPu$7p zQLozbd6WOtcL&HeJ)b{$wiP?jU{qjWaQy9^<@?&qVwUY=ID2S<`uF#XAEiq)7`)lF zQ22<0?Dk@LVGf>dSslhNBF(IAYx0*45!5fSnVt2Q2#_irz#KVQK9E$P)%dCe9B_OHuQ zzPfW9{L8p^w^-A64!Je_0oL!QyIe1I6Dk$nVH1*a(W#(xMwH7ggJe)2xjUUdUw%T%5nCoT8Z?wx(6iC5uGg_X{%Ir@1`+0sr@j2bWE z?gk&ew|2W)J}b+DHSz}yIJ!A@Fl%VZZg^JPz`Nkdr4RehKexBPz29baE|Xcqrn^@AlzsT}V{(w!%dd}vOWarz65d=ac+<2(kdaYB(#=5B!Ci@k$>19QLivLQKj!XK zR$xf?(r+kkbztDjbaPfX!3;N+8i6M>zN9mB@(MIRQB!De@N!aUICWN* zvAn@SWuJ;tLwz4Z(}Z7LGZ?grU#m`FV4CoUePX=L^+wAB^XKV void: queue.command_pushed.connect(on_queue_command_pushed) @@ -38,11 +40,23 @@ func _process(_delta: float) -> void: Input.is_action_pressed('shoot') if fire_action: push_copied_command(CommandQueue.Command.FIRE, weapon_sides) + # Reload logic var reload_action = Input.is_action_just_pressed('reload') if reload_action: if not queue.has_command(CommandQueue.Command.RELOAD): push_copied_command(CommandQueue.Command.RELOAD, weapon_sides) + + # Slot changing logic + var slot_action = false + var slot_id = 0 + for slot in slot_actions.size(): + if Input.is_action_just_pressed(slot_actions[slot]): + slot_action = true + slot_id = slot + if slot_action: + weapons.select_slot(slot_id) + for side in CommandQueue.Side.values(): var command = queue.current_command(side) match side: