From 5f00ff20e7b975c2a348865cb102075ac50d6255 Mon Sep 17 00:00:00 2001 From: Arthur Date: Sat, 10 Dec 2022 12:27:28 +0100 Subject: [PATCH 1/6] Added Trash bin --- project.godot | 6 ++++++ scripts/Modules/Bin.gd | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 scripts/Modules/Bin.gd diff --git a/project.godot b/project.godot index f9a62a0..127a278 100644 --- a/project.godot +++ b/project.godot @@ -10,6 +10,11 @@ config_version=5 _global_script_classes=[{ "base": "Module", +"class": &"Bin", +"language": &"GDScript", +"path": "res://scripts/Modules/Bin.gd" +}, { +"base": "Module", "class": &"Cannon", "language": &"GDScript", "path": "res://scripts/Modules/Cannon.gd" @@ -55,6 +60,7 @@ _global_script_classes=[{ "path": "res://scripts/Logic/TurnMapNode.gd" }] _global_script_class_icons={ +"Bin": "", "Cannon": "", "Game": "", "MapNode": "", diff --git a/scripts/Modules/Bin.gd b/scripts/Modules/Bin.gd new file mode 100644 index 0000000..dacfdab --- /dev/null +++ b/scripts/Modules/Bin.gd @@ -0,0 +1,9 @@ +extends Module + +class_name Bin + +@onready var train = get_parent() as Train + +#------------Methods-------------# +func interact(): + train.get_node("CharacterBody3D").inventory = 0 From 118f910aeb3113f7fd8e9e29eb7bfd2d85df1560 Mon Sep 17 00:00:00 2001 From: INoro Date: Sat, 10 Dec 2022 12:30:06 +0100 Subject: [PATCH 2/6] Leo - Szenen angepasst --- Chest.png | Bin 0 -> 12256 bytes Chest.png.import | 36 ++++++++++++++++++++++++++++++++++++ Nodes/Player.tscn | 4 ++-- Nodes/game.tscn | 7 +++++-- Storage.tscn | 16 ++++++++++++++-- project.godot | 2 +- scripts/Modules/Module.gd | 2 +- 7 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 Chest.png create mode 100644 Chest.png.import diff --git a/Chest.png b/Chest.png new file mode 100644 index 0000000000000000000000000000000000000000..696a3f35ef01e232fcc903aa3fb798753afd62bf GIT binary patch literal 12256 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 uU;Ar+?XUf{zxLPu+F$!?f9 Date: Sat, 10 Dec 2022 12:33:25 +0100 Subject: [PATCH 3/6] Szenen angepasst --- Nodes/cannon.tscn | 9 +++++++-- menu/main_menu.tscn | 7 ------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Nodes/cannon.tscn b/Nodes/cannon.tscn index 1771df1..0c377e8 100644 --- a/Nodes/cannon.tscn +++ b/Nodes/cannon.tscn @@ -1,6 +1,11 @@ -[gd_scene load_steps=2 format=3 uid="uid://byo1m0n20yl45"] +[gd_scene load_steps=3 format=3 uid="uid://byo1m0n20yl45"] [ext_resource type="Script" path="res://scripts/Modules/Cannon.gd" id="1_vdn0s"] -[node name="Cannon" type="Node"] +[sub_resource type="CylinderShape3D" id="CylinderShape3D_2geka"] + +[node name="Cannon" type="StaticBody3D"] script = ExtResource("1_vdn0s") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("CylinderShape3D_2geka") diff --git a/menu/main_menu.tscn b/menu/main_menu.tscn index 91d0824..018cab6 100644 --- a/menu/main_menu.tscn +++ b/menu/main_menu.tscn @@ -13,7 +13,6 @@ 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 @@ -22,7 +21,6 @@ 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 @@ -36,27 +34,22 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Start" type="Button" parent="VBoxContainer"] -layout_mode = 2 text = "Start " [node name="Tutorial" type="Button" parent="VBoxContainer"] -layout_mode = 2 text = "Tutorial " [node name="Settings" type="Button" parent="VBoxContainer"] -layout_mode = 2 text = "Volume:" [node name="VolSlider" type="HSlider" parent="VBoxContainer"] -layout_mode = 2 min_value = -30.0 max_value = 0.0 script = ExtResource("2_h85ei") [node name="Quit" type="Button" parent="VBoxContainer"] -layout_mode = 2 text = "Quit" [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"] From 642a32b56f091e8f35b4499ff83e46b6470e0ecb Mon Sep 17 00:00:00 2001 From: INoro Date: Sat, 10 Dec 2022 12:36:51 +0100 Subject: [PATCH 4/6] Leo -bug fixes --- Nodes/game.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nodes/game.tscn b/Nodes/game.tscn index c46b949..7c6f887 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -40,7 +40,7 @@ mesh = SubResource("BoxMesh_ognqx") shape = SubResource("ConcavePolygonShape3D_p3d4e") [node name="CharacterBody3D" parent="Player1" instance=ExtResource("4_1ipcp")] -transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, 0, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) [node name="Cannon2" parent="Player1" instance=ExtResource("2_vrf6k")] From c9755bfe8c35ebdc3dd00f287961c8675fac7dd0 Mon Sep 17 00:00:00 2001 From: PfandBoss <68470553+PfandBoss@users.noreply.github.com> Date: Sat, 10 Dec 2022 12:45:06 +0100 Subject: [PATCH 5/6] Game UI --- Nodes/game.tscn | 49 +++++++++++++++++++++++++++++-- scripts/Logic/Game.gd | 3 +- undefined - Imgur (1).png | Bin 0 -> 398 bytes undefined - Imgur (1).png.import | 34 +++++++++++++++++++++ undefined - Imgur.png | Bin 0 -> 401 bytes undefined - Imgur.png.import | 34 +++++++++++++++++++++ 6 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 undefined - Imgur (1).png create mode 100644 undefined - Imgur (1).png.import create mode 100644 undefined - Imgur.png create mode 100644 undefined - Imgur.png.import diff --git a/Nodes/game.tscn b/Nodes/game.tscn index f8a0e42..2ef7cb3 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=9 format=3 uid="uid://n7w0ff7u25yc"] +[gd_scene load_steps=15 format=3 uid="uid://n7w0ff7u25yc"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_61aog"] [ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="2_vrf6k"] [ext_resource type="Script" path="res://scripts/Train.gd" id="2_xl0he"] [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="4_1ipcp"] +[ext_resource type="Texture2D" uid="uid://b8rsm7uapp583" path="res://undefined - Imgur (1).png" id="6_agvbb"] +[ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="7_n8t7y"] [sub_resource type="BoxMesh" id="BoxMesh_ognqx"] size = Vector3(13, 1, 25) @@ -15,6 +17,14 @@ data = PackedVector3Array(-6.5, 0.5, 12.5, 6.5, 0.5, 12.5, -6.5, -0.5, 12.5, 6.5 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_l76gd"] data = PackedVector3Array(-6.5, 0.5, 12.5, 6.5, 0.5, 12.5, -6.5, -0.5, 12.5, 6.5, 0.5, 12.5, 6.5, -0.5, 12.5, -6.5, -0.5, 12.5, 6.5, 0.5, -12.5, -6.5, 0.5, -12.5, 6.5, -0.5, -12.5, -6.5, 0.5, -12.5, -6.5, -0.5, -12.5, 6.5, -0.5, -12.5, 6.5, 0.5, 12.5, 6.5, 0.5, -12.5, 6.5, -0.5, 12.5, 6.5, 0.5, -12.5, 6.5, -0.5, -12.5, 6.5, -0.5, 12.5, -6.5, 0.5, -12.5, -6.5, 0.5, 12.5, -6.5, -0.5, -12.5, -6.5, 0.5, 12.5, -6.5, -0.5, 12.5, -6.5, -0.5, -12.5, 6.5, 0.5, 12.5, -6.5, 0.5, 12.5, 6.5, 0.5, -12.5, -6.5, 0.5, 12.5, -6.5, 0.5, -12.5, 6.5, 0.5, -12.5, -6.5, -0.5, 12.5, 6.5, -0.5, 12.5, -6.5, -0.5, -12.5, 6.5, -0.5, 12.5, 6.5, -0.5, -12.5, -6.5, -0.5, -12.5) +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_d1e56"] + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_u6hdq"] + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_nlhhs"] + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_q46da"] + [node name="Game" type="Node"] script = ExtResource("1_iox18") @@ -48,7 +58,6 @@ transform = Transform3D(0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 12, 0, 0) script = ExtResource("2_xl0he") [node name="MeshInstance3D" type="MeshInstance3D" parent="Player2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) mesh = SubResource("BoxMesh_ognqx") [node name="StaticBody3D" type="StaticBody3D" parent="Player2/MeshInstance3D"] @@ -81,3 +90,39 @@ anchor_right = 0.5 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 + +[node name="VSlider" type="VSlider" parent="Control"] +layout_mode = 1 +anchors_preset = 13 +anchor_left = 0.5 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = -39.0 +offset_top = 1.0 +offset_right = -23.0 +offset_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_icons/grabber_disabled = ExtResource("6_agvbb") +theme_override_styles/slider = SubResource("StyleBoxTexture_d1e56") +theme_override_styles/grabber_area = SubResource("StyleBoxTexture_u6hdq") +value = 20.0 +editable = false +scrollable = false + +[node name="VSlider2" type="VSlider" parent="Control"] +layout_mode = 1 +anchors_preset = 13 +anchor_left = 0.5 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = 32.0 +offset_right = 48.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_icons/grabber_disabled = ExtResource("7_n8t7y") +theme_override_styles/slider = SubResource("StyleBoxTexture_nlhhs") +theme_override_styles/grabber_area = SubResource("StyleBoxTexture_q46da") +value = 80.0 +editable = false +scrollable = false diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index 65dc349..4d072a8 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -83,6 +83,7 @@ func _process(delta): if Input.is_action_pressed("test"): emit_signal("shoot") - + $Control/VSlider.value = p1_train.current_distance + $Control/VSlider2.value = p2_train.current_distance diff --git a/undefined - Imgur (1).png b/undefined - Imgur (1).png new file mode 100644 index 0000000000000000000000000000000000000000..61d85d6d80baeb32caa9081f317a34f18abe0e4a GIT binary patch literal 398 zcmV;90df9`P)#~b`JnFfD*uN;%^* zF-{ltDgb4>dp6$RXgpNKAm_yZY)<4)8_m61TDmcay9DOoxoVz!8X%JSEX1$^CX%^? zF!Dve2Y9z1BbrOS`oBX~z+4>`PQBMp1-Qw4CIlcoQnT_E(231^PY+OL04OEEt!*}h zb`l_)6yCq-NIhi&c*$P@{tefsk_~dYP}wWs0h$cnjRcrYEs=DP05&TC2gsDm(D=}r z{WRk0qiuqIo;4^e+HTtz{&L(PaFm5k-Pn9?J(1A@)QyWls9PSF;fi s%8hUQ%w0~Y!5o5JPOm_1yPgBM0Gf7|4yw!EzyJUM07*qoM6N<$f@S}rm;e9( literal 0 HcmV?d00001 diff --git a/undefined - Imgur (1).png.import b/undefined - Imgur (1).png.import new file mode 100644 index 0000000..8a2d729 --- /dev/null +++ b/undefined - Imgur (1).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8rsm7uapp583" +path="res://.godot/imported/undefined - Imgur (1).png-0d6247a52be8c4b2fc393c73c25c8a7d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://undefined - Imgur (1).png" +dest_files=["res://.godot/imported/undefined - Imgur (1).png-0d6247a52be8c4b2fc393c73c25c8a7d.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/undefined - Imgur.png b/undefined - Imgur.png new file mode 100644 index 0000000000000000000000000000000000000000..5db981b7a31fdd666799d406fdefb005e3982c1d GIT binary patch literal 401 zcmV;C0dD?@P)Wyv5QQJEz#*ZXn!u+D4tL-Zu7hhqEzrT0a2*&bkO_$G%!KZMoAs=iH3p6Y{rJt0 zFi7v4l~_F`UDsi)T9xf+Xlk1GwR0>6XjS$A-~b>8u%Gy>0#E`trKb6G0??|A4E2oZ zln6$rrYTnev?{x2PaiTrt^xm8U|HwJMRz#KeR$#YKwcru@b7*;@g zGM5lqzUcP=@Afy3=29>A?~oPHSBJS%@AXpwZZaPM0Z5P3tZW4ifz5kQ3y?p6f6B=46~u9tU;00000NkvXXu0mjf3;D1e literal 0 HcmV?d00001 diff --git a/undefined - Imgur.png.import b/undefined - Imgur.png.import new file mode 100644 index 0000000..822c285 --- /dev/null +++ b/undefined - Imgur.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://44lfs83sax35" +path="res://.godot/imported/undefined - Imgur.png-b336c6cd076a57762001e473ecdfe2b4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://undefined - Imgur.png" +dest_files=["res://.godot/imported/undefined - Imgur.png-b336c6cd076a57762001e473ecdfe2b4.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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 From ed89ae1cf4080a34e703bba26fce1e0915c4c65f Mon Sep 17 00:00:00 2001 From: PfandBoss <68470553+PfandBoss@users.noreply.github.com> Date: Sat, 10 Dec 2022 12:45:47 +0100 Subject: [PATCH 6/6] Update project.godot --- project.godot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.godot b/project.godot index 80c0093..127a278 100644 --- a/project.godot +++ b/project.godot @@ -29,7 +29,7 @@ _global_script_classes=[{ "language": &"GDScript", "path": "res://scripts/Logic/MapNode.gd" }, { -"base": "StaticBody3D", +"base": "Node", "class": &"Module", "language": &"GDScript", "path": "res://scripts/Modules/Module.gd"