diff --git a/Levels/level.tscn b/Levels/level.tscn index 3f3f041..5fe1a3c 100644 --- a/Levels/level.tscn +++ b/Levels/level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://b8rvp5g0vj8q1"] -[ext_resource type="TileSet" uid="uid://go8leybejifd" path="res://TileSets/tiles.tres" id="1_8igly"] +[ext_resource type="TileSet" uid="uid://bi3tupdxmgcim" path="res://TileSets/tiles.tres" id="1_8igly"] [ext_resource type="PackedScene" uid="uid://xev8p1td1icx" path="res://Player/player.tscn" id="2_raadk"] [ext_resource type="AudioStream" uid="uid://dhuxf2eklsha5" path="res://Music/school.ogg" id="3_rnkol"] diff --git a/PickableItems/basic_item.tscn b/PickableItems/basic_item.tscn index 677f8b9..4c183ed 100644 --- a/PickableItems/basic_item.tscn +++ b/PickableItems/basic_item.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://PickableItems/basic_item.gd" id="1_txlye"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_0nj5p"] -size = Vector2(29, 50) +size = Vector2(20, 17) [node name="basic_item" type="Area2D"] script = ExtResource("1_txlye") diff --git a/PickableItems/pickable_shoes.tscn b/PickableItems/pickable_shoes.tscn index 9ae99ab..ea8ee44 100644 --- a/PickableItems/pickable_shoes.tscn +++ b/PickableItems/pickable_shoes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3] +[gd_scene load_steps=4 format=3 uid="uid://degce2jvx3sli"] [ext_resource type="PackedScene" uid="uid://ci6xls3xseci2" path="res://PickableItems/basic_item.tscn" id="1_c3jw1"] [ext_resource type="PackedScene" uid="uid://bc4mkctxjnugk" path="res://Weapons/hourglass.tscn" id="2_f6mwn"] @@ -9,7 +9,7 @@ Type = "weapon" Item = ExtResource("2_f6mwn") [node name="CollisionShape2D" parent="." index="0"] -position = Vector2(-0.5, -1) +position = Vector2(-1, -0.5) [node name="Sprite2D" parent="." index="1"] position = Vector2(18, 22) diff --git a/Projectiles/basic_projectile.gd b/Projectiles/basic_projectile.gd index cd5d6f4..a5044de 100644 --- a/Projectiles/basic_projectile.gd +++ b/Projectiles/basic_projectile.gd @@ -5,11 +5,22 @@ extends Area2D @export var LIFETIME = 1.0; @export var HANG_TIME = 0.0; @export var FRICTION = 0.0; +@export var SIZE_MOD = 0.0; +@onready var sprite = $Sprite2D; + +var rng = RandomNumberGenerator.new(); var is_hanging = false; var velocity = Vector2.ZERO; var time = 0.0; +func _ready(): + var size_mod = rng.randf() * SIZE_MOD; + sprite.scale.x -= size_mod; + sprite.scale.y -= size_mod; + + + func _process(delta): if is_hanging : @@ -37,7 +48,8 @@ func end_of_life(): is_hanging = true; func explode(): + velocity = Vector2.ZERO; + sprite.play("explosion"); + +func _on_sprite_2d_animation_finished(): queue_free(); - - - diff --git a/Projectiles/basic_projectile.tscn b/Projectiles/basic_projectile.tscn index 4c06d0f..51b2b2d 100644 --- a/Projectiles/basic_projectile.tscn +++ b/Projectiles/basic_projectile.tscn @@ -1,7 +1,64 @@ -[gd_scene load_steps=4 format=3 uid="uid://cpo8qy3y0fuui"] +[gd_scene load_steps=12 format=3 uid="uid://cpo8qy3y0fuui"] [ext_resource type="Script" path="res://Projectiles/basic_projectile.gd" id="1_l2kyf"] -[ext_resource type="Texture2D" uid="uid://gqotbni355f" path="res://Sprites/placeholder_projectile.png" id="1_o7jy1"] +[ext_resource type="Texture2D" uid="uid://2xd84hbj47vd" path="res://Sprites/sand_sprite.png" id="2_1c2lh"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_oqhi1"] +atlas = ExtResource("2_1c2lh") +region = Rect2(0, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_hwcsx"] +atlas = ExtResource("2_1c2lh") +region = Rect2(64, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2kbmk"] +atlas = ExtResource("2_1c2lh") +region = Rect2(128, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_p1d4t"] +atlas = ExtResource("2_1c2lh") +region = Rect2(192, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_os7n2"] +atlas = ExtResource("2_1c2lh") +region = Rect2(256, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ppc06"] +atlas = ExtResource("2_1c2lh") +region = Rect2(320, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7gy0c"] +atlas = ExtResource("2_1c2lh") +region = Rect2(384, 0, 64, 64) + +[sub_resource type="SpriteFrames" id="SpriteFrames_5b7u4"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_oqhi1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_hwcsx") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_2kbmk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_p1d4t") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_os7n2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ppc06") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7gy0c") +}], +"loop": true, +"name": &"explosion", +"speed": 60.0 +}] [sub_resource type="RectangleShape2D" id="RectangleShape2D_pp7ve"] size = Vector2(4, 4) @@ -9,11 +66,14 @@ size = Vector2(4, 4) [node name="basic_projectile" type="Area2D"] script = ExtResource("1_l2kyf") -[node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(10, 10) -texture = ExtResource("1_o7jy1") +[node name="Sprite2D" type="AnimatedSprite2D" parent="."] +position = Vector2(12, 11) +scale = Vector2(0.531558, 0.531558) +frames = SubResource("SpriteFrames_5b7u4") +animation = &"explosion" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("RectangleShape2D_pp7ve") [connection signal="body_entered" from="." to="." method="_on_body_entered"] +[connection signal="animation_finished" from="Sprite2D" to="." method="_on_sprite_2d_animation_finished"] diff --git a/Projectiles/sand.tscn b/Projectiles/sand.tscn index 00cefee..0d00132 100644 --- a/Projectiles/sand.tscn +++ b/Projectiles/sand.tscn @@ -1,13 +1,75 @@ -[gd_scene load_steps=2 format=3 uid="uid://bedh0enwukdbf"] +[gd_scene load_steps=11 format=3 uid="uid://bedh0enwukdbf"] [ext_resource type="PackedScene" uid="uid://cpo8qy3y0fuui" path="res://Projectiles/basic_projectile.tscn" id="1_mqpki"] +[ext_resource type="Texture2D" uid="uid://2xd84hbj47vd" path="res://Sprites/sand_sprite.png" id="2_gbmp0"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_hmv27"] +atlas = ExtResource("2_gbmp0") +region = Rect2(0, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3crfb"] +atlas = ExtResource("2_gbmp0") +region = Rect2(64, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jn4yo"] +atlas = ExtResource("2_gbmp0") +region = Rect2(128, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_besyq"] +atlas = ExtResource("2_gbmp0") +region = Rect2(192, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gefy0"] +atlas = ExtResource("2_gbmp0") +region = Rect2(256, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_x03j6"] +atlas = ExtResource("2_gbmp0") +region = Rect2(320, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qh7me"] +atlas = ExtResource("2_gbmp0") +region = Rect2(384, 0, 64, 64) + +[sub_resource type="SpriteFrames" id="SpriteFrames_frbfh"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_hmv27") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3crfb") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_jn4yo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_besyq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gefy0") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_x03j6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qh7me") +}], +"loop": true, +"name": &"explosion", +"speed": 24.0 +}] [node name="basic_projectile" instance=ExtResource("1_mqpki")] -DAMAGE = 1 +DAMAGE = 2 SPEED = 1000 LIFETIME = 0.1 HANG_TIME = 0.3 FRICTION = 0.92 +SIZE_MOD = 0.15 [node name="Sprite2D" parent="." index="0"] -scale = Vector2(2.43502, 2.43502) +position = Vector2(-14, -13) +rotation = -3.14159 +scale = Vector2(0.612389, 0.612389) +frames = SubResource("SpriteFrames_frbfh") diff --git a/Projectiles/shirt_projectile.tscn b/Projectiles/shirt_projectile.tscn new file mode 100644 index 0000000..3e3dae2 --- /dev/null +++ b/Projectiles/shirt_projectile.tscn @@ -0,0 +1,38 @@ +[gd_scene load_steps=7 format=3 uid="uid://chf2kww8i3xsd"] + +[ext_resource type="PackedScene" uid="uid://cpo8qy3y0fuui" path="res://Projectiles/basic_projectile.tscn" id="1_g01wn"] +[ext_resource type="Texture2D" uid="uid://cdrdrffc2b8al" path="res://Sprites/bullet_Shirt_1.png" id="2_quwts"] +[ext_resource type="Texture2D" uid="uid://ded2ewso7kejt" path="res://Sprites/bullet_Shirt_2.png" id="3_wboqr"] +[ext_resource type="Texture2D" uid="uid://c378cpgsik5a1" path="res://Sprites/bullet_Shirt_3.png" id="4_rm1tq"] +[ext_resource type="Texture2D" uid="uid://bnbsl6mg0b8oc" path="res://Sprites/smolshirt.png" id="5_3gdki"] + +[sub_resource type="SpriteFrames" id="SpriteFrames_se0yf"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("2_quwts") +}, { +"duration": 1.0, +"texture": ExtResource("4_rm1tq") +}, { +"duration": 1.0, +"texture": ExtResource("3_wboqr") +}, { +"duration": 2.0, +"texture": ExtResource("5_3gdki") +}], +"loop": true, +"name": &"explosion", +"speed": 5.0 +}] + +[node name="basic_projectile" instance=ExtResource("1_g01wn")] +DAMAGE = 34 + +[node name="Sprite2D" parent="." index="0"] +position = Vector2(47, 51) +scale = Vector2(2, 2) +frames = SubResource("SpriteFrames_se0yf") + +[node name="CollisionShape2D" parent="." index="1"] +position = Vector2(1, 0) diff --git a/Sprites/ShirtGUn.png b/Sprites/ShirtGUn.png new file mode 100644 index 0000000..fa6dfe6 Binary files /dev/null and b/Sprites/ShirtGUn.png differ diff --git a/Sprites/ShirtGUn.png.import b/Sprites/ShirtGUn.png.import new file mode 100644 index 0000000..250d4e0 --- /dev/null +++ b/Sprites/ShirtGUn.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dmst0pqka10fq" +path="res://.godot/imported/ShirtGUn.png-60f4f5c4b1b5e41c310cb1c6771c3422.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/ShirtGUn.png" +dest_files=["res://.godot/imported/ShirtGUn.png-60f4f5c4b1b5e41c310cb1c6771c3422.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Sprites/bullet_Shirt_1.png b/Sprites/bullet_Shirt_1.png new file mode 100644 index 0000000..becec43 Binary files /dev/null and b/Sprites/bullet_Shirt_1.png differ diff --git a/Sprites/bullet_Shirt_1.png.import b/Sprites/bullet_Shirt_1.png.import new file mode 100644 index 0000000..d99b7b9 --- /dev/null +++ b/Sprites/bullet_Shirt_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cdrdrffc2b8al" +path="res://.godot/imported/bullet_Shirt_1.png-11552b85dc56e4de375fa508c54baef1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/bullet_Shirt_1.png" +dest_files=["res://.godot/imported/bullet_Shirt_1.png-11552b85dc56e4de375fa508c54baef1.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Sprites/bullet_Shirt_2.png b/Sprites/bullet_Shirt_2.png new file mode 100644 index 0000000..9a5e775 Binary files /dev/null and b/Sprites/bullet_Shirt_2.png differ diff --git a/Sprites/bullet_Shirt_2.png.import b/Sprites/bullet_Shirt_2.png.import new file mode 100644 index 0000000..71b98ef --- /dev/null +++ b/Sprites/bullet_Shirt_2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ded2ewso7kejt" +path="res://.godot/imported/bullet_Shirt_2.png-bf0dd142b145fae231a410d7b84c40cc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/bullet_Shirt_2.png" +dest_files=["res://.godot/imported/bullet_Shirt_2.png-bf0dd142b145fae231a410d7b84c40cc.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Sprites/bullet_Shirt_3.png b/Sprites/bullet_Shirt_3.png new file mode 100644 index 0000000..ff9fe25 Binary files /dev/null and b/Sprites/bullet_Shirt_3.png differ diff --git a/Sprites/bullet_Shirt_3.png.import b/Sprites/bullet_Shirt_3.png.import new file mode 100644 index 0000000..db0e5b4 --- /dev/null +++ b/Sprites/bullet_Shirt_3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c378cpgsik5a1" +path="res://.godot/imported/bullet_Shirt_3.png-47f5b8dfb0e912e5458b2eb05f01f306.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/bullet_Shirt_3.png" +dest_files=["res://.godot/imported/bullet_Shirt_3.png-47f5b8dfb0e912e5458b2eb05f01f306.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Sprites/sablier.png b/Sprites/sablier.png new file mode 100644 index 0000000..b52be7a Binary files /dev/null and b/Sprites/sablier.png differ diff --git a/Sprites/sablier.png.import b/Sprites/sablier.png.import new file mode 100644 index 0000000..8bf135c --- /dev/null +++ b/Sprites/sablier.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://byjdk7itcmvms" +path="res://.godot/imported/sablier.png-d644bea628febf29fea6e94dcfe6efed.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/sablier.png" +dest_files=["res://.godot/imported/sablier.png-d644bea628febf29fea6e94dcfe6efed.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Sprites/sand_sprite.png b/Sprites/sand_sprite.png new file mode 100644 index 0000000..89cbd16 Binary files /dev/null and b/Sprites/sand_sprite.png differ diff --git a/Sprites/sand_sprite.png.import b/Sprites/sand_sprite.png.import new file mode 100644 index 0000000..6540de1 --- /dev/null +++ b/Sprites/sand_sprite.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2xd84hbj47vd" +path="res://.godot/imported/sand_sprite.png-fde3a989e3bb623f8225339dea8009ed.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/sand_sprite.png" +dest_files=["res://.godot/imported/sand_sprite.png-fde3a989e3bb623f8225339dea8009ed.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Sprites/smolshirt.png b/Sprites/smolshirt.png new file mode 100644 index 0000000..29da4e8 Binary files /dev/null and b/Sprites/smolshirt.png differ diff --git a/Sprites/smolshirt.png.import b/Sprites/smolshirt.png.import new file mode 100644 index 0000000..2df5243 --- /dev/null +++ b/Sprites/smolshirt.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bnbsl6mg0b8oc" +path="res://.godot/imported/smolshirt.png-a800fccb0958b2f02103b97eabc4eebd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/smolshirt.png" +dest_files=["res://.godot/imported/smolshirt.png-a800fccb0958b2f02103b97eabc4eebd.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/TileSets/tiles.tres b/TileSets/tiles.tres index 745c173..3ad7332 100644 --- a/TileSets/tiles.tres +++ b/TileSets/tiles.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://go8leybejifd"] +[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://bi3tupdxmgcim"] [ext_resource type="Texture2D" uid="uid://d3y4rna66nylu" path="res://TileSets/Tiles Set GameJam.png" id="1_kka1l"] diff --git a/Weapons/hourglass.tscn b/Weapons/hourglass.tscn index 074f8cb..60b5766 100644 --- a/Weapons/hourglass.tscn +++ b/Weapons/hourglass.tscn @@ -1,21 +1,22 @@ [gd_scene load_steps=4 format=3 uid="uid://bc4mkctxjnugk"] [ext_resource type="PackedScene" uid="uid://cmtuq84761y0i" path="res://Weapons/basic_weapon.tscn" id="1_yfysf"] -[ext_resource type="Texture2D" uid="uid://dvwb4dx0p0ypw" path="res://Sprites/shoes.png" id="2_oyiyx"] [ext_resource type="PackedScene" uid="uid://bedh0enwukdbf" path="res://Projectiles/sand.tscn" id="2_qhdqv"] +[ext_resource type="Texture2D" uid="uid://byjdk7itcmvms" path="res://Sprites/sablier.png" id="3_w8m6s"] [node name="hourglass" instance=ExtResource("1_yfysf")] position = Vector2(65, -1) PROJECTILE = ExtResource("2_qhdqv") -PROJECTILE_AMOUNT = 200 +PROJECTILE_AMOUNT = 100 COOLDOWN = 1.0 SPREAD = 0.5 RANGE_MOD = 100 [node name="Sprite2D" parent="." index="0"] -position = Vector2(32, 38) -scale = Vector2(1.71875, 1.71875) -texture = ExtResource("2_oyiyx") +position = Vector2(5, 3.8147e-06) +rotation = 1.5708 +scale = Vector2(0.684518, 0.684518) +texture = ExtResource("3_w8m6s") [node name="RayCast2D" parent="." index="1"] position = Vector2(-14, 0) diff --git a/Weapons/t_shirt_cannon.tscn b/Weapons/t_shirt_cannon.tscn index b4dccb4..396f410 100644 --- a/Weapons/t_shirt_cannon.tscn +++ b/Weapons/t_shirt_cannon.tscn @@ -1,18 +1,20 @@ -[gd_scene load_steps=3 format=3 uid="uid://clusfc1udsrt3"] +[gd_scene load_steps=4 format=3 uid="uid://clusfc1udsrt3"] [ext_resource type="PackedScene" uid="uid://cmtuq84761y0i" path="res://Weapons/basic_weapon.tscn" id="1_fyfpr"] -[ext_resource type="Texture2D" uid="uid://cjrh8t1n0m2e4" path="res://Sprites/t_shirt.png" id="2_xni8e"] +[ext_resource type="PackedScene" uid="uid://chf2kww8i3xsd" path="res://Projectiles/shirt_projectile.tscn" id="2_c33s8"] +[ext_resource type="Texture2D" uid="uid://dmst0pqka10fq" path="res://Sprites/ShirtGUn.png" id="2_gu2t5"] [node name="t_shirt_cannon" instance=ExtResource("1_fyfpr")] position = Vector2(65, 0) +PROJECTILE = ExtResource("2_c33s8") COOLDOWN = 0.8 SPREAD = 0.1 [node name="Sprite2D" parent="." index="0"] -position = Vector2(15, 2.38419e-07) -rotation = 1.64532 -scale = Vector2(0.929632, 0.929632) -texture = ExtResource("2_xni8e") +position = Vector2(0, -34) +rotation = 3.14434 +scale = Vector2(1.30878, 1.30878) +texture = ExtResource("2_gu2t5") [node name="RayCast2D" parent="." index="1"] position = Vector2(2, 0) diff --git a/test_level001.tscn b/test_level001.tscn index f38a41a..174934d 100644 --- a/test_level001.tscn +++ b/test_level001.tscn @@ -4,7 +4,7 @@ [ext_resource type="Texture2D" uid="uid://d3y4rna66nylu" path="res://TileSets/Tiles Set GameJam.png" id="2_xwre6"] [ext_resource type="PackedScene" uid="uid://c661br4lh30r8" path="res://Enemies/basic_enemy.tscn" id="3_e1d3p"] [ext_resource type="PackedScene" uid="uid://bbg5x0apue0ei" path="res://PickableItems/pickable_t_shirt.tscn" id="4_5egyc"] -[ext_resource type="PackedScene" path="res://PickableItems/pickable_shoes.tscn" id="5_4b36u"] +[ext_resource type="PackedScene" uid="uid://degce2jvx3sli" path="res://PickableItems/pickable_shoes.tscn" id="5_4b36u"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_aemot"] resource_name = "Test"