Wake up the whole pack of Gargoyles when disturbed

diasurgical · Oct 30, 2024 · 6318c55 · 6318c55
1 parent 4a7d34a
commit 6318c55
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Source/monster.cpp b/Source/monster.cpp
@@ -1550,11 +1550,17 @@ void FollowTheLeader(Monster &monster)
 	if (leader == nullptr)
 		return;
 
-	if (monster.activeForTicks >= leader->activeForTicks)
-		return;
+	if (leader->activeForTicks > monster.activeForTicks) {
+		monster.position.last = leader->position.tile;
+		monster.activeForTicks = leader->activeForTicks - 1;
+	}
 
-	monster.position.last = leader->position.tile;
-	monster.activeForTicks = leader->activeForTicks - 1;
+	if (monster.ai != MonsterAIID::Gargoyle || (monster.flags & MFLAG_ALLOW_SPECIAL) == 0)
+		return;
+	if (leader->mode == MonsterMode::SpecialMeleeAttack)
+		return;
+	monster.flags &= ~MFLAG_ALLOW_SPECIAL;
+	monster.mode = MonsterMode::SpecialMeleeAttack;
 }
 
 void GroupUnity(Monster &monster)