summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Racing-Game/4WheelCar/4WheelCar.tscn9
-rw-r--r--Racing-Game/4WheelCar/Weight/Weight.gd (renamed from Racing-Game/4WheelCar/Weight.gd)0
-rw-r--r--Racing-Game/4WheelCar/Weight/Weight.tscn (renamed from Racing-Game/4WheelCar/Weight.tscn)9
-rw-r--r--Racing-Game/4WheelCar/Weight/WeightCreation.gd (renamed from Racing-Game/4WheelCar/WeightCreation.gd)2
-rw-r--r--Racing-Game/4WheelCar/Wheels/BackWheel.gd (renamed from Racing-Game/4WheelCar/BackWheel.gd)2
-rw-r--r--Racing-Game/4WheelCar/Wheels/BackWheel.tscn (renamed from Racing-Game/4WheelCar/BackWheel.tscn)5
-rw-r--r--Racing-Game/4WheelCar/Wheels/FrontWheel.gd (renamed from Racing-Game/4WheelCar/FrontWheel.gd)2
-rw-r--r--Racing-Game/4WheelCar/Wheels/FrontWheel.tscn (renamed from Racing-Game/4WheelCar/FrontWheel.tscn)5
-rw-r--r--Racing-Game/4WheelCar/Wheels/Skid/SkidController.gd (renamed from Racing-Game/4WheelCar/Skid/SkidController.gd)4
-rw-r--r--Racing-Game/4WheelCar/Wheels/Skid/Skidmark.tscn (renamed from Racing-Game/4WheelCar/Skid/Skidmark.tscn)3
-rw-r--r--Racing-Game/4WheelCar/Wheels/Skid/Skidmarks.gd (renamed from Racing-Game/4WheelCar/Skid/Skidmarks.gd)0
-rw-r--r--Racing-Game/4WheelCar/Wheels/Wheel.gd (renamed from Racing-Game/4WheelCar/Wheel.gd)0
-rw-r--r--Racing-Game/4WheelCar/Wheels/WheelCreation.gd (renamed from Racing-Game/4WheelCar/WheelCreation.gd)4
13 files changed, 25 insertions, 20 deletions
diff --git a/Racing-Game/4WheelCar/4WheelCar.tscn b/Racing-Game/4WheelCar/4WheelCar.tscn
index ff5d89f..a6e289a 100644
--- a/Racing-Game/4WheelCar/4WheelCar.tscn
+++ b/Racing-Game/4WheelCar/4WheelCar.tscn
@@ -2,11 +2,12 @@
[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/WeightCreation.gd" type="Script" id=4]
+[ext_resource path="res://4WheelCar/Weight/WeightCreation.gd" type="Script" id=4]
[ext_resource path="res://4WheelCar/CarProperties.gd" type="Script" id=6]
-[ext_resource path="res://4WheelCar/WheelCreation.gd" type="Script" id=9]
+[ext_resource path="res://4WheelCar/Wheels/WheelCreation.gd" type="Script" id=9]
-[sub_resource type="RectangleShape2D" id=2]
+
+[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 35.7301, 58.1399 )
[node name="4WheelCar" type="Node"]
@@ -24,7 +25,7 @@ texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="CarBody"]
visible = false
modulate = Color( 0, 0, 0, 1 )
-shape = SubResource( 2 )
+shape = SubResource( 1 )
[node name="Wheels" type="Node" parent="CarBody"]
script = ExtResource( 9 )
diff --git a/Racing-Game/4WheelCar/Weight.gd b/Racing-Game/4WheelCar/Weight/Weight.gd
index ea9e615..ea9e615 100644
--- a/Racing-Game/4WheelCar/Weight.gd
+++ b/Racing-Game/4WheelCar/Weight/Weight.gd
diff --git a/Racing-Game/4WheelCar/Weight.tscn b/Racing-Game/4WheelCar/Weight/Weight.tscn
index 4735229..094f257 100644
--- a/Racing-Game/4WheelCar/Weight.tscn
+++ b/Racing-Game/4WheelCar/Weight/Weight.tscn
@@ -1,7 +1,8 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://Art(non-orig)/crosshair(isorig).png" type="Texture" id=1]
-[ext_resource path="res://4WheelCar/Weight.gd" type="Script" id=2]
+[ext_resource path="res://4WheelCar/Weight/Weight.gd" type="Script" id=1]
+[ext_resource path="res://Art(non-orig)/crosshair(isorig).png" type="Texture" id=2]
+
[sub_resource type="RectangleShape2D" id=1]
@@ -9,7 +10,7 @@
position = Vector2( -0.446396, 25.4176 )
z_index = 2
mass = 10.0
-script = ExtResource( 2 )
+script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
z_index = 2
@@ -20,4 +21,4 @@ __meta__ = {
}
[node name="Sprite" type="Sprite" parent="."]
-texture = ExtResource( 1 )
+texture = ExtResource( 2 )
diff --git a/Racing-Game/4WheelCar/WeightCreation.gd b/Racing-Game/4WheelCar/Weight/WeightCreation.gd
index 6d6f607..290325c 100644
--- a/Racing-Game/4WheelCar/WeightCreation.gd
+++ b/Racing-Game/4WheelCar/Weight/WeightCreation.gd
@@ -16,7 +16,7 @@ func _ready():
# pass
func createWeight(dataArray):
- var weighttemp_resource = load("res://4WheelCar/Weight.tscn")
+ var weighttemp_resource = load("res://4WheelCar/Weight/Weight.tscn")
var weighttemp = weighttemp_resource.instance()
weighttemp.set_position(Vector2(dataArray[0],dataArray[1]))
add_child(weighttemp)
diff --git a/Racing-Game/4WheelCar/BackWheel.gd b/Racing-Game/4WheelCar/Wheels/BackWheel.gd
index 1d6ee18..88df113 100644
--- a/Racing-Game/4WheelCar/BackWheel.gd
+++ b/Racing-Game/4WheelCar/Wheels/BackWheel.gd
@@ -1,4 +1,4 @@
-extends "res://4WheelCar/Wheel.gd"
+extends "res://4WheelCar/Wheels/Wheel.gd"
#Accelerating
var hp = 4.0
diff --git a/Racing-Game/4WheelCar/BackWheel.tscn b/Racing-Game/4WheelCar/Wheels/BackWheel.tscn
index e493d24..c09eaca 100644
--- a/Racing-Game/4WheelCar/BackWheel.tscn
+++ b/Racing-Game/4WheelCar/Wheels/BackWheel.tscn
@@ -1,9 +1,10 @@
[gd_scene load_steps=5 format=2]
-[ext_resource path="res://4WheelCar/Skid/SkidController.gd" type="Script" id=1]
-[ext_resource path="res://4WheelCar/BackWheel.gd" type="Script" id=2]
+[ext_resource path="res://4WheelCar/Wheels/Skid/SkidController.gd" type="Script" id=1]
+[ext_resource path="res://4WheelCar/Wheels/BackWheel.gd" type="Script" id=2]
[ext_resource path="res://Art(non-orig)/crosshair(isorig).png" type="Texture" id=3]
+
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 7.07375, 14.3787 )
diff --git a/Racing-Game/4WheelCar/FrontWheel.gd b/Racing-Game/4WheelCar/Wheels/FrontWheel.gd
index 7731bca..7a05522 100644
--- a/Racing-Game/4WheelCar/FrontWheel.gd
+++ b/Racing-Game/4WheelCar/Wheels/FrontWheel.gd
@@ -1,4 +1,4 @@
-extends "res://4WheelCar/Wheel.gd"
+extends "res://4WheelCar/Wheels/Wheel.gd"
#Reduces steering strength when braking
var steerDamp = 1
diff --git a/Racing-Game/4WheelCar/FrontWheel.tscn b/Racing-Game/4WheelCar/Wheels/FrontWheel.tscn
index 330e147..25644a6 100644
--- a/Racing-Game/4WheelCar/FrontWheel.tscn
+++ b/Racing-Game/4WheelCar/Wheels/FrontWheel.tscn
@@ -1,9 +1,10 @@
[gd_scene load_steps=5 format=2]
-[ext_resource path="res://4WheelCar/Skid/SkidController.gd" type="Script" id=1]
-[ext_resource path="res://4WheelCar/FrontWheel.gd" type="Script" id=2]
+[ext_resource path="res://4WheelCar/Wheels/Skid/SkidController.gd" type="Script" id=1]
+[ext_resource path="res://4WheelCar/Wheels/FrontWheel.gd" type="Script" id=2]
[ext_resource path="res://Art(non-orig)/crosshair(isorig).png" type="Texture" id=3]
+
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 6.93714, 14.1584 )
diff --git a/Racing-Game/4WheelCar/Skid/SkidController.gd b/Racing-Game/4WheelCar/Wheels/Skid/SkidController.gd
index e3b28c3..df1e054 100644
--- a/Racing-Game/4WheelCar/Skid/SkidController.gd
+++ b/Racing-Game/4WheelCar/Wheels/Skid/SkidController.gd
@@ -11,7 +11,7 @@ var deleteme = 0;
# Called when the node enters the scene tree for the first time.
func _ready():
- skidFile = load("res://4WheelCar/Skid/Skidmark.tscn")
+ skidFile = load("res://4WheelCar/Wheels/Skid/Skidmark.tscn")
skidRecent = skidFile.instance()
add_child(skidRecent)
@@ -23,7 +23,7 @@ func _process(_delta):
elif(!skidSwitch && get_parent().isSkid):#controller doesnt skid, but wheel is supposed to be skidding
# create new skidding child, and set skid to true
skidSwitch = true
- skidFile = load("res://4WheelCar/Skid/Skidmark.tscn")
+ skidFile = load("res://4WheelCar/Wheels/Skid/Skidmark.tscn")
skidRecent = skidFile.instance()
add_child(skidRecent)
#set to run
diff --git a/Racing-Game/4WheelCar/Skid/Skidmark.tscn b/Racing-Game/4WheelCar/Wheels/Skid/Skidmark.tscn
index 17ecee0..865add0 100644
--- a/Racing-Game/4WheelCar/Skid/Skidmark.tscn
+++ b/Racing-Game/4WheelCar/Wheels/Skid/Skidmark.tscn
@@ -1,8 +1,9 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://4WheelCar/Skid/Skidmarks.gd" type="Script" id=1]
+[ext_resource path="res://4WheelCar/Wheels/Skid/Skidmarks.gd" type="Script" id=1]
[ext_resource path="res://Art(non-orig)/PNG/Objects/skidmark_short_1.png" type="Texture" id=2]
+
[node name="Skidmark" type="Line2D"]
position = Vector2( -21.2326, -38.4176 )
default_color = Color( 0.4, 0.501961, 1, 1 )
diff --git a/Racing-Game/4WheelCar/Skid/Skidmarks.gd b/Racing-Game/4WheelCar/Wheels/Skid/Skidmarks.gd
index 07bf622..07bf622 100644
--- a/Racing-Game/4WheelCar/Skid/Skidmarks.gd
+++ b/Racing-Game/4WheelCar/Wheels/Skid/Skidmarks.gd
diff --git a/Racing-Game/4WheelCar/Wheel.gd b/Racing-Game/4WheelCar/Wheels/Wheel.gd
index 49024fb..49024fb 100644
--- a/Racing-Game/4WheelCar/Wheel.gd
+++ b/Racing-Game/4WheelCar/Wheels/Wheel.gd
diff --git a/Racing-Game/4WheelCar/WheelCreation.gd b/Racing-Game/4WheelCar/Wheels/WheelCreation.gd
index 6be1a26..db09f4b 100644
--- a/Racing-Game/4WheelCar/WheelCreation.gd
+++ b/Racing-Game/4WheelCar/Wheels/WheelCreation.gd
@@ -20,7 +20,7 @@ func _ready():
func createWheel(type,dataArray):
if(type == "front"):
- var wheeltemp_resource = load("res://4WheelCar/FrontWheel.tscn")
+ var wheeltemp_resource = load("res://4WheelCar/Wheels/FrontWheel.tscn")
var wheeltemp = wheeltemp_resource.instance()
wheeltemp.set_position(Vector2(dataArray[0],dataArray[1]))
add_child(wheeltemp)
@@ -28,7 +28,7 @@ func createWheel(type,dataArray):
# add_child(tempA)
elif(type == "back"):
- var wheeltemp_resource = load("res://4WheelCar/BackWheel.tscn")
+ var wheeltemp_resource = load("res://4WheelCar/Wheels/BackWheel.tscn")
var wheeltemp = wheeltemp_resource.instance()
wheeltemp.set_position(Vector2(dataArray[0],dataArray[1]))
add_child(wheeltemp)
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-14 08:15:05 +0000