[skip ci] Merge branch 'master' into heroes_hold

1 files changed, 8 insertions, 5 deletions

diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index d50241346..956c08c91 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -29,6 +29,8 @@ L_Admus:
     setmapflagnosave("012-1", "000-1", 22, 22);
     //setmapflag("012-1", mf_nocommand); // This is just too powerful!
     setmapflag("012-1", mf_battleground);
+    setmapflag("012-1", mf_nopenalty);
+    setmapflag("012-1",mf_bexp,126);
     enablenpc "Hurnsguard";
 	donpcevent "Hurnsguard::OnSet";
 	donpcevent "Lieutenant Paul::OnSet";
@@ -163,10 +165,10 @@ OnDoEvent:
 OnSkip:
     // Here, coins drop rate are based on REMAINING PLAYERS and DEFEATED MONSTER LEVEL.
     // A level 100 monster can have a 5% drop bonus against a level 0 monster.
-    // You have 1% of base chance, plus 0.5% each player + 0.05% each monster level.
-    if (rand(10000) <= 100 + (getmapusers("012-1")*50) + (strmobinfo(3,killedrid)*5))
+    // You have 1.2% of base chance, plus 0.5% each player + 0.05% each monster level.
+    if (rand(10000) <= 120 + (getmapusers("012-1")*50) + (strmobinfo(3,killedrid)*5))
         getmapxy(.@m$, .@x, .@y, 0);
-        makeitem(any(Plushroom, Chagashroom, Bread, HalfCroconut, Aquada, CasinoCoins), rand(1,2), "012-1", .@x, .@y);
+        makeitem(any(Plushroom, Chagashroom, Bread, HalfCroconut, Aquada, CasinoCoins, CactusCocktail, AppleCocktail, CherryCocktail), any(1,1,2), "012-1", .@x, .@y);
     end;
 
 OnTimer300000:
@@ -207,10 +209,10 @@ OnTimer240000:
     // Scripted monsters
     if (.CYCLES == 2) {
     	mapannounce("012-1", "Monster Lieutenant appears! Watch out!", bc_map);
-        monster("012-1", 65, 71, "Monster Lieutenant", NightScorpion, 1, "Hurnsguard::OnXtreem");
+    	bg_monster($@FK_Team2, "012-1", 65, 71, "Monster Lieutenant", NightScorpion, "Hurnsguard::OnXtreem");
     } else if (.CYCLES == 3) {
     	mapannounce("012-1", "Monster Admiral appears! Kill it to liberate Hurns!", bc_map);
-        monster("012-1", 65, 71, "Monster Admiral", GiantMutatedBat, 1, "Hurnsguard::OnVictory");
+    	bg_monster($@FK_Team2, "012-1", 65, 71, "Monster Admiral", GiantMutatedBat, "Hurnsguard::OnVictory");
     }
 
     // One monster per user alive
@@ -298,6 +300,7 @@ OnVictory:
     removemapmask "012-1", MASK_EVILSANCTUM;
     //removemapflag("012-1", mf_nocommand);
     removemapflag("012-1", mf_battleground);
+    removemapflag("012-1", mf_bexp);
     enablenpc "#012-1_22_62";
     enablenpc "#012-1_79_17";
     enablenpc "#012-1_79_102";