diff --git a/godot/assets/Telegrenade.fbx b/godot/assets/Telegrenade.fbx new file mode 100644 index 0000000..759d740 Binary files /dev/null and b/godot/assets/Telegrenade.fbx differ diff --git a/godot/assets/Telegrenade.fbx.import b/godot/assets/Telegrenade.fbx.import new file mode 100644 index 0000000..72498de --- /dev/null +++ b/godot/assets/Telegrenade.fbx.import @@ -0,0 +1,46 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bjnojwqmmv74y" +path="res://.godot/imported/Telegrenade.fbx-fc238f8fa5005ed3c2f3ff461f3a99f0.scn" + +[deps] + +source_file="res://assets/Telegrenade.fbx" +dest_files=["res://.godot/imported/Telegrenade.fbx-fc238f8fa5005ed3c2f3ff461f3a99f0.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=true +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 +fbx/naming_version=2 diff --git a/godot/mesh/telegrenade.tscn b/godot/mesh/telegrenade.tscn new file mode 100644 index 0000000..9c6c585 --- /dev/null +++ b/godot/mesh/telegrenade.tscn @@ -0,0 +1,18 @@ +[gd_scene format=3 uid="uid://baexh5xmqj4ki"] + +[ext_resource type="PackedScene" uid="uid://bjnojwqmmv74y" path="res://assets/Telegrenade.fbx" id="1_n46c3"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sugp2"] +albedo_color = Color(0, 0, 1, 1) +emission_enabled = true +emission = Color(0, 0, 0.96862745, 1) +emission_energy_multiplier = 5.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jyhfs"] +albedo_color = Color(0.30692267, 0.3069227, 0.3069227, 1) + +[node name="Telegrenade" unique_id=1761178296 instance=ExtResource("1_n46c3")] + +[node name="Cube" parent="." index="0" unique_id=218178446] +surface_material_override/0 = SubResource("StandardMaterial3D_sugp2") +surface_material_override/1 = SubResource("StandardMaterial3D_jyhfs") diff --git a/godot/raw_assets/Soldier/Telegrenade.blend b/godot/raw_assets/Soldier/Telegrenade.blend new file mode 100644 index 0000000..b133b84 Binary files /dev/null and b/godot/raw_assets/Soldier/Telegrenade.blend differ diff --git a/godot/raw_assets/Soldier/Telegrenade.blend1 b/godot/raw_assets/Soldier/Telegrenade.blend1 new file mode 100644 index 0000000..2694934 Binary files /dev/null and b/godot/raw_assets/Soldier/Telegrenade.blend1 differ diff --git a/godot/scenes/main.tscn b/godot/scenes/main.tscn index dc9a44c..684ffce 100644 --- a/godot/scenes/main.tscn +++ b/godot/scenes/main.tscn @@ -23,7 +23,7 @@ credits = ExtResource("1_sugp2") open_replay_dialog = NodePath("open_replay_dialog") [node name="camera_3d" type="Camera3D" parent="." unique_id=1513321931] -transform = Transform3D(0.986291, -0.031187074, 0.16204135, -1.4054503e-08, 0.981978, 0.1889952, -0.16501525, -0.18640426, 0.96851605, 1.0973973, 1.7166122, 1.4909189) +transform = Transform3D(0.98629165, -0.031186381, 0.16203775, -1.4054481e-08, 0.981978, 0.1889952, -0.16501158, -0.18640438, 0.9685167, 1.0974052, 1.7166122, 1.4909106) current = true [node name="directional_light_3d" type="DirectionalLight3D" parent="." unique_id=75522463] diff --git a/godot/scenes/misc/teleport_grenade.tscn b/godot/scenes/misc/teleport_grenade.tscn index 9b0cab1..781e7bb 100644 --- a/godot/scenes/misc/teleport_grenade.tscn +++ b/godot/scenes/misc/teleport_grenade.tscn @@ -1,16 +1,39 @@ [gd_scene format=3 uid="uid://cuh8bvyx7yy8e"] +[ext_resource type="PackedScene" uid="uid://baexh5xmqj4ki" path="res://mesh/telegrenade.tscn" id="1_bbjda"] + [sub_resource type="SphereShape3D" id="SphereShape3D_1cgct"] radius = 0.5088567 -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_bbjda"] +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_1cgct"] +particle_flag_align_y = true +angular_velocity_min = -1.6093254e-05 +angular_velocity_max = -1.6093254e-05 +radial_velocity_min = -50.000023 +radial_velocity_max = -2.2351742e-05 +gravity = Vector3(0, 0, 0) +radial_accel_min = -2.2351742e-06 +radial_accel_max = -2.2351742e-06 -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_otqol"] -albedo_texture = SubResource("PlaceholderTexture2D_bbjda") +[sub_resource type="Curve" id="Curve_bbjda"] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 -[sub_resource type="BoxMesh" id="BoxMesh_3g557"] -material = SubResource("StandardMaterial3D_otqol") -size = Vector3(0.1, 0.1, 0.1) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m77kh"] +albedo_color = Color(0, 0, 1, 1) +emission_enabled = true +emission = Color(0, 0, 1, 1) +emission_energy_multiplier = 10.0 +use_particle_trails = true + +[sub_resource type="TubeTrailMesh" id="TubeTrailMesh_3g557"] +material = SubResource("StandardMaterial3D_m77kh") +radius = 0.05 +section_length = 0.15 +section_rings = 5 +cap_top = false +cap_bottom = false +curve = SubResource("Curve_bbjda") [node name="teleport_grenade" type="Telegrenade" unique_id=1670808846] collision_layer = 0 @@ -21,5 +44,11 @@ max_contacts_reported = 1 [node name="collision_shape_3d" type="CollisionShape3D" parent="." unique_id=1124839205] shape = SubResource("SphereShape3D_1cgct") -[node name="mesh_instance_3d" type="MeshInstance3D" parent="." unique_id=1327678222] -mesh = SubResource("BoxMesh_3g557") +[node name="Telegrenade" parent="." unique_id=1761178296 instance=ExtResource("1_bbjda")] +transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) + +[node name="gpu_particles_3d" type="GPUParticles3D" parent="." unique_id=608816258] +amount = 2 +trail_enabled = true +process_material = SubResource("ParticleProcessMaterial_1cgct") +draw_pass_1 = SubResource("TubeTrailMesh_3g557")