From c1bf5eb72e97e2a5be138181c62774a4de70a297 Mon Sep 17 00:00:00 2001
From: Lukas Moungos <lukas.moungos@tum.de>
Date: Sat, 10 Dec 2022 22:50:53 +0100
Subject: [PATCH] Train

---
 Nodes/Train_P2.tscn   | 29 +----------------------------
 scripts/Logic/Game.gd |  4 ----
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn
index 2047355..2a43a2b 100644
--- a/Nodes/Train_P2.tscn
+++ b/Nodes/Train_P2.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://bikdn7ep2vpxw"]
+[gd_scene load_steps=19 format=3 uid="uid://bikdn7ep2vpxw"]
 
 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_mcmgl"]
 [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="2_xoa1a"]
@@ -13,10 +13,6 @@
 [ext_resource type="Texture2D" uid="uid://djsergj3l4t2c" path="res://o_walking_ball2.png" id="9_rt6ws"]
 [ext_resource type="Texture2D" uid="uid://ctssikrodjqvc" path="res://o_walking_powder2.png" id="11_eefgn"]
 [ext_resource type="Texture2D" uid="uid://nctqw3vt5q0y" path="res://o_walking_coal2.png" id="12_581v4"]
-[ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="14_n2rwc"]
-[ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="15_sof53"]
-[ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="16_7dojn"]
-[ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="17_regf7"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"]
 size = Vector3(1, 3.77669, 24)
@@ -116,26 +112,3 @@ frames = SubResource("SpriteFrames_ltjyh")
 animation = &"walking_coal"
 speed_scale = 2.0
 playing = true
-
-[node name="Bin" parent="." instance=ExtResource("14_n2rwc")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18577, 0.622175, 10.6544)
-
-[node name="Cannon" parent="." instance=ExtResource("15_sof53")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, 0.245877)
-
-[node name="Cannon2" parent="." instance=ExtResource("15_sof53")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, -5.83086)
-
-[node name="Storage" parent="." instance=ExtResource("16_7dojn")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.30738, 0.293261, -10.1586)
-
-[node name="Storage2" parent="." instance=ExtResource("16_7dojn")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.67656, 0.293261, -1.79235)
-currentType = 1
-
-[node name="Storage3" parent="." instance=ExtResource("16_7dojn")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.79878, 0.293261, 6.13508)
-currentType = 2
-
-[node name="Engine" parent="." instance=ExtResource("17_regf7")]
-transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 2.86451, 1.17834, 10.1923)
diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd
index 90daea5..26d369f 100644
--- a/scripts/Logic/Game.gd
+++ b/scripts/Logic/Game.gd
@@ -102,10 +102,6 @@ func mapSimulation(delta):
 	
 func fightSimulation():
 	#FIGHT SIMULATION
-<<<<<<< HEAD
-=======
-	#print(p1_train.current_distance - p2_train.current_distance)
->>>>>>> 001f29cb394b200e67b451ba675fe20c2d780623
 	if(p1_node == p2_node && abs(p1_train.current_distance - p2_train.current_distance) < 0.5):
 		if(fight_state == CHILL):
 			fight_state = FIGHTING