Train

2025-11-12 04:16:12 +01:00 · 2022-12-10 22:49:09 +01:00
parent d303e8ba89
commit a470dfeca7
12 changed files with 34 additions and 40 deletions
--- a/Nodes/InfiniteScroller.tscn
+++ b/Nodes/InfiniteScroller.tscn
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://bw3yluhr72n2t"]
+
+[ext_resource type="Script" path="res://scripts/Logic/InfiniteScroller.gd" id="1_be3ou"]
+
+[node name="InfiniteScroller" type="Node3D"]
+script = ExtResource("1_be3ou")
--- a/Nodes/Train_P1.tscn
+++ b/Nodes/Train_P1.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=22 format=3 uid="uid://md2ofbviios3"]

 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"]
-[ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"]
+[ext_resource type="PackedScene" uid="uid://chrtbakf4df4t" path="res://Nodes/engine.tscn" id="3_1ix85"]
 [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="3_in6up"]
 [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="3_jmv6b"]
 [ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="4_5jw5g"]
@@ -110,7 +110,7 @@ shape = SubResource("BoxShape3D_sm5ue")
 transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 3.19744e-14, 3, -9)

 [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="CharacterBody3D"]
-transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0)
+transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -1, 0)
 frames = SubResource("SpriteFrames_6p0y6")
 animation = &"walking_coal"
 speed_scale = 2.0
--- a/Nodes/Train_P2.tscn
+++ b/Nodes/Train_P2.tscn
@@ -107,7 +107,7 @@ shape = SubResource("BoxShape3D_psmwd")
 transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 2.84217e-14, 3, -8)

 [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="CharacterBody3D"]
-transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0)
+transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -1, 0)
 frames = SubResource("SpriteFrames_ltjyh")
 animation = &"walking_coal"
 speed_scale = 2.0
--- a/Nodes/UI.tscn
+++ b/Nodes/UI.tscn
@@ -21,7 +21,6 @@ size_flags_horizontal = 4

 [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
@@ -30,7 +29,6 @@ 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
@@ -48,7 +46,6 @@ editable = false
 scrollable = false

 [node name="VSlider2" type="VSlider" parent="."]
-layout_mode = 1
 anchors_preset = 13
 anchor_left = 0.5
 anchor_right = 0.5
--- a/Nodes/engine.tscn
+++ b/Nodes/engine.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://bhivunrkj87cy"]
+[gd_scene load_steps=4 format=3 uid="uid://chrtbakf4df4t"]

 [ext_resource type="Script" path="res://scripts/Modules/Engine.gd" id="1_8ew0t"]

--- a/Nodes/game.tscn
+++ b/Nodes/game.tscn
@@ -1,34 +1,17 @@
-[gd_scene load_steps=9 format=3 uid="uid://db0pxwq1hvs45"]
+[gd_scene load_steps=7 format=3 uid="uid://db0pxwq1hvs45"]

 [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://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_v8535"]
 [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="3_0be5n"]
 [ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="4_kxuy0"]
 [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="4_lmu0s"]

-[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ghq3e"]
-sky_top_color = Color(0.662745, 0.356863, 0.129412, 1)
-sky_horizon_color = Color(0.815686, 0.145098, 0.254902, 1)
-
-[sub_resource type="Sky" id="Sky_y00o5"]
-sky_material = SubResource("ProceduralSkyMaterial_ghq3e")
-process_mode = 1
-
-[sub_resource type="Environment" id="Environment_t4j8q"]
-background_mode = 2
-background_energy_multiplier = 1.17
-sky = SubResource("Sky_y00o5")
-ambient_light_source = 3
-tonemap_mode = 2
-ssao_enabled = true
-ssao_power = 9.0943
-ssao_detail = 1.31
-ssao_horizon = 0.21
-ssil_enabled = true
-
 [node name="Game" type="Node"]
 script = ExtResource("1_iox18")

+[node name="LightSetup" parent="." instance=ExtResource("2_v8535")]
+
 [node name="StartNode" parent="." instance=ExtResource("2_61aog")]

 [node name="Camera3D" type="Camera3D" parent="."]
@@ -48,6 +31,3 @@ transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 9.90113,
 transform = Transform3D(0.875944, -0.294781, 0.381872, -0.0210188, 0.767515, 0.640687, -0.481955, -0.569232, 0.666104, 0, 8.25958, 0)

 [node name="Control" parent="." instance=ExtResource("4_kxuy0")]
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_t4j8q")
--- a/Nodes/light_setup.tscn
+++ b/Nodes/light_setup.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://crj1k7txwig77"]
+[gd_scene load_steps=4 format=3 uid="uid://nxapkgcq2c70"]

 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ghq3e"]
 sky_top_color = Color(0.662745, 0.356863, 0.129412, 1)
--- a/Nodes/train.tscn
+++ b/Nodes/train.tscn
@@ -130,7 +130,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, -2)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -2)

 [node name="Canon" parent="." instance=ExtResource("10_54n3n")]
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 6.14337, 0, 1.47043)
+transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 6.14337, 0, 1.47043)

 [node name="Canon2" parent="." instance=ExtResource("10_54n3n")]
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2.07371, 0, 1.47043)
--- 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"
--- a/scripts/Logic/Game.gd
+++ b/scripts/Logic/Game.gd
@@ -96,12 +96,11 @@ func mapSimulation(delta):
 		var distance_delta = p2_train.current_distance - p2_node.LENGTH
 		p2_node = p2_node._on_train_exit(p2_train)
 		p2_train.current_distance = distance_delta
