kookroach/SemesterGameJam2022
1
0
Fork 0
mirror of https://github.com/PfandBoss/SemesterGameJam2022.git synced 2025-11-12 04:16:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Leo bug fixes

Browse Source
This commit is contained in:
INoro
2022-12-11 06:06:07 +01:00
parent f2fd6fb376
commit 275c6205e6
8 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Assets/Textures/Gunpowder.png → Assets/Textures/Opera_senza_titolo (1).png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 330 KiB

After

Width:  |  Height:  |  Size: 330 KiB

0
Assets/Textures/Kohle.png → Assets/Textures/Opera_senza_titolo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 470 KiB

After

Width:  |  Height:  |  Size: 470 KiB

6
Nodes/game.tscn
View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"] [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="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://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://c2er6jf4t2e8t" 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://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="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://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"] [ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_c6uwu"]

4
Storage.tscn
View File

@@ -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="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://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"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_c1ipa"]
height = 3.60519 height = 3.60519
@@ -34,7 +33,6 @@ shape = SubResource("CylinderShape3D_orr2n")
[node name="Sprite3D2" type="Sprite3D" parent="."] [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) transform = Transform3D(0.15, 0, 0, 0, -6.55671e-09, 0.15, 0, -0.15, -6.55671e-09, 0, 3.10039, 0)
visible = false visible = false
texture = ExtResource("3_ojyse")
[connection signal="body_entered" from="Area3D" to="." method="on_Player_enter"] [connection signal="body_entered" from="Area3D" to="." method="on_Player_enter"]
[connection signal="body_exited" from="Area3D" to="." method="on_Player_exit"] [connection signal="body_exited" from="Area3D" to="." method="on_Player_exit"]

2
menu/Speedometer_player1.gd
View File

@@ -14,7 +14,7 @@ func _ready():
while not root is Game: while not root is Game:
root = root.get_parent() root = root.get_parent()
func _process(delta): func _process(_delta):
currentSpeed = root.p1_train.current_speed currentSpeed = root.p1_train.current_speed
deg = currentSpeed * (70.0/maxSpeed) - 35.0 deg = currentSpeed * (70.0/maxSpeed) - 35.0

6
scripts/Modules/Module.gd
View File

@@ -20,13 +20,13 @@ enum MODULE_TYPE {CANNON, STEERING, ENGINE, STORAGE}
#------------Methods-------------# #------------Methods-------------#
func interact(player): func interact(_player):
pass pass
func _ready(): func _ready():
var root = get_tree().root.get_child(0) #var root = get_tree().root.get_child(0)
pass
#-----------Setter and Getter---------------# #-----------Setter and Getter---------------#
func _set_currentStashValue(newValue): func _set_currentStashValue(newValue):

2
scripts/Modules/Storage.gd
View File

@@ -11,7 +11,7 @@ enum TYPE {AMMO, GUNPOWDER, COAL, LARGE, GIANT}
@export var audioClip : AudioStreamWAV @export var audioClip : AudioStreamWAV
#------------Methods-------------# #------------Methods-------------#
func _ready(): 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) #root.ammo_pickup.connect(_on_signal_storing)
maxStashValue = 10 maxStashValue = 10
currentStashValue = 10 currentStashValue = 10

2
scripts/Player.gd
View File

@@ -26,7 +26,7 @@ func _ready():
idle = "idle" idle = "idle"
func _physics_process(delta): func _physics_process(_delta):
if(velocity.length() > 0): if(velocity.length() > 0):
$AnimatedSprite3D.play(walking) $AnimatedSprite3D.play(walking)
else: else: