Merge pull request #223 from NancokPS2/dead-coll

Disables collisions for dead enemies
jonathaneeckhout · Jan 14, 2024 · 5dc42bc · 5dc42bc
2 parents 1229354 + 1e81ca6
commit 5dc42bc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/project.godot b/project.godot
@@ -182,6 +182,7 @@ locale/translations=PackedStringArray("res://assets/translation/en_US.en.transla
 2d_physics/layer_5="Items"
 2d_physics/layer_6="Networking"
 2d_physics/layer_7="Projectiles"
+2d_physics/layer_8="Passable Entity"
 
 [rendering]
 

diff --git a/scripts/components/common/animationcomponent/AnimationComponent.gd b/scripts/components/common/animationcomponent/AnimationComponent.gd
@@ -99,6 +99,10 @@ func _on_died():
 		animation_player.stop()
 		animation_player.play(die_animation)
 
+	if target_node is CollisionObject2D:
+		target_node.collision_layer = J.PHYSICS_LAYER_PASSABLE_ENTITIES
+		target_node.collision_mask = 0
+
 
 func _on_respawned():
 	dead = false

diff --git a/scripts/components/enemy/enemyrespawncomponent/EnemyRespawnComponent.gd b/scripts/components/enemy/enemyrespawncomponent/EnemyRespawnComponent.gd
@@ -40,6 +40,10 @@ func _ready():
 func _on_died():
 	despawn_timer.start()
 
+	if target_node is CollisionObject2D:
+		target_node.collision_layer = J.PHYSICS_LAYER_PASSABLE_ENTITIES
+		target_node.collision_mask = 0
+
 
 func _on_despawn_timer_timeout():
 	if should_respawn:

diff --git a/...omponents/networking/networkviewsynchronizercomponent/NetworkViewSynchronizerComponent.gd b/...omponents/networking/networkviewsynchronizercomponent/NetworkViewSynchronizerComponent.gd
@@ -52,6 +52,7 @@ func _ready():
 			+ J.PHYSICS_LAYER_ENEMIES
 			+ J.PHYSICS_LAYER_NPCS
 			+ J.PHYSICS_LAYER_ITEMS
+			+ J.PHYSICS_LAYER_PASSABLE_ENTITIES
 		)
 		body_network_view_area.add_child(cs_body_network_view_area)
 

diff --git a/scripts/singletons/jdungeon.gd b/scripts/singletons/jdungeon.gd
@@ -10,6 +10,7 @@ const PHYSICS_LAYER_NPCS = 8
 const PHYSICS_LAYER_ITEMS = 16
 const PHYSICS_LAYER_NETWORKING = 32
 const PHYSICS_LAYER_PROJECTILE = 64
+const PHYSICS_LAYER_PASSABLE_ENTITIES = 128
 
 const ARRIVAL_DISTANCE = 8
 const DROP_RANGE = 64