diff --git a/Nodes/Bin.tscn b/Nodes/Bin.tscn new file mode 100644 index 0000000..fb841cc --- /dev/null +++ b/Nodes/Bin.tscn @@ -0,0 +1,18 @@ +[gd_scene load_steps=4 format=3 uid="uid://iuoepenpnktv"] + +[ext_resource type="Texture2D" uid="uid://pwyskequsdls" path="res://bin.png" id="1_krl02"] +[ext_resource type="Script" path="res://scripts/Modules/Bin.gd" id="1_saxpo"] + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_0suy8"] +height = 3.84361 +radius = 1.33448 + +[node name="Bin" type="StaticBody3D"] +script = ExtResource("1_saxpo") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("CylinderShape3D_0suy8") + +[node name="Sprite3D" type="Sprite3D" parent="."] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 2, 0) +texture = ExtResource("1_krl02") diff --git a/bin.png b/bin.png new file mode 100644 index 0000000..cf9e245 Binary files /dev/null and b/bin.png differ diff --git a/bin.png.import b/bin.png.import new file mode 100644 index 0000000..4f07385 --- /dev/null +++ b/bin.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pwyskequsdls" +path.s3tc="res://.godot/imported/bin.png-baf8166091a4b2a643c36d0c3ba28729.s3tc.ctex" +path.etc2="res://.godot/imported/bin.png-baf8166091a4b2a643c36d0c3ba28729.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://bin.png" +dest_files=["res://.godot/imported/bin.png-baf8166091a4b2a643c36d0c3ba28729.s3tc.ctex", "res://.godot/imported/bin.png-baf8166091a4b2a643c36d0c3ba28729.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/menu/MainMenu.gd b/menu/MainMenu.gd index bbbd491..9867bb0 100644 --- a/menu/MainMenu.gd +++ b/menu/MainMenu.gd @@ -24,3 +24,12 @@ func _on_tutorial_pressed(): func _on_quit_pressed(): get_tree().quit() + + +func _on_full_screen_pressed(): + if DisplayServer.window_get_mode() != DisplayServer.WINDOW_MODE_EXCLUSIVE_FULLSCREEN: + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_EXCLUSIVE_FULLSCREEN) + else: + if DisplayServer.window_get_mode() != DisplayServer.WINDOW_MODE_WINDOWED: + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED) + diff --git a/menu/main_menu.tscn b/menu/main_menu.tscn index 018cab6..aa164f6 100644 --- a/menu/main_menu.tscn +++ b/menu/main_menu.tscn @@ -13,6 +13,7 @@ grow_vertical = 2 script = ExtResource("1_hyw8p") [node name="ColorRect" type="ColorRect" parent="."] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -21,6 +22,7 @@ grow_vertical = 2 color = Color(0.513726, 0.403922, 0.27451, 1) [node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -34,26 +36,45 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Start" type="Button" parent="VBoxContainer"] +offset_right = 72.0 +offset_bottom = 31.0 text = "Start " [node name="Tutorial" type="Button" parent="VBoxContainer"] +offset_top = 35.0 +offset_right = 72.0 +offset_bottom = 66.0 text = "Tutorial " [node name="Settings" type="Button" parent="VBoxContainer"] +offset_top = 70.0 +offset_right = 72.0 +offset_bottom = 101.0 text = "Volume:" [node name="VolSlider" type="HSlider" parent="VBoxContainer"] +offset_top = 105.0 +offset_right = 72.0 +offset_bottom = 121.0 min_value = -30.0 max_value = 0.0 script = ExtResource("2_h85ei") [node name="Quit" type="Button" parent="VBoxContainer"] +offset_top = 125.0 +offset_right = 72.0 +offset_bottom = 156.0 text = "Quit" +[node name="FullScreen" type="Button" parent="VBoxContainer"] +layout_mode = 2 +text = "Fullscreen" + [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"] [connection signal="pressed" from="VBoxContainer/Tutorial" to="." method="_on_tutorial_pressed"] [connection signal="pressed" from="VBoxContainer/Settings" to="." method="_on_settings_pressed"] [connection signal="value_changed" from="VBoxContainer/VolSlider" to="VBoxContainer/VolSlider" method="_on_value_changed"] [connection signal="pressed" from="VBoxContainer/Quit" to="." method="_on_quit_pressed"] +[connection signal="pressed" from="VBoxContainer/FullScreen" to="." method="_on_full_screen_pressed"] diff --git a/scripts/Modules/Bin.gd b/scripts/Modules/Bin.gd index ae5d00d..973f149 100644 --- a/scripts/Modules/Bin.gd +++ b/scripts/Modules/Bin.gd @@ -6,4 +6,4 @@ class_name Bin #------------Methods-------------# func interact(player): - train.get_node("CharacterBody3D").inventory = 0 + player.inventory = 0