Boss fanfare: Terogan, Night Dragon, Monster Army Generic Officers, Monster Admiral, Monster Governor, Pinkie Emperor, Frostia's Generic Yeti, Monster King's Illusion, Moubootaur (Sealed), Monster King (original), Luvia Gemini [hack], Pirate Captain Marley, Masked Assassin, Platinum Queen (Soul Eater), Dusty People's Boss, Demure Queen of Dragons, Tulimshar's Generic Assassin, The Icicle.

19 files changed, 25 insertions, 1 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 9f5a31cdc..c8f4660fd 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2304,6 +2304,7 @@ constants_db: {
 	FX_MGSHIELD:	60
 	FX_MGWARP:		64
 	FX_CIRCLE:		310
+	FX_FANFARE:		311
 	FX_LIGHTNING:	312
 
 	// Magic particles
diff --git a/npc/001-10-1/scripts.txt b/npc/001-10-1/scripts.txt
index fd7c89c6e..080cae7c9 100644
--- a/npc/001-10-1/scripts.txt
+++ b/npc/001-10-1/scripts.txt
@@ -47,6 +47,7 @@ OnReward2:
         getitem BottledDust, 1;
     }
     warp "018-2-1", 24, 29;
+    specialeffect(FX_FANFARE, SELF, getcharid(3));
     end;
 
 // You ran out of time
diff --git a/npc/003-0/mainquest.txt b/npc/003-0/mainquest.txt
index cda2cc2f9..28f49a892 100644
--- a/npc/003-0/mainquest.txt
+++ b/npc/003-0/mainquest.txt
@@ -125,6 +125,7 @@ OnAssassinDefeat:
     // Extra extra EXTRA bonus
     CsysNpcCraft(SmallKnife, IOPT_SPLASHDAMAGE, 1, 0,0, 0,0, VAR_MAXHPPERCENT, -5);
     addtimer 100, instance_npcname(.name$)+"::OnAbort";
+    specialeffect(FX_FANFARE, SELF, getcharid(3));
     end;
 
 OnAbort:
diff --git a/npc/006-7/ctrl.txt b/npc/006-7/ctrl.txt
index c81bd2abc..17243b561 100644
--- a/npc/006-7/ctrl.txt
+++ b/npc/006-7/ctrl.txt
@@ -17,6 +17,7 @@ OnRw:
     Mobpt += 10000;
     dispbottom l("Der Schneemann has been defeated: %s Monster Points gained.", fnum(10000));
     RegEasterEgg(EE_SNOWMAN, 25);
+    specialeffect(FX_FANFARE, SELF, getcharid(3));
     end;
 }
 
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index f6e2cbf1a..d36cc5b4a 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -490,6 +490,7 @@ OnReward:
     .@Pl=getmapusers("012-1")-1;
     getexp .@Pl*600, .@Pl*30; // 3,000 exp, 150 jxp
     Zeny=Zeny+.@Pl*300; // 1,500 gp
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 }
diff --git a/npc/015-3-3/boss.txt b/npc/015-3-3/boss.txt
index d71975eda..0fd764e48 100644
--- a/npc/015-3-3/boss.txt
+++ b/npc/015-3-3/boss.txt
@@ -65,6 +65,7 @@ OnTimer30000:
 OnWin:
     dispbottom l("Marley : You... thief... *grumble*");
     compareandsetq HurnscaldQuest_PirateCave, 6, 7;
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 }
 
diff --git a/npc/015-8-1/campaign.txt b/npc/015-8-1/campaign.txt
index 1736fdd2a..9a9401c02 100644
--- a/npc/015-8-1/campaign.txt
+++ b/npc/015-8-1/campaign.txt
@@ -180,6 +180,7 @@ OnSagrathaWin:
     .@n$=instance_npcname(.name$);
     addtimer(70, .@n$+"::OnSagrathaReallyWin", .PLAYERID);
     @swin=true;
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 OnSagrathaReallyWin:
diff --git a/npc/018-6-3/main.txt b/npc/018-6-3/main.txt
index b5e239f7d..f4544a0ae 100644
--- a/npc/018-6-3/main.txt
+++ b/npc/018-6-3/main.txt
@@ -290,6 +290,7 @@ OnKillBoss:
     .@q3=getq3(LoFQuest_Barbara);
     setq LoFQuest_Barbara, 4, .@q2, 0;
     makeitem2(HeadHood, 1, 1, 0, 0, BlackDye, 0, 0, 0, getmap(), -1, -1, 3); // ChocolateDye or BrownDye, maybe
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 }
diff --git a/npc/018-7-1/demure.txt b/npc/018-7-1/demure.txt
index 6372d5197..5f2001ca8 100644
--- a/npc/018-7-1/demure.txt
+++ b/npc/018-7-1/demure.txt
@@ -166,6 +166,7 @@ OnBye:
     Zeny += rand2(100, 300)*max(1, @d_mode2);
     warp "018-7-1", 23, 22;
     deltimer strnpcinfo(NPC_NAME_UNIQUE)+"::OnBeet";
+    specialeffect(FX_FANFARE, SELF, getcharid(3));
     end;
 
 // Summon second form (give 5 seconds to players to move)
diff --git a/npc/023-3/logic.txt b/npc/023-3/logic.txt
index 59a8bd7c5..0b722516e 100644
--- a/npc/023-3/logic.txt
+++ b/npc/023-3/logic.txt
@@ -171,6 +171,7 @@ OnYetiDefeat:
 	message(.@rid, l("You've slayed the Yeti."));
 	npctalk l("Good luck in your journey, @@.", rid2name(.@rid));
 	setq FrostiaQuest_Homunculus, 1;
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
 
 	end;
 OnInit:
