diff --git a/active_scene.tscn b/active_scene.tscn index 76b514a..681fdff 100644 --- a/active_scene.tscn +++ b/active_scene.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cci652umkym1f" path="res://test_scene.gd" id="1_8p2cu"] [ext_resource type="PackedScene" uid="uid://cd08dp16bixfv" path="res://guildhall.tscn" id="1_fcxuj"] [ext_resource type="PackedScene" uid="uid://c8ofw6na082gv" path="res://main_panel.tscn" id="2_8p2cu"] -[ext_resource type="PackedScene" uid="uid://dly7in8ql1fn4" path="res://quest_log.tscn" id="4_tro8a"] +[ext_resource type="PackedScene" uid="uid://c7jagw4y7w42l" path="res://top_menu.tscn" id="6_46fpu"] [ext_resource type="Script" uid="uid://bnbljf6u2d3kh" path="res://visitor_spawner.gd" id="6_d0hfk"] [sub_resource type="NavigationPolygon" id="NavigationPolygon_eenn6"] @@ -36,6 +36,9 @@ position = Vector2(0, 172) [node name="CollisionShape2D" parent="Guildhall/Sprites/CharacterBody2D" index="0"] shape = SubResource("CapsuleShape2D_d0hfk") +[node name="Sprite2D" parent="Guildhall/Sprites/CharacterBody2D" index="1"] +position = Vector2(0, -43) + [node name="Quest Board" parent="Guildhall" index="3"] position = Vector2(927, 33) @@ -66,7 +69,12 @@ layout_mode = 2 [node name="Notices" type="Control" parent="UI/VBoxContainer"] layout_mode = 2 -[node name="Quest Log" parent="UI" instance=ExtResource("4_tro8a")] +[node name="Control" parent="UI" instance=ExtResource("6_46fpu")] +offset_left = 26.0 +offset_top = 119.0 +offset_right = 26.0 +offset_bottom = 119.0 +scale = Vector2(2, 2) [connection signal="timeout" from="Guildhall/VisitorSpawner/Timer" to="Guildhall/VisitorSpawner" method="_on_timer_timeout"] diff --git a/ai/trees/adventurer.tres b/ai/trees/adventurer.tres index 55236f4..6019331 100644 --- a/ai/trees/adventurer.tres +++ b/ai/trees/adventurer.tres @@ -104,7 +104,6 @@ custom_name = "TODO: Make them talk to a random other adventurer" [sub_resource type="BTDecorator" id="BTDecorator_jq6fo"] children = [SubResource("BTComment_mwsop")] script = ExtResource("2_mtixs") -activity = null [sub_resource type="BTCooldown" id="BTCooldown_mtixs"] duration = 5.0 diff --git a/basic-sprite.png b/basic-sprite.png index f3b7b8f..30afa06 100644 Binary files a/basic-sprite.png and b/basic-sprite.png differ diff --git a/guild.gd b/guild.gd index 14e7107..744c4cc 100644 --- a/guild.gd +++ b/guild.gd @@ -59,7 +59,7 @@ func has_guild_member(member : AdventurerData) -> bool: func add_quest(quest : Quest) -> void: quests[quest] = false - Game.quest_log.add_entry(quest) + #Game.quest_log.add_entry(quest) func assign_quest(member : AdventurerData, quest : Quest) -> void: member.assign_quest(quest) diff --git a/guild_employee.gd b/guild_employee.gd index feec4c4..d37354d 100644 --- a/guild_employee.gd +++ b/guild_employee.gd @@ -8,4 +8,5 @@ signal service_provided() func interact(interactor, type : String = "") -> void: if type == "register": Guild.register_guild_member(interactor.data, true) + #interactor.advance_ service_provided.emit() diff --git a/profile_popup.tscn b/profile_popup.tscn index 1118d82..a7a4e04 100644 --- a/profile_popup.tscn +++ b/profile_popup.tscn @@ -7,8 +7,8 @@ [node name="Profile Popup" type="Control"] layout_mode = 3 anchors_preset = 0 -offset_top = -123.0 -offset_bottom = -123.0 +offset_top = -99.0 +offset_bottom = -99.0 mouse_filter = 2 script = ExtResource("1_pmp85") diff --git a/test_adventurer_sprite.tscn b/test_adventurer_sprite.tscn index ce1def2..7b1fe69 100644 --- a/test_adventurer_sprite.tscn +++ b/test_adventurer_sprite.tscn @@ -12,7 +12,7 @@ height = 54.0 [sub_resource type="BlackboardPlan" id="BlackboardPlan_tdl5m"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_aos2b"] -size = Vector2(62, 132) +size = Vector2(54, 97) [node name="AdventurerSprite" type="CharacterBody2D"] script = ExtResource("1_wif60") @@ -24,7 +24,7 @@ shape = SubResource("CapsuleShape2D_aos2b") [node name="Sprite2D" type="Sprite2D" parent="."] modulate = Color(0, 1, 0, 1) -position = Vector2(0, -64) +position = Vector2(0, -43) texture = ExtResource("2_aos2b") [node name="NavigationAgent2D" type="NavigationAgent2D" parent="."] @@ -32,7 +32,7 @@ path_desired_distance = 30.0 avoidance_enabled = true [node name="SpeechBubble" parent="." instance=ExtResource("3_aos2b")] -position = Vector2(44, -141) +position = Vector2(39, -110) [node name="BTPlayer" type="BTPlayer" parent="."] behavior_tree = ExtResource("6_006nh") @@ -41,7 +41,7 @@ blackboard_plan = SubResource("BlackboardPlan_tdl5m") [node name="HoverArea" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="HoverArea"] -position = Vector2(0, -57) +position = Vector2(0, -43.5) shape = SubResource("RectangleShape2D_aos2b") [connection signal="mouse_entered" from="HoverArea" to="." method="_on_mouse_entered"] diff --git a/top-icon-members-hover.png b/top-icon-members-hover.png new file mode 100644 index 0000000..1f1b3a0 Binary files /dev/null and b/top-icon-members-hover.png differ diff --git a/top-icon-members-hover.png.import b/top-icon-members-hover.png.import new file mode 100644 index 0000000..958ea7b --- /dev/null +++ b/top-icon-members-hover.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://hc1lmivi4bjs" +path="res://.godot/imported/top-icon-members-hover.png-a642015958c73d05eb5e09ae37c6f8f7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://top-icon-members-hover.png" +dest_files=["res://.godot/imported/top-icon-members-hover.png-a642015958c73d05eb5e09ae37c6f8f7.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/top-icon-members.png b/top-icon-members.png new file mode 100644 index 0000000..88b8507 Binary files /dev/null and b/top-icon-members.png differ diff --git a/top-icon-members.png.import b/top-icon-members.png.import new file mode 100644 index 0000000..c010ed4 --- /dev/null +++ b/top-icon-members.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0e0iw8osv0qh" +path="res://.godot/imported/top-icon-members.png-ea36db52922ab58d0fbf515e5939eb88.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://top-icon-members.png" +dest_files=["res://.godot/imported/top-icon-members.png-ea36db52922ab58d0fbf515e5939eb88.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/top-icon-policies-hover.png b/top-icon-policies-hover.png new file mode 100644 index 0000000..db38a8a Binary files /dev/null and b/top-icon-policies-hover.png differ diff --git a/top-icon-policies-hover.png.import b/top-icon-policies-hover.png.import new file mode 100644 index 0000000..5ec7624 --- /dev/null +++ b/top-icon-policies-hover.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://is4b1a0jroee" +path="res://.godot/imported/top-icon-policies-hover.png-444880f357a1a0c4c05c99d35578af5a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://top-icon-policies-hover.png" +dest_files=["res://.godot/imported/top-icon-policies-hover.png-444880f357a1a0c4c05c99d35578af5a.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/top-icon-policies.png b/top-icon-policies.png new file mode 100644 index 0000000..9d6d4d4 Binary files /dev/null and b/top-icon-policies.png differ diff --git a/top-icon-policies.png.import b/top-icon-policies.png.import new file mode 100644 index 0000000..e3065c7 --- /dev/null +++ b/top-icon-policies.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dpakd262awyrv" +path="res://.godot/imported/top-icon-policies.png-d38e6a215faaf5b3596ec393391dc977.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://top-icon-policies.png" +dest_files=["res://.godot/imported/top-icon-policies.png-d38e6a215faaf5b3596ec393391dc977.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/top-icon-quests-hover.png b/top-icon-quests-hover.png new file mode 100644 index 0000000..73ad6aa Binary files /dev/null and b/top-icon-quests-hover.png differ diff --git a/top-icon-quests-hover.png.import b/top-icon-quests-hover.png.import new file mode 100644 index 0000000..a945c87 --- /dev/null +++ b/top-icon-quests-hover.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3s762qc45n68" +path="res://.godot/imported/top-icon-quests-hover.png-9e921267449390437c485904f8bb98e2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://top-icon-quests-hover.png" +dest_files=["res://.godot/imported/top-icon-quests-hover.png-9e921267449390437c485904f8bb98e2.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/top-icon-quests.png b/top-icon-quests.png new file mode 100644 index 0000000..d6bc5ec Binary files /dev/null and b/top-icon-quests.png differ diff --git a/top-icon-quests.png.import b/top-icon-quests.png.import new file mode 100644 index 0000000..170bd16 --- /dev/null +++ b/top-icon-quests.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c2iyta0nbba4v" +path="res://.godot/imported/top-icon-quests.png-414c24eb1a95ccd37bfeb19a800beda6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://top-icon-quests.png" +dest_files=["res://.godot/imported/top-icon-quests.png-414c24eb1a95ccd37bfeb19a800beda6.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/top-menu-icons.aseprite b/top-menu-icons.aseprite new file mode 100644 index 0000000..0d4a370 Binary files /dev/null and b/top-menu-icons.aseprite differ diff --git a/top-menu-icons.png b/top-menu-icons.png new file mode 100644 index 0000000..a03a04a Binary files /dev/null and b/top-menu-icons.png differ diff --git a/top-menu-icons.png.import b/top-menu-icons.png.import new file mode 100644 index 0000000..9856e49 --- /dev/null +++ b/top-menu-icons.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bickdgnvo2ft8" +path="res://.godot/imported/top-menu-icons.png-8593d9c1489bc13e85df5195126e7866.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://top-menu-icons.png" +dest_files=["res://.godot/imported/top-menu-icons.png-8593d9c1489bc13e85df5195126e7866.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/top_menu.tscn b/top_menu.tscn new file mode 100644 index 0000000..8df1e88 --- /dev/null +++ b/top_menu.tscn @@ -0,0 +1,56 @@ +[gd_scene load_steps=9 format=3 uid="uid://c7jagw4y7w42l"] + +[ext_resource type="Texture2D" uid="uid://c0e0iw8osv0qh" path="res://top-icon-members.png" id="1_krxmy"] +[ext_resource type="Texture2D" uid="uid://hc1lmivi4bjs" path="res://top-icon-members-hover.png" id="2_370kg"] +[ext_resource type="Texture2D" uid="uid://c2iyta0nbba4v" path="res://top-icon-quests.png" id="3_o3fau"] +[ext_resource type="Texture2D" uid="uid://d3s762qc45n68" path="res://top-icon-quests-hover.png" id="4_ehkcg"] +[ext_resource type="Texture2D" uid="uid://dpakd262awyrv" path="res://top-icon-policies.png" id="5_3nqsh"] +[ext_resource type="Texture2D" uid="uid://is4b1a0jroee" path="res://top-icon-policies-hover.png" id="6_8h6j7"] + +[sub_resource type="Gradient" id="Gradient_7d00h"] + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_len8m"] +gradient = SubResource("Gradient_7d00h") +width = 1 + +[node name="Control" type="Control"] +layout_mode = 3 +anchors_preset = 0 +offset_left = 14.0 +offset_top = 58.0 +offset_right = 14.0 +offset_bottom = 58.0 + +[node name="TextureRect" type="TextureRect" parent="."] +layout_mode = 0 +offset_top = -20.0 +offset_right = 150.0 +offset_bottom = -1.0 +texture = SubResource("GradientTexture1D_len8m") + +[node name="MembersButton" type="TextureButton" parent="."] +layout_mode = 0 +offset_left = 10.0 +offset_top = -48.0 +offset_right = 58.0 +texture_normal = ExtResource("1_krxmy") +texture_pressed = ExtResource("2_370kg") +texture_hover = ExtResource("2_370kg") + +[node name="QuestsButton" type="TextureButton" parent="."] +layout_mode = 0 +offset_left = 57.0 +offset_top = -48.0 +offset_right = 105.0 +texture_normal = ExtResource("3_o3fau") +texture_pressed = ExtResource("4_ehkcg") +texture_hover = ExtResource("4_ehkcg") + +[node name="PoliciesButton" type="TextureButton" parent="."] +layout_mode = 0 +offset_left = 102.0 +offset_top = -48.0 +offset_right = 150.0 +texture_normal = ExtResource("5_3nqsh") +texture_pressed = ExtResource("6_8h6j7") +texture_hover = ExtResource("6_8h6j7")