From b4252c05bff6a3837b8acd288e648ba35effd475 Mon Sep 17 00:00:00 2001 From: Danil Alexeev Date: Wed, 1 Mar 2023 09:46:50 +0300 Subject: [PATCH] Update "Dodge the Creeps" demo --- 2d/dodge_the_creeps/HUD.gd | 2 +- 2d/dodge_the_creeps/Main.gd | 2 +- 2d/dodge_the_creeps/Mob.gd | 6 ++--- 2d/dodge_the_creeps/Player.gd | 11 +++++----- .../art/enemyFlyingAlt_1.png.import | 2 +- .../art/enemyFlyingAlt_2.png.import | 2 +- .../art/enemySwimming_1.png.import | 2 +- .../art/enemySwimming_2.png.import | 2 +- .../art/enemyWalking_1.png.import | 2 +- .../art/enemyWalking_2.png.import | 2 +- .../art/playerGrey_up1.png.import | 2 +- .../art/playerGrey_up2.png.import | 2 +- .../art/playerGrey_walk1.png.import | 2 +- .../art/playerGrey_walk2.png.import | 2 +- .../fonts/Xolonium-Regular.ttf.import | 1 + 2d/dodge_the_creeps/icon.png.import | 2 +- 2d/dodge_the_creeps/project.godot | 22 +++++++++---------- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/2d/dodge_the_creeps/HUD.gd b/2d/dodge_the_creeps/HUD.gd index 92ed4aeb..b4504f1b 100644 --- a/2d/dodge_the_creeps/HUD.gd +++ b/2d/dodge_the_creeps/HUD.gd @@ -23,7 +23,7 @@ func update_score(score): func _on_StartButton_pressed(): $StartButton.hide() - emit_signal("start_game") + start_game.emit() func _on_MessageTimer_timeout(): diff --git a/2d/dodge_the_creeps/Main.gd b/2d/dodge_the_creeps/Main.gd index 3660e7d7..b59b1b28 100644 --- a/2d/dodge_the_creeps/Main.gd +++ b/2d/dodge_the_creeps/Main.gd @@ -12,7 +12,7 @@ func game_over(): func new_game(): - get_tree().call_group("mobs", "queue_free") + get_tree().call_group(&"mobs", &"queue_free") score = 0 $Player.start($StartPosition.position) $StartTimer.start() diff --git a/2d/dodge_the_creeps/Mob.gd b/2d/dodge_the_creeps/Mob.gd index c62bf7c2..81763994 100644 --- a/2d/dodge_the_creeps/Mob.gd +++ b/2d/dodge_the_creeps/Mob.gd @@ -1,9 +1,9 @@ extends RigidBody2D func _ready(): - $AnimatedSprite2D.playing = true - var mob_types = $AnimatedSprite2D.frames.get_animation_names() - $AnimatedSprite2D.animation = mob_types[randi() % mob_types.size()] + $AnimatedSprite2D.play() + var mob_types = Array($AnimatedSprite2D.sprite_frames.get_animation_names()) + $AnimatedSprite2D.animation = mob_types.pick_random() func _on_VisibilityNotifier2D_screen_exited(): diff --git a/2d/dodge_the_creeps/Player.gd b/2d/dodge_the_creeps/Player.gd index 5565c822..48de527d 100644 --- a/2d/dodge_the_creeps/Player.gd +++ b/2d/dodge_the_creeps/Player.gd @@ -28,15 +28,14 @@ func _process(delta): $AnimatedSprite2D.stop() position += velocity * delta - position.x = clamp(position.x, 0, screen_size.x) - position.y = clamp(position.y, 0, screen_size.y) + position = position.clamp(Vector2.ZERO, screen_size) if velocity.x != 0: - $AnimatedSprite2D.animation = "right" + $AnimatedSprite2D.animation = &"right" $AnimatedSprite2D.flip_v = false $AnimatedSprite2D.flip_h = velocity.x < 0 elif velocity.y != 0: - $AnimatedSprite2D.animation = "up" + $AnimatedSprite2D.animation = &"up" $AnimatedSprite2D.flip_v = velocity.y > 0 @@ -48,6 +47,6 @@ func start(pos): func _on_Player_body_entered(_body): hide() # Player disappears after being hit. - emit_signal("hit") + hit.emit() # Must be deferred as we can't change physics properties on a physics callback. - $CollisionShape2D.set_deferred("disabled", true) + $CollisionShape2D.set_deferred(&"disabled", true) diff --git a/2d/dodge_the_creeps/art/enemyFlyingAlt_1.png.import b/2d/dodge_the_creeps/art/enemyFlyingAlt_1.png.import index bfa93918..0d8a41b9 100644 --- a/2d/dodge_the_creeps/art/enemyFlyingAlt_1.png.import +++ b/2d/dodge_the_creeps/art/enemyFlyingAlt_1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/enemyFlyingAlt_1.png-559f599b16c69b112c1b53f6 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/enemyFlyingAlt_2.png.import b/2d/dodge_the_creeps/art/enemyFlyingAlt_2.png.import index 393bcaba..aec0050a 100644 --- a/2d/dodge_the_creeps/art/enemyFlyingAlt_2.png.import +++ b/2d/dodge_the_creeps/art/enemyFlyingAlt_2.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/enemyFlyingAlt_2.png-31dc7310eda6e1b721224f3c [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/enemySwimming_1.png.import b/2d/dodge_the_creeps/art/enemySwimming_1.png.import index 76872194..cb787987 100644 --- a/2d/dodge_the_creeps/art/enemySwimming_1.png.import +++ b/2d/dodge_the_creeps/art/enemySwimming_1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/enemySwimming_1.png-dd0e11759dc3d624c8a704f6e [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/enemySwimming_2.png.import b/2d/dodge_the_creeps/art/enemySwimming_2.png.import index ada89f69..7d66c528 100644 --- a/2d/dodge_the_creeps/art/enemySwimming_2.png.import +++ b/2d/dodge_the_creeps/art/enemySwimming_2.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/enemySwimming_2.png-4c0cbc0732264c4ea3290340b [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/enemyWalking_1.png.import b/2d/dodge_the_creeps/art/enemyWalking_1.png.import index f4cb9b87..930b6c97 100644 --- a/2d/dodge_the_creeps/art/enemyWalking_1.png.import +++ b/2d/dodge_the_creeps/art/enemyWalking_1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/enemyWalking_1.png-5af6eedbe61b701677d490ffdc [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/enemyWalking_2.png.import b/2d/dodge_the_creeps/art/enemyWalking_2.png.import index 23913489..78f35c9b 100644 --- a/2d/dodge_the_creeps/art/enemyWalking_2.png.import +++ b/2d/dodge_the_creeps/art/enemyWalking_2.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/enemyWalking_2.png-67c480ed60c35e95f5acb04362 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/playerGrey_up1.png.import b/2d/dodge_the_creeps/art/playerGrey_up1.png.import index c7d85e81..7d2301f4 100644 --- a/2d/dodge_the_creeps/art/playerGrey_up1.png.import +++ b/2d/dodge_the_creeps/art/playerGrey_up1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/playerGrey_up1.png-6bd114d0a6beac91f48e3a7314 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/playerGrey_up2.png.import b/2d/dodge_the_creeps/art/playerGrey_up2.png.import index 367fb922..a8a736bb 100644 --- a/2d/dodge_the_creeps/art/playerGrey_up2.png.import +++ b/2d/dodge_the_creeps/art/playerGrey_up2.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/playerGrey_up2.png-d6aba85f5f2675ebc7045efa75 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/playerGrey_walk1.png.import b/2d/dodge_the_creeps/art/playerGrey_walk1.png.import index 6c507a49..10dd2d12 100644 --- a/2d/dodge_the_creeps/art/playerGrey_walk1.png.import +++ b/2d/dodge_the_creeps/art/playerGrey_walk1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/playerGrey_walk1.png-c4773fe7a7bf85d7ab732eb4 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/art/playerGrey_walk2.png.import b/2d/dodge_the_creeps/art/playerGrey_walk2.png.import index a3dd5d38..eb1227b7 100644 --- a/2d/dodge_the_creeps/art/playerGrey_walk2.png.import +++ b/2d/dodge_the_creeps/art/playerGrey_walk2.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/playerGrey_walk2.png-34d2d916366100182d08037c [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/fonts/Xolonium-Regular.ttf.import b/2d/dodge_the_creeps/fonts/Xolonium-Regular.ttf.import index ab0e9b11..7fb41a75 100644 --- a/2d/dodge_the_creeps/fonts/Xolonium-Regular.ttf.import +++ b/2d/dodge_the_creeps/fonts/Xolonium-Regular.ttf.import @@ -18,6 +18,7 @@ generate_mipmaps=false multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 +allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 diff --git a/2d/dodge_the_creeps/icon.png.import b/2d/dodge_the_creeps/icon.png.import index 2676942b..3b712cb5 100644 --- a/2d/dodge_the_creeps/icon.png.import +++ b/2d/dodge_the_creeps/icon.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.cte [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/2d/dodge_the_creeps/project.godot b/2d/dodge_the_creeps/project.godot index 5ef5cc01..2c3b9878 100644 --- a/2d/dodge_the_creeps/project.godot +++ b/2d/dodge_the_creeps/project.godot @@ -37,43 +37,43 @@ window/stretch/mode="canvas_items" move_left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } move_right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"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":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] } move_up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null) ] } move_down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } start_game={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"echo":false,"script":null) ] } [rendering] -vulkan/rendering/back_end=1 +renderer/rendering_method="mobile"