Browse Source

Merge pull request #833 from moth-boi/fix-bomb-animation

Fix bomb animation
Aaron Franke 2 years ago
parent
commit
a78c51da26
1 changed files with 34 additions and 26 deletions
  1. 34 26
      networking/multiplayer_bomber/bomb.tscn

+ 34 - 26
networking/multiplayer_bomber/bomb.tscn

@@ -1,30 +1,21 @@
-[gd_scene load_steps=11 format=3 uid="uid://enwoaqi0rnei"]
+[gd_scene load_steps=9 format=3 uid="uid://enwoaqi0rnei"]
 
 
 [ext_resource type="Script" path="res://bomb.gd" id="1"]
 [ext_resource type="Script" path="res://bomb.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://bdomqql6y50po" path="res://brickfloor.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://bdomqql6y50po" path="res://brickfloor.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://drfbkdqmj0gu2" path="res://explosion.png" id="3"]
 [ext_resource type="Texture2D" uid="uid://drfbkdqmj0gu2" path="res://explosion.png" id="3"]
 
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_ice0s"]
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_1ih13"]
 size = Vector2(16, 192)
 size = Vector2(16, 192)
 
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_53cqi"]
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_whso6"]
 size = Vector2(192, 16)
 size = Vector2(192, 16)
 
 
-[sub_resource type="Curve" id="Curve_ut0ij"]
+[sub_resource type="Curve" id="Curve_4yges"]
 max_value = 2.0
 max_value = 2.0
 _data = [Vector2(0.00150494, 0.398437), 0.0, 0.0, 0, 0, Vector2(0.0152287, 1.42969), 0.0, 0.0, 0, 0, Vector2(0.478607, 1.30078), 0.0, 0.0, 0, 0, Vector2(1, 0.291016), 0.0, 0.0, 0, 0]
 _data = [Vector2(0.00150494, 0.398437), 0.0, 0.0, 0, 0, Vector2(0.0152287, 1.42969), 0.0, 0.0, 0, 0, Vector2(0.478607, 1.30078), 0.0, 0.0, 0, 0, Vector2(1, 0.291016), 0.0, 0.0, 0, 0]
 point_count = 4
 point_count = 4
 
 
-[sub_resource type="CurveTexture" id="CurveTexture_pr2n4"]
-curve = SubResource("Curve_ut0ij")
-
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_5nh0n"]
-emission_shape = 2
-emission_sphere_radius = 1.0
-gravity = Vector3(0, 0, 0)
-scale_curve = SubResource("CurveTexture_pr2n4")
-
-[sub_resource type="Animation" id="Animation_f7hik"]
+[sub_resource type="Animation" id="Animation_21j5c"]
 length = 4.0
 length = 4.0
 tracks/0/type = "value"
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/imported = false
@@ -80,9 +71,9 @@ tracks/3/keys = {
 "values": [false, true]
 "values": [false, true]
 }
 }
 
 
-[sub_resource type="AnimationLibrary" id="AnimationLibrary_ph8u8"]
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_h2w7m"]
 _data = {
 _data = {
-"anim": SubResource("Animation_f7hik")
+"anim": SubResource("Animation_21j5c")
 }
 }
 
 
 [node name="Bomb" type="Area2D"]
 [node name="Bomb" type="Area2D"]
@@ -90,37 +81,54 @@ monitorable = false
 script = ExtResource("1")
 script = ExtResource("1")
 
 
 [node name="Sprite" type="Sprite2D" parent="."]
 [node name="Sprite" type="Sprite2D" parent="."]
+self_modulate = Color(1, 1, 1, 0)
 position = Vector2(-2.92606, -2.92606)
 position = Vector2(-2.92606, -2.92606)
 texture = ExtResource("2")
 texture = ExtResource("2")
 region_enabled = true
 region_enabled = true
 region_rect = Rect2(144, 0, 48, 48)
 region_rect = Rect2(144, 0, 48, 48)
 
 
 [node name="Shape1" type="CollisionShape2D" parent="."]
 [node name="Shape1" type="CollisionShape2D" parent="."]
-shape = SubResource("RectangleShape2D_ice0s")
+shape = SubResource("RectangleShape2D_1ih13")
 
 
 [node name="Shape2" type="CollisionShape2D" parent="."]
 [node name="Shape2" type="CollisionShape2D" parent="."]
-shape = SubResource("RectangleShape2D_53cqi")
+shape = SubResource("RectangleShape2D_whso6")
 
 
-[node name="Explosion1" type="GPUParticles2D" parent="."]
+[node name="Explosion1" type="CPUParticles2D" parent="."]
 emitting = false
 emitting = false
-process_material = SubResource("ParticleProcessMaterial_5nh0n")
-texture = ExtResource("3")
 lifetime = 0.5
 lifetime = 0.5
 one_shot = true
 one_shot = true
 explosiveness = 0.95
 explosiveness = 0.95
-
-[node name="Explosion2" type="GPUParticles2D" parent="."]
+texture = ExtResource("3")
+emission_shape = 3
+emission_rect_extents = Vector2(80, 1)
+gravity = Vector2(0, 0)
+initial_velocity_min = 1.0
+initial_velocity_max = 1.0
+angular_velocity_min = 187.35
+angular_velocity_max = 188.35
+scale_amount_curve = SubResource("Curve_4yges")
+
+[node name="Explosion2" type="CPUParticles2D" parent="."]
 rotation = 1.57162
 rotation = 1.57162
+scale = Vector2(1, 1)
 emitting = false
 emitting = false
-process_material = SubResource("ParticleProcessMaterial_5nh0n")
-texture = ExtResource("3")
+lifetime = 0.5
 one_shot = true
 one_shot = true
 explosiveness = 0.95
 explosiveness = 0.95
+texture = ExtResource("3")
+emission_shape = 3
+emission_rect_extents = Vector2(80, 1)
+gravity = Vector2(0, 0)
+initial_velocity_min = 1.0
+initial_velocity_max = 1.0
+angular_velocity_min = 187.35
+angular_velocity_max = 188.35
+scale_amount_curve = SubResource("Curve_4yges")
 
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 autoplay = "anim"
 autoplay = "anim"
 libraries = {
 libraries = {
-"": SubResource("AnimationLibrary_ph8u8")
+"": SubResource("AnimationLibrary_h2w7m")
 }
 }
 
 
 [connection signal="body_entered" from="." to="." method="_on_bomb_body_enter"]
 [connection signal="body_entered" from="." to="." method="_on_bomb_body_enter"]