Fish witch and test level implemented

This commit is contained in:
2023-09-02 02:28:37 -07:00
parent 8d5ca74330
commit 829db1adb9
18 changed files with 2115 additions and 36 deletions

View File

@@ -12,10 +12,10 @@ material = SubResource("StandardMaterial3D_5vpcx")
[node name="ShotgunBullet" type="Node3D"]
script = ExtResource("1_binxs")
_projectileSpeed = 5.0
_projectileSpeed = 50.0
[node name="RigidBody3D" type="RigidBody3D" parent="."]
transform = Transform3D(0.999848, 0, -0.0174524, 0, 1, 0, 0.0174524, 0, 0.999848, -0.275608, 0, 0)
transform = Transform3D(0.996195, 0, -0.0871557, 0, 1, 0, 0.0871557, 0, 0.996195, -1.27456, 0, 0)
collision_layer = 2
collision_mask = 0
gravity_scale = 0.0
@@ -23,16 +23,15 @@ continuous_cd = true
contact_monitor = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D"]
transform = Transform3D(0.0647894, 0, 0.0761731, 0, 0.1, 0, -0.0761731, 0, 0.0647894, 0, 0, 0)
transform = Transform3D(0.647894, 0, 0.761731, 0, 1, 0, -0.761731, 0, 0.647894, 0, 0, 0)
mesh = SubResource("SphereMesh_ugmuv")
skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
shape = SubResource("SphereShape3D_o6kys")
[node name="RigidBody3D2" type="RigidBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.207104)
transform = Transform3D(0.996195, 0, 0.0871557, 0, 1, 0, -0.0871557, 0, 0.996195, 1.32, 0, 0)
collision_layer = 2
collision_mask = 0
gravity_scale = 0.0
@@ -40,16 +39,14 @@ continuous_cd = true
contact_monitor = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D2"]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
mesh = SubResource("SphereMesh_ugmuv")
skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D2"]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
shape = SubResource("SphereShape3D_o6kys")
[node name="RigidBody3D3" type="RigidBody3D" parent="."]
transform = Transform3D(0.999848, 0, 0.0174524, 0, 1, 0, -0.0174524, 0, 0.999848, 0.226111, 0, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.56619)
collision_layer = 2
collision_mask = 0
gravity_scale = 0.0
@@ -57,10 +54,9 @@ continuous_cd = true
contact_monitor = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D3"]
transform = Transform3D(0.0906308, 0, -0.0422618, 0, 0.1, 0, 0.0422618, 0, 0.0906308, 0, 0, 0)
transform = Transform3D(0.999848, 0, 0.0174524, 0, 1, 0, -0.0174524, 0, 0.999848, 0, 0, 0)
mesh = SubResource("SphereMesh_ugmuv")
skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D3"]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
shape = SubResource("SphereShape3D_o6kys")

View File

@@ -12,7 +12,7 @@ material = SubResource("StandardMaterial3D_phgri")
[node name="TestBullet" type="Node3D"]
script = ExtResource("1_cavby")
_projectileSpeed = 5.0
_projectileSpeed = 50.0
[node name="RigidBody3D" type="RigidBody3D" parent="."]
collision_layer = 2
@@ -22,10 +22,8 @@ continuous_cd = true
contact_monitor = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D"]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
mesh = SubResource("SphereMesh_wuk0e")
skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
shape = SubResource("SphereShape3D_rokeu")

View File

@@ -1,9 +1,9 @@
[gd_scene load_steps=6 format=3 uid="uid://b38hcomu4tpm5"]
[ext_resource type="Script" path="res://Scripts/TestCharacter.cs" id="1_hddqi"]
[ext_resource type="PackedScene" uid="uid://dtyujwnb6w3kv" path="res://Models/TestModels/link.gltf" id="1_rwdbt"]
[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/ShotgunBullet.tscn" id="3_5h4r7"]
[ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="3_ojvu2"]
[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Models/Characters/fwitch.gltf" id="4_n3637"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_fqik1"]
radius = 0.152487
@@ -11,7 +11,7 @@ height = 0.456443
[node name="Character" type="CharacterBody3D"]
script = ExtResource("1_hddqi")
_speed = 2.0
_speed = 10.0
_fireProjectile = ExtResource("3_ojvu2")
_altFireProjectile = ExtResource("3_5h4r7")
@@ -21,5 +21,4 @@ shape = SubResource("CapsuleShape3D_fqik1")
[node name="Pivot" type="Node3D" parent="."]
[node name="link" parent="Pivot" instance=ExtResource("1_rwdbt")]
transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
[node name="fwitch" parent="Pivot" instance=ExtResource("4_n3637")]

View File

@@ -1,33 +1,29 @@
[gd_scene load_steps=4 format=3 uid="uid://dy3d4e6qegyjg"]
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/TestCharacter.tscn" id="1_fwf6c"]
[ext_resource type="PackedScene" uid="uid://cmj0fo8gufb4y" path="res://Levels/levelTEST.gltf" id="2_afl3s"]
[sub_resource type="BoxShape3D" id="BoxShape3D_dk0pn"]
size = Vector3(100, 1, 100)
[sub_resource type="BoxMesh" id="BoxMesh_eaper"]
size = Vector3(100, 1, 100)
[sub_resource type="BoxShape3D" id="BoxShape3D_wrrav"]
size = Vector3(82.1972, 9.85066, 69.234)
[node name="Level" type="Node3D"]
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.118128, 8.18686, -1.13346)
fov = 40.0
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.0769171, 67.1716, -34.2862)
fov = 50.0
[node name="StaticBody3D" type="StaticBody3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
shape = SubResource("BoxShape3D_dk0pn")
[node name="MeshInstance3D" type="MeshInstance3D" parent="StaticBody3D"]
mesh = SubResource("BoxMesh_eaper")
[node name="DebugCamera" type="Camera3D" parent="StaticBody3D"]
[node name="DebugCamera" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.821149, 0.570714, 0, -0.570714, 0.821149, -0.36148, 1.40359, 0.864433)
visible = false
[node name="Link" parent="." instance=ExtResource("1_fwf6c")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
[node name="Fish Witch" parent="." instance=ExtResource("1_fwf6c")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.56447, -7.95901)
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(-0.931845, -0.0850834, 0.35274, -0.0909281, 0.995857, -1.47234e-08, -0.351279, -0.032074, -0.935721, -3.58319, 8.01249, 0.163277)
[node name="levelTEST" parent="." instance=ExtResource("2_afl3s")]
[node name="CollisionShape3D" type="CollisionShape3D" parent="levelTEST"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.194912, 0.132027, -36.4269)
shape = SubResource("BoxShape3D_wrrav")