From ad9a14992cde8ad6759263da37e723b2b1825981 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 8 May 2015 16:15:07 +0200 Subject: Replaced checkre() calls with constants Signed-off-by: Haru --- npc/other/CashShop_Functions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'npc/other/CashShop_Functions.txt') diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 39bfa3c97..f71245ad6 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -74,7 +74,7 @@ function script F_CashReset { function script F_CashDungeon { switch(getarg(0)) { case 1: - switch(select("Nogg Road:Mjolnir Dead Pit:"+((checkre(0))?"":"Umbala Dungeon")+":Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor")) { + switch(select("Nogg Road:Mjolnir Dead Pit:"+(RENEWAL?"":"Umbala Dungeon")+":Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor")) { case 1: warp "mag_dun01",125,71; end; // Nogg Road case 2: warp "mjo_dun02",80,297; end; // Mjolnir Dead Pit case 3: warp "um_dun02",125,122; end; // Umbala Dungeon (Pre-Renewal only) @@ -133,7 +133,7 @@ function script F_CashCity { case 1: // Yellow - Rune-Midgart switch(select("Prontera:Izlude:Geffen:Payon:Morroc:Alberta:Al de Baran")) { case 1: warp "prontera",122,87; end; - case 2: if (checkre(0)) warp "izlude",130,90; else warp "izlude",91,105; end; + case 2: if (RENEWAL) warp "izlude",130,90; else warp "izlude",91,105; end; case 3: warp "geffen",128,48; end; case 4: warp "payon",164,123; end; case 5: warp "morocc",160,100; end; @@ -185,7 +185,7 @@ function script F_CashTele { case 1: warp "prontera",119,77; end; case 2: warp "geffen",119,39; end; case 3: warp "aldebaran",165,107; end; - case 4: if (checkre(0)) warp "izlude",128,105; else warp "izlude",91,105; end; + case 4: if (RENEWAL) warp "izlude",128,105; else warp "izlude",91,105; end; case 5: warp "SavePoint",0,0; end; } case 2: -- cgit v1.2.3-70-g09d2