diff --git a/Levels/level.gd b/Levels/level.gd index ce73aee..ac6e638 100644 --- a/Levels/level.gd +++ b/Levels/level.gd @@ -22,7 +22,7 @@ func _on_outside_enemy_is_killed(): func _on_shoes_picked(): - doors.remove_child($Doors/Bathroom_Top); + doors.remove_child($Doors/Locker); func _on_mimic_01_is_killed(): @@ -41,7 +41,7 @@ func _on_mimic_02_is_killed(): mimic_count += 1; func _on_pants_picked(): - doors.remove_child($Doors/Locker); + doors.remove_child($Doors/Bathroom_Top); func _on_gym_enemy_05_is_killed(): diff --git a/Levels/level.tscn b/Levels/level.tscn index ec0a945..1c96179 100644 --- a/Levels/level.tscn +++ b/Levels/level.tscn @@ -149,7 +149,7 @@ position = Vector2(2367, 1350) position = Vector2(3592, 679) [node name="shoes" parent="." instance=ExtResource("8_qnb3g")] -position = Vector2(2606, 954) +position = Vector2(2281, 2786) [node name="Mimic_01" parent="." instance=ExtResource("10_8g8ng")] position = Vector2(3686, 1379) @@ -166,7 +166,7 @@ rotation = 3.14159 position = Vector2(3750, 1379) [node name="pants" parent="." instance=ExtResource("9_8e12f")] -position = Vector2(2267, 2783) +position = Vector2(2610, 955) [node name="Gym_Enemy01" parent="." instance=ExtResource("7_qt4sv")] position = Vector2(4028, 3202) @@ -196,7 +196,7 @@ position = Vector2(2188, 2790) position = Vector2(2386, 2818) [node name="Cafeteria_Enemye05" parent="." instance=ExtResource("7_qt4sv")] -position = Vector2(2433, 2624) +position = Vector2(2455, 2599) [node name="End_Enemy01" parent="." instance=ExtResource("7_qt4sv")] position = Vector2(2771, 4556) diff --git a/Player/player.gd b/Player/player.gd index b9af161..df1d181 100644 --- a/Player/player.gd +++ b/Player/player.gd @@ -58,6 +58,14 @@ func pickup(item): if !weapons[n]: weapons[n] = item.Item.instantiate(); change_weapon(n); + + if n == 0 : + sprite.play("shirt"); + if n == 1 : + sprite.play("pants"); + if n == 2 : + sprite.play("shoes"); + return; func kill(): diff --git a/Player/player.tscn b/Player/player.tscn index 821fd40..18bd531 100644 --- a/Player/player.tscn +++ b/Player/player.tscn @@ -1,20 +1,144 @@ -[gd_scene load_steps=10 format=3 uid="uid://xev8p1td1icx"] +[gd_scene load_steps=26 format=3 uid="uid://xev8p1td1icx"] [ext_resource type="Script" path="res://Player/player.gd" id="1_mbyc2"] -[ext_resource type="Texture2D" uid="uid://wkeakqjvu3gg" path="res://Sprites/placeholder_player.png" id="2_bqbmq"] +[ext_resource type="Texture2D" uid="uid://c48xkf5blwwwq" path="res://Sprites/pixil-layer-finAL-SPRITESHEET.png" id="2_jlxu3"] [ext_resource type="Texture2D" uid="uid://d2nqjxofehkum" path="res://Images/BladderHollow.png" id="3_nm4h4"] [ext_resource type="Shader" path="res://hud.gdshader" id="4_4u6cb"] [ext_resource type="Texture2D" uid="uid://b25de1d0yyuji" path="res://Images/Bladder.png" id="5_pcbeg"] [ext_resource type="Script" path="res://Bladder.gd" id="6_8x3rf"] +[sub_resource type="AtlasTexture" id="AtlasTexture_s1rkw"] +atlas = ExtResource("2_jlxu3") +region = Rect2(1, 1, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_uq23s"] +atlas = ExtResource("2_jlxu3") +region = Rect2(65, 1, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_nmvsr"] +atlas = ExtResource("2_jlxu3") +region = Rect2(129, 1, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_36iad"] +atlas = ExtResource("2_jlxu3") +region = Rect2(193, 1, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0eynp"] +atlas = ExtResource("2_jlxu3") +region = Rect2(1, 257, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7yul4"] +atlas = ExtResource("2_jlxu3") +region = Rect2(65, 257, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_kwoof"] +atlas = ExtResource("2_jlxu3") +region = Rect2(129, 257, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_j5hyc"] +atlas = ExtResource("2_jlxu3") +region = Rect2(193, 257, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_em3bu"] +atlas = ExtResource("2_jlxu3") +region = Rect2(1, 129, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_hulq3"] +atlas = ExtResource("2_jlxu3") +region = Rect2(193, 129, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_m8y1k"] +atlas = ExtResource("2_jlxu3") +region = Rect2(65, 129, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ea3w7"] +atlas = ExtResource("2_jlxu3") +region = Rect2(129, 129, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_h7rai"] +atlas = ExtResource("2_jlxu3") +region = Rect2(1, 385, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1g6fa"] +atlas = ExtResource("2_jlxu3") +region = Rect2(65, 385, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_431yo"] +atlas = ExtResource("2_jlxu3") +region = Rect2(193, 385, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_r7afy"] +atlas = ExtResource("2_jlxu3") +region = Rect2(129, 385, 64, 64) + [sub_resource type="SpriteFrames" id="SpriteFrames_mqbrd"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_bqbmq") +"texture": SubResource("AtlasTexture_s1rkw") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_uq23s") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_nmvsr") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_36iad") }], "loop": true, -"name": &"default", +"name": &"naked", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_0eynp") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7yul4") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_kwoof") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_j5hyc") +}], +"loop": true, +"name": &"pants", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_em3bu") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_hulq3") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_m8y1k") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ea3w7") +}], +"loop": true, +"name": &"shirt", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_h7rai") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1g6fa") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_431yo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_r7afy") +}], +"loop": true, +"name": &"shoes", "speed": 5.0 }] @@ -32,6 +156,8 @@ script = ExtResource("1_mbyc2") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] frames = SubResource("SpriteFrames_mqbrd") +animation = &"naked" +playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("RectangleShape2D_ng5bv") diff --git a/Projectiles/feather.tscn b/Projectiles/feather.tscn index 0de6af6..1310d20 100644 --- a/Projectiles/feather.tscn +++ b/Projectiles/feather.tscn @@ -15,7 +15,6 @@ animations = [{ }] [node name="basic_projectile" instance=ExtResource("1_5vj07")] -DAMAGE = 25 SPEED = 1000 LIFETIME = 0.5 HANG_TIME = 0.2 diff --git a/Projectiles/sand.tscn b/Projectiles/sand.tscn index 0d00132..00402d2 100644 --- a/Projectiles/sand.tscn +++ b/Projectiles/sand.tscn @@ -61,7 +61,7 @@ animations = [{ }] [node name="basic_projectile" instance=ExtResource("1_mqpki")] -DAMAGE = 2 +DAMAGE = 5 SPEED = 1000 LIFETIME = 0.1 HANG_TIME = 0.3 diff --git a/Sprites/pixil-layer-finAL-SPRITESHEET.png b/Sprites/pixil-layer-finAL-SPRITESHEET.png new file mode 100644 index 0000000..fcf56d1 Binary files /dev/null and b/Sprites/pixil-layer-finAL-SPRITESHEET.png differ diff --git a/Sprites/pixil-layer-finAL-SPRITESHEET.png.import b/Sprites/pixil-layer-finAL-SPRITESHEET.png.import new file mode 100644 index 0000000..52f66f7 --- /dev/null +++ b/Sprites/pixil-layer-finAL-SPRITESHEET.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c48xkf5blwwwq" +path="res://.godot/imported/pixil-layer-finAL-SPRITESHEET.png-28dc463b23a428df6f1ae22efbd3a3b4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/pixil-layer-finAL-SPRITESHEET.png" +dest_files=["res://.godot/imported/pixil-layer-finAL-SPRITESHEET.png-28dc463b23a428df6f1ae22efbd3a3b4.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/Weapons/pillow.tscn b/Weapons/pillow.tscn index 2f78893..f4c3d0a 100644 --- a/Weapons/pillow.tscn +++ b/Weapons/pillow.tscn @@ -6,7 +6,7 @@ [node name="pillow" instance=ExtResource("1_4irix")] PROJECTILE = ExtResource("2_ym5xc") -COOLDOWN = 0.05 +COOLDOWN = 0.1 SPREAD = 0.25 [node name="Sprite2D" parent="." index="0"] diff --git a/YouWin.tscn b/YouWin.tscn index eeaa4a0..3ae3ea4 100644 --- a/YouWin.tscn +++ b/YouWin.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://cwrom0u0cj2yi"] +[gd_scene load_steps=3 format=3 uid="uid://cgwf23texn2ur"] [ext_resource type="Script" path="res://YouWin.gd" id="1_ui55j"] [ext_resource type="Texture2D" uid="uid://dboun0ofe7h6f" path="res://Images/WIN_screen.png" id="2_b03md"] @@ -13,6 +13,7 @@ grow_vertical = 2 script = ExtResource("1_ui55j") [node name="ColorRect" type="ColorRect" parent="."] +layout_mode = 0 offset_right = 1901.0 offset_bottom = 1146.0 color = Color(0, 0, 0, 1) diff --git a/start.tscn b/start.tscn index d232056..b82e21c 100644 --- a/start.tscn +++ b/start.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://d25c4ey6gvduc"] +[gd_scene load_steps=4 format=3 uid="uid://c58wsmkklb7wq"] [ext_resource type="Texture2D" uid="uid://cg848qjc4fxi" path="res://Images/Main_menu.png" id="1_65g7h"] [ext_resource type="Script" path="res://start.gd" id="1_exncb"]