diff --git a/buildings/room_pedastal.tscn b/buildings/room_pedastal.tscn index ed17a92..bd5ba3a 100644 --- a/buildings/room_pedastal.tscn +++ b/buildings/room_pedastal.tscn @@ -33,12 +33,12 @@ script = ExtResource("4_1cnhw") position = Vector2(-38, -481) [node name="Platform" parent="EnemyList" instance=ExtResource("6_caaff")] -z_index = 15 +visible = false position = Vector2(75, -585) collision_layer = 41 [node name="Platform2" parent="EnemyList" instance=ExtResource("6_caaff")] -z_index = 15 +visible = false position = Vector2(225, -585) collision_layer = 41 diff --git a/items/ItemShine.png b/items/ItemShine.png new file mode 100644 index 0000000..957daa1 Binary files /dev/null and b/items/ItemShine.png differ diff --git a/items/ItemShine.png.import b/items/ItemShine.png.import new file mode 100644 index 0000000..da011e4 --- /dev/null +++ b/items/ItemShine.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d4mrbgfl7jpqq" +path="res://.godot/imported/ItemShine.png-41425a3fac8f6530e2b2e4df0c180258.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://items/ItemShine.png" +dest_files=["res://.godot/imported/ItemShine.png-41425a3fac8f6530e2b2e4df0c180258.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/items/active_items/updash/updash.png b/items/active_items/updash/updash.png new file mode 100644 index 0000000..27cae9e Binary files /dev/null and b/items/active_items/updash/updash.png differ diff --git a/items/active_items/updash/updash.png.import b/items/active_items/updash/updash.png.import new file mode 100644 index 0000000..73d4863 --- /dev/null +++ b/items/active_items/updash/updash.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dxcfkdhl4g24c" +path="res://.godot/imported/updash.png-ddc6856a4b101f20557ef85572ee190a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://items/active_items/updash/updash.png" +dest_files=["res://.godot/imported/updash.png-ddc6856a4b101f20557ef85572ee190a.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/items/active_items/updash/updash.tscn b/items/active_items/updash/updash.tscn index 364c94b..597f179 100644 --- a/items/active_items/updash/updash.tscn +++ b/items/active_items/updash/updash.tscn @@ -1,22 +1,37 @@ -[gd_scene load_steps=5 format=3 uid="uid://ewe36lqcjojk"] +[gd_scene load_steps=6 format=3 uid="uid://ewe36lqcjojk"] [ext_resource type="Script" uid="uid://bbwsc2a2hd0ow" path="res://items/active_items/updash/updash.gd" id="1_ghbl6"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="1_ptc3l"] +[ext_resource type="Texture2D" uid="uid://dxcfkdhl4g24c" path="res://items/active_items/updash/updash.png" id="3_a5yxq"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_ktv3s"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_ssiqx"] [sub_resource type="CircleShape2D" id="CircleShape2D_ghbl6"] +radius = 12.6667 [node name="Updash" type="Area2D"] script = ExtResource("1_ghbl6") -sprite = ExtResource("1_ptc3l") +sprite = ExtResource("3_a5yxq") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -scale = Vector2(3, 3) +visible = false +position = Vector2(0, 19) +scale = Vector2(3, 2) shape = SubResource("CircleShape2D_ghbl6") +[node name="CollisionShape2D2" type="CollisionShape2D" parent="."] +visible = false +position = Vector2(0, -4) +scale = Vector2(1, 4) +shape = SubResource("CircleShape2D_ghbl6") + +[node name="Sprite2D2" type="Sprite2D" parent="."] +modulate = Color(0.583047, 0.321422, 0.988413, 1) +position = Vector2(0, 15) +scale = Vector2(1.2, 1.2) +texture = ExtResource("3_ssiqx") + [node name="Sprite2D" type="Sprite2D" parent="."] -modulate = Color(1, 0, 1, 1) -scale = Vector2(0.45, 0.45) -texture = ExtResource("1_ptc3l") +scale = Vector2(0.8, 0.8) +texture = ExtResource("3_a5yxq") [node name="EarthAligner" parent="." instance=ExtResource("3_ktv3s")] diff --git a/items/immediate_items/heal_item/heal_item.tscn b/items/immediate_items/heal_item/heal_item.tscn index 4ab1ef5..0ca3195 100644 --- a/items/immediate_items/heal_item/heal_item.tscn +++ b/items/immediate_items/heal_item/heal_item.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://b00185vygcka1"] +[gd_scene load_steps=6 format=3 uid="uid://b00185vygcka1"] [ext_resource type="Script" uid="uid://b43fudwi47qfd" path="res://items/immediate_items/heal_item/heal_item.gd" id="1_3vbv8"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="2_48lih"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_evqwq"] +[ext_resource type="Texture2D" uid="uid://djfc7sdc8wxp6" path="res://player/Heart_cut.png" id="3_fvuym"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_sr4am"] [sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] @@ -12,9 +13,15 @@ script = ExtResource("1_3vbv8") [node name="EarthAligner" parent="." instance=ExtResource("2_evqwq")] [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -scale = Vector2(7, 7) +scale = Vector2(2.4, 3.36) shape = SubResource("CircleShape2D_hvhjo") +[node name="Sprite2D2" type="Sprite2D" parent="."] +position = Vector2(1, -1) +scale = Vector2(1.2, 1.2) +texture = ExtResource("4_sr4am") + [node name="Sprite2D" type="Sprite2D" parent="."] -modulate = Color(1, 1, 0, 1) -texture = ExtResource("2_48lih") +position = Vector2(4, -3) +scale = Vector2(1.4, 1.4) +texture = ExtResource("3_fvuym") diff --git a/items/immediate_items/healthup/healthup.tscn b/items/immediate_items/healthup/healthup.tscn index 9ab798e..425c3a6 100644 --- a/items/immediate_items/healthup/healthup.tscn +++ b/items/immediate_items/healthup/healthup.tscn @@ -1,21 +1,36 @@ -[gd_scene load_steps=5 format=3 uid="uid://gwctb2xqsbj"] +[gd_scene load_steps=7 format=3 uid="uid://gwctb2xqsbj"] [ext_resource type="Script" uid="uid://ce6fxbjarlvtk" path="res://items/immediate_items/healthup/healthup.gd" id="1_ivtxh"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_lolop"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="3_v056v"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_gb062"] +[ext_resource type="Texture2D" uid="uid://ctwu08w867gax" path="res://player/Heart_cut Grey.png" id="4_uq82b"] +[ext_resource type="Texture2D" uid="uid://djfc7sdc8wxp6" path="res://player/Heart_cut.png" id="5_m76tj"] -[sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] +[sub_resource type="CircleShape2D" id="CircleShape2D_rlcnv"] [node name="HealthUp" type="Area2D"] -scale = Vector2(1, -1) script = ExtResource("1_ivtxh") [node name="EarthAligner" parent="." instance=ExtResource("2_lolop")] [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -scale = Vector2(7, 7) -shape = SubResource("CircleShape2D_hvhjo") +visible = false +scale = Vector2(2.4, 3.36) +shape = SubResource("CircleShape2D_rlcnv") + +[node name="Sprite2D2" type="Sprite2D" parent="."] +modulate = Color(0.583047, 0.321422, 0.988413, 1) +position = Vector2(1, -1) +scale = Vector2(1.2, 1.2) +texture = ExtResource("3_gb062") + +[node name="Sprite2D3" type="Sprite2D" parent="."] +modulate = Color(1, 0.853464, 0.355128, 1) +position = Vector2(5, -3) +scale = Vector2(1.6, 1.6) +texture = ExtResource("4_uq82b") [node name="Sprite2D" type="Sprite2D" parent="."] -modulate = Color(1, 1, 0, 1) -texture = ExtResource("3_v056v") +position = Vector2(4, -3) +scale = Vector2(1.4, 1.4) +texture = ExtResource("5_m76tj") diff --git a/items/permanent_items/backslash.png b/items/permanent_items/backslash.png new file mode 100644 index 0000000..6b5989b Binary files /dev/null and b/items/permanent_items/backslash.png differ diff --git a/items/permanent_items/backslash.png.import b/items/permanent_items/backslash.png.import new file mode 100644 index 0000000..9858f53 --- /dev/null +++ b/items/permanent_items/backslash.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7mrm8uel7r36" +path="res://.godot/imported/backslash.png-149a372aa6b01851fbdc2c6a7a2e54db.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://items/permanent_items/backslash.png" +dest_files=["res://.godot/imported/backslash.png-149a372aa6b01851fbdc2c6a7a2e54db.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/items/permanent_items/backslash.tscn b/items/permanent_items/backslash.tscn index bede36b..0f9252b 100644 --- a/items/permanent_items/backslash.tscn +++ b/items/permanent_items/backslash.tscn @@ -1,23 +1,31 @@ -[gd_scene load_steps=6 format=3 uid="uid://bbpf28ohayd8n"] +[gd_scene load_steps=7 format=3 uid="uid://bbpf28ohayd8n"] [ext_resource type="Script" uid="uid://blg876atd71cg" path="res://items/permanent_items/backslash.gd" id="1_s4bdx"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_kiuxs"] [ext_resource type="PackedScene" uid="uid://d3e3kuyeh6mr1" path="res://player/sword.tscn" id="2_u6vk4"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="3_vb0oa"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_legpc"] +[ext_resource type="Texture2D" uid="uid://c7mrm8uel7r36" path="res://items/permanent_items/backslash.png" id="5_qg660"] [sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] [node name="Backslash" type="Area2D"] -scale = Vector2(1, -1) script = ExtResource("1_s4bdx") sword = ExtResource("2_u6vk4") [node name="EarthAligner" parent="." instance=ExtResource("2_kiuxs")] [node name="CollisionShape2D" type="CollisionShape2D" parent="."] +visible = false scale = Vector2(7, 7) shape = SubResource("CircleShape2D_hvhjo") +[node name="Sprite2D2" type="Sprite2D" parent="."] +modulate = Color(0.725757, 0.519822, 5.77569e-07, 1) +position = Vector2(2, 2) +scale = Vector2(2.5, 2.5) +texture = ExtResource("4_legpc") + [node name="Sprite2D" type="Sprite2D" parent="."] -modulate = Color(0.686275, 0.160784, 0.529412, 1) -texture = ExtResource("3_vb0oa") +position = Vector2(-3, -2) +scale = Vector2(1.2, 1.2) +texture = ExtResource("5_qg660") diff --git a/items/permanent_items/extrajump.png b/items/permanent_items/extrajump.png new file mode 100644 index 0000000..df48b30 Binary files /dev/null and b/items/permanent_items/extrajump.png differ diff --git a/items/permanent_items/extrajump.png.import b/items/permanent_items/extrajump.png.import new file mode 100644 index 0000000..881168b --- /dev/null +++ b/items/permanent_items/extrajump.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dicx1uk4187dq" +path="res://.godot/imported/extrajump.png-5c34a7cf40e9d4d17063d874a102c414.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://items/permanent_items/extrajump.png" +dest_files=["res://.godot/imported/extrajump.png-5c34a7cf40e9d4d17063d874a102c414.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/items/permanent_items/extrajump.tscn b/items/permanent_items/extrajump.tscn index 4c92225..75b9d22 100644 --- a/items/permanent_items/extrajump.tscn +++ b/items/permanent_items/extrajump.tscn @@ -1,21 +1,29 @@ -[gd_scene load_steps=5 format=3 uid="uid://wc7kgtomy6xm"] +[gd_scene load_steps=6 format=3 uid="uid://wc7kgtomy6xm"] [ext_resource type="Script" uid="uid://bnr7cpjuvy6xj" path="res://items/permanent_items/extrajump.gd" id="1_t7gtn"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_70c5v"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="3_qmwml"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_hw3fr"] +[ext_resource type="Texture2D" uid="uid://dicx1uk4187dq" path="res://items/permanent_items/extrajump.png" id="3_t7gtn"] -[sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] +[sub_resource type="RectangleShape2D" id="RectangleShape2D_hw3fr"] +size = Vector2(78, 82) [node name="ExtraJump" type="Area2D"] -scale = Vector2(1, -1) script = ExtResource("1_t7gtn") [node name="EarthAligner" parent="." instance=ExtResource("2_70c5v")] [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -scale = Vector2(7, 7) -shape = SubResource("CircleShape2D_hvhjo") +visible = false +position = Vector2(1.90735e-06, 0.999999) +shape = SubResource("RectangleShape2D_hw3fr") + +[node name="Sprite2D2" type="Sprite2D" parent="."] +modulate = Color(0.583047, 0.321422, 0.988413, 1) +position = Vector2(0, 2) +scale = Vector2(1.5, 1.5) +texture = ExtResource("3_hw3fr") [node name="Sprite2D" type="Sprite2D" parent="."] -modulate = Color(2.00392, 2.00392, 2.00392, 1) -texture = ExtResource("3_qmwml") +scale = Vector2(0.7, 0.7) +texture = ExtResource("3_t7gtn") diff --git a/main.tscn b/main.tscn index f218caf..ba69085 100644 --- a/main.tscn +++ b/main.tscn @@ -67,6 +67,7 @@ z_index = 15 layer = -1 [node name="ColorRect" type="TextureRect" parent="Background"] +modulate = Color(0.544974, 0.544974, 0.544974, 1) anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/ui/item_ui/item_ui.tscn b/ui/item_ui/item_ui.tscn index ad31230..acef0be 100644 --- a/ui/item_ui/item_ui.tscn +++ b/ui/item_ui/item_ui.tscn @@ -9,7 +9,7 @@ border_width_left = 5 border_width_top = 5 border_width_right = 5 border_width_bottom = 5 -border_color = Color(0, 0, 0, 0.69411767) +border_color = Color(0, 0, 0, 0.694118) border_blend = true corner_radius_top_left = 50 corner_radius_top_right = 50 diff --git a/utils/platform.png b/utils/platform.png new file mode 100644 index 0000000..6c5bff8 Binary files /dev/null and b/utils/platform.png differ diff --git a/utils/platform.png.import b/utils/platform.png.import new file mode 100644 index 0000000..0dcf1b9 --- /dev/null +++ b/utils/platform.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dx1q5flmub36" +path="res://.godot/imported/platform.png-5334741150dcada29b5e7aa3769fe64f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://utils/platform.png" +dest_files=["res://.godot/imported/platform.png-5334741150dcada29b5e7aa3769fe64f.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/utils/platform.tscn b/utils/platform.tscn index 16d556c..a271e6c 100644 --- a/utils/platform.tscn +++ b/utils/platform.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://4l3elvxpghw8"] [ext_resource type="Script" uid="uid://dwmquoam37sve" path="res://utils/platform.gd" id="1_c1gtx"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="1_s8bxr"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_c1gtx"] +[ext_resource type="Texture2D" uid="uid://dx1q5flmub36" path="res://utils/platform.png" id="2_olh5f"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ry5bi"] size = Vector2(56, 6) @@ -18,8 +18,8 @@ one_way_collision = true one_way_collision_margin = 2.0 [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2(-0.5, -1.90735e-06) -scale = Vector2(0.429688, 0.046875) -texture = ExtResource("1_s8bxr") +position = Vector2(-0.359969, 9.03226) +scale = Vector2(0.122334, 0.1) +texture = ExtResource("2_olh5f") [node name="EarthAligner" parent="." instance=ExtResource("2_c1gtx")]