diff --git a/buildings/Building 1x2 fixed.png b/buildings/Building 1x2 fixed.png index 3b9345f..099253f 100644 Binary files a/buildings/Building 1x2 fixed.png and b/buildings/Building 1x2 fixed.png differ diff --git a/buildings/Building 2x1 downside.png b/buildings/Building 2x1 downside.png index ecab260..14ff7b3 100644 Binary files a/buildings/Building 2x1 downside.png and b/buildings/Building 2x1 downside.png differ diff --git a/buildings/Building 2x1 fixed.png b/buildings/Building 2x1 fixed.png index bc86c15..97ad65b 100644 Binary files a/buildings/Building 2x1 fixed.png and b/buildings/Building 2x1 fixed.png differ diff --git a/enemies/leech/segment.pdn b/enemies/leech/segment.pdn new file mode 100644 index 0000000..d41217f Binary files /dev/null and b/enemies/leech/segment.pdn differ diff --git a/enemies/leech/segment.png b/enemies/leech/segment.png new file mode 100644 index 0000000..74e856b Binary files /dev/null and b/enemies/leech/segment.png differ diff --git a/enemies/leech/segment.png.import b/enemies/leech/segment.png.import new file mode 100644 index 0000000..6fc0cb2 --- /dev/null +++ b/enemies/leech/segment.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bx4w0yifutm7y" +path="res://.godot/imported/segment.png-cdd72fb07696c7bd21dcdf251ba1e79d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://enemies/leech/segment.png" +dest_files=["res://.godot/imported/segment.png-cdd72fb07696c7bd21dcdf251ba1e79d.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/enemies/leech/segment.tscn b/enemies/leech/segment.tscn index 36d90e9..0a9f271 100644 --- a/enemies/leech/segment.tscn +++ b/enemies/leech/segment.tscn @@ -1,20 +1,22 @@ [gd_scene load_steps=5 format=3 uid="uid://cvoicwo2xnf7e"] [ext_resource type="Script" uid="uid://b3q5khoqnnicx" path="res://enemies/leech/segment.gd" id="1_o43lr"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="2_sa5vt"] +[ext_resource type="Texture2D" uid="uid://bx4w0yifutm7y" path="res://enemies/leech/segment.png" id="2_jsq5k"] [ext_resource type="PackedScene" uid="uid://mtfsdd4cdf3a" path="res://utils/enemy_hurtbox.tscn" id="3_sa5vt"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_fgt1l"] [node name="Segment" type="Area2D"] +z_index = -1 collision_layer = 0 collision_mask = 4 script = ExtResource("1_o43lr") [node name="Sprite2D" type="Sprite2D" parent="."] -modulate = Color(0.309804, 0.113725, 0, 1) -scale = Vector2(0.315, 0.16) -texture = ExtResource("2_sa5vt") +position = Vector2(-1.9073486e-06, 0) +rotation = 1.5707964 +scale = Vector2(0.6233792, 0.6257627) +texture = ExtResource("2_jsq5k") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] scale = Vector2(2, 1) @@ -26,6 +28,7 @@ canvasItem = NodePath("..") flashColor = Color(2.00392, 2.00392, 2.00392, 1) [node name="CollisionShape2D" type="CollisionShape2D" parent="EnemyHurtbox"] +visible = false scale = Vector2(2, 1) shape = SubResource("RectangleShape2D_fgt1l") diff --git a/main.tscn b/main.tscn index ae011bd..c26f383 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://cxo6bq26huau7"] +[gd_scene load_steps=14 format=3 uid="uid://cxo6bq26huau7"] [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"] [ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"] @@ -13,7 +13,6 @@ [ext_resource type="PackedScene" uid="uid://ca5ndobertnp4" path="res://water/water.tscn" id="10_4c57u"] [ext_resource type="Script" uid="uid://cpaskpj67pnaj" path="res://enemies/boss/boss_spawner.gd" id="10_efxa6"] [ext_resource type="PackedScene" uid="uid://cpe4s6vsn0ujd" path="res://enemies/boss/boss.tscn" id="11_efxa6"] -[ext_resource type="PackedScene" uid="uid://bpgo1djj8f1rg" path="res://items/permanent_items/high_jump.tscn" id="14_w48qg"] [node name="main" type="Node2D"] @@ -89,9 +88,6 @@ texture = ExtResource("3_kek77") script = ExtResource("10_efxa6") boss = ExtResource("11_efxa6") -[node name="HighJump" parent="." instance=ExtResource("14_w48qg")] -position = Vector2(139, -3123) - [connection signal="active_item_changed" from="Player" to="UIOverlay/ItemUI" method="_on_player_active_item_changed"] [connection signal="health_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_health_changed"] [connection signal="max_hp_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_max_hp_changed"] diff --git a/player/player.tscn b/player/player.tscn index b735898..0f6e2cf 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -19,7 +19,8 @@ [ext_resource type="AudioStream" uid="uid://ds0yw3au0quae" path="res://sounds/whoosh.mp3" id="12_ebec5"] [ext_resource type="AudioStream" uid="uid://c3pqq5yi1686n" path="res://sounds/sword_swing.wav" id="17_tqiix"] -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_onrkg"] +[sub_resource type="RectangleShape2D" id="RectangleShape2D_e7oew"] +size = Vector2(20, 27.777777) [sub_resource type="SpriteFrames" id="SpriteFrames_dw050"] animations = [{ @@ -83,9 +84,9 @@ script = ExtResource("1_4flbx") double_jump_animation = ExtResource("10_8t03j") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(0, 5.6) +position = Vector2(0.2, 6) scale = Vector2(0.7, 0.72) -shape = SubResource("CapsuleShape2D_onrkg") +shape = SubResource("RectangleShape2D_e7oew") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] scale = Vector2(0.37, 0.37) @@ -95,7 +96,6 @@ animation = &"attack" [node name="EarthAligner" parent="." instance=ExtResource("3_i3pqv")] [node name="Sword" parent="." instance=ExtResource("4_yw30f")] -scale = Vector2(1, 1) [node name="ActiveItemCooldown" type="Timer" parent="."] one_shot = true diff --git a/world/earth.tscn b/world/earth.tscn index c4f8a63..3c944d2 100644 --- a/world/earth.tscn +++ b/world/earth.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://vgxh2xdevat7" path="res://world/earth.gd" id="1_wxnww"] [ext_resource type="Script" uid="uid://m3vyyfk8gnma" path="res://world/grid.gd" id="3_2bhor"] -[ext_resource type="Shader" path="res://world/earth.gdshader" id="3_640fc"] +[ext_resource type="Shader" uid="uid://ptqflyxta2qd" path="res://world/earth.gdshader" id="3_640fc"] [ext_resource type="PackedScene" uid="uid://djawvtdwp423v" path="res://buildings/room_temple.tscn" id="3_nihcy"] [ext_resource type="PackedScene" uid="uid://cmofmd0vf3hx3" path="res://buildings/room_haunted_house.tscn" id="4_ml5no"] [ext_resource type="PackedScene" uid="uid://dliwqqmrxldjh" path="res://buildings/room_bear_trap.tscn" id="4_r4pw8"] @@ -30,6 +30,7 @@ collision_layer = 41 shape = SubResource("CircleShape2D_5i67w") [node name="MeshInstance2D" type="MeshInstance2D" parent="Ground"] +z_index = 10 material = SubResource("ShaderMaterial_abvrx") scale = Vector2(6000, 6000) mesh = SubResource("QuadMesh_ej0af")