From 6032b3dc82ccbb3710061059c90b7db40df19673 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Sat, 28 Sep 2024 15:27:57 +0200 Subject: next commit --- Assets/Enemies/apple.png | Bin 0 -> 296 bytes Assets/Enemies/apple.png.import | 34 ++++++++++++++++++++++++++++ Assets/Enemies/effects.png | Bin 0 -> 35723 bytes Assets/Enemies/effects.png.import | 34 ++++++++++++++++++++++++++++ Assets/Enemies/enemy-flying-01.png | Bin 0 -> 297 bytes Assets/Enemies/enemy-flying-01.png.import | 34 ++++++++++++++++++++++++++++ Assets/Enemies/enemy-flying-02.png | Bin 0 -> 299 bytes Assets/Enemies/enemy-flying-02.png.import | 34 ++++++++++++++++++++++++++++ Assets/Enemies/enemy-jumping-01.png | Bin 0 -> 259 bytes Assets/Enemies/enemy-jumping-01.png.import | 34 ++++++++++++++++++++++++++++ Assets/Enemies/enemy-jumping-02.png | Bin 0 -> 297 bytes Assets/Enemies/enemy-jumping-02.png.import | 34 ++++++++++++++++++++++++++++ Assets/Enemies/enemy-jumping-03.png | Bin 0 -> 313 bytes Assets/Enemies/enemy-jumping-03.png.import | 34 ++++++++++++++++++++++++++++ Assets/Map/DroppablePlatform01.tscn | 23 +++++++++++++++++++ Assets/Map/DroppablePlatform02.tscn | 29 ++++++++++++++++++++++++ Assets/Map/DroppablePlatform03.tscn | 35 +++++++++++++++++++++++++++++ Assets/Map/TileMapLayer.tscn | 20 ++++++++++++++++- Assets/Map/droppable_platform_01.gd | 20 +++++++++++++++++ Assets/Map/potion.png~ | Bin 0 -> 224 bytes Assets/Map/tileset.png | Bin 40520 -> 40587 bytes Assets/Map/tileset.png~ | Bin 40529 -> 40588 bytes Assets/Music/Boss.wav.import | 2 +- 23 files changed, 365 insertions(+), 2 deletions(-) create mode 100644 Assets/Enemies/apple.png create mode 100644 Assets/Enemies/apple.png.import create mode 100644 Assets/Enemies/effects.png create mode 100644 Assets/Enemies/effects.png.import create mode 100644 Assets/Enemies/enemy-flying-01.png create mode 100644 Assets/Enemies/enemy-flying-01.png.import create mode 100644 Assets/Enemies/enemy-flying-02.png create mode 100644 Assets/Enemies/enemy-flying-02.png.import create mode 100644 Assets/Enemies/enemy-jumping-01.png create mode 100644 Assets/Enemies/enemy-jumping-01.png.import create mode 100644 Assets/Enemies/enemy-jumping-02.png create mode 100644 Assets/Enemies/enemy-jumping-02.png.import create mode 100644 Assets/Enemies/enemy-jumping-03.png create mode 100644 Assets/Enemies/enemy-jumping-03.png.import create mode 100644 Assets/Map/DroppablePlatform01.tscn create mode 100644 Assets/Map/DroppablePlatform02.tscn create mode 100644 Assets/Map/DroppablePlatform03.tscn create mode 100644 Assets/Map/droppable_platform_01.gd create mode 100644 Assets/Map/potion.png~ (limited to 'Assets') diff --git a/Assets/Enemies/apple.png b/Assets/Enemies/apple.png new file mode 100644 index 0000000..9cbe2c3 Binary files /dev/null and b/Assets/Enemies/apple.png differ diff --git a/Assets/Enemies/apple.png.import b/Assets/Enemies/apple.png.import new file mode 100644 index 0000000..50e2986 --- /dev/null +++ b/Assets/Enemies/apple.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://curth07eq7amc" +path="res://.godot/imported/apple.png-0fcf85f38763831f08a5426a222e3579.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Enemies/apple.png" +dest_files=["res://.godot/imported/apple.png-0fcf85f38763831f08a5426a222e3579.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/Assets/Enemies/effects.png b/Assets/Enemies/effects.png new file mode 100644 index 0000000..4c5e969 Binary files /dev/null and b/Assets/Enemies/effects.png differ diff --git a/Assets/Enemies/effects.png.import b/Assets/Enemies/effects.png.import new file mode 100644 index 0000000..9aec585 --- /dev/null +++ b/Assets/Enemies/effects.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://sl3a0bgyr45b" +path="res://.godot/imported/effects.png-a832aced9a839c0b39bafd17f44c13b2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Enemies/effects.png" +dest_files=["res://.godot/imported/effects.png-a832aced9a839c0b39bafd17f44c13b2.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/Assets/Enemies/enemy-flying-01.png b/Assets/Enemies/enemy-flying-01.png new file mode 100644 index 0000000..9608725 Binary files /dev/null and b/Assets/Enemies/enemy-flying-01.png differ diff --git a/Assets/Enemies/enemy-flying-01.png.import b/Assets/Enemies/enemy-flying-01.png.import new file mode 100644 index 0000000..4fc9674 --- /dev/null +++ b/Assets/Enemies/enemy-flying-01.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c62o6lkel0hm" +path="res://.godot/imported/enemy-flying-01.png-d82a971226fd3618dfed0cdda7cb0af7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Enemies/enemy-flying-01.png" +dest_files=["res://.godot/imported/enemy-flying-01.png-d82a971226fd3618dfed0cdda7cb0af7.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/Assets/Enemies/enemy-flying-02.png b/Assets/Enemies/enemy-flying-02.png new file mode 100644 index 0000000..3941ced Binary files /dev/null and b/Assets/Enemies/enemy-flying-02.png differ diff --git a/Assets/Enemies/enemy-flying-02.png.import b/Assets/Enemies/enemy-flying-02.png.import new file mode 100644 index 0000000..30d1e61 --- /dev/null +++ b/Assets/Enemies/enemy-flying-02.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cmh7xpn5isthn" +path="res://.godot/imported/enemy-flying-02.png-19dcf2eed84e89f90fed689af91a25ee.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Enemies/enemy-flying-02.png" +dest_files=["res://.godot/imported/enemy-flying-02.png-19dcf2eed84e89f90fed689af91a25ee.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/Assets/Enemies/enemy-jumping-01.png b/Assets/Enemies/enemy-jumping-01.png new file mode 100644 index 0000000..97074c0 Binary files /dev/null and b/Assets/Enemies/enemy-jumping-01.png differ diff --git a/Assets/Enemies/enemy-jumping-01.png.import b/Assets/Enemies/enemy-jumping-01.png.import new file mode 100644 index 0000000..1b2f620 --- /dev/null +++ b/Assets/Enemies/enemy-jumping-01.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cnigv158w1233" +path="res://.godot/imported/enemy-jumping-01.png-4d65c6c623f2658eaf231de710b5e1f2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Enemies/enemy-jumping-01.png" +dest_files=["res://.godot/imported/enemy-jumping-01.png-4d65c6c623f2658eaf231de710b5e1f2.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/Assets/Enemies/enemy-jumping-02.png b/Assets/Enemies/enemy-jumping-02.png new file mode 100644 index 0000000..4c453bf Binary files /dev/null and b/Assets/Enemies/enemy-jumping-02.png differ diff --git a/Assets/Enemies/enemy-jumping-02.png.import b/Assets/Enemies/enemy-jumping-02.png.import new file mode 100644 index 0000000..226e4e4 --- /dev/null +++ b/Assets/Enemies/enemy-jumping-02.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cagu5o5je7tdq" +path="res://.godot/imported/enemy-jumping-02.png-0c67ebb072dda234971f579c2e45458b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Enemies/enemy-jumping-02.png" +dest_files=["res://.godot/imported/enemy-jumping-02.png-0c67ebb072dda234971f579c2e45458b.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/Assets/Enemies/enemy-jumping-03.png b/Assets/Enemies/enemy-jumping-03.png new file mode 100644 index 0000000..9b8f310 Binary files /dev/null and b/Assets/Enemies/enemy-jumping-03.png differ diff --git a/Assets/Enemies/enemy-jumping-03.png.import b/Assets/Enemies/enemy-jumping-03.png.import new file mode 100644 index 0000000..1393ceb --- /dev/null +++ b/Assets/Enemies/enemy-jumping-03.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://rct3xvwbffoo" +path="res://.godot/imported/enemy-jumping-03.png-552d3078e99903151c9744bf92b0db6c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Enemies/enemy-jumping-03.png" +dest_files=["res://.godot/imported/enemy-jumping-03.png-552d3078e99903151c9744bf92b0db6c.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/Assets/Map/DroppablePlatform01.tscn b/Assets/Map/DroppablePlatform01.tscn new file mode 100644 index 0000000..345fd4b --- /dev/null +++ b/Assets/Map/DroppablePlatform01.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=4 format=3 uid="uid://cltusavcxucip"] + +[ext_resource type="Script" path="res://Assets/Map/droppable_platform_01.gd" id="1_npqdr"] +[ext_resource type="Texture2D" uid="uid://mcgvpb1lh3ve" path="res://Assets/Map/tileset.png" id="2_s554b"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_fmc1n"] +size = Vector2(48, 1) + +[node name="DroppablePlatform01" type="StaticBody2D" groups=["droppable_platforms"]] +collision_layer = 4112 +collision_mask = 0 +script = ExtResource("1_npqdr") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +texture = ExtResource("2_s554b") +region_enabled = true +region_rect = Rect2(91, 19, 16, 16) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(0, -7.5) +shape = SubResource("RectangleShape2D_fmc1n") +one_way_collision = true diff --git a/Assets/Map/DroppablePlatform02.tscn b/Assets/Map/DroppablePlatform02.tscn new file mode 100644 index 0000000..1050b8c --- /dev/null +++ b/Assets/Map/DroppablePlatform02.tscn @@ -0,0 +1,29 @@ +[gd_scene load_steps=3 format=3 uid="uid://dhkkcjjqk7xmc"] + +[ext_resource type="Texture2D" uid="uid://mcgvpb1lh3ve" path="res://Assets/Map/tileset.png" id="1_ipgq4"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_fmc1n"] +size = Vector2(32, 1) + +[node name="DroppablePlatform01" type="StaticBody2D" groups=["droppable_platforms"]] +collision_layer = 16 +collision_mask = 0 + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(-8, 0) +texture = ExtResource("1_ipgq4") +region_enabled = true +region_rect = Rect2(91, 19, 16, 16) + +[node name="Sprite2D2" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(8, 0) +texture = ExtResource("1_ipgq4") +region_enabled = true +region_rect = Rect2(91, 19, 16, 16) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(0, -7.5) +shape = SubResource("RectangleShape2D_fmc1n") +one_way_collision = true diff --git a/Assets/Map/DroppablePlatform03.tscn b/Assets/Map/DroppablePlatform03.tscn new file mode 100644 index 0000000..03f680b --- /dev/null +++ b/Assets/Map/DroppablePlatform03.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=3 format=3 uid="uid://cdtfard8j7uj"] + +[ext_resource type="Texture2D" uid="uid://mcgvpb1lh3ve" path="res://Assets/Map/tileset.png" id="1_s4aiw"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_fmc1n"] +size = Vector2(48, 0.5) + +[node name="DroppablePlatform01" type="StaticBody2D" groups=["droppable_platforms"]] +collision_layer = 16 +collision_mask = 0 + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(-16, 0) +texture = ExtResource("1_s4aiw") +region_enabled = true +region_rect = Rect2(91, 19, 16, 16) + +[node name="Sprite2D2" type="Sprite2D" parent="."] +texture_filter = 1 +texture = ExtResource("1_s4aiw") +region_enabled = true +region_rect = Rect2(91, 19, 16, 16) + +[node name="Sprite2D3" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(16, 0) +texture = ExtResource("1_s4aiw") +region_enabled = true +region_rect = Rect2(91, 19, 16, 16) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(0, -7.75) +shape = SubResource("RectangleShape2D_fmc1n") +one_way_collision = true diff --git a/Assets/Map/TileMapLayer.tscn b/Assets/Map/TileMapLayer.tscn index f304f16..49b6be9 100644 --- a/Assets/Map/TileMapLayer.tscn +++ b/Assets/Map/TileMapLayer.tscn @@ -1,7 +1,10 @@ -[gd_scene load_steps=6 format=3 uid="uid://b1si77qfmut5x"] +[gd_scene load_steps=10 format=3 uid="uid://b1si77qfmut5x"] [ext_resource type="Texture2D" uid="uid://mcgvpb1lh3ve" path="res://Assets/Map/tileset.png" id="1_odmhe"] +[ext_resource type="PackedScene" uid="uid://cltusavcxucip" path="res://Assets/Map/DroppablePlatform01.tscn" id="2_5xc4i"] [ext_resource type="Script" path="res://Assets/Map/tile_map_layer.gd" id="2_qi2a0"] +[ext_resource type="PackedScene" uid="uid://dhkkcjjqk7xmc" path="res://Assets/Map/DroppablePlatform02.tscn" id="3_2l35j"] +[ext_resource type="PackedScene" uid="uid://cdtfard8j7uj" path="res://Assets/Map/DroppablePlatform03.tscn" id="4_3obh5"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_3qgmv"] friction = 0.0 @@ -42,6 +45,9 @@ separation = Vector2i(2, 2) 3:1/0 = 0 4:1/0 = 0 5:1/0 = 0 +5:1/0/y_sort_origin = -8 +5:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, -3, 8, -3, 8, -8) +5:1/0/physics_layer_0/polygon_0/one_way = true 6:1/0 = 0 7:1/0 = 0 8:1/0 = 0 @@ -90,6 +96,7 @@ separation = Vector2i(2, 2) 28:2/0 = 0 29:2/0 = 0 0:3/0 = 0 +0:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) 1:3/0 = 0 2:3/0 = 0 3:3/0 = 0 @@ -106,10 +113,14 @@ separation = Vector2i(2, 2) 14:3/0 = 0 15:3/0 = 0 16:3/0 = 0 +16:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) 17:3/0 = 0 +17:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) 18:3/0 = 0 +18:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) 19:3/0 = 0 20:3/0 = 0 +20:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 23:3/0 = 0 24:3/0 = 0 25:3/0 = 0 @@ -501,6 +512,12 @@ separation = Vector2i(2, 2) 26:6/animation_frame_1/duration = 0.5 26:6/0 = 0 26:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) +29:8/0 = 0 + +[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_pe6ej"] +scenes/1/scene = ExtResource("2_5xc4i") +scenes/4/scene = ExtResource("3_2l35j") +scenes/5/scene = ExtResource("4_3obh5") [sub_resource type="TileSet" id="TileSet_8jo18"] physics_layer_0/collision_layer = 16 @@ -509,6 +526,7 @@ physics_layer_1/collision_layer = 128 physics_layer_1/collision_mask = 0 physics_layer_1/physics_material = SubResource("PhysicsMaterial_3qgmv") sources/0 = SubResource("TileSetAtlasSource_iu5yc") +sources/1 = SubResource("TileSetScenesCollectionSource_pe6ej") [node name="TileMapLayer" type="TileMapLayer"] texture_filter = 1 diff --git a/Assets/Map/droppable_platform_01.gd b/Assets/Map/droppable_platform_01.gd new file mode 100644 index 0000000..7f8b276 --- /dev/null +++ b/Assets/Map/droppable_platform_01.gd @@ -0,0 +1,20 @@ +@tool +extends StaticBody2D + + +@export var width = 1 + + +func _ready() -> void: + var sprite_width = $Sprite2D.region_rect.size.x + + if width > 1: + for n in range(width - 1): + var next_sprite = $Sprite2D.duplicate() + if Engine.is_editor_hint(): + next_sprite.owner = get_tree().edited_scene_root + next_sprite.position.x = sprite_width * (n + 1) + add_child(next_sprite) + + $CollisionShape2D.shape.size.x = sprite_width * width + $CollisionShape2D.position.x = ((sprite_width * width) / 2) - (sprite_width / 2) diff --git a/Assets/Map/potion.png~ b/Assets/Map/potion.png~ new file mode 100644 index 0000000..acf9eaa Binary files /dev/null and b/Assets/Map/potion.png~ differ diff --git a/Assets/Map/tileset.png b/Assets/Map/tileset.png index ee740c1..e9cc47a 100644 Binary files a/Assets/Map/tileset.png and b/Assets/Map/tileset.png differ diff --git a/Assets/Map/tileset.png~ b/Assets/Map/tileset.png~ index abbf411..a764e16 100644 Binary files a/Assets/Map/tileset.png~ and b/Assets/Map/tileset.png~ differ diff --git a/Assets/Music/Boss.wav.import b/Assets/Music/Boss.wav.import index 1d12ab6..1e133d5 100644 --- a/Assets/Music/Boss.wav.import +++ b/Assets/Music/Boss.wav.import @@ -18,7 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop_mode=0 +edit/loop_mode=2 edit/loop_begin=0 edit/loop_end=-1 compress/mode=0 -- cgit v1.2.3