1 files changed, 19 insertions, 108 deletions
diff --git a/Racing-Game/4WheelCar/4WheelCar.tscn b/Racing-Game/4WheelCar/4WheelCar.tscn
index 81fef02..de13e82 100644
--- a/Racing-Game/4WheelCar/4WheelCar.tscn
+++ b/Racing-Game/4WheelCar/4WheelCar.tscn
@@ -1,42 +1,24 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://4WheelCar/CarBody.gd" type="Script" id=1]
 [ext_resource path="res://Art(non-orig)/PNG/Cars/big/blue/car_blue_2.png" type="Texture" id=2]
-[ext_resource path="res://4WheelCar/FrontWheel.gd" type="Script" id=3]
-[ext_resource path="res://4WheelCar/Skid/SkidController.gd" type="Script" id=4]
-[ext_resource path="res://4WheelCar/BackWheel.gd" type="Script" id=5]
-
-[sub_resource type="RectangleShape2D" id=1]
+[ext_resource path="res://Art(non-orig)/crosshair(isorig).png" type="Texture" id=3]
+[ext_resource path="res://4WheelCar/CarProperties.gd" type="Script" id=6]
+[ext_resource path="res://4WheelCar/WheelCreation.gd" type="Script" id=9]
 
 [sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 35.7301, 58.1399 )
 
-[sub_resource type="RectangleShape2D" id=3]
-extents = Vector2( 6.93714, 14.1584 )
-
-[sub_resource type="RectangleShape2D" id=4]
-extents = Vector2( 7.07375, 14.3787 )
+[sub_resource type="RectangleShape2D" id=1]
 
 [node name="4WheelCar" type="Node"]
+script = ExtResource( 6 )
 
 [node name="CarBody" type="RigidBody2D" parent="."]
 position = Vector2( -0.446396, -0.582428 )
 z_index = 1
-mass = 20.0
-script = ExtResource( 1 )
-
-[node name="Engine" type="RigidBody2D" parent="CarBody"]
-position = Vector2( 0, 26 )
-z_index = 2
 mass = 30.0
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CarBody/Engine"]
-z_index = 2
-shape = SubResource( 1 )
-disabled = true
-__meta__ = {
-"_edit_group_": true
-}
+script = ExtResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="CarBody"]
 texture = ExtResource( 2 )
@@ -46,97 +28,26 @@ visible = false
 modulate = Color( 0, 0, 0, 1 )
 shape = SubResource( 2 )
 
-[node name="Wheels" type="Node" parent="CarBody"]
-
-[node name="FRWheel" type="RigidBody2D" parent="CarBody/Wheels"]
-position = Vector2( 24.7786, -36.8564 )
-mass = 15.0
-linear_damp = 0.4
-angular_damp = 7.04
-script = ExtResource( 3 )
-__meta__ = {
-"_edit_group_": true
-}
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CarBody/Wheels/FRWheel"]
-shape = SubResource( 3 )
-disabled = true
-
-[node name="SkidController4" type="Node" parent="CarBody/Wheels/FRWheel"]
-script = ExtResource( 4 )
-
-[node name="FLWheel" type="RigidBody2D" parent="CarBody/Wheels"]
-position = Vector2( -25.6184, -36.8564 )
-mass = 15.0
-linear_damp = 0.4
-angular_damp = 7.04
-script = ExtResource( 3 )
-__meta__ = {
-"_edit_group_": true
-}
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CarBody/Wheels/FLWheel"]
-shape = SubResource( 4 )
-disabled = true
-
-[node name="SkidController3" type="Node" parent="CarBody/Wheels/FLWheel"]
-script = ExtResource( 4 )
-
-[node name="BLWheel" type="RigidBody2D" parent="CarBody/Wheels"]
-position = Vector2( -22.4074, 38.5726 )
-mass = 15.0
-linear_damp = 0.4
-angular_damp = 7.04
-script = ExtResource( 5 )
-__meta__ = {
-"_edit_group_": true
-}
+[node name="Engine" type="RigidBody2D" parent="CarBody"]
+position = Vector2( 0, 26 )
+z_index = 2
+mass = 10.0
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CarBody/Wheels/BLWheel"]
-shape = SubResource( 4 )
+[node name="CollisionShape2D" type="CollisionShape2D" parent="CarBody/Engine"]
+z_index = 2
+shape = SubResource( 1 )
 disabled = true
-
-[node name="SkidController2" type="Node" parent="CarBody/Wheels/BLWheel"]
-script = ExtResource( 4 )
-
-[node name="BRWheel" type="RigidBody2D" parent="CarBody/Wheels"]
-position = Vector2( 21.2326, 38.4176 )
-mass = 15.0
-linear_damp = 0.4
-angular_damp = 7.04
-script = ExtResource( 5 )
 __meta__ = {
 "_edit_group_": true
 }
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CarBody/Wheels/BRWheel"]
-shape = SubResource( 4 )
-disabled = true
-
-[node name="SkidController" type="Node" parent="CarBody/Wheels/BRWheel"]
-script = ExtResource( 4 )
-
-[node name="PinJointFR" type="PinJoint2D" parent="CarBody"]
-position = Vector2( 25.2246, -36.274 )
-node_a = NodePath("../Wheels/FRWheel")
-node_b = NodePath("..")
+[node name="Sprite" type="Sprite" parent="CarBody/Engine"]
+texture = ExtResource( 3 )
 
-[node name="PinJointBR" type="PinJoint2D" parent="CarBody"]
-position = Vector2( 21.6786, 39.155 )
-node_a = NodePath("../Wheels/BRWheel")
-node_b = NodePath("..")
-
-[node name="PinJointBL" type="PinJoint2D" parent="CarBody"]
-position = Vector2( -21.961, 39.155 )
-node_a = NodePath("../Wheels/BLWheel")
-node_b = NodePath("..")
-
-[node name="PinJointFL" type="PinJoint2D" parent="CarBody"]
-position = Vector2( -25.1724, -36.274 )
-node_a = NodePath("../Wheels/FLWheel")
-node_b = NodePath("..")
+[node name="Wheels" type="Node" parent="CarBody"]
+script = ExtResource( 9 )
 
 [node name="PinjointEngine" type="PinJoint2D" parent="CarBody"]
 position = Vector2( 0, 26 )
-node_a = NodePath("../..")
+node_a = NodePath("../Engine")
 node_b = NodePath("..")