Merge branch 'master' into heroes_holdheroes_hold

9 files changed, 40 insertions, 20 deletions

diff --git a/npc/001-7/celestia_bossfight.txt b/npc/001-7/celestia_bossfight.txt
index 89f57f3a3..a357bf9c4 100644
--- a/npc/001-7/celestia_bossfight.txt
+++ b/npc/001-7/celestia_bossfight.txt
@@ -66,10 +66,10 @@ L_Survivor:
                 getitem rand(CopperOre, TitaniumOre), 1;
             break;
         case 2:
-            getexp .@r*20, .@r; // max 2000 xp and 100 jp
+            getexp .@r*80, .@r*2; // max 8000 xp and 200 jp
             break;
         case 3:
-            Zeny=Zeny+.@r*25; // max 2500 gp
+            Zeny=Zeny+.@r*75; // max 7500 gp
             break;
         case 4:
             getitem Coal, (.@r/20); // max 5 coal
@@ -99,6 +99,8 @@ L_Survivor:
             next;
             mesn col(l("The Yeti King"), 3);
             mesq l("I give you five minutes to defeat me. Witness my wrath!");
+            if (mobcount(.map$, "#YetiKing::OnVictory"))
+                close;
             setnpcdisplay .name$, NPC_NO_SPRITE;
             npctalk l("*Roaaaaaar!*");
             monster .map$, .x, .y, strmobinfo(1, YetiKing), YetiKing, 1, "#YetiKing::OnVictory";
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index f668c99e2..9c4d698b7 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -7,6 +7,11 @@
 //    Take care of server updates, but instances are defined on their ships.
 
 003-3,36,34,0	script	Malindou	NPC_LLOYD,{
+    function	UpdateBF {
+        .@o=getbattleflag(getarg(0));
+        setbattleflag(getarg(0), .@o+getarg(1,0));
+    }
+
     Banker(.name$, "Tulimshar", 14000);
     close;
 
@@ -76,6 +81,13 @@ OnInit:
     htput($@CONTRIBUTORS, "dustman",    50);
     htput($@CONTRIBUTORS, "dragonstar", 20);
     //htput($@CONTRIBUTORS, "", 1);
+
+    // We must also apply penalty for losing Mana Fragments
+    // Forest Mana Fragment is lost: (+1% HP, +5% pop, 20s faster removal)
+    UpdateBF("monster_hp_rate",1);
+    UpdateBF("mob_count_rate",5);
+    UpdateBF("mob_remove_delay",-20000);
+    // Just copy these lines as fragments are lost
     end;
 
 OnPCLoginEvent:
diff --git a/npc/012-1/jack.txt b/npc/012-1/jack.txt
index c1bb45e5b..c66a1a820 100644
--- a/npc/012-1/jack.txt
+++ b/npc/012-1/jack.txt
@@ -106,7 +106,7 @@ L_Loop:
     delitem RawLog, 1;
     .@success=rand(6,26)-.@k; // You will never need more than 20 logs nor less than 5 logs
 
-    if (.@success == 1) {
+    if (.@success <= 1) {
         mesc l("The wood bends a little, but doesn't breaks.");
         getexp 295, 100; // 10% of max exp
         setq2 HurscaldQuest_ForestBow, 99;
diff --git a/npc/012-1/luffyx.txt b/npc/012-1/luffyx.txt
index 96ac80a96..d3f0adae1 100644
--- a/npc/012-1/luffyx.txt
+++ b/npc/012-1/luffyx.txt
@@ -27,7 +27,11 @@ L_SummerQuest:
     mesq l("Hey, do you know what is good on summer? @@!", getitemlink(LuffyxSummerShorts));
     next;
     mesn;
-    mesq l("What about you bring me 60 @@, 40 @@ and 20 @@? And a @@!", getitemlink(CactusCocktail), getitemlink(AppleCocktail), getitemlink(CherryCocktail), getitemlink(JeansShorts));
+    mes l("What about you bring me:");
+    mes l("@@/60 @@", countitem(CactusCocktail), getitemlink(CactusCocktail));
+    mes l("@@/40 @@", countitem(AppleCocktail), getitemlink(AppleCocktail));
+    mes l("@@/20 @@", countitem(CherryCocktail), getitemlink(CherryCocktail));
+    mes l("@@/1 @@", countitem(JeansShorts), getitemlink(JeansShorts));
     next;
     select
         l("Not now, thanks"),
@@ -49,6 +53,7 @@ L_SummerQuest:
         delitem CactusCocktail, 60;
         delitem JeansShorts, 1;
         getitem LuffyxSummerShorts, 1;
+        getexp 6500, 120;
         setq SQuest_Summer, 1;
         mesn;
         mesq l("Yay yay! Many thanks! Here, take the reward as promised!");
diff --git a/npc/012-3/alan.txt b/npc/012-3/alan.txt
index dbbf89d32..e1f328a23 100644
--- a/npc/012-3/alan.txt
+++ b/npc/012-3/alan.txt
@@ -89,8 +89,8 @@ OnInit:
 
     if ($ARKIM_ST > 1400)
         sellitem CursedArrow, -1, $ARKIM_ST-1400;
-    if ($ARKIM_ST > 1800)
-        sellitem PoisonArrow, -1, $ARKIM_ST-1800;
+    if ($ARKIM_ST > 2800)
+        sellitem PoisonArrow, -1, $ARKIM_ST-2800;
     end;
 
 
@@ -105,7 +105,7 @@ OnClock1800:
     restoreshopitem IronArrow, -1, 500;
     if ($ARKIM_ST > 1400)
         restoreshopitem CursedArrow, -1, $ARKIM_ST-1400;
-    if ($ARKIM_ST > 1800)
-        restoreshopitem PoisonArrow, -1, $ARKIM_ST-1800;
+    if ($ARKIM_ST > 2800)
+        restoreshopitem PoisonArrow, -1, $ARKIM_ST-2800;
 
 }
diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt
index 103541c94..5639efbd2 100644
--- a/npc/012-5/nicholas.txt
+++ b/npc/012-5/nicholas.txt
@@ -77,7 +77,7 @@ L_Menu:
         l("I just want to trade."),
         l("I want to forge Weapons!"),
         l("I want to forge Shields!"),
-        rif(is_admin(), l("I want to forge Quivers!")),
+        l("I want to forge Quivers!"),
         l("Nothing, thanks!");
 
     mes "";
diff --git a/npc/015-2/contrabandist.txt b/npc/015-2/contrabandist.txt
index 6f52c49af..296a3ebce 100644
--- a/npc/015-2/contrabandist.txt
+++ b/npc/015-2/contrabandist.txt
@@ -14,7 +14,7 @@ openshop;
 close;
 
     function Contraband_Unload {
-        if ($ARKIM_ST > 4500)
+        if ($ARKIM_ST > 7500)
             stopselling(DarkDesertMushroom);
 
         if (getarg(0,0) & 1)
@@ -36,8 +36,8 @@ close;
         return;
     }
     function Contraband_Load {
-        .DDMPrice=max(30000,50000-($ARKIM_ST/2)+(4500/2));
-        if ($ARKIM_ST > 4500)
+        .DDMPrice=max(30000,50000-($ARKIM_ST/2)+(7500/2));
+        if ($ARKIM_ST > 7500)
             sellitem DarkDesertMushroom, .DDMPrice, 1;
 
         if (getarg(0,0) & 1)
diff --git a/npc/015-3/hermit.txt b/npc/015-3/hermit.txt
index 0f3a84ecd..506f7198b 100644
--- a/npc/015-3/hermit.txt
+++ b/npc/015-3/hermit.txt
@@ -27,7 +27,7 @@ L_Loop:
     next;    
     if (.@q3 > $@ARKIM_TIMER) goto L_Timer;
     if (.@q3 < $@ARKIM_TIMER-(60*60*24)) setq3 HurnscaldQuest_Arkim, $@ARKIM_TIMER-(60*60*24); // Globally-bound timed quest
-    if (.@q2 >= 12) goto L_Timer;
+    if (.@q2 >= (BaseLevel-17)/3) goto L_Timer;
     select
         rif(countitem(BatWing) >= 1, l("Donate a Bat Wing")),
         rif(countitem(BatTeeth) >= 1, l("Donate a Bat Teeth")),
@@ -58,6 +58,8 @@ L_Loop:
     goto L_Loop;
 
 L_Timer:
+    if (BaseLevel < 20)
+        mesc l("You need at least level 20 to help.");
     mesn;
     mesq l("You've helped me plenty. Please come back in @@", FuzzyTime($@ARKIM_TIMER+(60*60*24),2,2));
     close;
@@ -70,13 +72,13 @@ L_Research:
     select
         l("Thanks."),
         rif($ARKIM_ST >= 1400, l("Cursed Arrows")),
-        rif($ARKIM_ST >= 1800, l("Poison Arrows")),
+        rif($ARKIM_ST >= 2800, l("Poison Arrows")),
         rif($ARKIM_ST >= 1200, l("Piberries Infusion")),
-        rif($ARKIM_ST >= 1600, l("Fate's Potion")),
-        rif($ARKIM_ST >= 2000, l("Clotho Liquor")),
-        rif($ARKIM_ST >= 2700, l("Lachesis Brew")),
-        rif($ARKIM_ST >= 3600, l("Atropos Mixture")),
-        rif($ARKIM_ST >= 4500, l("Dark Desert Mushroom"));
+        rif($ARKIM_ST >= 2600, l("Fate's Potion")),
+        rif($ARKIM_ST >= 4000, l("Clotho Liquor")),
+        rif($ARKIM_ST >= 4700, l("Lachesis Brew")),
+        rif($ARKIM_ST >= 6600, l("Atropos Mixture")),
+        rif($ARKIM_ST >= 7500, l("Dark Desert Mushroom"));
     mes "";
     mesn;
 
diff --git a/npc/016-1/captain.txt b/npc/016-1/captain.txt
index e31c9fa28..6850fd398 100644
--- a/npc/016-1/captain.txt
+++ b/npc/016-1/captain.txt
@@ -146,7 +146,6 @@ OnInterIfInit:
     instance_attachmap("016-1", .TULIM_INSTID, 0, "016-1@Tulim");
     instance_set_timeout(1000000, 1000000, .TULIM_INSTID);
     instance_init(.TULIM_INSTID);
-    end;
 
     // Hurns Instance
     .HURNS_INSTID = instance_create("016-1@HurnsInst", 0, IOT_NONE);