diff --git a/Scene/Interactibles/Crate.tscn b/Scene/Interactibles/Crate.tscn index d656ad0..f252b89 100644 --- a/Scene/Interactibles/Crate.tscn +++ b/Scene/Interactibles/Crate.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://nv8r4yu48mbj"] [ext_resource type="Script" path="res://Scripts/Interactibles/Crate.gd" id="1_a65k5"] -[ext_resource type="Texture2D" uid="uid://b4nga0rwqktws" path="res://Tilemaps/Tiles/tile_0274.png" id="1_aetqf"] +[ext_resource type="Texture2D" uid="uid://b4nga0rwqktws" path="res://GraphicalAssets/Tilemaps/Tiles/tile_0274.png" id="1_aetqf"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_jjien"] -size = Vector2(16, 16) +size = Vector2(2, 2) [node name="Crate" type="Area2D"] script = ExtResource("1_a65k5") @@ -15,19 +15,19 @@ texture_repeat = 1 texture = ExtResource("1_aetqf") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(-16, 0) +position = Vector2(-10, 0) shape = SubResource("RectangleShape2D_jjien") [node name="CollisionShape2D2" type="CollisionShape2D" parent="."] -position = Vector2(0, -16) +position = Vector2(0, -10) shape = SubResource("RectangleShape2D_jjien") [node name="CollisionShape2D3" type="CollisionShape2D" parent="."] -position = Vector2(0, 16) +position = Vector2(0, 10) shape = SubResource("RectangleShape2D_jjien") [node name="CollisionShape2D4" type="CollisionShape2D" parent="."] -position = Vector2(16, 0) +position = Vector2(10, 0) shape = SubResource("RectangleShape2D_jjien") [connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/Scene/Interactibles/Shelf.tscn b/Scene/Interactibles/Shelf.tscn index 76d6b9d..60344f1 100644 --- a/Scene/Interactibles/Shelf.tscn +++ b/Scene/Interactibles/Shelf.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://nv8r4yu48mbj" path="res://Scene/Interactibles/Crate.tscn" id="1_4363q"] [ext_resource type="Script" path="res://Scripts/Shelf.gd" id="2_5mi56"] -[ext_resource type="Texture2D" uid="uid://dfoc57ynahbbg" path="res://Tilemaps/Tiles/tile_0277.png" id="2_m2jbe"] +[ext_resource type="Texture2D" uid="uid://dfoc57ynahbbg" path="res://GraphicalAssets/Tilemaps/Tiles/tile_0277.png" id="3_8u05o"] [node name="Crate" instance=ExtResource("1_4363q")] script = ExtResource("2_5mi56") @@ -10,4 +10,4 @@ duration = 0 duration_type = 0 [node name="Sprite2D" parent="." index="0"] -texture = ExtResource("2_m2jbe") +texture = ExtResource("3_8u05o") diff --git a/Scene/PlayerScene.tscn b/Scene/PlayerScene.tscn index e0f3852..79bb61e 100644 --- a/Scene/PlayerScene.tscn +++ b/Scene/PlayerScene.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://dy12im5456ufx"] -[ext_resource type="Texture2D" uid="uid://degatxb7g5fr7" path="res://Tilemaps/tile_0350.png" id="1_jp5c8"] +[ext_resource type="Texture2D" uid="uid://degatxb7g5fr7" path="res://GraphicalAssets/Tilemaps/Tiles/tile_0350.png" id="1_jp5c8"] [ext_resource type="Script" path="res://Scripts/PlayerControler.gd" id="1_vtlo0"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_qegmh"] diff --git a/Scene/TestScene.tscn b/Scene/TestScene.tscn index 6d3a6cd..9b7ffb4 100644 --- a/Scene/TestScene.tscn +++ b/Scene/TestScene.tscn @@ -1,30 +1,67 @@ -[gd_scene load_steps=4 format=3 uid="uid://bvam15obn13sp"] +[gd_scene load_steps=5 format=3 uid="uid://bvam15obn13sp"] -[ext_resource type="TileSet" uid="uid://btq4xft7ghfa1" path="res://Tilemaps/TestScene.tres" id="1_ppucb"] +[ext_resource type="TileSet" uid="uid://btq4xft7ghfa1" path="res://GraphicalAssets/Tilemaps/TestScene.tres" id="1_ppucb"] [ext_resource type="Script" path="res://Scripts/NavigationTiles.gd" id="2_j8mqm"] [ext_resource type="PackedScene" uid="uid://dy12im5456ufx" path="res://Scene/PlayerScene.tscn" id="3_hlgkw"] +[ext_resource type="PackedScene" uid="uid://ntebhmr4qyys" path="res://Scene/UI/In_game_gui.tscn" id="4_32xy2"] [node name="Node2D" type="Node2D"] -[node name="Camera2D" type="Camera2D" parent="."] -scale = Vector2(1, 0.68) -offset = Vector2(84.925, 47.62) -zoom = Vector2(6.645, 6.645) - [node name="NavigationMap" type="TileMap" parent="."] texture_filter = 1 tile_set = ExtResource("1_ppucb") format = 2 layer_0/name = "Background" -layer_0/tile_data = PackedInt32Array(65537, 524288, 0, 131073, 524288, 1, 196609, 524288, 1, 262145, 524288, 2, 327681, 1048576, 1610612740, 65538, 589824, 0, 131074, 589824, 1, 196610, 589824, 1, 262146, 589824, 2, 327682, 1048576, 1610612742, 65539, 589824, 0, 196611, 589824, 1, 262147, 589824, 2, 327683, 1048576, 1610612742, 65540, 589824, 0, 262148, 589824, 2, 327684, 1048576, 1610612742, 65541, 655360, 0, 131077, 655360, 1, 196613, 655360, 1, 262149, 655360, 2, 327685, 1048576, 1610612742, 65542, 1048576, 5, 131078, 1048576, 5, 196614, 1048576, 5, 262150, 1048576, 5, 327686, 1048576, 7, 0, 1048576, 4, 65536, 1048576, 5, 131072, 1048576, 5, 196608, 1048576, 5, 262144, 1048576, 5, 327680, 1048576, 7, 1, 1048576, 1610612740, 2, 1048576, 1610612742, 3, 1048576, 1610612742, 4, 1048576, 1610612742, 5, 1048576, 1610612742, 6, 1048576, 4, 131075, 589824, 1, 196612, 589824, 1, 131076, 589824, 1) +layer_0/tile_data = PackedInt32Array(65537, 589824, 1, 131073, 589824, 1, 196609, 589824, 1, 262145, 589824, 1, 65538, 589824, 1, 131074, 589824, 1, 196610, 589824, 1, 262146, 589824, 1, 65539, 589824, 1, 196611, 589824, 1, 262147, 589824, 1, 65540, 589824, 1, 262148, 589824, 1, 65541, 589824, 1, 131077, 589824, 1, 196613, 589824, 1, 262149, 589824, 1, 131075, 589824, 1, 196612, 589824, 1, 131076, 589824, 1, 327682, 589824, 1, 2, 1179648, 4, 327683, 589824, 1, 327684, 589824, 1, 327685, 589824, 1, 262150, 589824, 1, 262151, 589824, 1, 196615, 589824, 1, 131079, 589824, 1, 131078, 589824, 1, 65542, 589824, 1, 6, 1179648, 4, 5, 1179648, 4, 4, 1179648, 4, 3, 1179648, 4, 196614, 589824, 1, 327686, 589824, 1, 7, 1179648, 4, 65543, 589824, 1, 327687, 589824, 1, 393223, 589824, 1, 327688, 589824, 1, 262152, 589824, 1, 196616, 589824, 1, 196617, 589824, 1, 131081, 589824, 1, 65545, 589824, 1, 65544, 589824, 1, 8, 1179648, 4, 131080, 589824, 1, 393224, 589824, 1, 393225, 589824, 1, 327689, 589824, 1, 262153, 589824, 1, 9, 1179648, 4, 10, 1179648, 4, 131082, 1048576, 5, 196618, 1048576, 5, 262154, 1048576, 5, 327690, 1048576, 5, 393226, 1048576, 5, 458762, 1048576, 7, 458761, 589824, 1, 458760, 589824, 1, 458759, 589824, 1, 458758, 589824, 1, 458757, 589824, 1, 458756, 589824, 1, 458755, 589824, 1, 458754, 589824, 1, 458753, 589824, 1, 393217, 589824, 1, 327681, 589824, 1, 393218, 589824, 1, 393219, 589824, 1, 393220, 589824, 1, 393221, 589824, 1, 393222, 589824, 1, 1, 1179648, 4, 11, 1179648, 4, 65547, 589824, 1, 131083, 589824, 1, 196619, 589824, 1, 262155, 589824, 1, 327691, 589824, 1, 393227, 589824, 1, 458763, 589824, 1, 524299, 589824, 1, 589835, 589824, 1, 589834, 589824, 1, 589833, 589824, 1, 589832, 589824, 1, 589831, 589824, 1, 589830, 589824, 1, 524294, 589824, 1, 524293, 589824, 1, 524292, 589824, 1, 524291, 589824, 1, 524290, 589824, 1, 524289, 589824, 1, 589825, 589824, 1, 589826, 589824, 1, 589827, 589824, 1, 589828, 589824, 1, 589829, 589824, 1, 524295, 589824, 1, 524296, 589824, 1, 524297, 589824, 1, 524298, 589824, 1, 12, 1179648, 4, 65548, 589824, 1, 131084, 589824, 1, 196620, 589824, 1, 262156, 589824, 1, 327692, 589824, 1, 393228, 589824, 1, 458764, 589824, 1, 524300, 589824, 1, 589836, 589824, 1, 13, 1179648, 4, 65549, 589824, 1, 131085, 589824, 1, 196621, 589824, 1, 262157, 589824, 1, 327693, 589824, 1, 393229, 589824, 1, 458765, 589824, 1, 524301, 589824, 1, 589837, 589824, 1, 14, 1179648, 4, 65550, 589824, 1, 131086, 589824, 1, 196622, 589824, 1, 262158, 589824, 1, 327694, 589824, 1, 393230, 589824, 1, 458766, 589824, 1, 524302, 589824, 1, 589838, 589824, 1, 15, 1179648, 4, 65551, 589824, 1, 131087, 589824, 1, 196623, 589824, 1, 262159, 589824, 1, 327695, 589824, 1, 393231, 589824, 1, 458767, 589824, 1, 524303, 589824, 1, 589839, 589824, 1, 16, 1179648, 4, 65552, 589824, 1, 131088, 589824, 1, 196624, 589824, 1, 262160, 589824, 1, 327696, 589824, 1, 393232, 589824, 1, 458768, 589824, 1, 524304, 589824, 1, 589840, 589824, 1, 17, 1179648, 4, 65553, 589824, 1, 131089, 589824, 1, 196625, 589824, 1, 262161, 589824, 1, 327697, 589824, 1, 393233, 589824, 1, 458769, 589824, 1, 524305, 589824, 1, 589841, 589824, 1, 18, 1179648, 4, 65554, 589824, 1, 131090, 589824, 1, 196626, 589824, 1, 262162, 589824, 1, 327698, 589824, 1, 393234, 589824, 1, 458770, 589824, 1, 524306, 589824, 1, 589842, 589824, 1, 19, 1179648, 4, 65555, 589824, 1, 131091, 589824, 1, 196627, 589824, 1, 262163, 589824, 1, 327699, 589824, 1, 393235, 589824, 1, 458771, 589824, 1, 524307, 589824, 1, 589843, 589824, 1, 20, 1179648, 4, 65556, 589824, 1, 131092, 589824, 1, 196628, 589824, 1, 262164, 589824, 1, 327700, 589824, 1, 393236, 589824, 1, 458772, 589824, 1, 524308, 589824, 1, 589844, 589824, 1, 65557, 1048576, 6, 131093, 1048576, 6, 196629, 1048576, 6, 262165, 1048576, 6, 327701, 1048576, 6, 393237, 1048576, 6, 458773, 1048576, 6, 524309, 1048576, 6, 589845, 1048576, 6, 655361, 589824, 1, 720897, 589824, 1, 786433, 1179648, 7, 655362, 589824, 1, 720898, 589824, 1, 786434, 1179648, 7, 655363, 589824, 1, 720899, 589824, 1, 786435, 1179648, 7, 655364, 589824, 1, 720900, 589824, 1, 786436, 1179648, 7, 655365, 589824, 1, 720901, 1048576, 4, 786437, 1245184, 7, 655366, 589824, 1, 720902, 589824, 1, 655367, 589824, 1, 720903, 1048576, 4, 655368, 589824, 1, 720904, 589824, 1, 786440, 1179648, 7, 655369, 589824, 1, 720905, 589824, 1, 786441, 1179648, 7, 655370, 1048576, 4, 720906, 1048576, 5, 655371, 589824, 1, 720907, 589824, 1, 786443, 1179648, 7, 655372, 589824, 1, 720908, 589824, 1, 786444, 1179648, 7, 655373, 589824, 1, 720909, 589824, 1, 786445, 1179648, 7, 655374, 589824, 1, 720910, 589824, 1, 786446, 1179648, 7, 655375, 589824, 1, 720911, 589824, 1, 786447, 1179648, 7, 655376, 589824, 1, 720912, 589824, 1, 786448, 1179648, 7, 655377, 589824, 1, 720913, 589824, 1, 786449, 1179648, 7, 655378, 589824, 1, 720914, 589824, 1, 786450, 1179648, 7, 655379, 589824, 1, 720915, 589824, 1, 786451, 1179648, 7, 655380, 589824, 1, 720916, 589824, 1, 786452, 1179648, 7, 655381, 1048576, 6, 720917, 1048576, 6, 786453, 1245184, 7, 65546, 1048576, 5, 786442, 1179648, 7, 21, 1245184, 4, 786439, 1114112, 7, 786432, 1114112, 7, 65536, 1114112, 6, 131072, 1114112, 6, 196608, 1114112, 6, 262144, 1114112, 6, 327680, 1114112, 6, 393216, 1114112, 6, 458752, 1114112, 6, 524288, 1114112, 6, 589824, 1114112, 6, 655360, 1114112, 6, 720896, 1114112, 6, 0, 1114112, 4, 786438, 917504, 10) layer_1/name = "Object" -layer_1/tile_data = PackedInt32Array(131076, 3, 65536, 196610, 3, 131072) +layer_1/tile_data = PackedInt32Array(65552, 3, 65536, 196628, 3, 131072, 393236, 3, 131072, 65555, 3, 65536, 65549, 3, 65536) layer_2/name = "ColisionMask" layer_2/modulate = Color(1, 1, 1, 0) -layer_2/tile_data = PackedInt32Array(131076, 1048576, 5) +layer_2/tile_data = PackedInt32Array(65549, 1048576, 5, 65552, 1048576, 5, 65555, 1048576, 5, 196628, 1048576, 5, 393236, 1048576, 5) script = ExtResource("2_j8mqm") [node name="PlayerScene" parent="." instance=ExtResource("3_hlgkw")] -position = Vector2(24, 24) +position = Vector2(168, 135) +[node name="Node2D" type="Node2D" parent="PlayerScene"] +z_index = 1 +texture_filter = 1 +position = Vector2(-168, -135) + +[node name="Camera2D" type="Camera2D" parent="PlayerScene"] +position = Vector2(-1.52588e-05, 0) +scale = Vector2(1, 1) +zoom = Vector2(5.045, 5.045) +limit_smoothed = true +position_smoothing_enabled = true +drag_horizontal_enabled = true +drag_vertical_enabled = true +drag_left_margin = 0.25 +drag_top_margin = 0.25 +drag_right_margin = 0.25 +drag_bottom_margin = 0.25 +editor_draw_drag_margin = true + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="InGameGui" parent="CanvasLayer" instance=ExtResource("4_32xy2")] +anchors_preset = 0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_right = 1920.0 +offset_bottom = 1080.0 +grow_horizontal = 1 +grow_vertical = 1 +mouse_filter = 2 + +[connection signal="body_entered" from="NavigationMap/Crate" to="NavigationMap/Crate" method="_on_body_entered"] +[connection signal="body_exited" from="NavigationMap/Crate" to="NavigationMap/Crate" method="_on_body_exited"] +[connection signal="body_entered" from="NavigationMap/@Area2D@26531" to="NavigationMap/@Area2D@26531" method="_on_body_entered"] +[connection signal="body_exited" from="NavigationMap/@Area2D@26531" to="NavigationMap/@Area2D@26531" method="_on_body_exited"] +[connection signal="body_entered" from="NavigationMap/@Area2D@26532" to="NavigationMap/@Area2D@26532" method="_on_body_entered"] +[connection signal="body_exited" from="NavigationMap/@Area2D@26532" to="NavigationMap/@Area2D@26532" method="_on_body_exited"] +[connection signal="body_entered" from="NavigationMap/@Area2D@26533" to="NavigationMap/@Area2D@26533" method="_on_body_entered"] +[connection signal="body_exited" from="NavigationMap/@Area2D@26533" to="NavigationMap/@Area2D@26533" method="_on_body_exited"] +[connection signal="body_entered" from="NavigationMap/@Area2D@26534" to="NavigationMap/@Area2D@26534" method="_on_body_entered"] +[connection signal="body_exited" from="NavigationMap/@Area2D@26534" to="NavigationMap/@Area2D@26534" method="_on_body_exited"] [connection signal="remove_interact" from="PlayerScene" to="PlayerScene" method="_on_remove_interact"] diff --git a/Scripts/Interactibles/Crate.gd b/Scripts/Interactibles/Crate.gd index b1976ce..67ae609 100644 --- a/Scripts/Interactibles/Crate.gd +++ b/Scripts/Interactibles/Crate.gd @@ -6,7 +6,7 @@ func _ready(): var firstitem = Item.new() firstitem.name = "rouge" firstitem.Icon = Sprite2D.new() - firstitem.Icon.set_texture(preload("res://Sprite/IMG_0156.PNG")) + firstitem.Icon.set_texture(preload("res://GraphicalAssets/Sprite/IMG_0156.PNG")) firstitem.Icon.set_texture_filter(CanvasItem.TEXTURE_FILTER_NEAREST) items.append(firstitem) diff --git a/Scripts/Interactibles/Item_Container.gd b/Scripts/Interactibles/Item_Container.gd index 60a6326..bc75e10 100644 --- a/Scripts/Interactibles/Item_Container.gd +++ b/Scripts/Interactibles/Item_Container.gd @@ -6,11 +6,11 @@ var items : Array[Item] func pop_item(index: int = 0): - pass + items.pop_at(index) func add_item(item: Item): - pass + items.append(item) diff --git a/Scripts/PlayerControler.gd b/Scripts/PlayerControler.gd index 0665838..5779d2a 100644 --- a/Scripts/PlayerControler.gd +++ b/Scripts/PlayerControler.gd @@ -35,6 +35,7 @@ func _unhandled_input(event): var click_position = get_global_mouse_position() if event.is_action_pressed("move_to"): if gridcontrol.is_spot_walkable(click_position): + print("yay") current_path = gridcontrol.astar.get_id_path( gridcontrol.local_to_map(global_position), gridcontrol.local_to_map(click_position) @@ -47,11 +48,13 @@ func _shortcut_input(event): held_item = object_near.items[0] object_near.pop_item(0) _add_item_overhead() - else : + elif held_item != null: object_near.add_item(held_item) remove_child(held_item) remove_child(held_item.Icon) held_item = null + else : + pass @@ -63,7 +66,7 @@ func _on_can_interact(object : Interactible): func _on_remove_interact(): can_interact_flag = false object_near = null - + func _add_item_overhead() : add_child(held_item) diff --git a/Sprite/IMG_0156.PNG b/Sprite/IMG_0156.PNG deleted file mode 100644 index a80b672..0000000 Binary files a/Sprite/IMG_0156.PNG and /dev/null differ diff --git a/Sprite/IMG_0156.PNG.import b/Sprite/IMG_0156.PNG.import deleted file mode 100644 index 940a4f5..0000000 --- a/Sprite/IMG_0156.PNG.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d4kuxsq8yf2t2" -path="res://.godot/imported/IMG_0156.PNG-5b08894a60fc22746c1de93eda63d789.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprite/IMG_0156.PNG" -dest_files=["res://.godot/imported/IMG_0156.PNG-5b08894a60fc22746c1de93eda63d789.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/Tilemaps/Information.png b/Tilemaps/Information.png deleted file mode 100644 index 9935508..0000000 Binary files a/Tilemaps/Information.png and /dev/null differ diff --git a/Tilemaps/Information.png.import b/Tilemaps/Information.png.import deleted file mode 100644 index caf8ac6..0000000 --- a/Tilemaps/Information.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ctoivxr2npa6p" -path="res://.godot/imported/Information.png-3404e12edf12f3084cbb4c01f20ede6c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Tilemaps/Information.png" -dest_files=["res://.godot/imported/Information.png-3404e12edf12f3084cbb4c01f20ede6c.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/Tilemaps/Instructions.url b/Tilemaps/Instructions.url deleted file mode 100644 index f67aaf0..0000000 --- a/Tilemaps/Instructions.url +++ /dev/null @@ -1,6 +0,0 @@ -[InternetShortcut] -URL=https://kenney.nl/documentation/game-assets/isometric -IDList= -HotKey=0 -[{000214A0-0000-0000-C000-000000000046}] -Prop3=19,11 diff --git a/Tilemaps/TestScene.tres b/Tilemaps/TestScene.tres deleted file mode 100644 index 35db571..0000000 --- a/Tilemaps/TestScene.tres +++ /dev/null @@ -1,517 +0,0 @@ -[gd_resource type="TileSet" load_steps=6 format=3 uid="uid://btq4xft7ghfa1"] - -[ext_resource type="Texture2D" uid="uid://n6wwhbhv6t6t" path="res://Tilemaps/tilemap_packed.png" id="1_eewka"] -[ext_resource type="PackedScene" uid="uid://nv8r4yu48mbj" path="res://Scene/Interactibles/Crate.tscn" id="2_oi0ah"] -[ext_resource type="PackedScene" uid="uid://d1oww5u6d2464" path="res://Scene/Interactibles/Shelf.tscn" id="3_imt3x"] - -[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_om8rr"] -resource_name = "Tilemap1" -texture = ExtResource("1_eewka") -0:0/0 = 0 -1:0/0 = 0 -2:0/0 = 0 -3:0/0 = 0 -4:0/0 = 0 -5:0/0 = 0 -6:0/0 = 0 -7:0/0 = 0 -8:0/0 = 0 -9:0/0 = 0 -10:0/0 = 0 -11:0/0 = 0 -12:0/0 = 0 -13:0/0 = 0 -14:0/0 = 0 -15:0/0 = 0 -16:0/0 = 0 -17:0/0 = 0 -18:0/0 = 0 -19:0/0 = 0 -20:0/0 = 0 -21:0/0 = 0 -22:0/0 = 0 -23:0/0 = 0 -24:0/0 = 0 -25:0/0 = 0 -26:0/0 = 0 -0:1/0 = 0 -1:1/0 = 0 -2:1/0 = 0 -3:1/0 = 0 -4:1/0 = 0 -5:1/0 = 0 -6:1/0 = 0 -7:1/0 = 0 -8:1/0 = 0 -9:1/0 = 0 -10:1/0 = 0 -11:1/0 = 0 -12:1/0 = 0 -13:1/0 = 0 -14:1/0 = 0 -15:1/0 = 0 -16:1/0 = 0 -17:1/0 = 0 -18:1/0 = 0 -19:1/0 = 0 -20:1/0 = 0 -21:1/0 = 0 -22:1/0 = 0 -23:1/0 = 0 -24:1/0 = 0 -25:1/0 = 0 -26:1/0 = 0 -0:2/0 = 0 -1:2/0 = 0 -2:2/0 = 0 -3:2/0 = 0 -4:2/0 = 0 -5:2/0 = 0 -6:2/0 = 0 -7:2/0 = 0 -8:2/0 = 0 -9:2/0 = 0 -10:2/0 = 0 -11:2/0 = 0 -12:2/0 = 0 -13:2/0 = 0 -14:2/0 = 0 -15:2/0 = 0 -16:2/0 = 0 -17:2/0 = 0 -18:2/0 = 0 -19:2/0 = 0 -20:2/0 = 0 -21:2/0 = 0 -22:2/0 = 0 -23:2/0 = 0 -24:2/0 = 0 -25:2/0 = 0 -26:2/0 = 0 -0:3/0 = 0 -1:3/0 = 0 -2:3/0 = 0 -3:3/0 = 0 -4:3/0 = 0 -5:3/0 = 0 -6:3/0 = 0 -7:3/0 = 0 -8:3/0 = 0 -9:3/0 = 0 -10:3/0 = 0 -11:3/0 = 0 -12:3/0 = 0 -13:3/0 = 0 -14:3/0 = 0 -15:3/0 = 0 -16:3/0 = 0 -17:3/0 = 0 -18:3/0 = 0 -19:3/0 = 0 -20:3/0 = 0 -21:3/0 = 0 -22:3/0 = 0 -23:3/0 = 0 -24:3/0 = 0 -25:3/0 = 0 -26:3/0 = 0 -0:4/0 = 0 -1:4/0 = 0 -2:4/0 = 0 -3:4/0 = 0 -4:4/0 = 0 -5:4/0 = 0 -6:4/0 = 0 -7:4/0 = 0 -8:4/0 = 0 -9:4/0 = 0 -10:4/0 = 0 -11:4/0 = 0 -12:4/0 = 0 -13:4/0 = 0 -14:4/0 = 0 -15:4/0 = 0 -16:4/0 = 0 -16:4/0/custom_data_0 = true -17:4/0 = 0 -18:4/0 = 0 -19:4/0 = 0 -20:4/0 = 0 -21:4/0 = 0 -22:4/0 = 0 -23:4/0 = 0 -24:4/0 = 0 -25:4/0 = 0 -26:4/0 = 0 -0:5/0 = 0 -1:5/0 = 0 -2:5/0 = 0 -3:5/0 = 0 -4:5/0 = 0 -5:5/0 = 0 -6:5/0 = 0 -7:5/0 = 0 -8:5/0 = 0 -9:5/0 = 0 -10:5/0 = 0 -11:5/0 = 0 -12:5/0 = 0 -13:5/0 = 0 -14:5/0 = 0 -15:5/0 = 0 -16:5/0 = 0 -16:5/0/custom_data_0 = true -17:5/0 = 0 -18:5/0 = 0 -19:5/0 = 0 -20:5/0 = 0 -21:5/0 = 0 -22:5/0 = 0 -23:5/0 = 0 -24:5/0 = 0 -25:5/0 = 0 -26:5/0 = 0 -0:6/0 = 0 -1:6/0 = 0 -2:6/0 = 0 -3:6/0 = 0 -4:6/0 = 0 -5:6/0 = 0 -6:6/0 = 0 -7:6/0 = 0 -8:6/0 = 0 -9:6/0 = 0 -10:6/0 = 0 -11:6/0 = 0 -12:6/0 = 0 -13:6/0 = 0 -14:6/0 = 0 -15:6/0 = 0 -16:6/0 = 0 -16:6/0/custom_data_0 = true -17:6/0 = 0 -18:6/0 = 0 -19:6/0 = 0 -20:6/0 = 0 -21:6/0 = 0 -22:6/0 = 0 -23:6/0 = 0 -24:6/0 = 0 -25:6/0 = 0 -26:6/0 = 0 -0:7/0 = 0 -1:7/0 = 0 -2:7/0 = 0 -3:7/0 = 0 -4:7/0 = 0 -5:7/0 = 0 -6:7/0 = 0 -7:7/0 = 0 -8:7/0 = 0 -9:7/0 = 0 -10:7/0 = 0 -11:7/0 = 0 -12:7/0 = 0 -13:7/0 = 0 -14:7/0 = 0 -15:7/0 = 0 -16:7/0 = 0 -16:7/0/custom_data_0 = true -17:7/0 = 0 -18:7/0 = 0 -19:7/0 = 0 -20:7/0 = 0 -21:7/0 = 0 -22:7/0 = 0 -23:7/0 = 0 -24:7/0 = 0 -25:7/0 = 0 -26:7/0 = 0 -0:8/0 = 0 -1:8/0 = 0 -2:8/0 = 0 -3:8/0 = 0 -4:8/0 = 0 -5:8/0 = 0 -6:8/0 = 0 -7:8/0 = 0 -8:8/0 = 0 -9:8/0 = 0 -10:8/0 = 0 -11:8/0 = 0 -12:8/0 = 0 -13:8/0 = 0 -14:8/0 = 0 -15:8/0 = 0 -16:8/0 = 0 -17:8/0 = 0 -18:8/0 = 0 -19:8/0 = 0 -20:8/0 = 0 -21:8/0 = 0 -22:8/0 = 0 -23:8/0 = 0 -24:8/0 = 0 -25:8/0 = 0 -26:8/0 = 0 -0:9/0 = 0 -1:9/0 = 0 -2:9/0 = 0 -3:9/0 = 0 -4:9/0 = 0 -5:9/0 = 0 -6:9/0 = 0 -7:9/0 = 0 -8:9/0 = 0 -9:9/0 = 0 -10:9/0 = 0 -11:9/0 = 0 -12:9/0 = 0 -13:9/0 = 0 -14:9/0 = 0 -15:9/0 = 0 -16:9/0 = 0 -17:9/0 = 0 -18:9/0 = 0 -19:9/0 = 0 -20:9/0 = 0 -21:9/0 = 0 -22:9/0 = 0 -23:9/0 = 0 -24:9/0 = 0 -25:9/0 = 0 -26:9/0 = 0 -0:10/0 = 0 -1:10/0 = 0 -2:10/0 = 0 -3:10/0 = 0 -4:10/0 = 0 -5:10/0 = 0 -5:10/0/custom_data_0 = true -5:10/0/custom_data_1 = true -6:10/0 = 0 -7:10/0 = 0 -7:10/0/custom_data_0 = true -7:10/0/custom_data_1 = true -8:10/0 = 0 -9:10/0 = 0 -9:10/0/custom_data_0 = true -9:10/0/custom_data_1 = true -10:10/0 = 0 -11:10/0 = 0 -12:10/0 = 0 -13:10/0 = 0 -14:10/0 = 0 -15:10/0 = 0 -16:10/0 = 0 -17:10/0 = 0 -18:10/0 = 0 -19:10/0 = 0 -20:10/0 = 0 -21:10/0 = 0 -22:10/0 = 0 -23:10/0 = 0 -24:10/0 = 0 -25:10/0 = 0 -26:10/0 = 0 -0:11/0 = 0 -1:11/0 = 0 -2:11/0 = 0 -3:11/0 = 0 -4:11/0 = 0 -5:11/0 = 0 -6:11/0 = 0 -7:11/0 = 0 -8:11/0 = 0 -9:11/0 = 0 -10:11/0 = 0 -11:11/0 = 0 -12:11/0 = 0 -13:11/0 = 0 -14:11/0 = 0 -15:11/0 = 0 -16:11/0 = 0 -17:11/0 = 0 -18:11/0 = 0 -19:11/0 = 0 -20:11/0 = 0 -21:11/0 = 0 -22:11/0 = 0 -23:11/0 = 0 -24:11/0 = 0 -25:11/0 = 0 -26:11/0 = 0 -0:12/0 = 0 -1:12/0 = 0 -2:12/0 = 0 -3:12/0 = 0 -4:12/0 = 0 -5:12/0 = 0 -6:12/0 = 0 -7:12/0 = 0 -8:12/0 = 0 -9:12/0 = 0 -10:12/0 = 0 -11:12/0 = 0 -12:12/0 = 0 -13:12/0 = 0 -14:12/0 = 0 -15:12/0 = 0 -16:12/0 = 0 -17:12/0 = 0 -18:12/0 = 0 -19:12/0 = 0 -20:12/0 = 0 -21:12/0 = 0 -22:12/0 = 0 -23:12/0 = 0 -24:12/0 = 0 -25:12/0 = 0 -26:12/0 = 0 -0:13/0 = 0 -1:13/0 = 0 -2:13/0 = 0 -3:13/0 = 0 -4:13/0 = 0 -5:13/0 = 0 -6:13/0 = 0 -7:13/0 = 0 -8:13/0 = 0 -9:13/0 = 0 -10:13/0 = 0 -11:13/0 = 0 -12:13/0 = 0 -13:13/0 = 0 -14:13/0 = 0 -15:13/0 = 0 -16:13/0 = 0 -17:13/0 = 0 -18:13/0 = 0 -19:13/0 = 0 -20:13/0 = 0 -21:13/0 = 0 -22:13/0 = 0 -23:13/0 = 0 -24:13/0 = 0 -25:13/0 = 0 -26:13/0 = 0 -0:14/0 = 0 -1:14/0 = 0 -2:14/0 = 0 -3:14/0 = 0 -4:14/0 = 0 -5:14/0 = 0 -6:14/0 = 0 -7:14/0 = 0 -8:14/0 = 0 -9:14/0 = 0 -10:14/0 = 0 -11:14/0 = 0 -12:14/0 = 0 -13:14/0 = 0 -14:14/0 = 0 -15:14/0 = 0 -16:14/0 = 0 -17:14/0 = 0 -18:14/0 = 0 -19:14/0 = 0 -20:14/0 = 0 -21:14/0 = 0 -22:14/0 = 0 -23:14/0 = 0 -24:14/0 = 0 -25:14/0 = 0 -26:14/0 = 0 -0:15/0 = 0 -1:15/0 = 0 -2:15/0 = 0 -3:15/0 = 0 -4:15/0 = 0 -5:15/0 = 0 -6:15/0 = 0 -7:15/0 = 0 -8:15/0 = 0 -9:15/0 = 0 -10:15/0 = 0 -11:15/0 = 0 -12:15/0 = 0 -13:15/0 = 0 -14:15/0 = 0 -15:15/0 = 0 -16:15/0 = 0 -17:15/0 = 0 -18:15/0 = 0 -19:15/0 = 0 -20:15/0 = 0 -21:15/0 = 0 -22:15/0 = 0 -23:15/0 = 0 -24:15/0 = 0 -25:15/0 = 0 -26:15/0 = 0 -0:16/0 = 0 -1:16/0 = 0 -2:16/0 = 0 -3:16/0 = 0 -4:16/0 = 0 -5:16/0 = 0 -6:16/0 = 0 -7:16/0 = 0 -8:16/0 = 0 -9:16/0 = 0 -10:16/0 = 0 -11:16/0 = 0 -12:16/0 = 0 -13:16/0 = 0 -14:16/0 = 0 -15:16/0 = 0 -16:16/0 = 0 -17:16/0 = 0 -18:16/0 = 0 -19:16/0 = 0 -20:16/0 = 0 -21:16/0 = 0 -22:16/0 = 0 -23:16/0 = 0 -24:16/0 = 0 -25:16/0 = 0 -26:16/0 = 0 -0:17/0 = 0 -1:17/0 = 0 -2:17/0 = 0 -3:17/0 = 0 -4:17/0 = 0 -5:17/0 = 0 -6:17/0 = 0 -7:17/0 = 0 -8:17/0 = 0 -9:17/0 = 0 -10:17/0 = 0 -11:17/0 = 0 -12:17/0 = 0 -13:17/0 = 0 -14:17/0 = 0 -15:17/0 = 0 -16:17/0 = 0 -17:17/0 = 0 -18:17/0 = 0 -19:17/0 = 0 -20:17/0 = 0 -21:17/0 = 0 -22:17/0 = 0 -23:17/0 = 0 -24:17/0 = 0 -25:17/0 = 0 -26:17/0 = 0 - -[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_t8dt2"] -scenes/1/scene = ExtResource("2_oi0ah") -scenes/2/scene = ExtResource("3_imt3x") - -[resource] -custom_data_layer_0/name = "is_solid" -custom_data_layer_0/type = 1 -custom_data_layer_1/name = "is_interact" -custom_data_layer_1/type = 1 -sources/0 = SubResource("TileSetAtlasSource_om8rr") -sources/3 = SubResource("TileSetScenesCollectionSource_t8dt2") diff --git a/Tilemaps/Tiles/tile_0274.png b/Tilemaps/Tiles/tile_0274.png deleted file mode 100644 index 11d03cd..0000000 Binary files a/Tilemaps/Tiles/tile_0274.png and /dev/null differ diff --git a/Tilemaps/Tiles/tile_0274.png.import b/Tilemaps/Tiles/tile_0274.png.import deleted file mode 100644 index dff002a..0000000 --- a/Tilemaps/Tiles/tile_0274.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b4nga0rwqktws" -path="res://.godot/imported/tile_0274.png-fbdee6c88f68e1b99b9627bf95f2fb99.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Tilemaps/Tiles/tile_0274.png" -dest_files=["res://.godot/imported/tile_0274.png-fbdee6c88f68e1b99b9627bf95f2fb99.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/Tilemaps/Tiles/tile_0277.png b/Tilemaps/Tiles/tile_0277.png deleted file mode 100644 index afb983e..0000000 Binary files a/Tilemaps/Tiles/tile_0277.png and /dev/null differ diff --git a/Tilemaps/Tiles/tile_0277.png.import b/Tilemaps/Tiles/tile_0277.png.import deleted file mode 100644 index a10cd87..0000000 --- a/Tilemaps/Tiles/tile_0277.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dfoc57ynahbbg" -path="res://.godot/imported/tile_0277.png-5c4f65ba33c8e2c8baa32bd926f7b9e3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Tilemaps/Tiles/tile_0277.png" -dest_files=["res://.godot/imported/tile_0277.png-5c4f65ba33c8e2c8baa32bd926f7b9e3.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/Tilemaps/tile_0350.png b/Tilemaps/tile_0350.png deleted file mode 100644 index e0d8318..0000000 Binary files a/Tilemaps/tile_0350.png and /dev/null differ diff --git a/Tilemaps/tile_0350.png.import b/Tilemaps/tile_0350.png.import deleted file mode 100644 index afc6e07..0000000 --- a/Tilemaps/tile_0350.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://degatxb7g5fr7" -path="res://.godot/imported/tile_0350.png-b4335ef6c261b9d555a1d778506a3be4.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Tilemaps/tile_0350.png" -dest_files=["res://.godot/imported/tile_0350.png-b4335ef6c261b9d555a1d778506a3be4.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/Tilemaps/tilemap_packed.png b/Tilemaps/tilemap_packed.png deleted file mode 100644 index 66bf115..0000000 Binary files a/Tilemaps/tilemap_packed.png and /dev/null differ diff --git a/Tilemaps/tilemap_packed.png.import b/Tilemaps/tilemap_packed.png.import deleted file mode 100644 index de10adf..0000000 --- a/Tilemaps/tilemap_packed.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://n6wwhbhv6t6t" -path="res://.godot/imported/tilemap_packed.png-f3c08ae70968419dbcc35de504bbd8c1.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Tilemaps/tilemap_packed.png" -dest_files=["res://.godot/imported/tilemap_packed.png-f3c08ae70968419dbcc35de504bbd8c1.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/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll b/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll deleted file mode 100644 index 60e5fe6..0000000 Binary files a/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll and /dev/null differ diff --git a/project.godot b/project.godot index 6d121a2..4c40065 100644 --- a/project.godot +++ b/project.godot @@ -11,15 +11,26 @@ config_version=5 [application] config/name="Chaos Kitchen" -run/main_scene="res://Scene/TestScene.tscn" +run/main_scene="res://Scene/UI/Main_Menu.tscn" config/features=PackedStringArray("4.2", "Forward Plus") config/icon="res://icon.svg" +[display] + +window/size/viewport_width=1920 +window/size/viewport_height=1080 +window/size/borderless=true +window/vsync/vsync_mode=0 + [editor] version_control/plugin_name="GitPlugin" version_control/autoload_on_startup=true +[editor_plugins] + +enabled=PackedStringArray() + [input] move_to={ @@ -32,3 +43,7 @@ interact={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"echo":false,"script":null) ] } + +[rendering] + +textures/canvas_textures/default_texture_filter=0