diff --git a/Assets/Textures/Track_Color.png b/Assets/Textures/Track_Color.png new file mode 100644 index 0000000..e22dbc9 Binary files /dev/null and b/Assets/Textures/Track_Color.png differ diff --git a/Assets/Textures/Track_Color.png.import b/Assets/Textures/Track_Color.png.import new file mode 100644 index 0000000..202c958 --- /dev/null +++ b/Assets/Textures/Track_Color.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cb5ns37ft6ju1" +path.s3tc="res://.godot/imported/Track_Color.png-f3402d7103712cb3ad888639b7a110d0.s3tc.ctex" +path.etc2="res://.godot/imported/Track_Color.png-f3402d7103712cb3ad888639b7a110d0.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Track_Color.png" +dest_files=["res://.godot/imported/Track_Color.png-f3402d7103712cb3ad888639b7a110d0.s3tc.ctex", "res://.godot/imported/Track_Color.png-f3402d7103712cb3ad888639b7a110d0.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/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index ef8024f..63376ef 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -31,7 +31,7 @@ [ext_resource type="PackedScene" uid="uid://cbvbqqwwnkut5" path="res://Assets/Model/Modules/Coal.glb" id="28_4ee2i"] [ext_resource type="PackedScene" uid="uid://dtur8jn3vpeuv" path="res://Assets/Model/Objects/Trashcan.glb" id="30_1bsq2"] [ext_resource type="Shader" path="res://Nodes/game.gdshader" id="31_tn7tf"] -[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="32_yykqx"] +[ext_resource type="Texture2D" uid="uid://cb5ns37ft6ju1" path="res://Assets/Textures/Track_Color.png" id="32_k8vou"] [sub_resource type="SpriteFrames" id="SpriteFrames_6p0y6"] animations = [{ @@ -126,10 +126,10 @@ size = Vector3(1.6991, 2.76277, 1) [sub_resource type="ShaderMaterial" id="ShaderMaterial_0sh6y"] render_priority = 0 shader = ExtResource("31_tn7tf") -shader_parameter/albedo = ExtResource("32_yykqx") +shader_parameter/albedo = ExtResource("32_k8vou") shader_parameter/direction_and_speed = Vector2(0, -1) shader_parameter/flip = null -shader_parameter/scale = Vector2(3, 5) +shader_parameter/scale = Vector2(3, 30) [sub_resource type="BoxMesh" id="BoxMesh_1njd7"] material = SubResource("ShaderMaterial_0sh6y") @@ -256,5 +256,5 @@ transform = Transform3D(0.712443, 0, -0.70173, 0, 1, 0, 0.70173, 0, 0.712443, 3. shape = SubResource("BoxShape3D_enmqk") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] -transform = Transform3D(50, 0, 0, 0, 1, 0, 0, 0, 512, 0, -4.40884, 0) +transform = Transform3D(10, 0, 0, 0, 0.2, 0, 0, 0, 500, 0, -4.40884, 0) mesh = SubResource("BoxMesh_1njd7") diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn index 0c5e8f2..b383da0 100644 --- a/Nodes/Train_P2.tscn +++ b/Nodes/Train_P2.tscn @@ -32,7 +32,7 @@ [ext_resource type="PackedScene" uid="uid://cbvbqqwwnkut5" path="res://Assets/Model/Modules/Coal.glb" id="28_11itx"] [ext_resource type="PackedScene" uid="uid://dtur8jn3vpeuv" path="res://Assets/Model/Objects/Trashcan.glb" id="29_mo2mr"] [ext_resource type="Shader" path="res://Nodes/game.gdshader" id="32_aqtbn"] -[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="33_mdav0"] +[ext_resource type="Texture2D" uid="uid://cb5ns37ft6ju1" path="res://Assets/Textures/Track_Color.png" id="33_1rq67"] [sub_resource type="SpriteFrames" id="SpriteFrames_ltjyh"] animations = [{ @@ -124,10 +124,10 @@ size = Vector3(1.83216, 2.38974, 1.62541) [sub_resource type="ShaderMaterial" id="ShaderMaterial_ocpcq"] render_priority = 0 shader = ExtResource("32_aqtbn") -shader_parameter/albedo = ExtResource("33_mdav0") +shader_parameter/albedo = ExtResource("33_1rq67") shader_parameter/direction_and_speed = Vector2(0, -1) shader_parameter/flip = null -shader_parameter/scale = Vector2(3, 5) +shader_parameter/scale = Vector2(3, 30) [sub_resource type="BoxMesh" id="BoxMesh_e1woo"] material = SubResource("ShaderMaterial_ocpcq") @@ -147,21 +147,21 @@ speed_scale = 2.0 playing = true [node name="Storage" parent="." instance=ExtResource("16_7dojn")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 5.64815, -0.00526038, -5.48825) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 5.64815, 0.988311, -5.48825) icon = ExtResource("18_flxwh") [node name="Storage4" parent="." instance=ExtResource("16_7dojn")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 5.50111, 0.0193441, -2.68954) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 5.50111, 1.40284, -2.68954) currentType = 3 icon = ExtResource("24_dbf0g") [node name="Storage5" parent="." instance=ExtResource("16_7dojn")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 4.91551, 0.0193443, 1.93591) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, 4.91551, 1.49585, 1.93591) currentType = 4 icon = ExtResource("25_a3u45") [node name="Storage2" parent="." instance=ExtResource("16_7dojn")] -transform = Transform3D(-0.248791, 0, -0.968557, 0, 1, 0, -0.968557, 0, 0.248791, 4.83957, 0.511235, 9.06418) +transform = Transform3D(-0.248791, 0, -0.968557, 0, 1, 0, -0.968557, 0, 0.248791, 4.83957, 1.04016, 9.06418) currentType = 2 icon = ExtResource("19_msksj") @@ -172,13 +172,13 @@ transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, -3.96857 transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, 8.74228e-08, 0, 1, -4.02311, 1.2303, 5.94791) [node name="Engine" parent="." instance=ExtResource("17_regf7")] -transform = Transform3D(-6.55671e-08, 0, -1.5, 0, 1.5, 0, -1.5, 0, 6.55671e-08, 4.92586, 1.1688, -9.70376) +transform = Transform3D(-6.55671e-08, 0, -1.5, 0, 1.5, 0, -1.5, 0, 6.55671e-08, 4.92586, 2.14168, -9.70376) [node name="Bin" parent="." instance=ExtResource("14_n2rwc")] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, -1, 0, 4.37114e-08, -1.887, -0.0309173, 10.6156) [node name="Storage3" parent="." instance=ExtResource("16_7dojn")] -transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -3.16754, -0.348943, -10.4205) +transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -3.16754, 0.82869, -10.4205) currentType = 1 icon = ExtResource("20_yp8lr") audioClip = ExtResource("17_xnc4h") @@ -250,5 +250,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.53467, 1.22896, 10.6981) shape = SubResource("BoxShape3D_euqoo") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] -transform = Transform3D(50, 0, 0, 0, 1, 0, 0, 0, 512, 0, -4.409, 0) +transform = Transform3D(10, 0, 0, 0, 0.2, 0, 0, 0, 500, 0, -4.409, 0) mesh = SubResource("BoxMesh_e1woo") diff --git a/Nodes/UI.tscn b/Nodes/UI.tscn index db1cb05..4103767 100644 --- a/Nodes/UI.tscn +++ b/Nodes/UI.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://Nodes/UI.gd" id="1_dxr24"] [ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"] [ext_resource type="Texture2D" uid="uid://cxfybbp5idjwg" path="res://o_idle1.png" id="3_segqn"] -[ext_resource type="PackedScene" path="res://menu/stats_player_1.tscn" id="3_yhsvf"] +[ext_resource type="PackedScene" uid="uid://dgr3cta6n1tg3" path="res://menu/stats_player_1.tscn" id="3_yhsvf"] [ext_resource type="PackedScene" path="res://menu/stats_player_2.tscn" id="4_c4m18"] [ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_uiyin"] @@ -31,6 +31,7 @@ script = ExtResource("1_dxr24") [node name="Panel" type="Panel" parent="."] custom_minimum_size = Vector2(15, 0) +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -39,12 +40,13 @@ grow_horizontal = 2 grow_vertical = 2 [node name="VSlider" type="VSlider" parent="."] +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = 20.0 -offset_right = 36.0 +offset_left = -36.0 +offset_right = -20.0 grow_horizontal = 2 grow_vertical = 2 pivot_offset = Vector2(32, 0) @@ -56,12 +58,13 @@ editable = false scrollable = false [node name="VSlider2" type="VSlider" parent="."] +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = -36.0 -offset_right = -20.0 +offset_left = 20.0 +offset_right = 36.0 grow_horizontal = 2 grow_vertical = 2 theme_override_icons/grabber_disabled = ExtResource("2_udann") @@ -74,7 +77,7 @@ scrollable = false [node name="GameOver" type="Control" parent="."] visible = false -layout_mode = 3 +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -82,6 +85,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Label" type="Label" parent="GameOver"] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -98,6 +102,7 @@ label_settings = SubResource("LabelSettings_ot0gm") horizontal_alignment = 1 [node name="VBoxContainer" type="VBoxContainer" parent="GameOver"] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -113,12 +118,15 @@ size_flags_horizontal = 4 size_flags_vertical = 4 [node name="Button" type="Button" parent="GameOver/VBoxContainer"] +layout_mode = 2 text = "RESTART" [node name="Button2" type="Button" parent="GameOver/VBoxContainer"] +layout_mode = 2 text = "BACK TO MAIN MENU" [node name="BoxContainer" type="BoxContainer" parent="GameOver"] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -133,21 +141,24 @@ grow_vertical = 2 [node name="HBoxContainer" type="HBoxContainer" parent="GameOver/BoxContainer"] custom_minimum_size = Vector2(900, 500) +layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 [node name="TextureRect" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"] custom_minimum_size = Vector2(500, 0) +layout_mode = 2 texture = ExtResource("3_segqn") ignore_texture_size = true [node name="TextureRect2" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"] custom_minimum_size = Vector2(500, 0) +layout_mode = 2 texture = ExtResource("4_uiyin") ignore_texture_size = true [node name="Control" type="Control" parent="."] -layout_mode = 3 +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -155,13 +166,16 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")] +layout_mode = 1 anchors_preset = 0 anchor_bottom = 0.0 -offset_right = 0.0 +offset_left = 1.0 +offset_right = 1.0 grow_vertical = 1 scale = Vector2(0.6, 0.6) [node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")] +layout_mode = 1 scale = Vector2(0.6, 0.6) [connection signal="pressed" from="GameOver/VBoxContainer/Button" to="." method="_on_button_pressed"] diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index 587eb9d..ca35134 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -39,8 +39,8 @@ func _ready(): p2_train.hit.connect(_on_hit_player) p1_train.game_over.connect(_on_player_game_over) p2_train.game_over.connect(_on_player_game_over) - p1_train.current_speed = 12 - p2_train.current_speed = 16 + p1_train.current_speed = 34 + p2_train.current_speed = 36 func getMapSize(node, is_start): if node == StartNode && not is_start: diff --git a/scripts/Modules/Engine.gd b/scripts/Modules/Engine.gd index 3691d0a..02c46ef 100644 --- a/scripts/Modules/Engine.gd +++ b/scripts/Modules/Engine.gd @@ -3,8 +3,8 @@ class_name TrainEngine enum STATE {RUNNING, DEAD} -const maxSpeed = 40 -const refuelRate = 1.0 +const maxSpeed = 60 +const refuelRate = 1.25 @onready var train = get_parent() as Train diff --git a/scripts/Modules/Storage.gd b/scripts/Modules/Storage.gd index 4b598af..b5281ba 100644 --- a/scripts/Modules/Storage.gd +++ b/scripts/Modules/Storage.gd @@ -13,8 +13,8 @@ enum TYPE {AMMO, GUNPOWDER, COAL, LARGE, GIANT} func _ready(): #var root = get_tree().root.get_child(0) #root.ammo_pickup.connect(_on_signal_storing) - maxStashValue = 10 - currentStashValue = 10 + maxStashValue = 100 + currentStashValue = 100 $Sprite3D2.texture = icon $AudioStreamPlayer.stream = audioClip $Sprite3D2.visible = false