Familiars dying will unsummon (#3547)

Also fixed the unsummon effect for new player colors
dkfans · Oct 12, 2024 · 1fd1a6e · 1fd1a6e
1 parent 97902cd
commit 1fd1a6e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/thing_creature.c b/src/thing_creature.c
@@ -2879,6 +2879,13 @@ struct Thing* kill_creature(struct Thing *creatng, struct Thing *killertng, Play
     if (creature_affected_by_spell(creatng, SplK_Rebound)) {
         terminate_thing_spell_effect(creatng, SplK_Rebound);
     }
+    struct CreatureControl* cctrl = creature_control_get_from_thing(creatng);
+    if ((cctrl->unsummon_turn > 0) && (cctrl->unsummon_turn > game.play_gameturn))
+    {
+        create_effect_around_thing(creatng, ball_puff_effects[creatng->owner]);
+        set_flag(flags, CrDed_NotReallyDying | CrDed_NoEffects);
+        return cause_creature_death(creatng, flags);
+    }
     struct Dungeon* dungeon = (!is_neutral_thing(creatng)) ? get_players_num_dungeon(creatng->owner) : INVALID_DUNGEON;
     if (!dungeon_invalid(dungeon))
     {