From a245ebc1353eda2dcebf495911bd24e869729de8 Mon Sep 17 00:00:00 2001 From: edgul Date: Mon, 4 May 2026 20:57:02 -0400 Subject: [PATCH] added grenades and running animations| --- .../player/idle/Player Idle 48x48.png | Bin 0 -> 1853 bytes .../player/idle/Player Idle 48x48.png.import | 40 +++++ .../player/idle/player jump 48x48.png | Bin 0 -> 1021 bytes .../player/idle/player jump 48x48.png.import | 40 +++++ .../graphics/player/idle/player run 48x48.png | Bin 0 -> 3199 bytes .../player/idle/player run 48x48.png.import | 40 +++++ project.godot | 5 + scenes/game_node.tscn | 4 + scenes/grenade.tscn | 18 ++ scenes/player.tscn | 155 ++++++++++++++++++ scripts/grenade.gd | 24 +++ scripts/grenade.gd.uid | 1 + scripts/player.gd | 30 ++++ scripts/scene_manager.gd | 8 + 14 files changed, 365 insertions(+) create mode 100644 assets/graphics/player/idle/Player Idle 48x48.png create mode 100644 assets/graphics/player/idle/Player Idle 48x48.png.import create mode 100644 assets/graphics/player/idle/player jump 48x48.png create mode 100644 assets/graphics/player/idle/player jump 48x48.png.import create mode 100644 assets/graphics/player/idle/player run 48x48.png create mode 100644 assets/graphics/player/idle/player run 48x48.png.import create mode 100644 scenes/grenade.tscn create mode 100644 scripts/grenade.gd create mode 100644 scripts/grenade.gd.uid diff --git a/assets/graphics/player/idle/Player Idle 48x48.png b/assets/graphics/player/idle/Player Idle 48x48.png new file mode 100644 index 0000000000000000000000000000000000000000..b618511699269f9bd10ff834f6b382e147588ebd GIT binary patch literal 1853 zcma)7_g9k%7X30{KoA&uC&-k*2m(V}iiV98siI(^NQA(IG9>gOk_3>BBH$vuD&Qj0 zI|zutNC=Ul^rDWTh5#RBW5}0Z;id z0D!HW)LQ)TllZ>qrSM6Dh1{@21Fy#v)&T&1WM%eGr^rIaB8?#7EyK6Nbb3T-b(Qi9 z@b#CjK%>(Gp1cawwlgV<%ZmI`{@Js?c9fa+O`30QKn z&+sZ~v0+J1(Lfg1ne4(UQpF`e_K~L-=Dh`*_s2~4yA!0s+1dw}vR;TC2RIxU>xLj{;*R8j77@10XAu$?wdl)rA^c$Yi(opzgK>%z zXlNW1h(?gJl}r_y8Ksx1eM^;cQRnkFdTqXE93tu3q=FMR0ym+0`DJx6&}P2XkR}y% z_Do=U*?$^VodIz8N(hm9P}jrV-?lF6ZgppqvYR5*-Shi9&LR6E?W) z2TU|K#7iOjWO7mPe9*s+#Nez_cRiwsUz5bwb8u^`iF8j}iF06*`1`u^b_xrGo*MiQ z;kXHMMT4&EyA#&zo5+mmpab0ZB#=lpKbvl(k`0g+I)zh>|AhGKyhWh z*-i42H!1RA1OjP4CIH*ehRbNDDuHdtMxH>7Q9?>Qn@7lWM1{XIKC#q%>(A01*3aT< zLQh%QRUMEqyokC<7cmfWdP8$eqa62U2CJ1W9>CB=#IPK zoIlWU+Cz*FBuUX%)=e>SE!V0*Cyno=q8oJ#6dHXO}{nMM;!qc|BkNNty5-4~yF zi#|bE+@t;x{QGaK;#b8LK(@G*HUzFplPPHRQTG5DGABqxQ{8NLr)-pSSN zm)vTd(vLJT+h*@7b1}TAI#JFEUJbLr+#8IM8XiL+@1{f)jtJi8nr2qsB?7u#RyOI?>S)#x6SdspE( z{zM-Z-6+Ci2PoGh=j%CGhSM`*>Bqzk#Ef&V|K{eG{AxPH1N5wKY~Gn4TFE1=FI`f* zt>Bl7Dr^<$D|pd8pCtd*RajHqbcA+yE6$dTg(2N-YvoiOs25vc+N8bXDU^evrEi$z zjSWmRH;962W!g_3Z(b`IDyC@CGc0CwR_45$7iKhQJ7O(5uq>(i!6j1>#r9a}O%{&F z8(QZpI9=pgG-Nb# zI^Kz!r2K`Lz2Kp?zmEQ7U} zLs5iSL^ysQndjn_Z_)cK!3y?8`13c+Y_To1lzKf`rD(zM^$i(L=C%6^9Hexzmp9TP7J z3x2D_5a!4t4@Lw;++IjPL?TE)*M!XouFOAKKtr?u-6Zv(YkUXdi)sf zak0Mh>nO11+UfNJza4o$n<0Rk1Z07%>MV|KH|Cnd*}PH={w!JoU_k}q;T@2{2S2OR zD+a#QyBe@rHR$i1USRL^qA`5(r#B^2wb1c{XQEaxHcV>?NY(}bx#42)8SNHPEAhx+ zwgbTUmm?2ozQJTIB3(a3CTazbJxT1)Zea|u@~8|2{NOX;WZ4432(zCtQ7d>^3MYza z`pO61;cUJh#UB&2?YppT6D78R|4^6h|6#?IDsW4&75XzcI( zI|u+6TJ`se!ZF#4lOpqh+0S5p*beUt&(-{yaUWs}2=GNDGqzgZXbL{yCx91`EdrAH za5aCX+;6jxRN?`E{`@|6r*cN^Po;%Do_#4@uM~^*CnFzWVt7lNu6Os9ze}qfq(y&z zAN~3LRNk#6AiixSnJ2yu4LOwnk>Ay7)+Q(!7+wzKMJ61R2SEE47DYJB3DHoS125zG z=NfjWa)C7$d|>gvJRb?fU-ZQUv9Iw_V7=DGio;H>%!gN%iq-8`MjGM)49-BT&x$2f zCLY@o5T)$9hFE?0!P#ULO;mw=BX5G;-Lu&+QdMkLz^zYNPI6;W(H&45@yQ*hzGvh%)2y re59^(3$vL{@`WG>f*=TjXb=AZ>!Ac3Jx|zZ00000NkvXXu0mjfKxWs7 literal 0 HcmV?d00001 diff --git a/assets/graphics/player/idle/player jump 48x48.png.import b/assets/graphics/player/idle/player jump 48x48.png.import new file mode 100644 index 0000000..eed3622 --- /dev/null +++ b/assets/graphics/player/idle/player jump 48x48.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b5v0iuihwx8he" +path="res://.godot/imported/player jump 48x48.png-1388ce43fe6472dcf429db288011a472.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/idle/player jump 48x48.png" +dest_files=["res://.godot/imported/player jump 48x48.png-1388ce43fe6472dcf429db288011a472.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/player/idle/player run 48x48.png b/assets/graphics/player/idle/player run 48x48.png new file mode 100644 index 0000000000000000000000000000000000000000..aca5b5560dba7381b8b06e68e76b1cadf80992cb GIT binary patch literal 3199 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 I)3Fc#A5dKsJ^%m! literal 0 HcmV?d00001 diff --git a/assets/graphics/player/idle/player run 48x48.png.import b/assets/graphics/player/idle/player run 48x48.png.import new file mode 100644 index 0000000..2d28f6e --- /dev/null +++ b/assets/graphics/player/idle/player run 48x48.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bl7p2n2kgw2qx" +path="res://.godot/imported/player run 48x48.png-4f561e0e1388a4aabd0657ab1641869d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/idle/player run 48x48.png" +dest_files=["res://.godot/imported/player run 48x48.png-4f561e0e1388a4aabd0657ab1641869d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/project.godot b/project.godot index 3cef1bd..5045a02 100644 --- a/project.godot +++ b/project.godot @@ -46,6 +46,11 @@ right={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) ] } +chuck={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":103,"location":0,"echo":false,"script":null) +] +} [physics] diff --git a/scenes/game_node.tscn b/scenes/game_node.tscn index a6792c8..7d53fca 100644 --- a/scenes/game_node.tscn +++ b/scenes/game_node.tscn @@ -5,6 +5,7 @@ [ext_resource type="Script" uid="uid://sj5x7sv6o6yb" path="res://scripts/scene_manager.gd" id="2_k3dxm"] [ext_resource type="PackedScene" uid="uid://bhsvqyhsemekq" path="res://scenes/player.tscn" id="3_k3dxm"] [ext_resource type="Script" uid="uid://gkpbb5sf4gu7" path="res://scripts/area_2d.gd" id="3_v0i7m"] +[ext_resource type="PackedScene" uid="uid://cncmlpntwxxx5" path="res://scenes/grenade.tscn" id="6_1aljj"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_elsnr"] @@ -92,5 +93,8 @@ metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="platforms/platform4" unique_id=1906028968] shape = SubResource("RectangleShape2D_elsnr") +[node name="grenade" parent="." unique_id=781159040 instance=ExtResource("6_1aljj")] +position = Vector2(385, 240) + [connection signal="body_entered" from="area" to="area" method="_on_body_entered"] [connection signal="triggerActiveSignal" from="area" to="." method="_on_area_2d_trigger_active_signal"] diff --git a/scenes/grenade.tscn b/scenes/grenade.tscn new file mode 100644 index 0000000..ad32e72 --- /dev/null +++ b/scenes/grenade.tscn @@ -0,0 +1,18 @@ +[gd_scene format=3 uid="uid://cncmlpntwxxx5"] + +[ext_resource type="Script" uid="uid://bwjaypkvgpb6t" path="res://scripts/grenade.gd" id="1_cvyik"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_1xt3t"] +radius = 5.0 + +[node name="grenade" type="RigidBody2D" unique_id=781159040] +contact_monitor = true +max_contacts_reported = 3 +script = ExtResource("1_cvyik") +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=346573127] +shape = SubResource("CircleShape2D_1xt3t") +debug_color = Color(0.8627451, 0.03137255, 0.20392157, 0.41960785) + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scenes/player.tscn b/scenes/player.tscn index b1bfc17..2643e2e 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,9 +1,150 @@ [gd_scene format=3 uid="uid://bhsvqyhsemekq"] [ext_resource type="Script" uid="uid://dlmf1p0vfitcx" path="res://scripts/player.gd" id="1_3vyb7"] +[ext_resource type="Texture2D" uid="uid://dio2ufnpnihce" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_g2els"] +[ext_resource type="Texture2D" uid="uid://bl7p2n2kgw2qx" path="res://assets/graphics/player/idle/player run 48x48.png" id="3_qhqgy"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_elsnr"] +[sub_resource type="AtlasTexture" id="AtlasTexture_qhqgy"] +atlas = ExtResource("2_g2els") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dqkch"] +atlas = ExtResource("2_g2els") +region = Rect2(48, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qlg0r"] +atlas = ExtResource("2_g2els") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_tuyoq"] +atlas = ExtResource("2_g2els") +region = Rect2(144, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_fjrip"] +atlas = ExtResource("2_g2els") +region = Rect2(192, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_smehm"] +atlas = ExtResource("2_g2els") +region = Rect2(240, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ur7pv"] +atlas = ExtResource("2_g2els") +region = Rect2(288, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_y4r1p"] +atlas = ExtResource("2_g2els") +region = Rect2(336, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_d2wvv"] +atlas = ExtResource("2_g2els") +region = Rect2(384, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3v2ag"] +atlas = ExtResource("2_g2els") +region = Rect2(432, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jej6c"] +atlas = ExtResource("3_qhqgy") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_f1ej7"] +atlas = ExtResource("3_qhqgy") +region = Rect2(48, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_oprun"] +atlas = ExtResource("3_qhqgy") +region = Rect2(96, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_a8ls1"] +atlas = ExtResource("3_qhqgy") +region = Rect2(144, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qfm1y"] +atlas = ExtResource("3_qhqgy") +region = Rect2(192, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_fulsm"] +atlas = ExtResource("3_qhqgy") +region = Rect2(240, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4r5pv"] +atlas = ExtResource("3_qhqgy") +region = Rect2(288, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_60mlk"] +atlas = ExtResource("3_qhqgy") +region = Rect2(336, 0, 48, 48) + +[sub_resource type="SpriteFrames" id="SpriteFrames_jej6c"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_qhqgy") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_dqkch") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qlg0r") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_tuyoq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_fjrip") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_smehm") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ur7pv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_y4r1p") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_d2wvv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3v2ag") +}], +"loop": true, +"name": &"idle", +"speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_jej6c") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_f1ej7") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_oprun") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_a8ls1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qfm1y") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_fulsm") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4r5pv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_60mlk") +}], +"loop": true, +"name": &"run", +"speed": 12.0 +}] + [node name="player" type="CharacterBody2D" unique_id=395957349] script = ExtResource("1_3vyb7") metadata/_edit_group_ = true @@ -17,3 +158,17 @@ target_position = Vector2(20, 0) [node name="raycastLeft" type="RayCast2D" parent="." unique_id=1511802462] target_position = Vector2(-20, 0) + +[node name="right_marker" type="Marker2D" parent="." unique_id=1266802678] +position = Vector2(10, -12) + +[node name="left_marker" type="Marker2D" parent="." unique_id=1663104896] +position = Vector2(-10, -12) + +[node name="graphic" type="AnimatedSprite2D" parent="." unique_id=2045696763] +texture_filter = 1 +position = Vector2(0, -1) +sprite_frames = SubResource("SpriteFrames_jej6c") +animation = &"run" +autoplay = "idle" +frame_progress = 0.8670586 diff --git a/scripts/grenade.gd b/scripts/grenade.gd new file mode 100644 index 0000000..c1ba793 --- /dev/null +++ b/scripts/grenade.gd @@ -0,0 +1,24 @@ +class_name Grenade extends RigidBody2D + +var timer = Timer.new() + +func _ready() -> void: + add_child(timer) + timer.wait_time = 2 + timer.one_shot = true + timer.connect("timeout", explode) + timer.start() + + +func explode() -> void: + print("explode") + self.queue_free() + +func _process(delta: float) -> void: + pass + +func _on_body_entered(body: Node) -> void: + print("collision with grenade") + if body.is_in_group("destructable"): + body.queue_free() + explode() diff --git a/scripts/grenade.gd.uid b/scripts/grenade.gd.uid new file mode 100644 index 0000000..8ca11b4 --- /dev/null +++ b/scripts/grenade.gd.uid @@ -0,0 +1 @@ +uid://bwjaypkvgpb6t diff --git a/scripts/player.gd b/scripts/player.gd index 5af1db6..614007e 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -2,6 +2,9 @@ class_name Player extends CharacterBody2D @onready var raycast_left: RayCast2D = $raycastLeft @onready var raycast_right: RayCast2D = $raycastRight +@onready var left_marker: Marker2D = $left_marker +@onready var right_marker: Marker2D = $right_marker +@onready var graphic: AnimatedSprite2D = $graphic const SPEED = 300.0 const JUMP_VELOCITY = -400.0 @@ -9,10 +12,14 @@ var direction : float = 0 enum FaceDirection { LEFT, RIGHT } var facing: FaceDirection = FaceDirection.LEFT var shove_target: RigidBody2D +enum State { IDLE, RUNNING } +var state: State = State.IDLE func _physics_process(delta: float): handle_input() handle_movement(delta) + handle_state() + handle_animation() move_and_slide() # pre-calc next position from velocity handle_collisions() @@ -23,13 +30,22 @@ func handle_input(): shove_target.apply_central_impulse(Vector2(shove_normal,0)*700) if Input.is_action_just_pressed("jump") and is_on_floor(): velocity.y = JUMP_VELOCITY + if Input.is_action_just_pressed("chuck"): + if facing == FaceDirection.LEFT: + print("Chuck grenade left") + %SceneManager.make_grenade(left_marker.global_transform, -1) + else: + print("Chuck grenade right") + %SceneManager.make_grenade(right_marker.global_transform, 1) # Get the input direction and handle the movement/deceleration. # As good practice, you should replace UI actions with custom gameplay actions. direction = Input.get_axis("left", "right") if direction < 0: facing = FaceDirection.LEFT + graphic.flip_h = true elif direction > 0: facing = FaceDirection.RIGHT + graphic.flip_h = false func handle_movement(delta: float): # Add the gravity. @@ -53,3 +69,17 @@ func handle_collisions(): var c = get_slide_collision(i) if c.get_collider() is RigidBody2D: c.get_collider().apply_central_impulse(-c.get_normal() * 100) + +func handle_state(): + match state: + State.IDLE when velocity.x != 0: + state = State.RUNNING + State.RUNNING when velocity.x == 0: + state = State.IDLE + +func handle_animation(): + match state: + State.IDLE: + graphic.play("idle") + State.RUNNING: + graphic.play("run") diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index c59efda..b7b04bd 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -2,6 +2,7 @@ class_name SceneManager extends Node2D @onready var game_node: Node2D = $".." @onready var crates: Node2D = $"../crates" +var grenade = preload("res://scenes/grenade.tscn") func _ready() -> void: print("scene manager is ready") @@ -14,6 +15,13 @@ func _process(delta: float) -> void: func build_level() -> void: update_crates() +func make_grenade(grenade_pos: Transform2D, grenade_dir: int) -> void: + print("scene manager making grenade") + var g:Grenade = grenade.instantiate() + g.transform = grenade_pos + owner.add_child(g) + g.apply_central_impulse(Vector2(grenade_dir, 1)*400) + func update_crates() -> void: var crate_total:int = 0 if crates: