Fix Fountain part

2 files changed, 22 insertions, 16 deletions

diff --git a/npc/014-3/fountain.txt b/npc/014-3/fountain.txt
index 9078d1e14..702afc1d0 100644
--- a/npc/014-3/fountain.txt
+++ b/npc/014-3/fountain.txt
@@ -3,7 +3,8 @@
 //    Saulc
 //    Jesusalva
 // Description:
-//    Hurnscald doesn't have a well
+//    Hurnscald doesn't have a well, but have a MAGIC FOUNTAIN ***
+//    Req. Int 40 to finish Tier Elevation quest.
 
 014-3,151,117,0	script	Fountain#Hurns	NPC_NO_SPRITE,{
     if (ST_TIER == 5 && gettimetick(2) < QUEST_ELEVARTEMPO) goto L_Tier2;
@@ -12,7 +13,7 @@
     mes col("But I probably should not do it. It might be poisoned!", 9);
     close;
 
-    // TODO FIXME: We don't have a "Hurnscald" water, and we might add
+    // TODO FIXME: We don't have a "Magic" water, and we might add
     // Mahed or Mahad, another well master (Mehoud? Muhoud?)
     input .@count;
 
@@ -47,6 +48,7 @@ L_NotEnoughMoney:
 
 
 L_Tier2:
+    if (readparam(bInt) < 10) goto L_Dumb;
     mesn;
     mes col("WHAT ARE YOU GOING TO DO?", 9);
     next;
@@ -76,19 +78,33 @@ L_Tier2:
     mes col("Nothing happens.", 9);
     close;
 
+L_Fail2:
+    mes col("Your low intelligence prevents anything from happening with you.", 9);
+    mes "";
+
 L_Failed:
     mesn strcharinfo(0);
     mesq l("Ah no... That's not what I had to do... I wasted the potion...");
     QUEST_ELEVARTEMPO=gettimetick(2);
     close;
 
+L_Dumb:
+    mesn strcharinfo(0);
+    mesq l("Hello there pretty fountain, what about granting me magic?");
+    next;
+    mes col("Unsurprisingly, nothing happens.", 9);
+    close;
+
 L_Tier2Ok:
     mes col("You pour the whole potion on the fountain.", 9);
     next;
+    if (readparam(bInt) < 20) goto L_Fail2;
     mes col("You hear birds singing! That is what you had to do!", 9);
     next;
+    if (readparam(bInt) < 30) goto L_Fail2;
     mes col("Your body starts to glow. You're not sure why, the fountain did that!", 9);
     next;
+    if (readparam(bInt) < 40) goto L_Fail2;
     mesn;
     mes l("I am the Magic Fountain of Hurnscald. You look qualified.");
     next;
@@ -102,7 +118,8 @@ L_Tier2Ok:
     mes l("I will empower you with raw mana, and your time will start running out again.");
     next;
     // 4~6 minutes to finish in average. Each level grants 4~6 extra seconds.
-    QUEST_ELEVARTEMPO=gettimetick(2)+rand((BaseLevel*4),(BaseLevel*6));
+    // You will also get extra time for int, but randomly.
+    QUEST_ELEVARTEMPO=gettimetick(2)+rand((BaseLevel*4),(BaseLevel*6))+rand(1,readparam(bInt));
     ST_TIER=6;
     // Ref. 240 xp. You will be penalized with 1 xp for over-level. (waw...)
     if (BaseLevel < 300)
@@ -114,15 +131,7 @@ L_Tier2Ok:
 OnInit:
     .COST_PER_BOTTLE = 0;
     .sex = G_OTHER;
-    .distance = 7;
-
-    .@npcId = getnpcid(0, .name$);
-    // Check items.xml for info about this
-    setunitdata(.@npcId, UDT_HEADTOP, InfantryHelmet);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
+    .distance = 3;
 
     end;
 }
diff --git a/npc/functions/class.txt b/npc/functions/class.txt
index 8cad0ec43..20bfd3d3a 100644
--- a/npc/functions/class.txt
+++ b/npc/functions/class.txt
@@ -303,10 +303,7 @@ L_T2_S5:
     mesq l("Good! Last step! West of Hurnscald, there is a magic fountain.");
     next;
     mesn;
-    // TODO FIXME WARNING DESYNC-ED
-    // 1- Pour the potion
-    // 2- Add to fountain an int check
-    mesq l("Talk to the Fountain. Obey every command. I advise you to put all your points on int if possible.");
+    mesq l("Talk to the Fountain. Pour the potion on it. I advise you to put all your points on int if possible.");
     next;
     mesn;
     mesq l("Hurry up, you'll run out of time in @@!", FuzzyTime(QUEST_ELEVARTEMPO,2,2));