Skip to content

Commit

Permalink
Fixed merge error
Browse files Browse the repository at this point in the history
Added a bottom GUI for Character, Inventory, Quest, Shop, Settings added the Quest functionality in the game, This is Quest being able to move from In-process to the Completed area. Quest in this menu are scroll-able being that the In-process ones are first and completed shown later. This has a helper window that displays the conditions for completing the quest.
This quest Menu is movable by the player, Note: it does not save any placement in the save file, this could be a feature added. This quest system will remember the quest players have completed since it uses the save file. Files being organized by what system they fall into
  • Loading branch information
Ruben14789 committed Apr 15, 2024
1 parent 053af49 commit 451ac6a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 9 additions & 3 deletions Game/LifeQuest/game_scene.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[gd_scene load_steps=9 format=3 uid="uid://ccuoxmewdujb4"]
[gd_scene load_steps=11 format=3 uid="uid://ccuoxmewdujb4"]

[ext_resource type="Texture2D" uid="uid://sp5sqsqilkte" path="res://Sprites/tilemap_Floor_spaced_smaller.png" id="1_khfqp"]
[ext_resource type="Script" path="res://game_scene.gd" id="1_xu6qf"]
[ext_resource type="Script" path="res://Scripts/Inventory GUI/UserInterface.gd" id="2_rva7x"]
[ext_resource type="PackedScene" uid="uid://bqwh0ar8cqyro" path="res://inventory.tscn" id="2_vgroc"]
[ext_resource type="PackedScene" uid="uid://dlefoq5yaab4c" path="res://Scripts/Bottom GUI Buttons/bottom_gui.tscn" id="5_ie0r0"]
[ext_resource type="PackedScene" uid="uid://dc481yfgddn04" path="res://Scripts/Quest/Quest Menu.tscn" id="6_bdd2w"]
[ext_resource type="PackedScene" uid="uid://ccwd1ftqobgn8" path="res://in_game_menu.tscn" id="6_satse"]

[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_olttd"]
Expand Down Expand Up @@ -160,7 +162,6 @@ offset_top = 236.0
offset_right = 638.0
offset_bottom = 308.0
text = "This is the game level placeholder"
metadata/_edit_use_anchors_ = true

[node name="TileMap" type="TileMap" parent="."]
tile_set = SubResource("TileSet_b1e8q")
Expand All @@ -170,11 +171,16 @@ layer_0/tile_data = PackedInt32Array(524288, 131072, 2, 524289, 131072, 2, 52429
[node name="UserInterface" type="CanvasLayer" parent="."]
script = ExtResource("2_rva7x")

[node name="BottomGUI" parent="UserInterface" instance=ExtResource("4_141gg")]
[node name="Bottom GUI" parent="UserInterface" instance=ExtResource("5_ie0r0")]

[node name="Inventory" parent="UserInterface" instance=ExtResource("2_vgroc")]
visible = false

[node name="QuestInterface" parent="UserInterface" instance=ExtResource("6_bdd2w")]
visible = false
position = Vector2(186, 155)
scale = Vector2(0.45, 0.45)

[node name="Settings" type="Button" parent="."]
offset_left = 1082.0
offset_top = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Game/LifeQuest/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PlayerInventory="*res://Scripts/Inventory GUI/PlayerInventory.gd"

[editor_plugins]

enabled=PackedStringArray("res://addons/gdUnit4/plugin.cfg")
enabled=PackedStringArray()

[input]

Expand Down

0 comments on commit 451ac6a

Please sign in to comment.