feat: implemented shield powerup and enemy cars

This commit is contained in:
Sara 2024-05-24 11:09:03 +02:00
parent a8f7bd20db
commit b8d487f14e
27 changed files with 353 additions and 114 deletions

View file

@ -13,7 +13,7 @@ radius = 0.308023
[node name="Beam" type="Beam"]
collision_layer = 0
collision_mask = 4
collision_mask = 2
monitorable = false
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]

View file

@ -1,11 +1,11 @@
[gd_scene load_steps=4 format=3 uid="uid://d0ir0dpghkikq"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_36cjj"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nvwav"]
shading_mode = 0
albedo_color = Color(0.227451, 0.827451, 0.678431, 1)
albedo_color = Color(1, 0.415825, 0.249137, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_2fqgx"]
material = SubResource("StandardMaterial3D_36cjj")
[sub_resource type="CapsuleMesh" id="CapsuleMesh_gx8hk"]
material = SubResource("StandardMaterial3D_nvwav")
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_v1t6q"]
radius = 0.0869471
@ -17,7 +17,7 @@ monitorable = false
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)
mesh = SubResource("CapsuleMesh_2fqgx")
mesh = SubResource("CapsuleMesh_gx8hk")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)

View file

@ -1,10 +1,11 @@
[gd_scene load_steps=14 format=3 uid="uid://dkvgi7x2epurk"]
[gd_scene load_steps=15 format=3 uid="uid://dkvgi7x2epurk"]
[ext_resource type="PackedScene" uid="uid://1eawpg0buvah" path="res://GameObjects/player_turret.tscn" id="1_ing2c"]
[ext_resource type="PackedScene" uid="uid://bm2mavtmnbaw1" path="res://Models/CarParts/SM_Veh_Hatch_01.fbx" id="1_tymeg"]
[ext_resource type="PackedScene" uid="uid://cr1ytl0o43ftv" path="res://GameObjects/beacon_powerup.tscn" id="1_uhbx0"]
[ext_resource type="PackedScene" uid="uid://bfq7ipx01ag7p" path="res://Models/CarParts/SM_Veh_Hatch_01_Bonnet_01.fbx" id="2_l8ox5"]
[ext_resource type="PackedScene" uid="uid://ci63le6giakt1" path="res://Models/CarParts/SM_Veh_Hatch_01_Front_Bumper_01.fbx" id="3_8ayy1"]
[ext_resource type="PackedScene" uid="uid://dihk5i2dqoorb" path="res://GameObjects/shield_powerup.tscn" id="3_pck3g"]
[ext_resource type="PackedScene" uid="uid://buhilfnxfvnor" path="res://Models/CarParts/SM_Veh_Hatch_01_Light_Covers_01.fbx" id="4_ebbck"]
[ext_resource type="PackedScene" uid="uid://bapool371ad5g" path="res://Models/CarParts/SM_Veh_Hatch_01_Rear_Bumper_01.fbx" id="5_v2arc"]
[ext_resource type="PackedScene" uid="uid://6qwqncti3xr2" path="res://Models/CarParts/SM_Veh_Hatch_01_Fenders_02.fbx" id="6_xu64x"]
@ -22,24 +23,24 @@ friction = 0.0
rough = true
absorbent = true
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_4xe1s"]
points = PackedVector3Array(-1.155, -0.6, -3.48, 1.155, -0.6, -3.48, -1.155, -0.6, 1.405, 1.155, -0.6, 1.405, 1.155, -0.6, 2.81, -1.155, -0.6, 2.81, -1.155, 1.16, -3.48, 1.155, 1.16, -3.48, -1.155, 1.16, 0.65, 1.155, 1.16, 0.65, 1.155, 0.335, 2.81, -1.155, 0.335, 2.81)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_0bup5"]
points = PackedVector3Array(-1.055, -0.6, -2.11, 1.055, -0.6, -2.11, -1.055, -0.6, 1.405, 1.055, -0.6, 1.405, 0.7, -0.6, 2.155, -0.7, -0.6, 2.155, -0.71, 0.475, -2.11, 0.71, 0.475, -2.11, -0.71, 0.475, 0.11, 0.71, 0.475, 0.11, 0.675, -0.235, 2.04, -0.675, -0.235, 2.04)
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_p38n5"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_3cogn"]
radius = 0.48558
height = 2.765
height = 2.26312
[node name="CarPlayer" type="CarPlayer"]
turret_scene = ExtResource("1_ing2c")
beacon_scene = ExtResource("1_uhbx0")
shield_scene = ExtResource("1_uhbx0")
shield_scene = ExtResource("3_pck3g")
oversteer_curve = SubResource("Curve_dpk6q")
oversteer_curve_x_scale = 40.0
understeer_curve = SubResource("Curve_htvme")
understeer_curve_x_scale = 40.0
max_slide_speed = 10.0
oversteer_speed_penalty = 10.0
collision_layer = 7
collision_layer = 5
collision_mask = 3
mass = 1000.0
physics_material_override = SubResource("PhysicsMaterial_vwjm3")
@ -59,15 +60,15 @@ fov = 68.9128
[node name="Body" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.687824, 0.174572)
shape = SubResource("ConvexPolygonShape3D_4xe1s")
shape = SubResource("ConvexPolygonShape3D_0bup5")
[node name="FrontWheels" type="CollisionShape3D" parent="."]
transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0.156071, 1.51353)
shape = SubResource("CapsuleShape3D_p38n5")
transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0.156071, 1.46129)
shape = SubResource("CapsuleShape3D_3cogn")
[node name="BackWheels" type="CollisionShape3D" parent="."]
transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0.156071, -1.52522)
shape = SubResource("CapsuleShape3D_p38n5")
transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0.156071, -1.32497)
shape = SubResource("CapsuleShape3D_3cogn")
[node name="Mesh" parent="." instance=ExtResource("1_tymeg")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.372761, 0)

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=3 uid="uid://b3p3ikural0cq"]
[gd_scene load_steps=8 format=3 uid="uid://b3p3ikural0cq"]
[ext_resource type="PackedScene" uid="uid://dsi3prgr34t85" path="res://Models/SM_Veh_Armored_Truck_01.fbx" id="1_2m0nm"]
@ -16,17 +16,21 @@ rough = true
absorbent = true
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_4xe1s"]
points = PackedVector3Array(-1.155, -0.6, -3.48, 1.155, -0.6, -3.48, -1.155, -0.6, 1.405, 1.155, -0.6, 1.405, 1.155, -0.6, 2.81, -1.155, -0.6, 2.81, -1.155, 1.16, -3.48, 1.155, 1.16, -3.48, -1.155, 1.16, 0.65, 1.155, 1.16, 0.65, 1.155, 0.335, 2.81, -1.155, 0.335, 2.81)
points = PackedVector3Array(-1.155, -0.6, -3.48, 1.155, -0.6, -3.48, -1.155, -0.6, 1.405, 1.155, -0.6, 1.405, 1.155, -0.6, 2.81, -1.155, -0.6, 2.81, -1.155, 1.16, -3.48, 1.155, 1.16, -3.48, -1.155, 1.16, 0.65, 1.155, 1.16, 0.65, 1.155, 0.335, 2.565, -1.155, 0.335, 2.565)
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_p38n5"]
radius = 0.48558
height = 2.765
[sub_resource type="BoxShape3D" id="BoxShape3D_a4n5y"]
size = Vector3(1.58301, 1, 0.363281)
[node name="EnemyCar" type="EnemyCar"]
oversteer_curve = SubResource("Curve_dpk6q")
oversteer_curve_x_scale = 40.0
understeer_curve = SubResource("Curve_htvme")
understeer_curve_x_scale = 40.0
acceleration = 10.0
max_slide_speed = 10.0
oversteer_speed_penalty = 10.0
collision_layer = 7
@ -43,9 +47,9 @@ contact_monitor = true
linear_damp_mode = 1
linear_damp = 0.5
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(-1, -2.02334e-08, -8.50491e-08, -2.87879e-08, 0.994803, 0.10182, 8.25469e-08, 0.10182, -0.994803, 4.6449e-07, 2.24116, -4.7912)
fov = 68.9128
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
path_desired_distance = 8.0
target_desired_distance = 5.0
[node name="Body" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.27103, 0.174572)
@ -64,4 +68,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.31348, -0.510359)
[node name="Root Scene" parent="." instance=ExtResource("1_2m0nm")]
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
[node name="DamageArea" type="DamageArea" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.08846, 3.19529)
[node name="CollisionShape3D" type="CollisionShape3D" parent="DamageArea"]
shape = SubResource("BoxShape3D_a4n5y")

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=7 format=3 uid="uid://1eawpg0buvah"]
[ext_resource type="PackedScene" uid="uid://d0ir0dpghkikq" path="res://GameObjects/beam.tscn" id="1_xm6id"]
[ext_resource type="PackedScene" uid="uid://b74cqcryut76c" path="res://GameObjects/anti_air_beam.tscn" id="1_newd3"]
[ext_resource type="PackedScene" uid="uid://v5p6ih28q6ro" path="res://Models/SM_Wep_Shotgun_Plasma_01.fbx" id="2_vsdye"]
[sub_resource type="CylinderMesh" id="CylinderMesh_1btvq"]
@ -18,7 +18,7 @@ radius = 0.392821
[node name="Turret" type="Turret"]
attack_classes = [&"EnemyTargetBody"]
beam_scene = ExtResource("1_xm6id")
beam_scene = ExtResource("1_newd3")
fire_time = 0.2
charge_time = 0.0
lock_time = 0.5

File diff suppressed because one or more lines are too long

View file

@ -41,7 +41,7 @@ shape = SubResource("BoxShape3D_rxnqc")
[node name="AwarenessArea" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -15.7959, 0)
collision_layer = 0
collision_mask = 2
collision_mask = 6
monitorable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="AwarenessArea"]