From e9eb26c9bba14d40c00c9dac37c9ec79004358d7 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 8 Jun 2018 02:27:12 -0300
Subject: This might work out in the end

---
 npc/soren/main.txt | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'npc/soren/main.txt')

diff --git a/npc/soren/main.txt b/npc/soren/main.txt
index d2000ab11..ffeaa804b 100644
--- a/npc/soren/main.txt
+++ b/npc/soren/main.txt
@@ -72,19 +72,19 @@ soren,105,92,0	script	Soren's Fountain	NPC_NO_SPRITE,{
     if (askyesno() == ASK_YES) {
         .casterId=getcharid(3);
         .st=1;
-        npctalk l("@@ started disarm process. Please stand by.");
+        npctalk l("@@ started disarm process. Please stand by.", strcharinfo(0));
         initnpctimer;
-        close;
     }
-    end;
+    close;
 
-// Waves (total: 6 waves)
+// Waves (total: 6 waves + 1 optional)
 OnTimer5000:
 OnTimer10300:
 OnTimer14000:
 OnTimer18000:
 OnTimer25000:
-OnTimer29000:
+OnTimer28000:
+OnTimer31000:
     if (!attachrid(.casterId)) {
         npctalk "Disarm process aborted: Disarmer is gone.";
         stopnpctimer; .st=0;
@@ -128,26 +128,28 @@ OnTimer29000:
                 .@monsterId = Yeti ; break;
     }
     // Item Gen
-    .@mid=rand(1,5)+.st;
+    .@mid=rand(1,7)+.st;
     switch (.@mid) {
         case 1:
         case 2:
                 .@itemId = Acorn ; break;
         case 3:
-                .@itemId = ChocolateMouboo ; break;
         case 4:
+                .@itemId = ChocolateMouboo ; break;
         case 5:
-                .@itemId = OrangeCupcake ; break;
         case 6:
-                .@itemId = CherryCake ; break;
+                .@itemId = OrangeCupcake ; break;
         case 7:
         case 8:
-                .@itemId = Chagashroom ; break;
+                .@itemId = CherryCake ; break;
         case 9:
-                .@itemId = HastePotion ; break;
         case 10:
+                .@itemId = Chagashroom ; break;
+        case 11:
+                .@itemId = HastePotion ; break;
+        case 12:
                 .@itemId = rand(Diamond, Amethyst) ; break;
-        default: // case 11
+        default: // case 13
                 .@itemId = rand(CopperOre, TitaniumOre) ; break;
     }
     // Defines
@@ -160,7 +162,7 @@ OnTimer29000:
     areamonster .map$, .@lx, .@ly, .@ux, .@uy, strmobinfo(1, .@monsterId), .@monsterId, .@amount; makeitem(.@itemId, 1, .map$, rand(.@lx, .@ux), rand(.@ly, .@uy)); ++.st;
 
     // If we're done with waves
-    if (.st >= 6) {
+    if (.st >= 7) {
         .lifetime=gettimetick(2)+300+rand(0, 60);
         npctalk l("Disarmed with success for: @@", FuzzyTime(.lifetime, 2, 2));
         stopnpctimer; .st=0;
-- 
cgit v1.2.3-60-g2f50