diff --git a/Assets/Textures/Gunpowder.png b/Assets/Textures/Opera_senza_titolo (1).png similarity index 100% rename from Assets/Textures/Gunpowder.png rename to Assets/Textures/Opera_senza_titolo (1).png diff --git a/Assets/Textures/Kohle.png b/Assets/Textures/Opera_senza_titolo.png similarity index 100% rename from Assets/Textures/Kohle.png rename to Assets/Textures/Opera_senza_titolo.png diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 1046f80..476245f 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"] -[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] +[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"] -[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] -[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] +[ext_resource type="PackedScene" uid="uid://c2er6jf4t2e8t" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] +[ext_resource type="PackedScene" uid="uid://cr2qnrachvh01" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] [ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="6_eicse"] [ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_wagg2"] [ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_c6uwu"] diff --git a/Storage.tscn b/Storage.tscn index 66a5103..697310c 100644 --- a/Storage.tscn +++ b/Storage.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=6 format=3 uid="uid://cet80w4yr8rse"] +[gd_scene load_steps=5 format=3 uid="uid://cet80w4yr8rse"] [ext_resource type="Script" path="res://scripts/Modules/Storage.gd" id="1_guwoh"] [ext_resource type="Texture2D" uid="uid://cjc4wohtjb73j" path="res://Chest.png" id="2_a5kei"] -[ext_resource type="Texture2D" uid="uid://cet5o7wla1x7t" path="res://Assets/Textures/Opera_senza_titolo.png" id="3_ojyse"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_c1ipa"] height = 3.60519 @@ -34,7 +33,6 @@ shape = SubResource("CylinderShape3D_orr2n") [node name="Sprite3D2" type="Sprite3D" parent="."] transform = Transform3D(0.15, 0, 0, 0, -6.55671e-09, 0.15, 0, -0.15, -6.55671e-09, 0, 3.10039, 0) visible = false -texture = ExtResource("3_ojyse") [connection signal="body_entered" from="Area3D" to="." method="on_Player_enter"] [connection signal="body_exited" from="Area3D" to="." method="on_Player_exit"] diff --git a/menu/Speedometer_player1.gd b/menu/Speedometer_player1.gd index 7709b42..1c2f6f2 100644 --- a/menu/Speedometer_player1.gd +++ b/menu/Speedometer_player1.gd @@ -14,7 +14,7 @@ func _ready(): while not root is Game: root = root.get_parent() -func _process(delta): +func _process(_delta): currentSpeed = root.p1_train.current_speed deg = currentSpeed * (70.0/maxSpeed) - 35.0 diff --git a/scripts/Modules/Module.gd b/scripts/Modules/Module.gd index 2576f2a..776707e 100644 --- a/scripts/Modules/Module.gd +++ b/scripts/Modules/Module.gd @@ -20,13 +20,13 @@ enum MODULE_TYPE {CANNON, STEERING, ENGINE, STORAGE} #------------Methods-------------# -func interact(player): +func interact(_player): pass func _ready(): - var root = get_tree().root.get_child(0) - + #var root = get_tree().root.get_child(0) + pass #-----------Setter and Getter---------------# func _set_currentStashValue(newValue): diff --git a/scripts/Modules/Storage.gd b/scripts/Modules/Storage.gd index 1c7e5cc..f543ddc 100644 --- a/scripts/Modules/Storage.gd +++ b/scripts/Modules/Storage.gd @@ -11,7 +11,7 @@ enum TYPE {AMMO, GUNPOWDER, COAL, LARGE, GIANT} @export var audioClip : AudioStreamWAV #------------Methods-------------# func _ready(): - var root = get_tree().root.get_child(0) + #var root = get_tree().root.get_child(0) #root.ammo_pickup.connect(_on_signal_storing) maxStashValue = 10 currentStashValue = 10 diff --git a/scripts/Player.gd b/scripts/Player.gd index b6de996..90b69a4 100644 --- a/scripts/Player.gd +++ b/scripts/Player.gd @@ -26,7 +26,7 @@ func _ready(): idle = "idle" -func _physics_process(delta): +func _physics_process(_delta): if(velocity.length() > 0): $AnimatedSprite3D.play(walking) else: