mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-12-05 19:20:19 -08:00
Fixed Projectiles playing incorrect hit sounds
Fireball should be the only one that plays a hit sound now
This commit is contained in:
parent
3ac1d09d44
commit
2733876d29
2 changed files with 12 additions and 11 deletions
|
|
@ -51,13 +51,14 @@ size = Vector2(6, 8)
|
|||
[sub_resource type="CircleShape2D" id="CircleShape2D_dhdpv"]
|
||||
radius = 8.0
|
||||
|
||||
[node name="Fireball" type="CharacterBody2D"]
|
||||
[node name="Fireball" type="CharacterBody2D" unique_id=623058240]
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
slide_on_ceiling = false
|
||||
script = ExtResource("1_00jom")
|
||||
is_friendly = true
|
||||
PARTICLE = ExtResource("2_ajyso")
|
||||
SFX_COLLIDE = "bump"
|
||||
PIERCE_COUNT = 0
|
||||
GROUND_BOUNCE = true
|
||||
MOVE_SPEED = 220
|
||||
|
|
@ -67,34 +68,34 @@ MAX_FALL_SPEED = 150.0
|
|||
damage_type = "Fire"
|
||||
metadata/_custom_type_script = "uid://c5elnt7uap15b"
|
||||
|
||||
[node name="Sprite" type="AnimatedSprite2D" parent="."]
|
||||
[node name="Sprite" type="AnimatedSprite2D" parent="." unique_id=361996534]
|
||||
z_index = 2
|
||||
|
||||
[node name="Animation" type="AnimationPlayer" parent="Sprite"]
|
||||
[node name="Animation" type="AnimationPlayer" parent="Sprite" unique_id=742695984]
|
||||
libraries = {
|
||||
&"": SubResource("AnimationLibrary_an01s")
|
||||
}
|
||||
autoplay = "Spin"
|
||||
autoplay = &"Spin"
|
||||
speed_scale = 2.0
|
||||
|
||||
[node name="ResourceSetter" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect")]
|
||||
[node name="ResourceSetter" type="Node" parent="Sprite" unique_id=1314835073 node_paths=PackedStringArray("node_to_affect")]
|
||||
script = ExtResource("2_gfqet")
|
||||
node_to_affect = NodePath("..")
|
||||
property_name = "sprite_frames"
|
||||
resource_json = ExtResource("3_an01s")
|
||||
metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
|
||||
[node name="Collision" type="CollisionShape2D" parent="."]
|
||||
[node name="Collision" type="CollisionShape2D" parent="." unique_id=1562100549]
|
||||
shape = SubResource("RectangleShape2D_ajyso")
|
||||
|
||||
[node name="Hitbox" type="Area2D" parent="."]
|
||||
[node name="Hitbox" type="Area2D" parent="." unique_id=1089075693]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox" unique_id=346843973]
|
||||
shape = SubResource("CircleShape2D_dhdpv")
|
||||
|
||||
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
|
||||
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="." unique_id=649084901]
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="." unique_id=994603278 node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("4_an01s")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ extends Enemy
|
|||
## Determines if the projectile will display a particle upon making contact with something, but hasn't been destroyed.
|
||||
@export var PARTICLE_ON_CONTACT := false
|
||||
## Determines what sound will play when the projectile makes contact with something.
|
||||
@export var SFX_COLLIDE := "bump"
|
||||
@export var SFX_COLLIDE := ""
|
||||
## Determines how many entities a projectile can hit before being destroyed. Negative values are considered infinite.
|
||||
@export var PIERCE_COUNT: int = -1
|
||||
## Determines how much time must pass in seconds before the projectile can hit the same enemy it is currently intersecting with again. Negative values are considered infinite.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue