From 2c08e2d99cc6324ba4fcb93d70ed12dd341862a7 Mon Sep 17 00:00:00 2001 From: Fabio Date: Sat, 17 Aug 2024 21:32:52 +0200 Subject: [PATCH 1/4] Delete File-Icon-Sheet.png --- gmtk_2024/scripts/File-Icon-Sheet.png | Bin 2723 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gmtk_2024/scripts/File-Icon-Sheet.png diff --git a/gmtk_2024/scripts/File-Icon-Sheet.png b/gmtk_2024/scripts/File-Icon-Sheet.png deleted file mode 100644 index 6db41bd37a52b837597ff2185e11025c39e6d91f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2723 zcmai02~<fJDYHNf4A7L1YeLo)Yq2`tsX;YyV&CzqQ`IcfE7(zUS?;&$;*UB?}|rJ(7E1 zFqp9MMSUw63_cEx&kOE?+6HPC9qQnBt&H?wMP1T!FxZ|8#`?N8{;A9~T{Ee3S;~XaPaA@{@1qo%E%Z z1&y(pqzqyA?dA1nu3Q$CJU!fA$Y@?(E_U0Qp_A-iY9A?o%|04i3`QX2HxUcwxJi5K zY{nIOJho-?*BbwoYlBS3$ShgNeyjj(rEJF!@{qhKZgfx(w*3a!fjvlaG`gT}lClhe zx*{nyDqq2>?lY4U`(4Ch_2Mf&k%1C)lw46C+neB8x+SlnuF0a{*& z5pAPav%Xg@e7~MelNz50|ICE8;aq9Xac?Pgrwh~qjO5(*+;t%Sl(jNfh2T` z@olfd^p@;g$WXi^p|BX7P0YHyVNdQz%~~TTQ-w7(g|LD1 z;n;@+=U4Mr)X}Rl=>YanwxX-KnORleE8J2#cCfp9e{5S;{*9m9#6B&q-=Rye>o&hB z8u4E^u7u?4t<)#@e!&5JOM1Yh z2l`(f*zn+Yo15a|wZ#2EaUrsS(b|M8m#yzcGPX=J=jouUAdCRSZMA7Ayh$g#2k^P} zfKy%4Ph%aaJU3)hw7G@z(XhTKwaAGngS%4}DYP=P7B%))1#_ZUldO@=IX}w6TN0vT zquE5G#NP*tiox&!zMwBE4-}CK{k|?hm9KgyYH_II;3}CymEI_#GH@uHz@*-(6k{Wq z3O(@ZTXLsk_q14Kzr@0NWgXS7Q&e{iqY|&D65r6&B%q+6AWe6oW>!}u5=r265jw8E zUYBl~28Fys9e-X2&wd5;eeE}=G(bGdTu@`HDQoX}=_Z@Y(q^ZmN5O&|(RWyxulAm? z4!FhmS!wcvOtltJ3f>ef1x<221bhLD9<>8r37q^z@=t+%m`f;A(028^I{y3WA43f5 z%48F;bqdY~nkdu{+B$jLzm7`2xE@;FbZoN}NsMSmGo27_!KXu$ayc1{w@3y#{`tJ< zgHOVTqiS2wvOsgmV*dLHZtoapGzcT+!d?VLnNG0%Y~E(^hVMv@IE4c0^k$7k!|9ab zejO0Hj$-^%AEoiC4j@rl4HbU2Ur$i%!T;*yY=r$4u`aI4_LTtg#8h$I zNdnS~?GE%@q*ic_v3I(wjQpqKG)S6w6}eq^U9KvK;24tNtvC z&yCLY4tDlaA_?C|YG>KML9}1nCoi;_`OIW2_zO!LVkqp~-Mq%xK=Sq~@t!Ssnu)o8 z9T)ZFAM-{n1&=_i{GaCO(O)EXlYZW+@)}_IP2FyEKF*^U;+3>vPch5p_MfI%o(%IH$xp}M$w%v^-5qEIxs+qe>SklM#D4Olku;uD(;>Mpu#jlZnMf)8c z_l5MmtaWMKEGx4;Fx(K~R8Q{q0S>#x>jj-lWp=;owXQpP?kUR3l zKm{%&a-~hcJjeAD>oZ2bvpZyeZle4nuQ`BR-WNRfg`I zICMcF4i3xe^=!IUBI&FEX|3mqgLQYl)Y$=qXmAWoX!r^F!?Y7)@a?_Pl`1lszQUQF zeu3476sd2!Fb2Q6_Y8v5API;7i-)bE@B2^`!)_21?KFIe_slz$Jz%p8Mwua1(K5Y> z&DIJG3WEIebHWvvLLB`Tf!#BtvvG^IgnAh=KPZxuAp{Y}U$Co|^0aZ@uq*lIt|yt8 z9WKw?(Cq-a=MAU+308|Dfk=T0!W;Z*ExoAwvU}f$96K(VKXzK=8+g zMB+5VV9xyPLL`x>l}wh%)|gtJm}2M+LuCo7Y2Wev_RGWU?`^$xzF=m$@=z*s3AKoA zZt+9_e9dC2KB~eYwiw)~=#^fSn{VlMzwAOL=D8-{E|C`*;*Xo2ZvCk9N6o5gFDYst z)7V7Tl+_qE{{wddcVZIZ#=G3`%2rP)2QkqtL%ZnU!w20hMcf^XJ9i0A~DgXcg From 138d4c2cfb7d615ed077f4ea01727c7a40e9b2d8 Mon Sep 17 00:00:00 2001 From: Fabio Date: Sun, 18 Aug 2024 02:48:09 +0200 Subject: [PATCH 2/4] scaling objects or the player works --- gmtk_2024/levels/level_1.tscn | 44 ++++++++++---------- gmtk_2024/menu/level_menu/level_button.tscn | 6 +-- gmtk_2024/objects/ResizableBlock.tscn | 21 ++++++++++ gmtk_2024/project.godot | 6 +++ gmtk_2024/scripts/player_movement.gd | 4 ++ gmtk_2024/scripts/resizable_block.gd | 24 +++++++++++ gmtk_2024/scripts/ui_actions.gd | 17 ++++++-- gmtk_2024/textures/block-big.png | Bin 0 -> 410 bytes gmtk_2024/textures/block-small.png | Bin 0 -> 338 bytes 9 files changed, 95 insertions(+), 27 deletions(-) create mode 100644 gmtk_2024/objects/ResizableBlock.tscn create mode 100644 gmtk_2024/scripts/resizable_block.gd create mode 100644 gmtk_2024/textures/block-big.png create mode 100644 gmtk_2024/textures/block-small.png diff --git a/gmtk_2024/levels/level_1.tscn b/gmtk_2024/levels/level_1.tscn index bb83033..51a9dde 100644 --- a/gmtk_2024/levels/level_1.tscn +++ b/gmtk_2024/levels/level_1.tscn @@ -2,11 +2,11 @@ [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_87xn7"] [ext_resource type="Texture2D" uid="uid://c3m4os8kteaix" path="res://textures/level01-spritesheet.png" id="2_wqskp"] -[ext_resource type="PackedScene" uid="uid://vtwswrkfkgas" path="res://objects/EnemyMover.tscn" id="3_ushk2"] [ext_resource type="Shader" path="res://shaders/scrolling.gdshader" id="4_0x2h7"] -[ext_resource type="Texture2D" uid="uid://bki6ucvk6bjwk" path="res://textures/Level 01.png" id="5_4p03u"] -[ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="6_xhax5"] -[ext_resource type="PackedScene" uid="uid://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"] +[ext_resource type="Texture2D" uid="uid://c61y0181w3sq2" path="res://textures/Level 01.png" id="5_4p03u"] +[ext_resource type="PackedScene" path="res://objects/Goal.tscn" id="6_xhax5"] +[ext_resource type="PackedScene" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"] +[ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"] texture = ExtResource("2_wqskp") @@ -128,15 +128,24 @@ shader_parameter/scroll_speed = 0.02 [node name="Player" parent="." index="0"] position = Vector2(-542, 331) +[node name="UI" parent="UILayer" index="0"] +mouse_filter = 2 + +[node name="HBoxContainer" parent="UILayer/UI" index="0"] +mouse_filter = 0 + +[node name="Walls" parent="." index="4"] +collision_mask = 22 + +[node name="LeftWall" parent="Walls" index="2"] +position = Vector2(-665, 14) + [node name="Layer0" type="TileMapLayer" parent="." index="5"] use_parent_material = true tile_map_data = PackedByteArray("AADt/wsAAAABAAAAAADu/wsAAAABAAAAAADv/wsAAAABAAAAAADw/wsAAAABAAAAAADx/wsAAAABAAAAAADy/wsAAAABAAAAAADz/wsAAAABAAAAAAD0/wsAAAABAAAAAAD1/wsAAAABAAAAAAD2/wsAAAABAAAAAAD3/wsAAAABAAAAAAD4/wsAAAABAAAAAAD5/wsAAAABAAAAAAD6/wsAAAABAAAAAAD7/wsAAAABAAAAAAD8/wsAAAABAAAAAAD9/wsAAAABAAAAAAD+/wsAAAABAAAAAAD//wsAAAABAAAAAAAAAAsAAAABAAAAAAABAAsAAAABAAAAAAACAAsAAAABAAAAAAADAAsAAAABAAAAAAAEAAsAAAABAAAAAAAFAAsAAAABAAAAAAAGAAsAAAABAAAAAAAHAAsAAAABAAAAAAAIAAsAAAABAAAAAAAJAAsAAAABAAAAAAAKAAsAAAAFAAIAAAALAAsAAAABAAEAAAAMAAsAAAABAAEAAAANAAsAAAABAAEAAAAOAAsAAAABAAEAAAAPAAsAAAABAAEAAAAQAAsAAAABAAEAAAARAAsAAAABAAEAAAASAAsAAAABAAEAAAATAAsAAAABAAEAAAAKAPT/AAABAAIAAAALAPT/AAABAAIAAAAMAPT/AAABAAIAAAANAPT/AAABAAIAAAATAPT/AAAFAAAAAAASAPT/AAABAAIAAAARAPT/AAABAAIAAAAQAPT/AAABAAIAAAAPAPT/AAABAAIAAAAOAPT/AAABAAIAAAAJAPT/AAABAAIAAAAIAPT/AAABAAIAAAAHAPT/AAABAAIAAAAGAPT/AAABAAIAAAAFAPT/AAABAAIAAAAEAPT/AAABAAIAAAADAPT/AAABAAIAAAACAPT/AAABAAIAAAD5//T/AAABAAIAAAD4//T/AAABAAIAAAD3//T/AAABAAIAAAD2//T/AAABAAIAAAD1//T/AAABAAIAAAD0//T/AAABAAIAAADz//T/AAABAAIAAADy//T/AAABAAIAAADx//T/AAABAAIAAADw//T/AAABAAIAAADv//T/AAABAAIAAADu//T/AAABAAIAAADt//T/AAABAAIAAADs//T/AAADAAAAAAD6//T/AAABAAIAAAD7//T/AAABAAIAAAD8//T/AAABAAIAAAD9//T/AAABAAIAAAD+//T/AAABAAIAAAD///T/AAABAAIAAAAAAPT/AAABAAIAAAABAPT/AAABAAIAAADs/woAAAACAAEAAADs/wkAAAACAAEAAADs/wgAAAACAAEAAADs/wcAAAACAAEAAADs/wYAAAADAAAAAADs/wUAAAABAAEAAADs/wQAAAABAAEAAADs/wMAAAADAAIAAADs/wIAAAACAAEAAADs/wEAAAACAAEAAADs/wAAAAABAAEAAADs////AAABAAEAAADs//7/AAADAAIAAADs//3/AAACAAEAAADs//z/AAACAAEAAADs//v/AAACAAEAAADs//r/AAACAAEAAADs//X/AAACAAEAAADs//b/AAACAAEAAADs//f/AAACAAEAAADs//j/AAACAAEAAADs//n/AAACAAEAAAATAPX/AAAAAAEAAAATAPb/AAAAAAEAAAATAPf/AAAFAAIAAAATAPj/AAABAAEAAAATAPn/AAABAAEAAAATAPr/AAABAAEAAAATAPv/AAABAAEAAAATAPz/AAAFAAAAAAATAP3/AAAAAAEAAAATAP7/AAAAAAEAAAATAP//AAAAAAEAAAATAAAAAAAAAAEAAAATAAEAAAAAAAEAAAATAAIAAAAAAAEAAAATAAMAAAAAAAEAAAATAAQAAAAAAAEAAAATAAUAAAAAAAEAAAATAAYAAAAAAAEAAAATAAcAAAAAAAEAAAATAAgAAAAAAAEAAAATAAkAAAAFAAIAAAATAAoAAAABAAEAAAAKAAkAAAAAAAAAAAAKAAoAAAAAAAEAAAALAAkAAAABAAAAAAALAAoAAAABAAEAAAAMAAkAAAABAAAAAAAMAAoAAAABAAEAAAANAAkAAAABAAAAAAANAAoAAAABAAEAAAAOAAkAAAABAAAAAAAOAAoAAAABAAEAAAAPAAkAAAABAAAAAAAPAAoAAAABAAEAAAAQAAkAAAABAAAAAAAQAAoAAAABAAEAAAARAAkAAAABAAAAAAARAAoAAAABAAEAAAASAAkAAAABAAAAAAASAAoAAAABAAEAAADt/wMAAAABAAAAAADt/wQAAAABAAEAAADt/wUAAAABAAEAAADt/wYAAAABAAIAAADu/wMAAAABAAAAAADu/wQAAAABAAEAAADu/wUAAAABAAEAAADu/wYAAAABAAIAAADv/wMAAAABAAAAAADv/wQAAAABAAEAAADv/wUAAAABAAEAAADv/wYAAAABAAIAAADw/wMAAAABAAAAAADw/wQAAAABAAEAAADw/wUAAAABAAEAAADw/wYAAAABAAIAAADx/wMAAAABAAAAAADx/wQAAAABAAEAAADx/wUAAAABAAEAAADx/wYAAAABAAIAAADy/wMAAAABAAAAAADy/wQAAAABAAEAAADy/wUAAAABAAEAAADy/wYAAAABAAIAAADz/wMAAAABAAAAAADz/wQAAAABAAEAAADz/wUAAAABAAEAAADz/wYAAAABAAIAAAD0/wMAAAABAAAAAAD0/wQAAAABAAEAAAD0/wUAAAABAAEAAAD0/wYAAAABAAIAAAD1/wMAAAABAAAAAAD1/wQAAAABAAEAAAD1/wUAAAABAAEAAAD1/wYAAAABAAIAAAD2/wMAAAABAAAAAAD2/wQAAAABAAEAAAD2/wUAAAABAAEAAAD2/wYAAAABAAIAAAD3/wMAAAABAAAAAAD3/wQAAAABAAEAAAD3/wUAAAABAAEAAAD3/wYAAAABAAIAAAD4/wMAAAABAAAAAAD4/wQAAAABAAEAAAD4/wUAAAABAAEAAAD4/wYAAAABAAIAAAD5/wMAAAABAAAAAAD5/wQAAAABAAEAAAD5/wUAAAABAAEAAAD5/wYAAAABAAIAAAD6/wMAAAABAAAAAAD6/wQAAAABAAEAAAD6/wUAAAABAAEAAAD6/wYAAAABAAIAAAD7/wMAAAABAAAAAAD7/wQAAAABAAEAAAD7/wUAAAABAAEAAAD7/wYAAAABAAIAAAD8/wMAAAABAAAAAAD8/wQAAAABAAEAAAD8/wUAAAABAAEAAAD8/wYAAAABAAIAAAD9/wMAAAABAAAAAAD9/wQAAAABAAEAAAD9/wUAAAABAAEAAAD9/wYAAAABAAIAAAD+/wMAAAABAAAAAAD+/wQAAAABAAEAAAD+/wUAAAABAAEAAAD+/wYAAAABAAIAAAD//wMAAAABAAAAAAD//wQAAAABAAEAAAD//wUAAAABAAEAAAD//wYAAAABAAIAAAAAAAMAAAABAAAAAAAAAAQAAAABAAEAAAAAAAUAAAABAAEAAAAAAAYAAAABAAIAAAABAAMAAAACAAAAAAABAAQAAAADAAIAAAABAAUAAAABAAEAAAABAAYAAAABAAIAAAACAAQAAAAEAAIAAAACAAUAAAABAAEAAAACAAYAAAABAAIAAAADAAQAAAACAAAAAAADAAUAAAADAAIAAAADAAYAAAABAAIAAAAEAAUAAAAEAAIAAAAEAAYAAAABAAIAAAAFAAUAAAACAAAAAAAFAAYAAAAGAAEAAAAGAAYAAAAIAAAAAwD7/wAAAAABAAIAAAD8/wAAAAABAAIAAAD9/wAAAAABAAIAAAD+/wAAAAABAAIAAAD//wAAAAABAAIAAAAAAAAAAAACAAIAAAD7////AAABAAEAAAD8////AAABAAEAAAD9////AAABAAEAAAD+////AAABAAEAAAD/////AAABAAEAAAAAAP//AAACAAEAAAAAAP7/AAACAAAAAAD///7/AAABAAAAAAD+//7/AAABAAAAAAD9//7/AAABAAAAAAD8//7/AAABAAAAAAD7//7/AAABAAAAAAD6/wAAAAABAAIAAAD5/wAAAAABAAIAAAD4/wAAAAABAAIAAAD3/wAAAAAHAAEAAAD2/wAAAAAIAAAAAgD3////AAAAAAAAAAD4////AAAFAAIAAAD4//7/AAAAAAAAAAD5//7/AAABAAAAAAD6//7/AAABAAAAAAD6////AAABAAEAAAD5////AAABAAEAAADz/wAAAAAIAAAAAwDy/wAAAAAGAAEAAADy////AAACAAAAAADx////AAABAAEAAADw////AAABAAEAAADv////AAABAAEAAADv//7/AAABAAAAAADu//7/AAABAAAAAADt//7/AAABAAAAAADt////AAABAAEAAADu////AAABAAEAAADv/wAAAAABAAIAAADw/wAAAAABAAIAAADx/wAAAAABAAIAAADu/wAAAAABAAIAAADt/wAAAAABAAIAAADw//7/AAABAAAAAADx//7/AAACAAAAAADy//v/AAAIAAAAAgDz//z/AAAAAAIAAAD0//3/AAAAAAIAAAD1//3/AAACAAIAAAD2//z/AAACAAIAAAD3//v/AAAIAAAAAwDz//v/AAAHAAAAAAD0//v/AAABAAAAAAD1//v/AAABAAAAAAD2//v/AAAGAAAAAAD0//z/AAABAAEAAAD1//z/AAABAAEAAAD6//n/AAAIAAAAAgD7//n/AAAHAAAAAAD8//n/AAABAAEAAAD8//j/AAAAAAAAAAD9//j/AAACAAAAAAD9//n/AAABAAEAAAD+//n/AAAGAAAAAAD///n/AAAIAAAAAwD7//r/AAAAAAIAAAD8//r/AAABAAEAAAD9//r/AAABAAEAAAD+//r/AAACAAIAAAD8//v/AAAAAAIAAAD9//v/AAACAAIAAAADAPj/AAAIAAAAAgAEAPj/AAAHAAAAAAAFAPj/AAABAAAAAAAGAPj/AAABAAAAAAAHAPj/AAABAAAAAAAIAPj/AAABAAAAAAAJAPj/AAABAAAAAAAKAPj/AAABAAAAAAALAPj/AAAFAAIAAAALAPf/AAAAAAAAAAAMAPf/AAABAAAAAAANAPf/AAABAAAAAAAOAPf/AAABAAAAAAAPAPf/AAABAAAAAAAQAPf/AAABAAAAAAARAPf/AAABAAAAAAASAPf/AAABAAAAAAASAPj/AAABAAEAAAARAPj/AAABAAEAAAAQAPj/AAABAAEAAAAPAPj/AAABAAEAAAAOAPn/AAABAAEAAAANAPn/AAABAAEAAAAMAPn/AAABAAEAAAAMAPj/AAABAAEAAAANAPj/AAABAAEAAAAOAPj/AAABAAEAAAASAPn/AAABAAEAAAARAPn/AAABAAEAAAAQAPn/AAABAAEAAAAPAPn/AAABAAEAAAALAPn/AAABAAEAAAAKAPn/AAABAAEAAAAJAPn/AAABAAEAAAAIAPn/AAABAAEAAAAHAPn/AAABAAEAAAAGAPn/AAABAAEAAAAFAPn/AAAFAAAAAAAEAPn/AAAAAAIAAAAFAPr/AAAAAAIAAAAGAPr/AAABAAIAAAAHAPr/AAABAAIAAAAIAPr/AAABAAEAAAAJAPr/AAABAAEAAAAKAPr/AAABAAEAAAALAPr/AAABAAEAAAAMAPr/AAABAAEAAAANAPr/AAABAAEAAAAOAPr/AAABAAEAAAAPAPr/AAABAAEAAAAQAPr/AAABAAEAAAARAPr/AAABAAEAAAASAPr/AAABAAEAAAAQAPv/AAABAAEAAAAPAPv/AAABAAEAAAAOAPv/AAABAAEAAAANAPv/AAABAAEAAAAMAPv/AAABAAEAAAALAPv/AAAFAAAAAAAKAPv/AAABAAIAAAAJAPv/AAABAAIAAAAIAPv/AAAAAAIAAAARAPv/AAABAAEAAAASAPv/AAABAAEAAAASAPz/AAABAAIAAAARAPz/AAABAAIAAAAQAPz/AAABAAIAAAAPAPz/AAABAAIAAAAOAPz/AAABAAIAAAANAPz/AAABAAIAAAAMAPz/AAABAAIAAAALAPz/AAAAAAIAAADs/wsAAAADAAIAAAA=") tile_set = SubResource("TileSet_n3khe") -[node name="EnemyMover" parent="." index="6" instance=ExtResource("3_ushk2")] -position = Vector2(-579, 77) - -[node name="TextureRect" type="TextureRect" parent="." index="7"] +[node name="TextureRect" type="TextureRect" parent="." index="6"] z_index = -100 material = SubResource("ShaderMaterial_mvq46") anchors_preset = 15 @@ -151,19 +160,12 @@ grow_vertical = 2 texture = ExtResource("5_4p03u") stretch_mode = 1 -[node name="EnemyMover2" parent="." index="8" instance=ExtResource("3_ushk2")] -position = Vector2(-240, 77) - -[node name="EnemyMover3" parent="." index="9" instance=ExtResource("3_ushk2")] -position = Vector2(577, 269) -direction = -1 - -[node name="EnemyMover4" parent="." index="10" instance=ExtResource("3_ushk2")] -position = Vector2(-78, -280) -direction = -1 - -[node name="Goal" parent="." index="11" instance=ExtResource("6_xhax5")] +[node name="Goal" parent="." index="7" instance=ExtResource("6_xhax5")] position = Vector2(582, -317) -[node name="MirrorOrb" parent="." index="12" instance=ExtResource("7_dyi0e")] +[node name="MirrorOrb" parent="." index="8" instance=ExtResource("7_dyi0e")] position = Vector2(-431, -212) + +[node name="Block" parent="." index="9" instance=ExtResource("8_ec71m")] +position = Vector2(476, 253) +collision_layer = 1 diff --git a/gmtk_2024/menu/level_menu/level_button.tscn b/gmtk_2024/menu/level_menu/level_button.tscn index befe199..6fe7b1c 100644 --- a/gmtk_2024/menu/level_menu/level_button.tscn +++ b/gmtk_2024/menu/level_menu/level_button.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=3 uid="uid://t83eid7pf4iv"] -[ext_resource type="Texture2D" uid="uid://dd5ufa00fdgk2" path="res://textures/File-Icon.png" id="1_2sfn6"] -[ext_resource type="Texture2D" uid="uid://cf17aig8u3ue3" path="res://textures/File-Icon-Closed.png" id="2_6ev1f"] +[ext_resource type="Texture2D" uid="uid://yg2u8vwwbpv1" path="res://textures/File-Icon.png" id="1_2sfn6"] +[ext_resource type="Texture2D" uid="uid://bc2ictes4mln1" path="res://textures/File-Icon-Closed.png" id="2_6ev1f"] [ext_resource type="FontFile" uid="uid://d3pbvdemdbxes" path="res://CommodoreSixtyFour.ttf" id="3_732s0"] -[ext_resource type="Texture2D" uid="uid://bihp6n2kusbql" path="res://textures/File-Icon-Sheet.png" id="3_bbfoq"] +[ext_resource type="Texture2D" uid="uid://cp2ybylvgmek4" path="res://textures/File-Icon-Sheet.png" id="3_bbfoq"] [ext_resource type="Script" path="res://scripts/level_menu_level_button.gd" id="3_e83yn"] [sub_resource type="AtlasTexture" id="AtlasTexture_u313o"] diff --git a/gmtk_2024/objects/ResizableBlock.tscn b/gmtk_2024/objects/ResizableBlock.tscn new file mode 100644 index 0000000..26d3e13 --- /dev/null +++ b/gmtk_2024/objects/ResizableBlock.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=4 format=3 uid="uid://br6fngf5208j0"] + +[ext_resource type="Texture2D" uid="uid://bplkveclkwuk" path="res://textures/block-big.png" id="1_ejp7j"] +[ext_resource type="Script" path="res://scripts/resizable_block.gd" id="1_j40bu"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_h0307"] +radius = 35.0143 + +[node name="Block" type="StaticBody2D"] +collision_layer = 17 +collision_mask = 22 +input_pickable = true +script = ExtResource("1_j40bu") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_ejp7j") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_h0307") + +[connection signal="input_event" from="." to="." method="_on_input_event"] diff --git a/gmtk_2024/project.godot b/gmtk_2024/project.godot index a8b9aa9..6154e5f 100644 --- a/gmtk_2024/project.godot +++ b/gmtk_2024/project.godot @@ -44,6 +44,11 @@ click={ "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } +clickR={ +"deadzone": 0.5, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} [layer_names] @@ -51,6 +56,7 @@ click={ 2d_physics/layer_2="Enemies" 2d_physics/layer_3="Player" 2d_physics/layer_4="Goal" +2d_physics/layer_5="Interactions" [rendering] diff --git a/gmtk_2024/scripts/player_movement.gd b/gmtk_2024/scripts/player_movement.gd index 191894b..cfa30f7 100644 --- a/gmtk_2024/scripts/player_movement.gd +++ b/gmtk_2024/scripts/player_movement.gd @@ -64,3 +64,7 @@ func Jump(): func _on_hurtbox_body_entered(body: Node2D) -> void: get_tree().reload_current_scene() + + +func _on_area_2d_body_entered(body): + print("Body entered") diff --git a/gmtk_2024/scripts/resizable_block.gd b/gmtk_2024/scripts/resizable_block.gd new file mode 100644 index 0000000..07331a3 --- /dev/null +++ b/gmtk_2024/scripts/resizable_block.gd @@ -0,0 +1,24 @@ +extends StaticBody2D + +@export var scale_up_target: Vector2 = Vector2(3.0, 3.0) +@export var scale_down_target: Vector2 = Vector2(0.5, 0.5) +@export var scale_duration: float = 0.5 + + +func scale_up(): + var tween = create_tween() + tween.tween_property(self, "scale", scale_up_target, scale_duration) + # TODO: scale the player + +func scale_down(): + var tween = create_tween() + tween.tween_property(self, "scale", scale_down_target, scale_duration) + # TODO: scale the player + +func _on_input_event(viewport, event, shape_idx): + print("works") + if event is InputEventMouseButton and event.pressed: + if Input.is_action_just_pressed("click"): + scale_up() + elif Input.is_action_just_pressed("clickR"): + scale_down() diff --git a/gmtk_2024/scripts/ui_actions.gd b/gmtk_2024/scripts/ui_actions.gd index 8e247b1..8f90d85 100644 --- a/gmtk_2024/scripts/ui_actions.gd +++ b/gmtk_2024/scripts/ui_actions.gd @@ -4,6 +4,9 @@ extends Node var current_selected = "none"; +@export var scale_duration: float = 0.5 +var target_scale: Vector2 = Vector2(1, 1) + func _process(delta: float) -> void: if Input.is_action_just_pressed("click"): @@ -25,10 +28,18 @@ func select_mirror(): current_selected = "mirror" func scale_up(): - pass #Hir hochscalieren einbauen + if player: + target_scale = Vector2(3.0, 3.0) + start_scaling() func scale_down(): - pass #Hir runterscalieren einbauen - + if player: + target_scale = Vector2(0.5, 0.5) + start_scaling() + +func start_scaling(): + var tween = create_tween() + tween.tween_property(player, "scale", target_scale, scale_duration) + func mirror(): pass #Hir mirror einbauen einbauen diff --git a/gmtk_2024/textures/block-big.png b/gmtk_2024/textures/block-big.png new file mode 100644 index 0000000000000000000000000000000000000000..3c36dc6875569e713d455aaa191be83b48efca1e GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WChA;dAc};RK&fVZOC=VLBvHkaD#Bp+LoAumo|5%Z~nr?s2zRKFW^Gj1_|c* zXY&dYpP9bjF8QN5&n$QHiCxzF48u;YwO6sd%rosM4Fz9#}v41%C{9T3K9l=2L9n2i;45uG4Bt!ybx|thN3mG=( z08IqhEn+V`=U0uw*Z=m9KQkNx3Ro~ihyhgx{i$!lvI6;!JY5_^BHWWx4lowY`T5^@W(Z^Ox4I));=)tp3>eBqclG;<-dw2js^RkY zdZ$PM2JVTB{ER&84K;qb_nR5?irMXW4?LO|5ih^BR9D2_IS*rnG(M_Tc3V zVm$M_d3!uVk>Z)DS6FtOk+sQWkUemTW$OWjx3b0t3=CP}aVM>KoyCB@zopr0A`GEQ~&?~ literal 0 HcmV?d00001 From b0d6a998530da7a68e664cd5c5a5416ede7fbc3d Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Sun, 18 Aug 2024 11:42:39 +0200 Subject: [PATCH 3/4] now only scale when actually clicking again --- gmtk_2024/scripts/ui_actions.gd | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gmtk_2024/scripts/ui_actions.gd b/gmtk_2024/scripts/ui_actions.gd index 8f90d85..8744051 100644 --- a/gmtk_2024/scripts/ui_actions.gd +++ b/gmtk_2024/scripts/ui_actions.gd @@ -3,29 +3,36 @@ extends Node @export var player : CharacterBody2D; var current_selected = "none"; +var this_frame = true; @export var scale_duration: float = 0.5 var target_scale: Vector2 = Vector2(1, 1) func _process(delta: float) -> void: - if Input.is_action_just_pressed("click"): + + if Input.is_action_just_pressed("click") and this_frame: if current_selected == "scale_up": scale_up() elif current_selected == "scale_down": scale_down() elif current_selected == "mirror": mirror(); - + this_frame = true func select_up(): current_selected = "scale_up" + this_frame = false func select_down(): current_selected = "scale_down" + this_frame = false + func select_mirror(): current_selected = "mirror" + this_frame = false + func scale_up(): if player: From fb7a9c3852c81d50065e411f73b6f04f76b6c839 Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Sun, 18 Aug 2024 12:09:28 +0200 Subject: [PATCH 4/4] scale when clicking on character --- gmtk_2024/levels/level_1.tscn | 6 +++--- gmtk_2024/scripts/ui_actions.gd | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gmtk_2024/levels/level_1.tscn b/gmtk_2024/levels/level_1.tscn index 51a9dde..d483d18 100644 --- a/gmtk_2024/levels/level_1.tscn +++ b/gmtk_2024/levels/level_1.tscn @@ -3,9 +3,9 @@ [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_87xn7"] [ext_resource type="Texture2D" uid="uid://c3m4os8kteaix" path="res://textures/level01-spritesheet.png" id="2_wqskp"] [ext_resource type="Shader" path="res://shaders/scrolling.gdshader" id="4_0x2h7"] -[ext_resource type="Texture2D" uid="uid://c61y0181w3sq2" path="res://textures/Level 01.png" id="5_4p03u"] -[ext_resource type="PackedScene" path="res://objects/Goal.tscn" id="6_xhax5"] -[ext_resource type="PackedScene" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"] +[ext_resource type="Texture2D" uid="uid://bki6ucvk6bjwk" path="res://textures/Level 01.png" id="5_4p03u"] +[ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="6_xhax5"] +[ext_resource type="PackedScene" uid="uid://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"] [ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"] diff --git a/gmtk_2024/scripts/ui_actions.gd b/gmtk_2024/scripts/ui_actions.gd index 8744051..12e7e1a 100644 --- a/gmtk_2024/scripts/ui_actions.gd +++ b/gmtk_2024/scripts/ui_actions.gd @@ -3,45 +3,45 @@ extends Node @export var player : CharacterBody2D; var current_selected = "none"; -var this_frame = true; @export var scale_duration: float = 0.5 var target_scale: Vector2 = Vector2(1, 1) - -func _process(delta: float) -> void: - - if Input.is_action_just_pressed("click") and this_frame: +func _unhandled_input(event: InputEvent) -> void: + if event.is_action_pressed("click"): if current_selected == "scale_up": scale_up() elif current_selected == "scale_down": scale_down() elif current_selected == "mirror": mirror(); - this_frame = true + func select_up(): current_selected = "scale_up" - this_frame = false func select_down(): current_selected = "scale_down" - this_frame = false func select_mirror(): current_selected = "mirror" - this_frame = false func scale_up(): - if player: - target_scale = Vector2(3.0, 3.0) + var pPos = player.position + pPos.x += 1280/2 + pPos.y += 720/2 + if player.scale.x < 2 and get_viewport().get_mouse_position().distance_to(pPos) < 12: + target_scale = Vector2(2.0, 2.0) start_scaling() - + func scale_down(): - if player: - target_scale = Vector2(0.5, 0.5) + var pPos = player.position + pPos.x += 1280/2 + pPos.y += 720/2 + if player.scale.x > 1 and get_viewport().get_mouse_position().distance_to(pPos) < 12: + target_scale = Vector2(1, 1) start_scaling() func start_scaling():