From 92a965db33335894490abadd4e51da042eb422fe Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 8 Apr 2022 10:44:21 -0300
Subject: Backport all changes from Legacy

---
 npc/functions/evil_obelisk.txt | 95 ++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 45 deletions(-)

(limited to 'npc/functions/evil_obelisk.txt')

diff --git a/npc/functions/evil_obelisk.txt b/npc/functions/evil_obelisk.txt
index b85884c7..6ac78596 100644
--- a/npc/functions/evil_obelisk.txt
+++ b/npc/functions/evil_obelisk.txt
@@ -1,96 +1,101 @@
 function	script	EvilObelisk	{
-    mes "[Evil Obelisk]";
-    mes "(A mystical aura surrounds this stone. It seems to crave money.)";
+    mesn l("Evil Obelisk");
+    mes l("(A mystical aura surrounds this stone. It seems to crave money.)");
     next;
 
-    @Cost_jacko = 6500;
-    @Cost_gy1 = 4000;
-    @Cost_gy2 = 3000;
-    @Cost_skull = 2800;
-    @Cost_snake = 2500;
+    .@Cost_jacko = 6500;
+    .@Cost_gy1 = 4000;
+    .@Cost_gy2 = 3000;
+    .@Cost_skull = 2800;
+    .@Cost_snake = 2500;
+    .@Cost_keshlam = 10000;
 
     menu
-        "Don't pay it anything.", L_close,
-        "Pay it " + @Cost_jacko + " gold.", L_JACKO,
-        "Pay it " + @Cost_gy1 + " gold.", L_GRAVEYARD1,
-        "Pay it " + @Cost_gy2 + " gold.", L_GRAVEYARD2,
-        "Pay it " + @Cost_skull + " gold.", L_SKULL,
-        "Pay it " + @Cost_snake + " gold.", L_SNAKE;
+        "Don't pay it anything.", -,
+        "Pay it " + .@Cost_jacko + " gold.", L_JACKO,
+        "Pay it " + .@Cost_gy1 + " gold.", L_GRAVEYARD1,
+        "Pay it " + .@Cost_gy2 + " gold.", L_GRAVEYARD2,
+        "Pay it " + .@Cost_skull + " gold.", L_SKULL,
+        "Pay it " + .@Cost_snake + " gold.", L_SNAKE,
+        "Pay it " + .@Cost_keshlam + " gold.", L_KESHLAM;
+    return;
 
 L_JACKO:
-    if (Zeny < @Cost_jacko)
+    if (Zeny < .@Cost_jacko)
         goto L_NotEnough;
-    Zeny = Zeny - @Cost_jacko;
-    @mob_id = 1022;
+    Zeny = Zeny - .@Cost_jacko;
+    @mob_id = JackO;
     @mob_count = rand(1,2);
     goto L_Summon;
 
 L_GRAVEYARD1:
-    if (Zeny < @Cost_gy1)
+    if (Zeny < .@Cost_gy1)
         goto L_NotEnough;
     @temp = rand(2);
     if(@temp == 0)
-        set @mob_id, 1036;  // Zombie
+        set @mob_id, Zombie;  // Zombie
     if(@temp == 1)
-        set @mob_id, 1045;  // Fallen
+        set @mob_id, Fallen;  // Fallen
     @mob_count = rand(1,2);
-    Zeny = Zeny - @Cost_gy1;
+    Zeny = Zeny - .@Cost_gy1;
     goto L_Summon;
 
 L_GRAVEYARD2:
-    if (Zeny < @Cost_gy2)
+    if (Zeny < .@Cost_gy2)
         goto L_NotEnough;
     @temp = rand(2);
     if(@temp == 0)
-        set @mob_id, 1044;  // Lady Skelly
+        set @mob_id, LadySkeleton;  // Lady Skelly
     if(@temp == 1)
-        set @mob_id, 1043;  // Normal Skelly
+        set @mob_id, Skeleton;      // Normal Skelly
     @mob_count = rand(1,2);
-    Zeny = Zeny - @Cost_gy2;
+    Zeny = Zeny - .@Cost_gy2;
     goto L_Summon;
 
 L_SKULL:
-    if (Zeny < @Cost_skull)
+    if (Zeny < .@Cost_skull)
         goto L_NotEnough;
     @temp = rand(2);
     if(@temp == 0)
-        set @mob_id, 1024;  // Poison
+        set @mob_id, PoisonSkull;  // Poison
     if(@temp == 1)
-        set @mob_id, 1023;  // Fire
+        set @mob_id, FireSkull;    // Fire
     @mob_count = rand(1,4);
-    Zeny = Zeny - @Cost_skull;
+    Zeny = Zeny - .@Cost_skull;
     goto L_Summon;
 
 L_SNAKE:
-    if (Zeny < @Cost_snake)
+    if (Zeny < .@Cost_snake)
         goto L_NotEnough;
-    @temp = rand(4);
+    @temp = rand(5);
     if(@temp == 0)
-        set @mob_id, 1034;  // Grass
+        set @mob_id, GrassSnake;     // Grass
     if(@temp == 1)
-        set @mob_id, 1026;  // Mnt.
+        set @mob_id, MountainSnake;  // Mnt.
     if(@temp == 2)
-        set @mob_id, 1010;  // Normal
+        set @mob_id, Snake;          // Normal
     if(@temp == 3)
-        set @mob_id, 1021;  // Cave
+        set @mob_id, CaveSnake;      // Cave
+    if(@temp == 4)
+        set @mob_id, VoidSnake;      // Void
     @mob_count = rand(1,4);
-    Zeny = Zeny - @Cost_snake;
+    Zeny = Zeny - .@Cost_snake;
+    goto L_Summon;
+
+L_KESHLAM:
+    if (Zeny < .@Cost_keshlam)
+        goto L_NotEnough;
+    set @mob_id, any(Tengu, Sasquatch, ManaSlayer);
+    @mob_count = rand(1,3);
+    Zeny = Zeny - .@Cost_keshlam;
     goto L_Summon;
 
 L_Summon:
     areamonster @map$, @x0, @y0, @x1, @y1, "Evil", @mob_id, @mob_count;
-    goto L_close;
+    return;
 
 L_NotEnough:
-    mes "You don't have that much money";
-    goto L_close;
-
-L_close:
-    @Cost_jacko = 0;
-    @Cost_gy1 = 0;
-    @Cost_gy2 = 0;
-    @Cost_skull = 0;
-    @Cost_snake = 0;
+    mes l("You don't have that much money");
     return;
 
 }
-- 
cgit v1.2.3-60-g2f50