diff --git a/assets/sprites/environment/castle/DP_castle_back.png b/assets/sprites/environment/castle/DP_castle_back.png new file mode 100644 index 0000000..c82669c Binary files /dev/null and b/assets/sprites/environment/castle/DP_castle_back.png differ diff --git a/assets/sprites/environment/castle/DP_castle_back.png.import b/assets/sprites/environment/castle/DP_castle_back.png.import new file mode 100644 index 0000000..4a34e7a --- /dev/null +++ b/assets/sprites/environment/castle/DP_castle_back.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bc2lykc3gwykh" +path="res://.godot/imported/DP_castle_back.png-09e417c3e362cdd304a953528a228026.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/environment/castle/DP_castle_back.png" +dest_files=["res://.godot/imported/DP_castle_back.png-09e417c3e362cdd304a953528a228026.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/sprites/environment/castle/DP_castle_front.png b/assets/sprites/environment/castle/DP_castle_front.png new file mode 100644 index 0000000..30f0a99 Binary files /dev/null and b/assets/sprites/environment/castle/DP_castle_front.png differ diff --git a/assets/sprites/environment/castle/DP_castle_front.png.import b/assets/sprites/environment/castle/DP_castle_front.png.import new file mode 100644 index 0000000..c0d2565 --- /dev/null +++ b/assets/sprites/environment/castle/DP_castle_front.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1w6y1qvetsaw" +path="res://.godot/imported/DP_castle_front.png-86cf4f7646cd194d393b7487431e53a4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/environment/castle/DP_castle_front.png" +dest_files=["res://.godot/imported/DP_castle_front.png-86cf4f7646cd194d393b7487431e53a4.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/sprites/environment/castle/DP_castle_mid.png b/assets/sprites/environment/castle/DP_castle_mid.png new file mode 100644 index 0000000..0eb8329 Binary files /dev/null and b/assets/sprites/environment/castle/DP_castle_mid.png differ diff --git a/assets/sprites/environment/castle/DP_castle_mid.png.import b/assets/sprites/environment/castle/DP_castle_mid.png.import new file mode 100644 index 0000000..b1a2f6e --- /dev/null +++ b/assets/sprites/environment/castle/DP_castle_mid.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://o1e8lge2vuqu" +path="res://.godot/imported/DP_castle_mid.png-7555c7adf2663f544511929805938659.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/environment/castle/DP_castle_mid.png" +dest_files=["res://.godot/imported/DP_castle_mid.png-7555c7adf2663f544511929805938659.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/project.godot b/project.godot index 50059ac..e91c93b 100644 --- a/project.godot +++ b/project.godot @@ -18,7 +18,10 @@ config/icon="res://assets/sprites/icon.svg" [display] +window/size/viewport_width=600 +window/size/viewport_height=300 window/size/borderless=true +window/size/always_on_top=true window/size/transparent=true window/subwindows/embed_subwindows=false window/stretch/mode="viewport" diff --git a/scenes/clock/clock.tscn b/scenes/clock/clock.tscn index 5caf6fc..71447a6 100644 --- a/scenes/clock/clock.tscn +++ b/scenes/clock/clock.tscn @@ -10,6 +10,7 @@ transparent_bg = true size = Vector2i(200, 100) unresizable = true borderless = true +always_on_top = true transparent = true script = ExtResource("1_yxh3l") diff --git a/scenes/dragon_adder/dragon_adder.tscn b/scenes/dragon_adder/dragon_adder.tscn index ec18f25..485d80d 100644 --- a/scenes/dragon_adder/dragon_adder.tscn +++ b/scenes/dragon_adder/dragon_adder.tscn @@ -11,6 +11,7 @@ position = Vector2i(0, 36) size = Vector2i(500, 300) transient = true exclusive = true +always_on_top = true script = ExtResource("1_x83p2") hat_outfits = ExtResource("2_33u3u") shirt_outfits = ExtResource("3_xb0i6") diff --git a/scenes/dragon_editor/dragon_editor.tscn b/scenes/dragon_editor/dragon_editor.tscn index 4313713..11a7698 100644 --- a/scenes/dragon_editor/dragon_editor.tscn +++ b/scenes/dragon_editor/dragon_editor.tscn @@ -15,6 +15,7 @@ title = "Dragon Editor" position = Vector2i(0, 36) size = Vector2i(300, 500) +always_on_top = true min_size = Vector2i(300, 500) max_size = Vector2i(1000, 1000) script = ExtResource("1_8vkll") diff --git a/scenes/dragon_list/dragon_list.tscn b/scenes/dragon_list/dragon_list.tscn index 29e7d8c..76968bb 100644 --- a/scenes/dragon_list/dragon_list.tscn +++ b/scenes/dragon_list/dragon_list.tscn @@ -10,6 +10,7 @@ size = Vector2i(450, 700) transient = true exclusive = true +always_on_top = true script = ExtResource("1_q7g8i") dragon_list_entry = ExtResource("1_4vct3") dragon_list_view = NodePath("CanvasLayer/ScrollContainer/VBoxContainer") diff --git a/scenes/main.tscn b/scenes/main.tscn index cc638e2..4e82ecf 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=15 format=3 uid="uid://ctytpqaed0yqx"] +[gd_scene load_steps=17 format=3 uid="uid://ctytpqaed0yqx"] [ext_resource type="Script" uid="uid://3kyt3shje5r1" path="res://scenes/main.gd" id="1_sugp2"] [ext_resource type="PackedScene" uid="uid://c7nfcgjxqeg7l" path="res://scenes/window/dragon_popup.tscn" id="2_jyhfs"] -[ext_resource type="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://assets/sprites/icon.svg" id="3_tbgi4"] [ext_resource type="Resource" uid="uid://cnhwn6kfcbjl5" path="res://assets/outfits/hats.tres" id="4_85g3d"] [ext_resource type="PackedScene" uid="uid://bj5ptaniasaaj" path="res://scenes/clock/clock.tscn" id="4_a8y0u"] [ext_resource type="PackedScene" uid="uid://miutbdsgccd1" path="res://scenes/dragons/dragon.tscn" id="4_jyhfs"] @@ -14,6 +13,9 @@ [ext_resource type="PackedScene" uid="uid://tubxrqxjic6r" path="res://scenes/dragon_list/dragon_list.tscn" id="10_ya4ey"] [ext_resource type="Script" uid="uid://w60u0tg1hlvu" path="res://scenes/dragon_adder.gd" id="11_eb6dy"] [ext_resource type="PackedScene" uid="uid://oqa2ry73vqjf" path="res://scenes/dragon_adder/dragon_adder.tscn" id="12_trceg"] +[ext_resource type="Texture2D" uid="uid://bc2lykc3gwykh" path="res://assets/sprites/environment/castle/DP_castle_back.png" id="15_muem4"] +[ext_resource type="Texture2D" uid="uid://o1e8lge2vuqu" path="res://assets/sprites/environment/castle/DP_castle_mid.png" id="16_dp3eg"] +[ext_resource type="Texture2D" uid="uid://b1w6y1qvetsaw" path="res://assets/sprites/environment/castle/DP_castle_front.png" id="17_0ld40"] [node name="Base" type="Node2D" node_paths=PackedStringArray("dragon_spots")] script = ExtResource("1_sugp2") @@ -33,10 +35,10 @@ max_dragon_instantiation_time = 10.0 anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 -offset_left = -157.0 -offset_top = 50.0 -offset_right = -57.0 -offset_bottom = 150.0 +offset_left = -585.0 +offset_top = 11.0 +offset_right = -543.0 +offset_bottom = 42.0 grow_horizontal = 0 focus_mode = 0 text = "crea" @@ -47,10 +49,10 @@ dragon_editor = ExtResource("5_tefeu") anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 -offset_left = -156.0 -offset_top = 168.0 -offset_right = -56.0 -offset_bottom = 268.0 +offset_left = -525.0 +offset_top = 12.0 +offset_right = -474.0 +offset_bottom = 43.0 grow_horizontal = 0 focus_mode = 0 text = "tanca" @@ -59,10 +61,10 @@ text = "tanca" anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 -offset_left = -156.0 -offset_top = 288.0 -offset_right = -56.0 -offset_bottom = 388.0 +offset_left = -456.0 +offset_top = 14.0 +offset_right = -411.0 +offset_bottom = 45.0 grow_horizontal = 0 focus_mode = 0 text = "llista" @@ -73,29 +75,41 @@ dragon_list = ExtResource("10_ya4ey") anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 -offset_left = -156.0 -offset_top = 407.0 -offset_right = -56.0 -offset_bottom = 507.0 +offset_left = -393.0 +offset_top = 14.0 +offset_right = -329.0 +offset_bottom = 45.0 grow_horizontal = 0 focus_mode = 0 text = "afegeix" script = ExtResource("11_eb6dy") dragon_adder = ExtResource("12_trceg") -[node name="Icon" type="Sprite2D" parent="."] -position = Vector2(576, 324) -scale = Vector2(9, 5.0625) -texture = ExtResource("3_tbgi4") +[node name="Castle" type="Node2D" parent="."] + +[node name="DpCastleBack" type="Sprite2D" parent="Castle"] +z_index = -1 +position = Vector2(395, 159) +texture = ExtResource("15_muem4") + +[node name="DpCastleMid" type="Sprite2D" parent="Castle"] +z_index = -1 +position = Vector2(395, 159) +texture = ExtResource("16_dp3eg") + +[node name="DpCastleFront" type="Sprite2D" parent="Castle"] +z_index = 1 +position = Vector2(395, 159) +texture = ExtResource("17_0ld40") [node name="DragonSpot1" type="Node2D" parent="."] -position = Vector2(259, 450) +position = Vector2(53, 249) [node name="DragonSpot2" type="Node2D" parent="."] -position = Vector2(557, 239) +position = Vector2(142, 118) [node name="DragonSpot3" type="Node2D" parent="."] -position = Vector2(850, 360) +position = Vector2(207, 252) [connection signal="tree_entered" from="." to="." method="_on_tree_entered"] [connection signal="tree_exiting" from="." to="." method="_on_tree_exiting"] diff --git a/scenes/window/dragon_popup.tscn b/scenes/window/dragon_popup.tscn index 5c7df28..8d4ccde 100644 --- a/scenes/window/dragon_popup.tscn +++ b/scenes/window/dragon_popup.tscn @@ -10,6 +10,7 @@ transparent_bg = true size = Vector2i(76, 88) unresizable = true borderless = true +always_on_top = true transparent = true content_scale_mode = 2 script = ExtResource("1_ctdir")