diff --git a/npc/025-1/ctrl.c b/npc/025-1/ctrl.c
index 85b4c74d2..7b1d76839 100644
--- a/npc/025-1/ctrl.c
+++ b/npc/025-1/ctrl.c
@@ -459,12 +459,13 @@ OnConquest:
     if (playerattached()) {
         getexp 500000, 100000;
         getitem StrangeCoin, rand2(40,50);
+        specialeffect(FX_FANFARE, AREA, getcharid(3));
     }
     // Experience injection to the survivors
     maptimer("025-1", 10, "Gate#F::OnConBonus");
     stopnpctimer;
     // Begin Fires of Steam if needed
-    if ($MK_TEMPVAR == MK_FIRESOFSTEAM_START) {
+    if (!$FIRESOFSTEAM && $MK_TEMPVAR >= MK_FIRESOFSTEAM_START) {
         kamibroadcast("Andrei Sakar : It has been about three months since we begun battling for control overthe Fortress Town.");
         sleep(5000);
         kamibroadcast("Andrei Sakar : Since this begun, however, we've heard nothing of Artis Town.");
diff --git a/npc/025-2-3/boss.txt b/npc/025-2-3/boss.txt
index ba1bd89d6..7621eb17d 100644
--- a/npc/025-2-3/boss.txt
+++ b/npc/025-2-3/boss.txt
@@ -29,6 +29,7 @@ OnBossDeath:
     }
     callfunc "02524_Revenge_BlackBox";
     fix_mobkill(PinkieEmperor);
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 OnBossReward:
diff --git a/npc/029-9/boss.txt b/npc/029-9/boss.txt
index 9cb75ecef..c2188a3ad 100644
--- a/npc/029-9/boss.txt
+++ b/npc/029-9/boss.txt
@@ -406,6 +406,7 @@ OnMFSurvive:
     getitem StrangeCoin, max(1, 1+(($@FIRESOFSTEAM_DIFF-100)/30));
     if (!MOUBOOTAUR_WINNER)
         MOUBOOTAUR_WINNER=gettimetick(2);
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 ////////////// Heartbeat //////////////
diff --git a/npc/032-5/episode.txt b/npc/032-5/episode.txt
index c8836335a..73971b890 100644
--- a/npc/032-5/episode.txt
+++ b/npc/032-5/episode.txt
@@ -128,6 +128,7 @@ OnWin:
         getitem RedknightArmor, 1;
         getexp 70000, 0;
     }
+    specialeffect(FX_FANFARE, SELF, getcharid(3));
     end;
 
 OnSS:
diff --git a/npc/034-4/lobby.txt b/npc/034-4/lobby.txt
index 3af9043f1..dd9a26780 100644
--- a/npc/034-4/lobby.txt
+++ b/npc/034-4/lobby.txt
@@ -22,6 +22,8 @@ OnTouch:
         $@VALIA_STATUS[.@p]=15;
     }
     if ($@VALIA_STATUS[.@p] >= 15) {
+        if (!@v_fanfare)
+            specialeffect(FX_FANFARE, SELF, getcharid(3));
         slide 143, 96;
     }
     end;
diff --git a/npc/042-11/boss.txt b/npc/042-11/boss.txt
index 5457d6804..5cc3b6578 100644
--- a/npc/042-11/boss.txt
+++ b/npc/042-11/boss.txt
@@ -161,6 +161,7 @@ OnKillBoss:
         // Player Reward for completing this stage
         getitem GuildCoin, 10;
         getexp $KAMELOT_MX[.@g]*150, $KAMELOT_MX[.@g]*30;
+        specialeffect(FX_FANFARE, AREA, getcharid(3));
     } else {
         explode(.@map$, .map$, "@");
         .@g=atoi(.@map$[1]);
diff --git a/npc/boss/throne.txt b/npc/boss/throne.txt
index 80a93492f..8bf51d0c5 100644
--- a/npc/boss/throne.txt
+++ b/npc/boss/throne.txt
@@ -110,6 +110,7 @@ OnVictory:
     stopnpctimer;
     mapwarp("boss", "017-1", 120, 88);
     $GAME_STORYLINE=5;
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     // Without the Monster King to rule monsters... TODO Isbamuth
     setbattleflag("monster_ai", 0x209);
     setbattleflag("monster_active_enable", false);
diff --git a/npc/functions/mkbot.txt b/npc/functions/mkbot.txt
index 3074ade2b..1229dfd60 100644
--- a/npc/functions/mkbot.txt
+++ b/npc/functions/mkbot.txt
@@ -49,6 +49,7 @@ OnBourneAgain:
             Mobpt+=max(13500, rand2(10000, BaseLevel*90));
         Mobpt = Mobpt + 165;
         //$MOST_HEROIC$=strcharinfo(0);
+        specialeffect(FX_FANFARE, AREA, getcharid(3));
     }
     // We need to start over
     .bar=true;
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index 570991b12..33375d314 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -496,6 +496,7 @@ OnSergeantDeath:
     $@EXP_EVENT=rand2(1, 3);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 OnLieutenantDeath:
@@ -506,6 +507,7 @@ OnLieutenantDeath:
     $@EXP_EVENT=rand2(4, 6);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 OnCaptainDeath:
@@ -516,6 +518,7 @@ OnCaptainDeath:
     $@EXP_EVENT=rand2(7, 9);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 OnColonelDeath:
@@ -526,6 +529,7 @@ OnColonelDeath:
     $@EXP_EVENT=rand2(10, 12);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 OnGeneralDeath:
@@ -536,6 +540,7 @@ OnGeneralDeath:
     $@EXP_EVENT=rand2(13, 15);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
+    specialeffect(FX_FANFARE, AREA, getcharid(3));
     end;
 
 }