-	$Control/VSlider.value = p1_train.distance_from_start
-	$Control/VSlider2.value = p2_train.distance_from_start
+	$Control/VSlider.value = p2_train.distance_from_startgit 
+	$Control/VSlider2.value = p1_train.distance_from_start
 	
 func fightSimulation():
 	#FIGHT SIMULATION
-	print(p1_train.current_distance - p2_train.current_distance)
 	if(p1_node == p2_node && abs(p1_train.current_distance - p2_train.current_distance) < 0.5):
 		if(fight_state == CHILL):
 			fight_state = FIGHTING
@@ -111,7 +110,7 @@ func fightSimulation():
 			var speed_differene = p1_train.current_speed - p2_train.current_speed
 			tween.set_parallel()
 			tween.tween_property($Camera3D, "position", initial_camera_pos + Vector3(0,80,20), 1.4)
-			if(speed_differene < 0):
+			if(speed_differene > 0):
 				var new_pos_p1 = p1_train.position + Vector3(-30 ,0,+30)
 				tween.tween_property(p1_train, "position",new_pos_p1, 0.5)
 				var new_pos_p2 = p2_train.position + Vector3(30,0,-30)
@@ -145,7 +144,7 @@ func approach():
 	tween.set_ease(Tween.EASE_OUT)
 	tween.set_parallel()
 	var speed_differene = p1_train.current_speed - p2_train.current_speed
-	if(speed_differene < 0):
+	if(speed_differene > 0):
 		tween.tween_property(p1_train, "position", Vector3(p1_train.position.x, p1_train.position.y, p2_train.position.z), 0.7)
 	else:
 		tween.tween_property(p2_train, "position", Vector3(p2_train.position.x, p2_train.position.y, p1_train.position.z), 0.7)
@@ -158,7 +157,7 @@ func fight():
 	tween.set_ease(Tween.EASE_IN_OUT)
 	tween.set_parallel()
 	var speed_differene = p1_train.current_speed - p2_train.current_speed
-	if(speed_differene < 0):
+	if(speed_differene > 0):
 		tween.tween_property(p1_train, "position", Vector3(p1_train.position.x, p1_train.position.y, p2_train.position.z - 90), 0.7)
 	else:
 		tween.tween_property(p2_train, "position", Vector3(p2_train.position.x, p2_train.position.y, p1_train.position.z - 90), 0.7)
--- a/scripts/Logic/InfiniteScroller.gd
+++ b/scripts/Logic/InfiniteScroller.gd
@@ -0,0 +1,11 @@
+extends Node3D
+
+@onready var rails
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	pass
--- a/scripts/Train.gd
+++ b/scripts/Train.gd
@@ -30,6 +30,7 @@ func _on_signal_shooting():

 func is_dead():
 	if current_speed <= 0:
+		current_speed = 0
 		game_over.emit()
 		return true
 	return false