From be95ec8202ef6a967de3d0ca33bba5f0b43e584e Mon Sep 17 00:00:00 2001 From: vaporvee Date: Thu, 18 Jan 2024 21:05:10 +0100 Subject: [PATCH] did some gun stuff --- assets/materials/dark_metal.material | Bin 0 -> 1053 bytes assets/materials/metal.material | Bin 0 -> 1038 bytes assets/materials/old_plastic.material | Bin 0 -> 1032 bytes assets/materials/orange_glow.material | Bin 0 -> 1060 bytes assets/materials/wood.material | Bin 0 -> 1029 bytes assets/textures/circle.png | Bin 0 -> 1320 bytes assets/textures/circle.png.import | 35 ++++++++ resources/environment.tres | 5 +- scenes/gravity_gun.tscn | 117 ++++++++++++++++++++++++++ scenes/levels/debug.tscn | 49 +---------- scenes/player.tscn | 7 +- scripts/player.gd | 6 +- 12 files changed, 167 insertions(+), 52 deletions(-) create mode 100644 assets/materials/dark_metal.material create mode 100644 assets/materials/metal.material create mode 100644 assets/materials/old_plastic.material create mode 100644 assets/materials/orange_glow.material create mode 100644 assets/materials/wood.material create mode 100644 assets/textures/circle.png create mode 100644 assets/textures/circle.png.import create mode 100644 scenes/gravity_gun.tscn diff --git a/assets/materials/dark_metal.material b/assets/materials/dark_metal.material new file mode 100644 index 0000000000000000000000000000000000000000..85b249627f124a1755fc2fed13de6e9685ef25f0 GIT binary patch literal 1053 zcmV+&1mgQrQ$s@n000005C8y>3IG5F1ONaiwJ-f(kO|!%09Gx6Hc(HJ4lpy*WM*b& z5Sf{}9JSUOk>%TRllI9*h}>J|L{STM_CUJoof)={A+zAiEQU4cAe{nk0B`_v0PSHI zP0iATk=8Byc1@7eMVe(&>Oq;-xwKL({}a4|Rx+}-ko*6Fw}$MRlIwrQE3LfB>^RfX zcsjTkJXfN2+ouq%x-m;3Xgmm9r5=VoVEL#eWF@3H%T6 zf50EC5VZvg9p3ejJhyloIoWcmV%q9)uF`O>ytMMxYHRAGh1POKnrB(%S{OlB!NKpr zkt&6q&VK}FQgbfCGH2n*PgAlRd}+8{QwiUci^6MoylT-=vN9)IM zNVKq99Suu6BHgUyZk*i=KW%xMF1@l@*vC{c6iz{}VuXs7SFmT6EyBVS@t#fpE0=N33x1p}_wG2;K`J zAkKpa5&tp#2hdCz8KB@Ty^u>)Kby@$K9v+@*EA($uF~o#WtlalsgO2fgkHKVS!lbI z6lK=44&G$BVVNBg7G?t0PL4 z%K$$Kc(nCRCrO+o5tRwq+%*prLt^ewqxS*{Z!fqiWcVTgl02p6io(8g6BphNc`dhq z+@W9;7m^FP*|=-IU7}8jRPseTIEt|3`r9yacQPWtdU@#2^;(Qxp)9QHFar=n6O%eA zb(Y)jA3g9`#r(09*YR0$;&F<&3V;)ch%SARiG@6zLr(&z(h?hOp*=|Cnu%vAIZr@O zvyH-ycYy91qhfj19%2Z8TrA9~Bhr2>sgKE$9Gtsjc%@{Po|>@eK3W<-U-7R|5b}9E%+#*6-5`r+K$>$i;+^ zC2&uO`-8UxxiV*oJKp-;5wu(nXg%@p*14^eSvBrK1_FaF6>-!Ke;V1QQB zp3U{5_nz13Uw4eQXbMz~O@vC$#U&RUFfB#^{(@|$AdY_V+Dmii7kMW(A|+5O%Y<)I zVtOoPWR!Ci4=kq>uL_9TRxp+)Dct1F9E4RTzzuaIUg0shay87eta2@E&`DtMYjC7WVW;!oz?amV zd$7w*c=FSd>;+dCZr60IEsyKM56l@R})q|3? zY|j!46;tlcwk+!b@^DU29pusIXy_<*CJGE1Auq`p9SD_fy9$Ox3%k|Hu(YFTW+ivy z>|Xe3%F|TomCV9ErfP|B2`Yt*>{w>vVCZD?zk!3rM!76_tFa87$g1VQge~_rU6|3h zh%psf+K#fLtPr&X0V7PDFtIj-V8NmVhlmxwhzl-W7d?i#s|H0S*p->DJ8nBXC1uAGQ%=EHW*h? zN)?1`BOBS25KWYf$&#~`E|16K@yJMuH^La3c8mdlq@yx9 zn=9*qVmQnlYUJJ{arO{bVGIX>ImuUQk|^k%8*|-L$ZK>9*c}R>_%5YT%*I`_+9h^M zWRg#`fhu>P1{n`XBaA$KIiECE{m3y{;PsjHKTg3% zY-y-OTwJ;20aGz<@B>7hVsVleOS}YkLJ{r+CL#k`vz+j)K}?IKjEr)w@`2@a(rW=- z+nC1kB!!#iY=Uraiigf_{kv|cwU%-B=pa*?D|AKjTz04_tiZ>Ox0aSNFNw<4A3$lG I9a2+6L&+WLyZ`_I literal 0 HcmV?d00001 diff --git a/assets/materials/old_plastic.material b/assets/materials/old_plastic.material new file mode 100644 index 0000000000000000000000000000000000000000..9edcd1eedf26d159c7af14b7ba6856268edc215d GIT binary patch literal 1032 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 literal 0 HcmV?d00001 diff --git a/assets/textures/circle.png b/assets/textures/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..ce64e434a3947bb98f8b15196206a29aa8359434 GIT binary patch literal 1320 zcmV+@1=sqCP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1ieW_K~#8N?VH=H z6;&L^_esLavMetdN}5m7Mbtpal6uG&k=}c$e;`sKl^*K7CsPh=1=n3vFt=s7e4J%t`e4*)WY zeN~6*nrPMcE;u<4ZAQ&O52EAfRI)WR^jqzteI3>L4VrJw^$s{S3vEY^96!2!%%a^6*UU|^SD70EF!cEl4qh5rDg?tfTqEY5f^F7jU zOTTq)6Lr&KZl$*;B?Yt$h~Ot+4xmZsZ!{iN0r&L`dY&Z6=5n9eB0fh7{uHW8@It=I zXFWfxQb7@gJ%FSC8s;Z-4UJY=1-XhIK(EsaeoRUNa(e*5D>0umwrbUT9KFpYvmX;v zZmdN^U- z$D%8OW}8y-dcd1z)pcUQWAWHh@_K+W^lW1*Iu6kT)WcIU2_X0>nByp>?(b;gRgnEM-B(K5(YAdN9hKn%COcZCF`afd@-&}__PVhj_Yr@z?A zJl=;1IBhm&GBJh;NN*7%CKF?rfM3mOQZY9EF{?-YlrRDN%*J>w_}8q*m=InDr(%ww zn4boxa}_+2lt88j@DDu-tBb@Iyio9mn}ZkO5D?#*J!v)uJeF-{Q}Pn*Fo@w~cmb*V?38P!e`xHY2@U z)SK3-A)n>@7Gl|vl;n^*1RREfUN7s!AzP)P;J*HaULXO52e7aQ2zJ!Mg13;mkH%6} z&J*91aDglr{6dC zIs*+ZM90)RC>fnzE$#JQ}K4QdkOUU*y8 er%!jN)ouY1@DAYIQo#%W0000 void: capture() + camera.make_current() func _physics_process(delta: float) -> void: + gun_cam.transform = camera.transform + if not is_on_floor(): velocity.y -= gravity * delta @@ -36,7 +40,7 @@ func _input(event: InputEvent) -> void: if event is InputEventMouseMotion && Input.mouse_mode == Input.MOUSE_MODE_CAPTURED: rotate_y(-event.relative.x * camera_senitivity * 0.0025) camera.rotate_x(-event.relative.y * camera_senitivity * 0.0015) - camera.rotation_degrees.x = clamp(camera.rotation_degrees.x, -60, 80) + camera.rotation_degrees.x = clamp(camera.rotation_degrees.x, -30, 80) if event.is_action_pressed("pause"): capture(false) if event.is_action_pressed("mouse_capture"):