diff --git a/asset_dev/gfolfball.xcf b/asset_dev/balls/gfolfball.xcf similarity index 100% rename from asset_dev/gfolfball.xcf rename to asset_dev/balls/gfolfball.xcf diff --git a/asset_dev/balls/plasma_ball.png b/asset_dev/balls/plasma_ball.png new file mode 100644 index 0000000..78da9cc --- /dev/null +++ b/asset_dev/balls/plasma_ball.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6c4b8b3ceab5a242dafdd83d33eba542e516b7b4b5786430f474eb81d599d15 +size 767 diff --git a/asset_dev/balls/plasma_ball.xcf b/asset_dev/balls/plasma_ball.xcf new file mode 100644 index 0000000..f350565 Binary files /dev/null and b/asset_dev/balls/plasma_ball.xcf differ diff --git a/asset_dev/balls/plasma_ball_xl.png b/asset_dev/balls/plasma_ball_xl.png new file mode 100644 index 0000000..60e4ac1 --- /dev/null +++ b/asset_dev/balls/plasma_ball_xl.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8495e12f43d4185a0c7d890934046f2a2f6a673d602101ab56791a70280dfb63 +size 692 diff --git a/assets/materials/gummy_material.tres b/assets/materials/gummy_material.tres index f25a0f9..56b55d1 100644 --- a/assets/materials/gummy_material.tres +++ b/assets/materials/gummy_material.tres @@ -41,5 +41,6 @@ shader_parameter/edge_color = Color(0, 0, 0, 1) shader_parameter/surface_contribution = 0.9 shader_parameter/specular_contribution = 20.0 shader_parameter/refraction_contribution = 3.0 +shader_parameter/alpha = 1.0 shader_parameter/uv1_scale = Vector3(1, 1, 1) shader_parameter/uv1_offset = Vector3(0, 0, 0) diff --git a/assets/materials/plasma_ball.tres b/assets/materials/plasma_ball.tres new file mode 100644 index 0000000..5a2694d --- /dev/null +++ b/assets/materials/plasma_ball.tres @@ -0,0 +1,11 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://f3qufrkoiv66"] + +[ext_resource type="Texture2D" uid="uid://b7mexqu466hll" path="res://assets/textures/plasma_ball/plasma_ball.png" id="1_c5njv"] +[ext_resource type="Texture2D" uid="uid://bde62x0qlefmp" path="res://assets/textures/plasma_ball/plasma_ball_normal_map.png" id="2_1ari2"] + +[resource] +albedo_texture = ExtResource("1_c5njv") +normal_enabled = true +normal_texture = ExtResource("2_1ari2") +uv1_scale = Vector3(2, 1, 2) +texture_filter = 2 diff --git a/assets/textures/plasma_ball/plasma_ball.png b/assets/textures/plasma_ball/plasma_ball.png new file mode 100644 index 0000000..571c96d --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c6c50b784c6e2dd6725b614433a267891e7dbc02d84ab6a354374aedffa215c +size 879 diff --git a/assets/textures/plasma_ball/plasma_ball.png.import b/assets/textures/plasma_ball/plasma_ball.png.import new file mode 100644 index 0000000..52d9aef --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7mexqu466hll" +path="res://.godot/imported/plasma_ball.png-c4d5acfe04b6c104fde28d019cb35275.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/plasma_ball/plasma_ball.png" +dest_files=["res://.godot/imported/plasma_ball.png-c4d5acfe04b6c104fde28d019cb35275.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/assets/textures/plasma_ball/plasma_ball_normal_map.png b/assets/textures/plasma_ball/plasma_ball_normal_map.png new file mode 100644 index 0000000..45f67f8 --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball_normal_map.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d6be96a82261f20f3f56b441ae632507f3ed56b0b897447b404cc35f5a20961 +size 1123 diff --git a/assets/textures/plasma_ball/plasma_ball_normal_map.png.import b/assets/textures/plasma_ball/plasma_ball_normal_map.png.import new file mode 100644 index 0000000..c2c5a0a --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball_normal_map.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bde62x0qlefmp" +path="res://.godot/imported/plasma_ball_normal_map.png-119be068fc77a5110385979340f31349.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/plasma_ball/plasma_ball_normal_map.png" +dest_files=["res://.godot/imported/plasma_ball_normal_map.png-119be068fc77a5110385979340f31349.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/textures/plasma_ball/plasma_ball_normal_map.png" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/src/equipment/balls/plasma_ball/plasma_ball.tscn b/src/equipment/balls/plasma_ball/plasma_ball.tscn index 1f6e1ef..cd0c756 100644 --- a/src/equipment/balls/plasma_ball/plasma_ball.tscn +++ b/src/equipment/balls/plasma_ball/plasma_ball.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=11 format=3 uid="uid://dcqxlbsrubapk"] +[gd_scene load_steps=13 format=3 uid="uid://dcqxlbsrubapk"] [ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_yh4fp"] [ext_resource type="Texture2D" uid="uid://c47bkx508biqr" path="res://assets/sprites/particles/plasma.png" id="2_8fdyx"] [ext_resource type="Script" path="res://src/equipment/balls/plasma_ball/plasma_ball.gd" id="2_16fhh"] +[ext_resource type="Material" uid="uid://f3qufrkoiv66" path="res://assets/materials/plasma_ball.tres" id="3_6gyuc"] [sub_resource type="Curve" id="Curve_kabhn"] max_value = 2.0 @@ -47,10 +48,17 @@ grow_amount = -0.6 material = SubResource("StandardMaterial3D_tyfsm") size = Vector2(0.4, 0.4) +[sub_resource type="SphereShape3D" id="SphereShape3D_muqqr"] +radius = 0.1 + [node name="PlasmaBall" instance=ExtResource("1_yh4fp")] script = ExtResource("2_16fhh") magnetic = true +[node name="BallMesh" parent="." index="0"] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0) +surface_material_override/0 = ExtResource("3_6gyuc") + [node name="PlasmaFireEffect" type="GPUParticles3D" parent="BallMesh" index="0"] sorting_offset = -1.0 amount = 20 @@ -58,4 +66,7 @@ lifetime = 0.6 process_material = SubResource("ParticleProcessMaterial_uffe8") draw_pass_1 = SubResource("QuadMesh_go8iw") +[node name="CollisionShape3D" parent="." index="1"] +shape = SubResource("SphereShape3D_muqqr") + [connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/src/items/extra_ball/plasma_ball_item.tscn b/src/items/extra_ball/plasma_ball_item.tscn index b5189e1..69c69b5 100644 --- a/src/items/extra_ball/plasma_ball_item.tscn +++ b/src/items/extra_ball/plasma_ball_item.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=22 format=3 uid="uid://mcuhy71v6ggu"] +[gd_scene load_steps=20 format=3 uid="uid://mcuhy71v6ggu"] [ext_resource type="PackedScene" uid="uid://comd88yp45mnb" path="res://src/items/item/item.tscn" id="1_f11yp"] [ext_resource type="Script" path="res://src/items/extra_ball/extra_ball.gd" id="2_tixea"] [ext_resource type="Shader" path="res://src/shaders/frosted_glass.gdshader" id="3_ljwjj"] [ext_resource type="Texture2D" uid="uid://c2p2in2p7mjyo" path="res://assets/materials/crystal_noise_normal_map.tres" id="4_da2m2"] [ext_resource type="Texture2D" uid="uid://cx33n4h5mfcdb" path="res://assets/materials/crystal_noise_map.tres" id="5_mfadb"] -[ext_resource type="Texture2D" uid="uid://ckhiq6rfjv63u" path="res://assets/textures/gfolfball/gfolfball.png" id="6_qn15y"] -[ext_resource type="Texture2D" uid="uid://btntjs7mbdigu" path="res://assets/textures/gfolfball/gfolfball_normal.png" id="7_kyc21"] +[ext_resource type="Material" uid="uid://f3qufrkoiv66" path="res://assets/materials/plasma_ball.tres" id="6_o5jva"] [ext_resource type="Texture2D" uid="uid://c47bkx508biqr" path="res://assets/sprites/particles/plasma.png" id="8_tjeqq"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_4un1r"] @@ -30,20 +29,8 @@ shader_parameter/alpha = 0.9 shader_parameter/uv1_scale = Vector3(1, 1, 1) shader_parameter/uv1_offset = Vector3(0, 0, 0) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xqofq"] -albedo_texture = ExtResource("6_qn15y") -albedo_texture_force_srgb = true -metallic = 0.27 -roughness = 0.67 -normal_enabled = true -normal_scale = 0.2 -normal_texture = ExtResource("7_kyc21") -clearcoat_roughness = 0.0 -uv1_scale = Vector3(3, 1.5, 3) -texture_filter = 4 - [sub_resource type="SphereMesh" id="SphereMesh_2r4nb"] -material = SubResource("StandardMaterial3D_xqofq") +material = ExtResource("6_o5jva") radius = 0.05 height = 0.1 radial_segments = 6 @@ -69,8 +56,8 @@ angle_min = -720.0 angle_max = 720.0 direction = Vector3(0, 1, 0) spread = 10.0 -initial_velocity_max = 0.2 -gravity = Vector3(0, 2.4, 0) +initial_velocity_max = 0.1 +gravity = Vector3(0, 1.2, 0) scale_curve = SubResource("CurveTexture_vfusk") emission_curve = SubResource("CurveTexture_oxhrr") @@ -191,13 +178,14 @@ surface_material_override/0 = SubResource("ShaderMaterial_4un1r") transform = Transform3D(0.99863, 0.052336, 0, -0.052336, 0.99863, 0, 0, 0, 1, 0, 0, 0) [node name="BallMesh" type="MeshInstance3D" parent="Pivot/Octahedron/ItemMeshContainer/Pivot" index="1"] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0) +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0) mesh = SubResource("SphereMesh_2r4nb") [node name="PlasmaFireEffect" type="GPUParticles3D" parent="Pivot/Octahedron/ItemMeshContainer/Pivot/BallMesh" index="0"] sorting_offset = -1.0 amount = 20 lifetime = 0.6 +speed_scale = 0.2 process_material = SubResource("ParticleProcessMaterial_wmn3a") draw_pass_1 = SubResource("QuadMesh_lsswf") @@ -207,20 +195,4 @@ libraries = { } autoplay = "idle" -[node name="Skeleton3D" parent="gfolf_girl/Armature" index="0"] -bones/2/scale = Vector3(1, 1, 1) -bones/3/scale = Vector3(1, 1, 1) -bones/4/scale = Vector3(1, 1, 1) -bones/6/scale = Vector3(1, 1, 1) -bones/8/scale = Vector3(1, 1, 1) -bones/11/scale = Vector3(1, 1, 1) -bones/12/scale = Vector3(1, 1, 1) -bones/13/scale = Vector3(1, 1, 1) -bones/20/scale = Vector3(1, 1, 1) -bones/21/rotation = Quaternion(-0.000222673, 0.707107, 0.707107, 0.000222504) -bones/21/scale = Vector3(1, 1, 1) -bones/22/scale = Vector3(1, 1, 1) -bones/23/scale = Vector3(1, 1, 1) - [editable path="Pivot/Octahedron"] -[editable path="gfolf_girl"]