From ddb8de13e5a3624933c27c0b08957da7b4ddec9f Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 8 Jun 2018 20:18:22 -0300
Subject: Introduce @YetiKing_Challenger. Only those lvl 35+ who join the quest
 by challenging the Yeti King will have that flag and be able to: * Challenge
 the Yeti King on the very end * Have higher chances of better rewards at end,
 or get more xp/gp.

---
 npc/001-7/celestia_bossfight.txt | 6 +++---
 npc/003-1-1/yetiking.txt         | 6 ++++--
 npc/soren-2/main.txt             | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'npc')

diff --git a/npc/001-7/celestia_bossfight.txt b/npc/001-7/celestia_bossfight.txt
index c84190775..614a2ab43 100644
--- a/npc/001-7/celestia_bossfight.txt
+++ b/npc/001-7/celestia_bossfight.txt
@@ -46,10 +46,10 @@ L_Survivor:
         l("I want coal");
 
     mes "";
-    .@r=rand(1,100);
+    .@r=rand(1,100)+(@YetiKing_Challenger*5);
     switch (@menu) {
         case 1:
-            if (.@r < 30)
+            if (.@r > 70)
                 getitem rand(Diamond, Amethyst), 1;
             else
                 getitem rand(CopperOre, TitaniumOre), 1;
@@ -73,7 +73,7 @@ L_Survivor:
     mes "";
     select
         l("Please, bring me back home."),
-        rif((getareausers("001-7", 7) > 1 || $@GM_OVERRIDE) && !mobcount(.map$, "#YetiKing::OnVictory"), l("No, we challenge you to a duel!")),
+        rif((getareausers("001-7", 7) > 1 || $@GM_OVERRIDE) && !mobcount(.map$, "#YetiKing::OnVictory") && @YetiKing_Challenger, l("No, we challenge you to a duel!")),
         l("I'll walk around here a little more.");
 
     mes "";
diff --git a/npc/003-1-1/yetiking.txt b/npc/003-1-1/yetiking.txt
index 4b01b5069..303f1857d 100644
--- a/npc/003-1-1/yetiking.txt
+++ b/npc/003-1-1/yetiking.txt
@@ -118,14 +118,16 @@ OnSummonTalk:
     mesn "Dah Yeti King!!";
     mesq l("I'll warp you to the Cave Of Trials. Pass all trials, and meet me on Soren's House. Hahah!");
     setq HurnscaldQuest_Celestia, 2;
+    @YetiKing_Challenger=1;
     areatimer "003-1-1", 93, 20, 97, 25, 15000, "#DahYetiKing::OnWarper";
     npctalk l("Listen to me! Whoever wants to follow foolish @@ on their suicide quest, stay here for 15 seconds!", strcharinfo(0));
     close;
 
 OnWarper:
     // If you had to return, erase quest progress
-    if (.@q > 2 && .@q < 99)
-        setq HurnscaldQuest_Celestia, 2;
+    if (.@q > 2 && .@q < 99) {
+            @YetiKing_Challenger=0;
+    }
 
     mes col("Warp to the Cave Of Trials?", 9);
     mes col("There is no EXP penalty, but you cannot go back without either completing the cave, or dying.", 9);
diff --git a/npc/soren-2/main.txt b/npc/soren-2/main.txt
index e5354bcd6..19e856526 100644
--- a/npc/soren-2/main.txt
+++ b/npc/soren-2/main.txt
@@ -214,7 +214,7 @@ OnStep4:
 
 OnStep5:
     //setnpcdisplay .name$, NPC_NO_SPRITE;
-    npctalk3 l("May the last line of defense of Soren's happen. Once you're done, this will become a warp. Hurry before it closes.");
+    npctalk3 l("Defeat a few waves of Soren's House. Once you're done, this will become a warp. Hurry before it closes.");
     @sorensanctum=0;
     addtimer(5000, "#SorenSanctum::OnSanctum");
     end;
-- 
cgit v1.2.3-60-g2f50