Merge branch 'bossdefeat' into 'master'

use announce_mobkill() for more stuff

See merge request ml/serverdata!89

5 files changed, 5 insertions, 21 deletions

diff --git a/npc/010-1-1/boss.txt b/npc/010-1-1/boss.txt
index 3e9449f6d..899766ed3 100644
--- a/npc/010-1-1/boss.txt
+++ b/npc/010-1-1/boss.txt
@@ -20,12 +20,7 @@ OnInit:
 
 OnBossDeath:
     initnpctimer;
-    .@party=getcharid(1);
-    if (.@party > 0) {
-        mapannounce getmap(), "Giant Cave Maggot defeated by Party: " + getpartyname(.@party), bc_all;
-    } else {
-        mapannounce getmap(), "Giant Cave Maggot defeated by: " + strcharinfo(0), bc_all;
-    }
+    announce_bosskill(getmap(), GiantCaveMaggot);
     fix_mobkill(GiantCaveMaggot);
     end;
 
diff --git a/npc/015-3-3/boss.txt b/npc/015-3-3/boss.txt
index 0fd764e48..50f9af934 100644
--- a/npc/015-3-3/boss.txt
+++ b/npc/015-3-3/boss.txt
@@ -13,7 +13,7 @@
     /* Treasure Chest logic */
     if (getq(HurnscaldQuest_PirateCave) == 7) {
         // You'll always get the maximum prize the first time
-    	TreasureBox(99999);
+        TreasureBox(99999);
         Zeny+=rand2(5700, 6200);
         getexp 1000, 320;
         compareandsetq HurnscaldQuest_PirateCave, 7, 8;
diff --git a/npc/015-6/boss.txt b/npc/015-6/boss.txt
index 0fe8ee6b9..845bc72ba 100644
--- a/npc/015-6/boss.txt
+++ b/npc/015-6/boss.txt
@@ -19,12 +19,7 @@ OnInit:
 
 OnBossDeath:
     initnpctimer;
-    .@party=getcharid(1);
-    if (.@party > 0) {
-        mapannounce "015-6", "Terranite King defeated by Party: " + getpartyname(.@party), bc_all;
-    } else {
-        mapannounce "015-6", "Terranite King defeated by: " + strcharinfo(0), bc_all;
-    }
+    announce_bosskill(getmap(), TerraniteKing);
     fix_mobkill(TerraniteKing);
     end;
 
diff --git a/npc/025-2-3/boss.txt b/npc/025-2-3/boss.txt
index 5cd42c822..d375a5c6f 100644
--- a/npc/025-2-3/boss.txt
+++ b/npc/025-2-3/boss.txt
@@ -21,11 +21,9 @@ OnBossDeath:
     initnpctimer;
     .@party=getcharid(1);
     getitem StrangeCoin, 1;
+    announce_bosskill(getmap(), PinkieEmperor);
     if (.@party > 0) {
-        mapannounce "025-2-3", "Pinkie Emperor defeated by Party: " + getpartyname(.@party), bc_all;
         partytimer("025-2-3", 200, "#BossCtrl_025-2-3::OnBossReward");
-    } else {
-        mapannounce "025-2-3", "Pinkie Emperor defeated by: " + strcharinfo(0), bc_all;
     }
     callfunc "02524_Revenge_BlackBox";
     fix_mobkill(PinkieEmperor);
diff --git a/npc/031-0/boss.txt b/npc/031-0/boss.txt
index 003d22b49..8ef2b1fa7 100644
--- a/npc/031-0/boss.txt
+++ b/npc/031-0/boss.txt
@@ -18,11 +18,7 @@ OnInit:
 OnBossDeath:
     initnpctimer;
     .@party=getcharid(1);
-    if (.@party > 0) {
-        mapannounce getmap(), "Tengu defeated by Party: " + getpartyname(.@party), bc_all;
-    } else {
-        mapannounce getmap(), "Tengu defeated by: " + strcharinfo(0), bc_all;
-    }
+    announce_bosskill(getmap(), Tengu);
     getexp 0, 1000+BaseLevel*8+JobLevel;
     fix_mobkill(Tengu);
     end;